diff options
author | Valerio Virgillito | 2012-01-27 16:39:22 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-01-27 16:39:22 -0800 |
commit | a53d4ef4d26d5c4c8e5f4859f8fd3e95ccce8c3b (patch) | |
tree | 436668182ef20ab30fb59701deb2e25c5da4498f /_scss/imports/themes/default | |
parent | 302e3eb01037ff550bc93547cb8d5d0a0780b312 (diff) | |
parent | 01e7e2448bc58698fb5808d141c1a8a5dfbdaaf7 (diff) | |
download | ninja-a53d4ef4d26d5c4c8e5f4859f8fd3e95ccce8c3b.tar.gz |
Merge pull request #2 from jreid01/pullrequest
Fixes to radio button base styles. Comment clean-up.
Diffstat (limited to '_scss/imports/themes/default')
-rw-r--r-- | _scss/imports/themes/default/_colors.scss | 65 | ||||
-rw-r--r-- | _scss/imports/themes/default/_fonts.scss | 5 | ||||
-rw-r--r-- | _scss/imports/themes/default/_mixins.scss | 6 |
3 files changed, 34 insertions, 42 deletions
diff --git a/_scss/imports/themes/default/_colors.scss b/_scss/imports/themes/default/_colors.scss index 2fbe7956..34d5ffc9 100644 --- a/_scss/imports/themes/default/_colors.scss +++ b/_scss/imports/themes/default/_colors.scss | |||
@@ -4,14 +4,13 @@ | |||
4 | // (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | // (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
5 | // </copyright> | 5 | // </copyright> |
6 | 6 | ||
7 | /* | 7 | //_colors.scss |
8 | * _colors.scss | 8 | //Defines the colors for the UI of the application. |
9 | * Defines the colors for the UI of the application. | 9 | //To create a new theme, copy this file and change the values as desired. |
10 | * To create a new theme, copy this file and change the values as desired. | 10 | //Note: Some colors are defined as both rgb and rgba; some of the rgba versions have multiple a values. |
11 | * Note: Some colors are defined as both rgb and rgba; some of the rgba versions have multiple a values. | ||
12 | */ | ||
13 | 11 | ||
14 | /* Colors for radio buttons and other form elements */ | 12 | |
13 | // Colors for radio buttons and other form elements | ||
15 | $color-radio-border: rgb(40,40,40); | 14 | $color-radio-border: rgb(40,40,40); |
16 | $color-radio-shadow: rgba(200,200,200,0.5); | 15 | $color-radio-shadow: rgba(200,200,200,0.5); |
17 | $color-radio-gradient-top: rgb(100,100,100); | 16 | $color-radio-gradient-top: rgb(100,100,100); |
@@ -22,29 +21,29 @@ $color-input: rgb(255,255,255); | |||
22 | $color-input-bg: rgb(68, 68, 68); | 21 | $color-input-bg: rgb(68, 68, 68); |
23 | $color-input-border: rgb(49, 49, 49); | 22 | $color-input-border: rgb(49, 49, 49); |
24 | $color-focus-outline: rgb(180, 180, 180); | 23 | $color-focus-outline: rgb(180, 180, 180); |
24 | $color-transparent: rgba(0,0,0,0); | ||
25 | 25 | ||
26 | /* Base colors for dividers | 26 | // Base colors for dividers |
27 | * | 27 | // Dividers consist of a div with a background color and either |
28 | * Dividers consist of a div with a background color and either | 28 | // a top & bottom border (in the case of horizontal dividers) |
29 | * a top & bottom border (in the case of horizontal dividers) | 29 | // or a left & right border (in the case of vertical dividers), |
30 | * or a left & right border (in the case of vertical dividers), | 30 | // for a total of three different colors. |
31 | * for a total of three different colors. | 31 | // |
32 | * | 32 | |
33 | */ | 33 | $color-divider-first: rgb(35,35,35); // top and left |
34 | $color-divider-first: rgb(35,35,35); /* top and left */ | 34 | $color-divider-second: rgb(0,0,0); // Middle |
35 | $color-divider-second: rgb(0,0,0); /* Middle */ | 35 | $color-divider-third: rgb(58,58,58); // Bottom and right |
36 | $color-divider-third: rgb(58,58,58); /* Bottom and right */ | ||
37 | 36 | ||
38 | /* Main background color of entire app */ | 37 | // Main background color of entire app |
39 | $color-app-bg: rgb(0,0,0); /* Main app background color. */ | 38 | $color-app-bg: rgb(0,0,0); // Main app background color. |
40 | $color-app-bg-a1: rgba(0,0,0,1); /* rgba version */ | 39 | $color-app-bg-a1: rgba(0,0,0,1); // rgba version |
41 | $color-app-border: rgb(51,51,51); /* Main app border color */ | 40 | $color-app-border: rgb(51,51,51); // Main app border color |
42 | $color-app-shadow: rgba(0,0,0,.5); /* color of drop shadows */ | 41 | $color-app-shadow: rgba(0,0,0,.5); // color of drop shadows |
43 | $color-stage: rgb(128,128,128); /* Stage color */ | 42 | $color-stage: rgb(128,128,128); // Stage color |
44 | $color-body-border: rgb(0,0,0); /* body border color */ | 43 | $color-body-border: rgb(0,0,0); // body border color |
45 | $color-body-bg: rgb(255,255,255); /* Body background color */ | 44 | $color-body-bg: rgb(255,255,255); // Body background color |
46 | 45 | ||
47 | /* Colors for main dropdown menus: background & text for both regular and highlighted states, dividers */ | 46 | // Colors for main dropdown menus: background & text for both regular and highlighted states, dividers |
48 | $color-menu-bg: rgb(71,71,71); | 47 | $color-menu-bg: rgb(71,71,71); |
49 | $color-menu-text: rgb(255,255,255); | 48 | $color-menu-text: rgb(255,255,255); |
50 | $color-menu-hilite-bg: rgb(178,178,178); | 49 | $color-menu-hilite-bg: rgb(178,178,178); |
@@ -54,7 +53,7 @@ $color-menu-border: rgb(0,0,0); | |||
54 | $color-menu-active-bg: rgb(181,122,10); | 53 | $color-menu-active-bg: rgb(181,122,10); |
55 | 54 | ||
56 | 55 | ||
57 | /* Colors for tools: background, text, how they interact with the UI */ | 56 | // Colors for tools: background, text, how they interact with the UI |
58 | $color-tool-bg: rgb(41,41,41); | 57 | $color-tool-bg: rgb(41,41,41); |
59 | $color-tool-bg-active: rgb(178,178,178); | 58 | $color-tool-bg-active: rgb(178,178,178); |
60 | $color-tool-border-selected: rgb(89,89,89); | 59 | $color-tool-border-selected: rgb(89,89,89); |
@@ -69,15 +68,15 @@ $color-tool-select-border: rgb(0,0,0); | |||
69 | $color-tool-select-hover-bg: rgb(221,221,221); | 68 | $color-tool-select-hover-bg: rgb(221,221,221); |
70 | 69 | ||
71 | 70 | ||
72 | /* Colors for panels: background & text, both regular and highlighted states, dividers, borders, shadows, etc. */ | 71 | // Colors for panels: background & text, both regular and highlighted states, dividers, borders, shadows, etc. |
73 | $color-panel-bg: $color-menu-bg; | 72 | $color-panel-bg: $color-menu-bg; |
74 | $color-panel-text: $color-menu-text; | 73 | $color-panel-text: $color-menu-text; |
75 | $color-panel-input: $color-panel-text; | 74 | $color-panel-input: $color-panel-text; |
76 | $color-panel-hilite-bg: $color-menu-hilite-bg; | 75 | $color-panel-hilite-bg: $color-menu-hilite-bg; |
77 | $color-panel-hilite-text: $color-menu-hilite-text; | 76 | $color-panel-hilite-text: $color-menu-hilite-text; |
78 | $color-panel-clickable: rgb(215,215,215); /* used for editable items in their non-edit state, etc. */ | 77 | $color-panel-clickable: rgb(215,215,215); // used for editable items in their non-edit state, etc. |
79 | $color-panel-border: $color-menu-border; /* Border for panel and for block elements */ | 78 | $color-panel-border: $color-menu-border; // Border for panel and for block elements |
80 | $color-panel-shadow: rgb(58,58,58); /* Shadow for text and block elements */ | 79 | $color-panel-shadow: rgb(58,58,58); // Shadow for text and block elements |
81 | $color-panel-input-bg: rgb(68, 68, 68); | 80 | $color-panel-input-bg: rgb(68, 68, 68); |
82 | $color-panel-dividerlabel-bg: rgb(62, 62, 62); | 81 | $color-panel-dividerlabel-bg: rgb(62, 62, 62); |
83 | $color-panel-input-border: rgb(49, 49, 49); | 82 | $color-panel-input-border: rgb(49, 49, 49); |
@@ -85,7 +84,7 @@ $color-panel-divider-top: rgb(62, 62, 62); | |||
85 | $color-panel-divider: $color-menu-divider; | 84 | $color-panel-divider: $color-menu-divider; |
86 | $color-panel-divider-bottom: rgb(86, 86, 86); | 85 | $color-panel-divider-bottom: rgb(86, 86, 86); |
87 | 86 | ||
88 | /* Colors for scroll bars */ | 87 | // Colors for scroll bars |
89 | $color-sb-border: rgb(0,0,0); | 88 | $color-sb-border: rgb(0,0,0); |
90 | $color-sb-1: rgb(140,140,140); | 89 | $color-sb-1: rgb(140,140,140); |
91 | $color-sb-2: rgb(173,173,173); | 90 | $color-sb-2: rgb(173,173,173); |
diff --git a/_scss/imports/themes/default/_fonts.scss b/_scss/imports/themes/default/_fonts.scss index 9410dfd2..9174cff3 100644 --- a/_scss/imports/themes/default/_fonts.scss +++ b/_scss/imports/themes/default/_fonts.scss | |||
@@ -4,9 +4,4 @@ | |||
4 | // (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | // (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
5 | // </copyright> | 5 | // </copyright> |
6 | 6 | ||
7 | /* | ||
8 | * _fonts.scss | ||
9 | * Defines the fonts for the application. | ||
10 | */ | ||
11 | 7 | ||
12 | /* Droid Sans: Normal, bold asdf*/ | ||
diff --git a/_scss/imports/themes/default/_mixins.scss b/_scss/imports/themes/default/_mixins.scss index e6a38a93..9f61e7ef 100644 --- a/_scss/imports/themes/default/_mixins.scss +++ b/_scss/imports/themes/default/_mixins.scss | |||
@@ -4,10 +4,8 @@ | |||
4 | // (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | // (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
5 | // </copyright> | 5 | // </copyright> |
6 | 6 | ||
7 | /* | 7 | // themes/themename/mixins.scss |
8 | * themes/themename/mixins.scss | 8 | // Mixins that are theme-dependent (e.g. sprite mixins, etc) |
9 | * Mixins that are theme-dependent (e.g. sprite mixins, etc) | ||
10 | */ | ||
11 | 9 | ||
12 | $Mx:0; | 10 | $Mx:0; |
13 | $My:0; | 11 | $My:0; |