From 33bb9b7e97e9ec3bd664b3e1c3e7297ba8d07ede Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Mon, 7 May 2012 15:44:18 -0700 Subject: more work on making subtool styling/layout consistent --- css/ninja.css | 4 +++- .../fill-properties.reel/fill-properties.css | 7 +++++++ .../fill-properties.reel/fill-properties.html | 5 ++--- .../selection-properties.reel/selection-properties.css | 8 ++++++-- .../selection-properties.reel/selection-properties.html | 12 ++++++------ .../shape-properties.reel/shape-properties.html | 2 +- scss/imports/scss/_Tools.scss | 11 +++++++---- 7 files changed, 32 insertions(+), 17 deletions(-) diff --git a/css/ninja.css b/css/ninja.css index 650f3b08..be8b8109 100755 --- a/css/ninja.css +++ b/css/ninja.css @@ -683,7 +683,9 @@ nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul .subToolHolderPanel .toolbutton:hover, .subToolHolderPanel .toolbutton.active { -webkit-transform: scale(0.75); } -.subOption { float: left; margin-top: 5px; margin-left: 10px; margin-right: 10px; } +.subOption { float: left; margin-top: 0px; margin-left: 1px; margin-right: 0px; } + +.subOptionSpacer { margin-right: 16px; } .toolSeparator { height: 1px; width: 30px; } diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.css b/js/components/tools-properties/fill-properties.reel/fill-properties.css index 7f1b0f7f..58b1c1e8 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.css +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.css @@ -4,3 +4,10 @@ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. */ +.optionsFillTool { + padding: 6px; +} + + .optionsFillTool > * { + float:left; +} \ No newline at end of file diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.html b/js/components/tools-properties/fill-properties.reel/fill-properties.html index 6532907e..abc2e843 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.html +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html @@ -34,9 +34,8 @@ -
- - +
+
diff --git a/js/components/tools-properties/selection-properties.reel/selection-properties.css b/js/components/tools-properties/selection-properties.reel/selection-properties.css index e3fe1755..1d5eb513 100755 --- a/js/components/tools-properties/selection-properties.reel/selection-properties.css +++ b/js/components/tools-properties/selection-properties.reel/selection-properties.css @@ -4,6 +4,10 @@ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. */ -.selectionProperties { - margin-top: -6px; +.optionsSelectionTool { + padding: 6px; +} + + .optionsSelectionTool > * { + float:left; } \ No newline at end of file diff --git a/js/components/tools-properties/selection-properties.reel/selection-properties.html b/js/components/tools-properties/selection-properties.reel/selection-properties.html index f0b907af..3d2456c6 100755 --- a/js/components/tools-properties/selection-properties.reel/selection-properties.html +++ b/js/components/tools-properties/selection-properties.reel/selection-properties.html @@ -25,18 +25,18 @@ -
- +
+
-
-
+
+
-
+
-
+
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.html b/js/components/tools-properties/shape-properties.reel/shape-properties.html index 3c492e6e..cc3534f2 100755 --- a/js/components/tools-properties/shape-properties.reel/shape-properties.html +++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html @@ -149,7 +149,7 @@
- +
diff --git a/scss/imports/scss/_Tools.scss b/scss/imports/scss/_Tools.scss index 55c37d02..00655241 100755 --- a/scss/imports/scss/_Tools.scss +++ b/scss/imports/scss/_Tools.scss @@ -25,10 +25,13 @@ .subOption{ float:left; - // margin:10px; - margin-top: 5px; - margin-left: 10px; - margin-right: 10px; + margin-top: 0px; + margin-left: 1px; + margin-right: 0px; +} + +.subOptionSpacer{ + margin-right: 16px; } .toolSeparator { -- cgit v1.2.3