Bug 965814 - Make the shader editor look good on the light theme. r=bgrins

This commit is contained in:
Victor Porof 2014-01-30 21:25:51 +02:00
Родитель 36edb17218
Коммит b4e7a4ec5b
3 изменённых файлов: 42 добавлений и 19 удалений

Просмотреть файл

@ -19,7 +19,7 @@
<script type="application/javascript" src="shadereditor.js"/> <script type="application/javascript" src="shadereditor.js"/>
<vbox id="body" flex="1"> <vbox class="theme-body" flex="1">
<hbox id="reload-notice" <hbox id="reload-notice"
class="notice-container" class="notice-container"
align="center" align="center"
@ -44,8 +44,10 @@
value="&shaderEditorUI.emptyNotice;"/> value="&shaderEditorUI.emptyNotice;"/>
</hbox> </hbox>
<box id="content" flex="1" hidden="true" <box id="content"
class="devtools-responsive-container theme-body"> class="devtools-responsive-container"
flex="1"
hidden="true">
<vbox id="shaders-pane"/> <vbox id="shaders-pane"/>
<splitter class="devtools-side-splitter"/> <splitter class="devtools-side-splitter"/>
<box id="shaders-editors" class="devtools-responsive-container" flex="1"> <box id="shaders-editors" class="devtools-responsive-container" flex="1">

Просмотреть файл

@ -21,7 +21,7 @@
.theme-dark #sources-pane > tabs, .theme-dark #sources-pane > tabs,
.theme-dark #sources-pane .devtools-toolbar { .theme-dark #sources-pane .devtools-toolbar {
-moz-border-end-color: black; /* Match the splitter. */ -moz-border-end-color: black; /* Match the splitter color. */
} }
.theme-light #sources-pane > tabs, .theme-light #sources-pane > tabs,

Просмотреть файл

@ -2,16 +2,20 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file, * License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */ * You can obtain one at http://mozilla.org/MPL/2.0/. */
#body {
background: url(background-noise-toolbar.png), #343c45; /* Dark toolbars */
}
/* Reload and waiting notices */ /* Reload and waiting notices */
.notice-container { .notice-container {
background: transparent;
margin-top: -50vh; margin-top: -50vh;
color: #fff; }
.theme-dark .notice-container {
background: url(background-noise-toolbar.png), #343c45; /* Toolbars */
color: #f5f7fa; /* Light foreground text */
}
.theme-light .notice-container {
background: url(background-noise-toolbar.png), #f0f1f2; /* Toolbars */
color: #585959; /* Grey foreground text */
} }
#reload-notice { #reload-notice {
@ -80,21 +84,33 @@
background-position: 0 0; background-position: 0 0;
} }
.side-menu-widget-item-checkbox:not([checked]) ~ .side-menu-widget-item-contents {
color: rgba(255,255,255,0.4);
}
/* Shader source editors */ /* Shader source editors */
.editor-label { .editor-label {
background: url(background-noise-toolbar.png), #343c45; /* Dark toolbars */
border-top: 1px solid #222426;
padding: 1px 12px; padding: 1px 12px;
color: #fff; border-top: 1px solid;
} }
.editor-label[selected] { .theme-dark .editor-label {
background: linear-gradient(hsl(206,59%,39%), hsl(206,59%,29%)) repeat-x top left; background: #343c45; /* Dark toolbars */
border-color: #222426; /* Match the splitter color. */
color: #f5f7fa; /* Light foreground text */
}
.theme-light .editor-label {
background: #f0f1f2; /* Light toolbars */
border-color: #aaa; /* Match the splitter color. */
color: #585959; /* Grey foreground text */
}
.theme-dark .editor-label[selected] {
background-color: #1d4f73; /* Select Highlight Blue */
color: #f5f7fa; /* Light foreground text */
}
.theme-light .editor-label[selected] {
background-color: #4c9ed9; /* Select Highlight Blue */
color: #f5f7fa; /* Light foreground text */
} }
/* Responsive sidebar */ /* Responsive sidebar */
@ -104,6 +120,10 @@
max-height: 60vh; max-height: 60vh;
} }
#editors-splitter {
border-color: transparent;
}
.side-menu-widget-container { .side-menu-widget-container {
box-shadow: none !important; box-shadow: none !important;
} }
@ -114,5 +134,6 @@
.editor-label { .editor-label {
-moz-box-ordinal-group: 0; -moz-box-ordinal-group: 0;
border-bottom: 1px solid;
} }
} }