aboutsummaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
authorJohn Mayhew2012-07-24 15:46:16 -0700
committerJohn Mayhew2012-07-24 15:46:16 -0700
commit9f240b8b9b1f5fb0f145c343ca5e533e25e81374 (patch)
tree407564eaa6466e8d4cf2eeee0c56dc623243586f /scss
parentd25359c75089215ee48838db081fd3d51cbbd85f (diff)
parent21d74af1e9fc57cc25cea8aa7408beabf79ff2f3 (diff)
downloadninja-9f240b8b9b1f5fb0f145c343ca5e533e25e81374.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja
Diffstat (limited to 'scss')
-rwxr-xr-xscss/imports/scss/_MainWindow.scss2
-rwxr-xr-xscss/imports/scss/_Tools.scss10
2 files changed, 1 insertions, 11 deletions
diff --git a/scss/imports/scss/_MainWindow.scss b/scss/imports/scss/_MainWindow.scss
index a13487dd..0bb5fd8c 100755
--- a/scss/imports/scss/_MainWindow.scss
+++ b/scss/imports/scss/_MainWindow.scss
@@ -90,7 +90,7 @@
90#topMenu { 90#topMenu {
91 background-color: #474747; 91 background-color: #474747;
92 position:absolute; 92 position:absolute;
93 height:28px; 93 height:26px;
94 width:100%; 94 width:100%;
95 top:0px; 95 top:0px;
96 left:0px; 96 left:0px;
diff --git a/scss/imports/scss/_Tools.scss b/scss/imports/scss/_Tools.scss
index 52d8ab46..5d935d69 100755
--- a/scss/imports/scss/_Tools.scss
+++ b/scss/imports/scss/_Tools.scss
@@ -351,16 +351,6 @@ input[type="radio"]:disabled {
351 position: relative; 351 position: relative;
352} 352}
353 353
354.tagRadioButtons select.nj-skinned {
355 visibility: visible;
356 position: relative;
357 margin-top: 1px;
358}
359
360.tagRadioButtons select[disabled="true"].nj-skinned,
361.tagRadioButtons select[disabled].nj-skinned {
362 visibility: hidden;
363}
364// End: styles for tag toolbar 354// End: styles for tag toolbar
365 355
366#zoomToolOptionHolder .zoomOutToolIcon { 356#zoomToolOptionHolder .zoomOutToolIcon {