diff options
author | John Mayhew | 2012-05-14 14:57:07 -0700 |
---|---|---|
committer | John Mayhew | 2012-05-14 14:57:07 -0700 |
commit | 52f63541065ce94fab8766b1b0db057eafcfccaa (patch) | |
tree | 0b2129f4bda627c2cdf5c2b79e6079dafdc63b01 /scss | |
parent | 2cdefe05cdc058160093d7ab9d50a4fadd1c45fc (diff) | |
download | ninja-52f63541065ce94fab8766b1b0db057eafcfccaa.tar.gz |
-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
Diffstat (limited to 'scss')
-rwxr-xr-x | scss/imports/scss/_Tools.scss | 38 | ||||
-rwxr-xr-x | scss/imports/scss/_toolbar.scss | 2 |
2 files changed, 15 insertions, 25 deletions
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 @@ | |||
54 | 54 | ||
55 | // generic styles for image radio button groups used in the tool options bar | 55 | // generic styles for image radio button groups used in the tool options bar |
56 | .subToolHolderPanel input.toolOptsRadioButton { | 56 | .subToolHolderPanel input.toolOptsRadioButton { |
57 | background: none; | 57 | width: 24px; |
58 | width: 20px; | 58 | height: 24px; |
59 | height: 20px; | 59 | margin: 0px 5px 0px 0px; |
60 | display: block; | ||
61 | margin: 0px; | ||
62 | padding: 0px; | 60 | padding: 0px; |
63 | margin-right: 5px; | ||
64 | margin-top: 0px; | ||
65 | background-repeat: no-repeat; | ||
66 | opacity: 0.8; | ||
67 | text-indent: -9999px; | ||
68 | cursor: pointer; | 61 | cursor: pointer; |
69 | -webkit-border-radius: 3px; | 62 | border-radius: 3px; |
70 | -webkit-user-select: none; | 63 | -webkit-user-select: none; |
71 | border: 1px solid transparent; | 64 | border: 1px solid transparent; |
72 | background-position: 1px 1px; | 65 | background: none; |
73 | } | 66 | background-repeat: no-repeat; |
74 | 67 | background-position: center center; | |
75 | .subToolHolderPanel input.toolOptsRadioButton:active { | 68 | -webkit-transform: scale(0.9); |
76 | border: 1px solid transparent; | ||
77 | } | 69 | } |
78 | 70 | ||
79 | .subToolHolderPanel input.toolOptsRadioButton:hover { | 71 | .subToolHolderPanel input.toolOptsRadioButton:hover { |
80 | opacity: 1.0; | 72 | box-shadow: 0px 0px 2px 2px #999; |
81 | -webkit-box-shadow: 0px 0px 4px #fff; | 73 | -webkit-transform: scale(1); |
82 | } | 74 | } |
83 | 75 | ||
84 | .subToolHolderPanel input.toolOptsRadioButton:checked { | 76 | .subToolHolderPanel input.toolOptsRadioButton:checked { |
85 | background-color: $color-tool-bg-active; | 77 | box-shadow: inset 0px 0px 2px 2px #999; |
86 | opacity: 1.0; | 78 | background-color:#363636; |
87 | cursor: default; | 79 | background-position: center center; |
88 | -webkit-box-shadow: none; | ||
89 | background-repeat: no-repeat; | 80 | background-repeat: no-repeat; |
90 | background-position: 1px 1px; | 81 | -webkit-transform: scale(1); |
91 | } | 82 | } |
92 | 83 | ||
93 | |||
94 | // Added new styling Sub Tool Shape Options | 84 | // Added new styling Sub Tool Shape Options |
95 | .textBox { | 85 | .textBox { |
96 | 86 | ||
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 @@ | |||
53 | } | 53 | } |
54 | 54 | ||
55 | .toolbutton.active { | 55 | .toolbutton.active { |
56 | box-shadow: inset 0px 0px 2px 2px #555; | 56 | box-shadow: inset 0px 0px 2px 2px #999; |
57 | background-color:#363636; | 57 | background-color:#363636; |
58 | } | 58 | } |
59 | 59 | ||