aboutsummaryrefslogtreecommitdiff
path: root/_scss/imports
diff options
context:
space:
mode:
authorAnanya Sen2012-02-03 09:57:41 -0800
committerAnanya Sen2012-02-03 09:57:41 -0800
commitc093dd13a84ce6eb3e00a672c38a808093c5d966 (patch)
tree5dfd4a800bbbe02a8cbcb3ffeee542686bc258bb /_scss/imports
parent79b0173eeca079dec42ff1480182656dbe3af44f (diff)
parent8e06b63e5eab5558823f4923e20a832c8b36cbe2 (diff)
downloadninja-c093dd13a84ce6eb3e00a672c38a808093c5d966.tar.gz
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Conflicts: js/io/document/document-controller.js js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js js/io/ui/save-as-dialog.reel/save-as-dialog.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to '_scss/imports')
-rwxr-xr-x_scss/imports/scss/_Base.scss7
-rwxr-xr-x_scss/imports/scss/_PanelUI.scss2
-rwxr-xr-x_scss/imports/themes/default/_colors.scss2
3 files changed, 8 insertions, 3 deletions
diff --git a/_scss/imports/scss/_Base.scss b/_scss/imports/scss/_Base.scss
index 77faa8f3..8a743174 100755
--- a/_scss/imports/scss/_Base.scss
+++ b/_scss/imports/scss/_Base.scss
@@ -127,15 +127,18 @@ button.nj-skinned {
127 padding: 4px; 127 padding: 4px;
128 border: 1px $color-input-border solid; 128 border: 1px $color-input-border solid;
129 background-color: $color-menu-bg; 129 background-color: $color-menu-bg;
130 background-image: -webkit-linear-gradient(top, $color-radio-gradient-top 0%, $color-radio-gradient-bottom 100%); 130 background-image: -webkit-linear-gradient(top, $color-formgrad-top 0%, $color-formgrad-bottom 100%);
131 border-radius: 4px; 131 border-radius: 4px;
132 color: $color-menu-text; 132 color: $color-menu-text;
133 text-transform: uppercase; 133 text-transform: uppercase;
134 cursor: pointer; 134 cursor: pointer;
135 text-shadow: 1px 1px 1px $color-app-shadow 135 text-shadow: 1px 1px 1px $color-app-shadow
136} 136}
137button.nj-skinned:active {
138 background-image: -webkit-linear-gradient(top, $color-formgrad-bottom 0%, $color-formgrad-top 100%);
139}
137button.nj-skinned:hover { 140button.nj-skinned:hover {
138 background-image: -webkit-linear-gradient(top, $color-radio-gradient-bottom 0%, $color-radio-gradient-top 100%); 141 -webkit-box-shadow: 0px 0px 3px $color-focus-outline;
139} 142}
140 143
141// Radio buttons 144// Radio buttons
diff --git a/_scss/imports/scss/_PanelUI.scss b/_scss/imports/scss/_PanelUI.scss
index ac82adf8..21ada556 100755
--- a/_scss/imports/scss/_PanelUI.scss
+++ b/_scss/imports/scss/_PanelUI.scss
@@ -390,7 +390,7 @@ ul.treeComponent > img:first-child
390// 390//
391#pp-container-assets .pp-scroll-linked, 391#pp-container-assets .pp-scroll-linked,
392#pp-container-list .pp-scroll-linked { 392#pp-container-list .pp-scroll-linked {
393 width: 420px; 393 //width: 420px;
394} 394}
395 395
396 396
diff --git a/_scss/imports/themes/default/_colors.scss b/_scss/imports/themes/default/_colors.scss
index 34d5ffc9..2a7b8191 100755
--- a/_scss/imports/themes/default/_colors.scss
+++ b/_scss/imports/themes/default/_colors.scss
@@ -15,6 +15,8 @@ $color-radio-border: rgb(40,40,40);
15$color-radio-shadow: rgba(200,200,200,0.5); 15$color-radio-shadow: rgba(200,200,200,0.5);
16$color-radio-gradient-top: rgb(100,100,100); 16$color-radio-gradient-top: rgb(100,100,100);
17$color-radio-gradient-bottom: rgb(60,60,60); 17$color-radio-gradient-bottom: rgb(60,60,60);
18$color-formgrad-top: rgb(80,80,80);
19$color-formgrad-bottom: rgb(60,60,60);
18$color-radio-bg: rgb(0,0,0); 20$color-radio-bg: rgb(0,0,0);
19$color-radio: rgb(200,200,200); 21$color-radio: rgb(200,200,200);
20$color-input: rgb(255,255,255); 22$color-input: rgb(255,255,255);