diff options
author | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
commit | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch) | |
tree | 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/panels/color/colorpanelbase.reel/css/colorpanelbase.scss | |
parent | c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff) | |
parent | 40c6eb2c06b34f65a74d59ef9687251952858bab (diff) | |
download | ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz |
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts:
js/components/gradientpicker.reel/gradientpicker.js
js/components/tools-properties/text-properties.reel/text-properties.js
js/document/views/base.js
js/document/views/design.js
js/helper-classes/3D/StageLine.js
js/helper-classes/3D/draw-utils.js
js/lib/drawing/world.js
js/lib/geom/circle.js
js/lib/geom/line.js
js/lib/geom/rectangle.js
js/lib/geom/shape-primitive.js
js/lib/rdge/materials/bump-metal-material.js
js/lib/rdge/materials/flag-material.js
js/lib/rdge/materials/fly-material.js
js/lib/rdge/materials/julia-material.js
js/lib/rdge/materials/keleidoscope-material.js
js/lib/rdge/materials/mandel-material.js
js/lib/rdge/materials/material.js
js/lib/rdge/materials/plasma-material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/radial-gradient-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/water-material.js
js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
js/panels/Materials/materials-popup.reel/materials-popup.html
js/panels/Materials/materials-popup.reel/materials-popup.js
js/tools/LineTool.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/panels/color/colorpanelbase.reel/css/colorpanelbase.scss')
-rwxr-xr-x | js/panels/color/colorpanelbase.reel/css/colorpanelbase.scss | 338 |
1 files changed, 169 insertions, 169 deletions
diff --git a/js/panels/color/colorpanelbase.reel/css/colorpanelbase.scss b/js/panels/color/colorpanelbase.reel/css/colorpanelbase.scss index 79461048..b8009903 100755 --- a/js/panels/color/colorpanelbase.reel/css/colorpanelbase.scss +++ b/js/panels/color/colorpanelbase.reel/css/colorpanelbase.scss | |||
@@ -37,327 +37,327 @@ $sprite_stdbtn_spacing: 4; | |||
37 | 37 | ||
38 | @mixin sprite_background ($x, $y) | 38 | @mixin sprite_background ($x, $y) |
39 | { | 39 | { |
40 | background: url(../../../../../images/SpriteSheets/NinjaSpriteSheet.png) transparent no-repeat top left !important; | 40 | background: url(../../../../../images/SpriteSheets/NinjaSpriteSheet.png) transparent no-repeat top left !important; |
41 | background-position: $x*-1px $y*-1px !important; | 41 | background-position: $x*-1px $y*-1px !important; |
42 | border: none !important; | 42 | border: none !important; |
43 | display: block; | 43 | display: block; |
44 | } | 44 | } |
45 | 45 | ||
46 | .cp_expanded | 46 | .cp_expanded |
47 | { | 47 | { |
48 | font-size: 12px; | 48 | font-size: 12px; |
49 | text-shadow: 1px 1px 1px #000; | 49 | text-shadow: 1px 1px 1px #000; |
50 | color: #FFF; | 50 | color: #FFF; |
51 | } | 51 | } |
52 | 52 | ||
53 | .cp_expanded a:hover | 53 | .cp_expanded a:hover |
54 | { | 54 | { |
55 | color: #CCC; | 55 | color: #CCC; |
56 | } | 56 | } |
57 | 57 | ||
58 | .cp_expanded hr | 58 | .cp_expanded hr |
59 | { | 59 | { |
60 | float: left; | 60 | float: left; |
61 | clear: both; | 61 | clear: both; |
62 | width: 100%; | 62 | width: 100%; |
63 | display: block; | 63 | display: block; |
64 | background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.5, rgb(29,29,29)), color-stop(0.75, rgb(66,66,66))); | 64 | background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.5, rgb(29,29,29)), color-stop(0.75, rgb(66,66,66))); |
65 | border: none; | 65 | border: none; |
66 | height: 2px; | 66 | height: 2px; |
67 | margin: 4px 0px 4px 0px; | 67 | margin: 4px 0px 4px 0px; |
68 | } | 68 | } |
69 | 69 | ||
70 | .cp_history | 70 | .cp_history |
71 | { | 71 | { |
72 | float: left; | 72 | float: left; |
73 | margin: 4px 0px 0px 4px; | 73 | margin: 4px 0px 0px 4px; |
74 | background: url(../../../../../images/colorpanel/transparent.png) repeat; | 74 | background: url(../../../../../images/colorpanel/transparent.png) repeat; |
75 | } | 75 | } |
76 | 76 | ||
77 | .cp_history button | 77 | .cp_history button |
78 | { | 78 | { |
79 | 79 | ||
80 | width: 22px; | 80 | width: 22px; |
81 | height: 22px; | 81 | height: 22px; |
82 | overflow: hidden; | 82 | overflow: hidden; |
83 | text-indent: -9999px; | 83 | text-indent: -9999px; |
84 | background: #333; | 84 | background: #333; |
85 | float: left; | 85 | float: left; |
86 | border: solid 1px #000; | 86 | border: solid 1px #000; |
87 | cursor: pointer; | 87 | cursor: pointer; |
88 | margin: 0px -1px 0px 0px; | 88 | margin: 0px -1px 0px 0px; |
89 | padding: 0px 0px 0px 0px; | 89 | padding: 0px 0px 0px 0px; |
90 | } | 90 | } |
91 | 91 | ||
92 | .cp_expanded .cp_inputs | 92 | .cp_expanded .cp_inputs |
93 | { | 93 | { |
94 | float: left; | 94 | float: left; |
95 | margin: 0px 4px 0px 4px; | 95 | margin: 0px 4px 0px 4px; |
96 | } | 96 | } |
97 | 97 | ||
98 | 98 | ||
99 | .cp_expanded .cp_input_button | 99 | .cp_expanded .cp_input_button |
100 | { | 100 | { |
101 | background: url(../../../../../images/colorpanel/transparent.png) repeat; | 101 | background: url(../../../../../images/colorpanel/transparent.png) repeat; |
102 | float: left; | 102 | float: left; |
103 | clear: left; | 103 | clear: left; |
104 | margin: 0px 0px 6px 0px; | 104 | margin: 0px 0px 6px 0px; |
105 | } | 105 | } |
106 | 106 | ||
107 | .cp_expanded .cp_inputs button, .cpe_fill, .cpe_stroke, .cpe_fill_icon, .cpe_stroke_icon | 107 | .cp_expanded .cp_inputs button, .cpe_fill, .cpe_stroke, .cpe_fill_icon, .cpe_stroke_icon |
108 | { | 108 | { |
109 | 109 | ||
110 | width: 22px; | 110 | width: 22px; |
111 | height: 22px; | 111 | height: 22px; |
112 | overflow: hidden; | 112 | overflow: hidden; |
113 | text-indent: -9999px; | 113 | text-indent: -9999px; |
114 | padding: 0px 0px 0px 0px; | 114 | padding: 0px 0px 0px 0px; |
115 | display: block; | 115 | display: block; |
116 | float: left; | 116 | float: left; |
117 | cursor: pointer; | 117 | cursor: pointer; |
118 | } | 118 | } |
119 | 119 | ||
120 | .cpe_fill, .cpe_stroke | 120 | .cpe_fill, .cpe_stroke |
121 | { | 121 | { |
122 | clear: left; | 122 | clear: left; |
123 | background-color: #333; | 123 | background-color: #333; |
124 | border: solid 1px #000; | 124 | border: solid 1px #000; |
125 | } | 125 | } |
126 | 126 | ||
127 | .cpe_fill_icon, .cpe_fill_icon | 127 | .cpe_fill_icon, .cpe_fill_icon |
128 | { | 128 | { |
129 | @include sprite_background (($sprite_stdbtn_width+$sprite_stdbtn_spacing)*10, 0); | 129 | @include sprite_background (($sprite_stdbtn_width+$sprite_stdbtn_spacing)*10, 0); |
130 | } | 130 | } |
131 | 131 | ||
132 | .cpe_fill_icon:hover, .cpe_fill_icon.selected, .cpe_fill_icon:hover, .cpe_fill_icon.selected | 132 | .cpe_fill_icon:hover, .cpe_fill_icon.selected, .cpe_fill_icon:hover, .cpe_fill_icon.selected |
133 | { | 133 | { |
134 | @include sprite_background (($sprite_stdbtn_width+$sprite_stdbtn_spacing)*11, 0); | 134 | @include sprite_background (($sprite_stdbtn_width+$sprite_stdbtn_spacing)*11, 0); |
135 | } | 135 | } |
136 | 136 | ||
137 | .cpe_stroke_icon, .cpe_stroke_icon | 137 | .cpe_stroke_icon, .cpe_stroke_icon |
138 | { | 138 | { |
139 | @include sprite_background (($sprite_stdbtn_width+$sprite_stdbtn_spacing)*8, ($sprite_stdbtn_height+$sprite_stdbtn_spacing)*1); | 139 | @include sprite_background (($sprite_stdbtn_width+$sprite_stdbtn_spacing)*8, ($sprite_stdbtn_height+$sprite_stdbtn_spacing)*1); |
140 | } | 140 | } |
141 | 141 | ||
142 | .cpe_stroke_icon:hover, .cpe_stroke_icon.selected, .cpe_stroke_icon:hover, .cpe_stroke_icon.selected | 142 | .cpe_stroke_icon:hover, .cpe_stroke_icon.selected, .cpe_stroke_icon:hover, .cpe_stroke_icon.selected |
143 | { | 143 | { |
144 | @include sprite_background (($sprite_stdbtn_width+$sprite_stdbtn_spacing)*9, ($sprite_stdbtn_height+$sprite_stdbtn_spacing)*1); | 144 | @include sprite_background (($sprite_stdbtn_width+$sprite_stdbtn_spacing)*9, ($sprite_stdbtn_height+$sprite_stdbtn_spacing)*1); |
145 | } | 145 | } |
146 | 146 | ||
147 | .cp_modes | 147 | .cp_modes |
148 | { | 148 | { |
149 | float: right; | 149 | float: right; |
150 | margin: 4px 6px 0px 0px; | 150 | margin: 4px 6px 0px 0px; |
151 | min-width: 73px; | 151 | min-width: 73px; |
152 | } | 152 | } |
153 | 153 | ||
154 | .cp_modes button | 154 | .cp_modes button |
155 | { | 155 | { |
156 | font-size: 14px; | 156 | font-size: 14px; |
157 | line-height: 22px; | 157 | line-height: 22px; |
158 | vertical-align: middle; | 158 | vertical-align: middle; |
159 | float: left; | 159 | float: left; |
160 | background: none; | 160 | background: none; |
161 | border: none; | 161 | border: none; |
162 | margin: 0px; | 162 | margin: 0px; |
163 | padding: 0px; | 163 | padding: |