aboutsummaryrefslogtreecommitdiff
path: root/_scss/imports
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-01-31 22:46:00 -0800
committerJose Antonio Marquez2012-01-31 22:46:00 -0800
commit15e19f5cddc603ed8a2095c228bdb9d9f8a58647 (patch)
tree6abec905713b21ddcdf7780a212ad2e1b7abbf07 /_scss/imports
parentd2ff7026abd7e40b49917491773cba9367221f99 (diff)
parent7ba23d31d55ee6a520dd86bce319b93494c55747 (diff)
downloadninja-15e19f5cddc603ed8a2095c228bdb9d9f8a58647.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts: _scss/compass_app_log.txt
Diffstat (limited to '_scss/imports')
-rwxr-xr-x_scss/imports/scss/_Base.scss18
1 files changed, 16 insertions, 2 deletions
diff --git a/_scss/imports/scss/_Base.scss b/_scss/imports/scss/_Base.scss
index 75ccc07d..77faa8f3 100755
--- a/_scss/imports/scss/_Base.scss
+++ b/_scss/imports/scss/_Base.scss
@@ -48,8 +48,7 @@ input.nj-skinned,
48textarea.nj-skinned, 48textarea.nj-skinned,
49button.nj-skinned, 49button.nj-skinned,
50select.nj-skinned, 50select.nj-skinned,
51select.nj-skinned option, 51select.nj-skinned option {
52button.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 {
122button.nj-skinned { 121button.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}
137button.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