From 52f63541065ce94fab8766b1b0db057eafcfccaa Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Mon, 14 May 2012 14:57:07 -0700 Subject: -changed tool options radio button class to match the styling of the shape options tool buttons -fixed bug injected in the tag tool caused by accidental removal of the value element attribute -moved color chip in the tag tool to the right of the element radio button group --- css/ninja.css | 10 +++--- .../tag-properties.reel/tag-properties.html | 16 ++++----- scss/imports/scss/_Tools.scss | 38 ++++++++-------------- scss/imports/scss/_toolbar.scss | 2 +- 4 files changed, 27 insertions(+), 39 deletions(-) diff --git a/css/ninja.css b/css/ninja.css index 34a29362..6b3c00d6 100755 --- a/css/ninja.css +++ b/css/ninja.css @@ -679,13 +679,11 @@ nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul .toolColorChipIcon { width: 20px; height: 20px; margin-top: 1px; -webkit-transform: scale(0.8); background-color: #282828; } -.subToolHolderPanel input.toolOptsRadioButton { background: none; width: 20px; height: 20px; display: block; margin: 0px; padding: 0px; margin-right: 5px; margin-top: 0px; background-repeat: no-repeat; opacity: 0.8; text-indent: -9999px; cursor: pointer; -webkit-border-radius: 3px; -webkit-user-select: none; border: 1px solid transparent; background-position: 1px 1px; } +.subToolHolderPanel input.toolOptsRadioButton { width: 24px; height: 24px; margin: 0px 5px 0px 0px; padding: 0px; cursor: pointer; border-radius: 3px; -webkit-user-select: none; border: 1px solid transparent; background: none; background-repeat: no-repeat; background-position: center center; -webkit-transform: scale(0.9); } -.subToolHolderPanel input.toolOptsRadioButton:active { border: 1px solid transparent; } +.subToolHolderPanel input.toolOptsRadioButton:hover { box-shadow: 0px 0px 2px 2px #999; -webkit-transform: scale(1); } -.subToolHolderPanel input.toolOptsRadioButton:hover { opacity: 1.0; -webkit-box-shadow: 0px 0px 4px #fff; } - -.subToolHolderPanel input.toolOptsRadioButton:checked { background-color: #b2b2b2; opacity: 1.0; cursor: default; -webkit-box-shadow: none; background-repeat: no-repeat; background-position: 1px 1px; } +.subToolHolderPanel input.toolOptsRadioButton:checked { box-shadow: inset 0px 0px 2px 2px #999; background-color: #363636; background-position: center center; background-repeat: no-repeat; -webkit-transform: scale(1); } .textBox { padding-top: 3px; min-width: 10em; margin-left: 5px; position: relative; margin-top: 0px; } @@ -837,7 +835,7 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 .toolbutton:active { background-color: #8c8c8c; } -.toolbutton.active { box-shadow: inset 0px 0px 2px 2px #555; background-color: #363636; } +.toolbutton.active { box-shadow: inset 0px 0px 2px 2px #999; background-color: #363636; } .SelectionTool { background-image: url("../images/tools/Tool-Selection.png"); } diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.html b/js/components/tools-properties/tag-properties.reel/tag-properties.html index e9c15d22..7a8f6d87 100755 --- a/js/components/tools-properties/tag-properties.reel/tag-properties.html +++ b/js/components/tools-properties/tag-properties.reel/tag-properties.html @@ -39,18 +39,18 @@
+ + + + + + +
 
+
 
- - - - - - -
 
-
diff --git a/scss/imports/scss/_Tools.scss b/scss/imports/scss/_Tools.scss index 1813fb14..a4deb488 100755 --- a/scss/imports/scss/_Tools.scss +++ b/scss/imports/scss/_Tools.scss @@ -54,43 +54,33 @@ // generic styles for image radio button groups used in the tool options bar .subToolHolderPanel input.toolOptsRadioButton { - background: none; - width: 20px; - height: 20px; - display: block; - margin: 0px; + width: 24px; + height: 24px; + margin: 0px 5px 0px 0px; padding: 0px; - margin-right: 5px; - margin-top: 0px; - background-repeat: no-repeat; - opacity: 0.8; - text-indent: -9999px; cursor: pointer; - -webkit-border-radius: 3px; + border-radius: 3px; -webkit-user-select: none; border: 1px solid transparent; - background-position: 1px 1px; -} - -.subToolHolderPanel input.toolOptsRadioButton:active { - border: 1px solid transparent; + background: none; + background-repeat: no-repeat; + background-position: center center; + -webkit-transform: scale(0.9); } .subToolHolderPanel input.toolOptsRadioButton:hover { - opacity: 1.0; - -webkit-box-shadow: 0px 0px 4px #fff; + box-shadow: 0px 0px 2px 2px #999; + -webkit-transform: scale(1); } .subToolHolderPanel input.toolOptsRadioButton:checked { - background-color: $color-tool-bg-active; - opacity: 1.0; - cursor: default; - -webkit-box-shadow: none; + box-shadow: inset 0px 0px 2px 2px #999; + background-color:#363636; + background-position: center center; background-repeat: no-repeat; - background-position: 1px 1px; + -webkit-transform: scale(1); } - // Added new styling Sub Tool Shape Options .textBox { diff --git a/scss/imports/scss/_toolbar.scss b/scss/imports/scss/_toolbar.scss index d2e2f766..9440fa85 100755 --- a/scss/imports/scss/_toolbar.scss +++ b/scss/imports/scss/_toolbar.scss @@ -53,7 +53,7 @@ } .toolbutton.active { - box-shadow: inset 0px 0px 2px 2px #555; + box-shadow: inset 0px 0px 2px 2px #999; background-color:#363636; } -- cgit v1.2.3