diff options
| author | Jose Antonio Marquez | 2012-02-02 18:00:45 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-02 18:00:45 -0800 |
| commit | 04d89daed90c35a4393773ca2e2d0ac3a4c15cd4 (patch) | |
| tree | d0041abc7379ef38b20cce148e5dea6f531b8569 /_scss/imports/themes/default | |
| parent | 4d8306b638c53899403a4f0328c02bf1ab893e8f (diff) | |
| parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
| download | ninja-04d89daed90c35a4393773ca2e2d0ac3a4c15cd4.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts:
.gitignore
js/ninja.reel/ninja.js
Diffstat (limited to '_scss/imports/themes/default')
| -rwxr-xr-x | _scss/imports/themes/default/_colors.scss | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/_scss/imports/themes/default/_colors.scss b/_scss/imports/themes/default/_colors.scss index 34d5ffc9..2a7b8191 100755 --- a/_scss/imports/themes/default/_colors.scss +++ b/_scss/imports/themes/default/_colors.scss | |||
| @@ -15,6 +15,8 @@ $color-radio-border: rgb(40,40,40); | |||
| 15 | $color-radio-shadow: rgba(200,200,200,0.5); | 15 | $color-radio-shadow: rgba(200,200,200,0.5); |
| 16 | $color-radio-gradient-top: rgb(100,100,100); | 16 | $color-radio-gradient-top: rgb(100,100,100); |
| 17 | $color-radio-gradient-bottom: rgb(60,60,60); | 17 | $color-radio-gradient-bottom: rgb(60,60,60); |
| 18 | $color-formgrad-top: rgb(80,80,80); | ||
| 19 | $color-formgrad-bottom: rgb(60,60,60); | ||
| 18 | $color-radio-bg: rgb(0,0,0); | 20 | $color-radio-bg: rgb(0,0,0); |
| 19 | $color-radio: rgb(200,200,200); | 21 | $color-radio: rgb(200,200,200); |
| 20 | $color-input: rgb(255,255,255); | 22 | $color-input: rgb(255,255,255); |