diff options
| author | Valerio Virgillito | 2012-02-03 12:20:10 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-03 12:20:10 -0800 |
| commit | e6e539f345f5e1ac36a595db5d1a1c3700715e88 (patch) | |
| tree | 39846bf1570f9b5a4057b726c54905de9e9e1c02 /_scss/imports/themes/default/_colors.scss | |
| parent | 7950424cf704bb221971f4645406b01e6979db18 (diff) | |
| parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
| download | ninja-e6e539f345f5e1ac36a595db5d1a1c3700715e88.tar.gz | |
Merge branch 'master' into components
Conflicts:
node_modules/montage/ui/bluemoon/progress.reel/progress.html
node_modules/montage/ui/image2.reel/image2.html
node_modules/ninja-components/effect/desaturate-effect.js
node_modules/ninja-components/effect/effect.js
node_modules/ninja-components/effect/invert-effect.js
node_modules/ninja-components/effect/kaliedoscope-effect.js
node_modules/ninja-components/effect/multiply-effect.js
node_modules/ninja-components/effect/sepia-effect.js
node_modules/ninja-components/flow-controller.reel/flow-controller.html
node_modules/ninja-components/flow-controller.reel/flow-controller.js
node_modules/ninja-components/flow-offset.js
node_modules/ninja-components/hottext.reel/hottext.css
node_modules/ninja-components/hottext.reel/hottext.html
node_modules/ninja-components/hottext.reel/hottext.js
node_modules/ninja-components/hottextunit.reel/hottextunit.css
node_modules/ninja-components/hottextunit.reel/hottextunit.html
node_modules/ninja-components/hottextunit.reel/hottextunit.js
node_modules/ninja-components/image2.reel/image2.html
node_modules/ninja-components/image2.reel/image2.js
node_modules/ninja-components/image3d.reel/image3d.html
node_modules/ninja-components/image3d.reel/image3d.js
node_modules/ninja-components/photo-editor.reel/photo-editor.css
node_modules/ninja-components/photo-editor.reel/photo-editor.html
node_modules/ninja-components/photo-editor.reel/photo-editor.js
node_modules/ninja-components/slider-base.js
user-document-templates/montage-application-cloud/appdelegate.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to '_scss/imports/themes/default/_colors.scss')
| -rw-r--r-- | _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 100644 --- 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); |