aboutsummaryrefslogtreecommitdiff
path: root/scss/imports/themes
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-09 14:35:44 -0700
committerValerio Virgillito2012-07-09 14:35:44 -0700
commit84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /scss/imports/themes
parentc0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
downloadninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts: js/components/gradientpicker.reel/gradientpicker.js js/components/tools-properties/text-properties.reel/text-properties.js js/document/views/base.js js/document/views/design.js js/helper-classes/3D/StageLine.js js/helper-classes/3D/draw-utils.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/line.js js/lib/geom/rectangle.js js/lib/geom/shape-primitive.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/flag-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/water-material.js js/panels/Materials/materials-library-panel.reel/materials-library-panel.html js/panels/Materials/materials-library-panel.reel/materials-library-panel.js js/panels/Materials/materials-popup.reel/materials-popup.html js/panels/Materials/materials-popup.reel/materials-popup.js js/tools/LineTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'scss/imports/themes')
-rwxr-xr-xscss/imports/themes/_test.scss14
-rwxr-xr-xscss/imports/themes/default/_colors.scss46
2 files changed, 30 insertions, 30 deletions
diff --git a/scss/imports/themes/_test.scss b/scss/imports/themes/_test.scss
index 0767c300..4e8b914a 100755
--- a/scss/imports/themes/_test.scss
+++ b/scss/imports/themes/_test.scss
@@ -39,13 +39,13 @@ POSSIBILITY OF SUCH DAMAGE.
39} 39}
40 40
41.docAreaBackground { 41.docAreaBackground {
42 color: black; 42 color: black;
43 background: black; 43 background: black;
44} 44}
45 45
46.mainStageBackground { 46.mainStageBackground {
47 color: white; 47 color: white;
48 background: gray; 48 background: gray;
49} 49}
50 50
51.stageContentShadow { 51.stageContentShadow {
@@ -55,9 +55,9 @@ POSSIBILITY OF SUCH DAMAGE.
55} 55}
56 56
57.panelBackground { 57.panelBackground {
58 color: white; 58 color: white;
59 /*border: solid 1px #333;*/ 59 /*border: solid 1px #333;*/
60 background: rgba(41,41,41,1); 60 background: rgba(41,41,41,1);
61} 61}
62 62
63.panelCollapseControlBackground { 63.panelCollapseControlBackground {
diff --git a/scss/imports/themes/default/_colors.scss b/scss/imports/themes/default/_colors.scss
index d22cb29a..8e67cfd7 100755
--- a/scss/imports/themes/default/_colors.scss
+++ b/scss/imports/themes/default/_colors.scss
@@ -34,7 +34,7 @@ POSSIBILITY OF SUCH DAMAGE.
34//Note: Some colors are defined as both rgb and rgba; some of the rgba versions have multiple a values. 34//Note: Some colors are defined as both rgb and rgba; some of the rgba versions have multiple a values.
35 35
36 36
37// Colors for radio buttons and other form elements 37// Colors for radio buttons and other form elements
38$color-radio-border: rgb(40,40,40); 38$color-radio-border: rgb(40,40,40);
39$color-radio-shadow: rgba(200,200,200,0.5); 39$color-radio-shadow: rgba(200,200,200,0.5);
40$color-radio-gradient-top: rgb(100,100,100); 40$color-radio-gradient-top: rgb(100,100,100);
@@ -49,27 +49,27 @@ $color-input-border: rgb(49, 49, 49);
49$color-focus-outline: rgb(180, 180, 180); 49$color-focus-outline: rgb(180, 180, 180);
50$color-transparent: rgba(0,0,0,0); 50$color-transparent: rgba(0,0,0,0);
51 51
52// Base colors for dividers 52// Base colors for dividers
53// Dividers consist of a div with a background color and either 53// Dividers consist of a div with a background color and either
54// a top & bottom border (in the case of horizontal dividers) 54// a top & bottom border (in the case of horizontal dividers)
55// or a left & right border (in the case of vertical dividers), 55// or a left & right border (in the case of vertical dividers),
56// for a total of three different colors. 56// for a total of three different colors.
57// 57//
58
59$color-divider-first: rgb(35,35,35); // top and left
60$color-divider-second: rgb(0,0,0); // Middle
61$color-divider-third: rgb(58,58,58); // Bottom and right
62 58
63// Main background color of entire app 59$color-divider-first: rgb(35,35,35); // top and left
64$color-app-bg: rgb(0,0,0); // Main app background color. 60$color-divider-second: rgb(0,0,0); // Middle
65$color-app-bg-a1: rgba(0,0,0,1); // rgba version 61$color-divider-third: rgb(58,58,58); // Bottom and right
66$color-app-border: rgb(51,51,51); // Main app border color
67$color-app-shadow: rgba(0,0,0,.5); // color of drop shadows
68$color-stage: rgb(128,128,128); // Stage color
69$color-body-border: rgb(0,0,0); // body border color
70$color-body-bg: rgb(255,255,255); // Body background color
71 62
72// Colors for main dropdown menus: background & text for both regular and highlighted states, dividers 63// Main background color of entire app
64$color-app-bg: rgb(0,0,0); // Main app background color.
65$color-app-bg-a1: rgba(0,0,0,1); // rgba version
66$color-app-border: rgb(51,51,51); // Main app border color
67$color-app-shadow: rgba(0,0,0,.5); // color of drop shadows
68$color-stage: rgb(128,128,128); // Stage color
69$color-body-border: rgb(0,0,0); // body border color
70$color-body-bg: rgb(255,255,255); // Body background color
71
72// Colors for main dropdown menus: background & text for both regular and highlighted states, dividers
73$color-menu-bg: rgb(71,71,71); 73$color-menu-bg: rgb(71,71,71);
74$color-menu-text: rgb(255,255,255); 74$color-menu-text: rgb(255,255,255);
75$color-menu-hilite-bg: rgb(178,178,178); 75$color-menu-hilite-bg: rgb(178,178,178);
@@ -79,7 +79,7 @@ $color-menu-border: rgb(0,0,0);
79$color-menu-active-bg: rgb(181,122,10); 79$color-menu-active-bg: rgb(181,122,10);
80 80
81 81
82// Colors for tools: background, text, how they interact with the UI 82// Colors for tools: background, text, how they interact with the UI
83$color-tool-bg: rgb(41,41,41); 83$color-tool-bg: rgb(41,41,41);
84$color-tool-bg-active: rgb(178,178,178); 84$color-tool-bg-active: rgb(178,178,178);
85$color-tool-border-selected: rgb(89,89,89); 85$color-tool-border-selected: rgb(89,89,89);
@@ -94,15 +94,15 @@ $color-tool-select-border: rgb(0,0,0);
94$color-tool-select-hover-bg: rgb(221,221,221); 94$color-tool-select-hover-bg: rgb(221,221,221);
95 95
96 96
97// Colors for panels: background & text, both regular and highlighted states, dividers, borders, shadows, etc. 97// Colors for panels: background & text, both regular and highlighted states, dividers, borders, shadows, etc.
98$color-panel-bg: $color-menu-bg; 98$color-panel-bg: $color-menu-bg;
99$color-panel-text: $color-menu-text; 99$color-panel-text: $color-menu-text;
100$color-panel-input: $color-panel-text; 100$color-panel-input: $color-panel-text;
101$color-panel-hilite-bg: $color-menu-hilite-bg; 101$color-panel-hilite-bg: $color-menu-hilite-bg;
102$color-panel-hilite-text: $color-menu-hilite-text; 102$color-panel-hilite-text: $color-menu-hilite-text;
103$color-panel-clickable: rgb(215,215,215); // used for editable items in their non-edit state, etc. 103$color-panel-clickable: rgb(215,215,215); // used for editable items in their non-edit state, etc.
104$color-panel-border: $color-menu-border; // Border for panel and for block elements 104$color-panel-border: $color-menu-border; // Border for panel and for block elements
105$color-panel-shadow: rgb(58,58,58); // Shadow for text and block elements 105$color-panel-shadow: rgb(58,58,58); // Shadow for text and block elements
106$color-panel-input-bg: rgb(68, 68, 68); 106$color-panel-input-bg: rgb(68, 68, 68);
107$color-panel-dividerlabel-bg: rgb(62, 62, 62); 107$color-panel-dividerlabel-bg: rgb(62, 62, 62);
108$color-panel-input-border: rgb(49, 49, 49); 108$color-panel-input-border: rgb(49, 49, 49);
@@ -110,7 +110,7 @@ $color-panel-divider-top: rgb(62, 62, 62);
110$color-panel-divider: $color-menu-divider; 110$color-panel-divider: $color-menu-divider;
111$color-panel-divider-bottom: rgb(86, 86, 86); 111$color-panel-divider-bottom: rgb(86, 86, 86);
112 112
113// Colors for scroll bars 113// Colors for scroll bars
114$color-sb-border: rgb(0,0,0); 114$color-sb-border: rgb(0,0,0);
115$color-sb-1: rgb(140,140,140); 115$color-sb-1: rgb(140,140,140);
116$color-sb-2: rgb(173,173,173); 116$color-sb-2: rgb(173,173,173);