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 /scss/imports | |
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 'scss/imports')
-rwxr-xr-x | scss/imports/scss/_Base.scss | 196 | ||||
-rwxr-xr-x | scss/imports/scss/_Components.scss | 4 | ||||
-rwxr-xr-x | scss/imports/scss/_MainWindow.scss | 58 | ||||
-rwxr-xr-x | scss/imports/scss/_MenuUI.scss | 6 | ||||
-rw-r--r-- | scss/imports/scss/_MontageOverrides.scss | 2 | ||||
-rwxr-xr-x | scss/imports/scss/_PanelUI.scss | 430 | ||||
-rwxr-xr-x | scss/imports/scss/_ScrollBars.scss | 36 | ||||
-rw-r--r-- | scss/imports/scss/_Stage.scss | 16 | ||||
-rwxr-xr-x | scss/imports/scss/_Tools.scss | 166 | ||||
-rwxr-xr-x | scss/imports/scss/_mixins.scss | 2 | ||||
-rwxr-xr-x | scss/imports/scss/_toolbar.scss | 6 | ||||
-rwxr-xr-x | scss/imports/themes/_test.scss | 14 | ||||
-rwxr-xr-x | scss/imports/themes/default/_colors.scss | 46 |
13 files changed, 491 insertions, 491 deletions
diff --git a/scss/imports/scss/_Base.scss b/scss/imports/scss/_Base.scss index 78a3bbaf..c5a2949b 100755 --- a/scss/imports/scss/_Base.scss +++ b/scss/imports/scss/_Base.scss | |||
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
31 | 31 | ||
32 | //Base.scss | 32 | //Base.scss |
33 | //Base styles for entire application. | 33 | //Base styles for entire application. |
34 | //Note that colors and font definitions go in | 34 | //Note that colors and font definitions go in |
35 | //_scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss | 35 | //_scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss |
36 | 36 | ||
37 | 37 | ||
@@ -45,9 +45,9 @@ POSSIBILITY OF SUCH DAMAGE. | |||
45 | font-weight: bold; | 45 | font-weight: bold; |
46 | } | 46 | } |
47 | :focus { | 47 | :focus { |
48 | outline: none; | 48 | outline: none; |
49 | border: none; | 49 | border: none; |
50 | -webkit-box-shadow: 0px 0px 1px 1px $color-focus-outline; | 50 | -webkit-box-shadow: 0px 0px 1px 1px $color-focus-outline; |
51 | 51 | ||
52 | } | 52 | } |
53 | .layout-table { | 53 | .layout-table { |
@@ -57,7 +57,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
57 | display: table-row; | 57 | display: table-row; |
58 | } | 58 | } |
59 | .layout-cell { | 59 | .layout-cell { |
60 | display: table-cell; | 60 | display: table-cell; |
61 | } | 61 | } |
62 | .layout-table .flexor div:first-child { | 62 | .layout-table .flexor div:first-child { |
63 | float: left; | 63 | float: left; |
@@ -66,15 +66,15 @@ POSSIBILITY OF SUCH DAMAGE. | |||
66 | float: right; | 66 | float: right; |
67 | } | 67 | } |
68 | 68 | ||
69 | // Begin: Basic skinning for form fields | 69 | // Begin: Basic skinning for form fields |
70 | // Reset all | 70 | // Reset all |
71 | input.nj-skinned, | 71 | input.nj-skinned, |
72 | textarea.nj-skinned, | 72 | textarea.nj-skinned, |
73 | button.nj-skinned, | 73 | button.nj-skinned, |
74 | select.nj-skinned, | 74 | select.nj-skinned, |
75 | select.nj-skinned option { | 75 | select.nj-skinned option { |
76 | -webkit-appearance: none; | 76 | -webkit-appearance: none; |
77 | outline: none; | 77 | outline: none; |
78 | } | 78 | } |
79 | 79 | ||
80 | // Base styles | 80 | // Base styles |
@@ -84,11 +84,11 @@ input[type="search"].nj-skinned, | |||
84 | textarea.nj-skinned, | 84 | textarea.nj-skinned, |
85 | select.nj-skinned, | 85 | select.nj-skinned, |
86 | select.nj-skinned option { | 86 | select.nj-skinned option { |
87 | border: 1px solid $color-input-border; | 87 | border: 1px solid $color-input-border; |
88 | color: $color-input; | 88 | color: $color-input; |
89 | background-color: $color-input-bg; | 89 | background-color: $color-input-bg; |
90 | font-size: 12px; | 90 | font-size: 12px; |
91 | font-family: 'Droid Sans', sans-serif; | 91 | font-family: 'Droid Sans', sans-serif; |
92 | } | 92 | } |
93 | 93 | ||
94 | // Disabled styles | 94 | // Disabled styles |
@@ -96,16 +96,16 @@ input.nj-skinned:disabled, | |||
96 | textarea.nj-skinned:disabled, | 96 | textarea.nj-skinned:disabled, |
97 | select.nj-skinned:disabled, | 97 | select.nj-skinned:disabled, |
98 | button.nj-skinned:disabled { | 98 | button.nj-skinned:disabled { |
99 | opacity: 0.4; | 99 | opacity: 0.4; |
100 | } | 100 | } |
101 | 101 | ||
102 | // Text inputs and select boxes | 102 | // Text inputs and select boxes |
103 | input[type="text"].nj-skinned, | 103 | input[type="text"].nj-skinned, |
104 | input[type="password"].nj-skinned, | 104 | input[type="password"].nj-skinned, |
105 | input[type="search"].nj-skinned, | 105 | input[type="search"].nj-skinned, |
106 | select.nj-skinned, | 106 | select.nj-skinned, |
107 | select.nj-skinned option { | 107 | select.nj-skinned option { |
108 | height: 13px; | 108 | height: 13px; |
109 | } | 109 | } |
110 | // | 110 | // |
111 | input[type="text"].nj-skinned:focus, | 111 | input[type="text"].nj-skinned:focus, |
@@ -114,7 +114,7 @@ input[type="search"].nj-skinned:focus, | |||
114 | textarea.nj-skinned:focus, | 114 | textarea.nj-skinned:focus, |
115 | select.nj-skinned:focus, | 115 | select.nj-skinned:focus, |
116 | select.nj-skinned option:focus { | 116 | select.nj-skinned option:focus { |
117 | -webkit-box-shadow: 0px 0px 3px $color-focus-outline; | 117 | -webkit-box-shadow: 0px 0px 3px $color-focus-outline; |
118 | } | 118 | } |
119 | 119 | ||
120 | 120 | ||
@@ -122,99 +122,99 @@ select.nj-skinned { | |||
122 | background-image: url("../images/dropdown-bg.png"); | 122 | background-image: url("../images/dropdown-bg.png"); |
123 | background-repeat: no-repeat; | 123 | background-repeat: no-repeat; |
124 | background-position: right center; | 124 | background-position: right center; |
125 | font-size: 12px; | 125 | font-size: 12px; |
126 | height: 16px; | 126 | height: 16px; |
127 | padding-right: 20px; | 127 | padding-right: 20px; |
128 | } | 128 | } |
129 | 129 | ||
130 | input[type="search"].nj-skinned { | 130 | input[type="search"].nj-skinned { |
131 | height: 17px ; | 131 | height: 17px ; |
132 | -webkit-box-shadow: none; | 132 | -webkit-box-shadow: none; |
133 | } | 133 | } |
134 | input[type="search"].nj-skinned::-webkit-search-cancel-button { | 134 | input[type="search"].nj-skinned::-webkit-search-cancel-button { |
135 | -webkit-appearance: none; | 135 | -webkit-appearance: none; |
136 | font-size: 10px; | 136 | font-size: 10px; |
137 | height: 10px; | 137 | height: 10px; |
138 | width: 10px; | 138 | width: 10px; |
139 | } | 139 | } |
140 | input[type="search"].nj-skinned::-webkit-search-cancel-button:after { | 140 | input[type="search"].nj-skinned::-webkit-search-cancel-button:after { |
141 | content:"\2716"; | 141 | content:"\2716"; |
142 | } | 142 | } |
143 | 143 | ||
144 | // Buttons | 144 | // Buttons |
145 | button.nj-skinned { | 145 | button.nj-skinned { |
146 | font-size: 9px; | 146 | font-size: 9px; |
147 | cursor: pointer; | ||
148 | display: block; | ||
149 | border: 0px; | ||
150 | margin: 0px; | ||
151 | padding: 4px; | ||
152 | border: 1px $color-input-border solid; | ||
153 | background-color: $color-menu-bg; | ||
154 | background-image: -webkit-linear-gradient(top, $color-formgrad-top 0%, $color-formgrad-bottom 100%); | ||
155 | border-radius: 4px; | ||
156 | color: $color-menu-text; | ||
157 | text-transform: uppercase; | ||
147 | cursor: pointer; | 158 | cursor: pointer; |
148 | display: block; | 159 | text-shadow: 1px 1px 1px $color-app-shadow |
149 | border: 0px; | ||
150 | margin: 0px; | ||
151 | padding: 4px; | ||
152 | border: 1px $color-input-border solid; | ||
153 | background-color: $color-menu-bg; | ||
154 | background-image: -webkit-linear-gradient(top, $color-formgrad-top 0%, $color-formgrad-bottom 100%); | ||
155 | border-radius: 4px; | ||
156 | color: $color-menu-text; | ||
157 | text-transform: uppercase; | ||
158 | cursor: pointer; | ||
159 | text-shadow: 1px 1px 1px $color-app-shadow | ||
160 | } | 160 | } |
161 | button.nj-skinned:active, button.nj-skinned.active { | 161 | button.nj-skinned:active, button.nj-skinned.active { |
162 | background-image: -webkit-linear-gradient(top, $color-formgrad-bottom 0%, $color-formgrad-top 100%); | 162 | background-image: -webkit-linear-gradient(top, $color-formgrad-bottom 0%, $color-formgrad-top 100%); |
163 | } | 163 | } |
164 | button.nj-skinned:hover { | 164 | button.nj-skinned:hover { |
165 | -webkit-box-shadow: 0px 0px 3px $color-focus-outline; | 165 | -webkit-box-shadow: 0px 0px 3px $color-focus-outline; |
166 | } | 166 | } |
167 | 167 | ||
168 | // Radio buttons | 168 | // Radio buttons |
169 | input[type="radio"].nj-skinned { | 169 | input[type="radio"].nj-skinned { |
170 | background-color: $color-menu-bg; | 170 | background-color: $color-menu-bg; |
171 | background-image: -webkit-linear-gradient(top, $color-radio-gradient-top 0%, $color-radio-gradient-bottom 100%); | 171 | background-image: -webkit-linear-gradient(top, $color-radio-gradient-top 0%, $color-radio-gradient-bottom 100%); |
172 | color: $color-radio; | 172 | color: $color-radio; |
173 | border: 2px solid $color-radio-border; | 173 | border: 2px solid $color-radio-border; |
174 | width: 12px; | 174 | width: 12px; |
175 | height: 12px; | 175 | height: 12px; |
176 | overflow: hidden; | 176 | overflow: hidden; |
177 | border-radius: 10px; | 177 | border-radius: 10px; |
178 | font-size: 16px; | 178 | font-size: 16px; |
179 | line-height: 7px; | 179 | line-height: 7px; |
180 | text-indent: -7px; | 180 | text-indent: -7px; |
181 | cursor: pointer; | 181 | cursor: pointer; |
182 | -webkit-box-shadow |