diff options
author | Jose Antonio Marquez | 2012-02-01 13:36:02 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-01 13:36:02 -0800 |
commit | 9c317ebb46e82a00b83eb732c73ae39ce9ef46b9 (patch) | |
tree | 84b14f94893d941bacd7552311a3b5e36cd3d6d8 /_scss/imports | |
parent | 92ddcf89711c77453a55c4621afb469d61075e96 (diff) | |
parent | 7ba23d31d55ee6a520dd86bce319b93494c55747 (diff) | |
download | ninja-9c317ebb46e82a00b83eb732c73ae39ce9ef46b9.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to '_scss/imports')
-rw-r--r-- | _scss/imports/scss/_Base.scss | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/_scss/imports/scss/_Base.scss b/_scss/imports/scss/_Base.scss index 75ccc07d..77faa8f3 100644 --- a/_scss/imports/scss/_Base.scss +++ b/_scss/imports/scss/_Base.scss | |||
@@ -48,8 +48,7 @@ input.nj-skinned, | |||
48 | textarea.nj-skinned, | 48 | textarea.nj-skinned, |
49 | button.nj-skinned, | 49 | button.nj-skinned, |
50 | select.nj-skinned, | 50 | select.nj-skinned, |
51 | select.nj-skinned option, | 51 | select.nj-skinned option { |
52 | button.nj-skinned { | ||
53 | -webkit-appearance: none; | 52 | -webkit-appearance: none; |
54 | outline: none; | 53 | outline: none; |
55 | } | 54 | } |
@@ -122,6 +121,21 @@ input[type="search"].nj-skinned::-webkit-search-cancel-button:after { | |||
122 | button.nj-skinned { | 121 | button.nj-skinned { |
123 | font-size: 9px; | 122 | font-size: 9px; |
124 | cursor: pointer; | 123 | cursor: pointer; |
124 | display: block; | ||
125 | border: 0px; | ||
126 | margin: 0px; | ||
127 | padding: 4px; | ||
128 | border: 1px $color-input-border solid; | ||
129 | background-color: $color-menu-bg; | ||
130 | background-image: -webkit-linear-gradient(top, $color-radio-gradient-top 0%, $color-radio-gradient-bottom 100%); | ||
131 | border-radius: 4px; | ||
132 | color: $color-menu-text; | ||
133 | text-transform: uppercase; | ||
134 | cursor: pointer; | ||
135 | text-shadow: 1px 1px 1px $color-app-shadow | ||
136 | } | ||
137 | button.nj-skinned:hover { | ||
138 | background-image: -webkit-linear-gradient(top, $color-radio-gradient-bottom 0%, $color-radio-gradient-top 100%); | ||
125 | } | 139 | } |
126 | 140 | ||
127 | // Radio buttons | 141 | // Radio buttons |