mirror
/
c9-core
kopia lustrzana https://github.com/c9/core
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

fix colors of stats widget in jett theme

pull/483/merge
nightwing 2018-03-06 22:20:46 +04:00
rodzic e6bd7cc895
commit 22baba1e14
4 zmienionych plików z 20 dodań i 17 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

9
plugins/c9.ide.layout.classic/layout.js
Wyświetl plik

@ -150,8 +150,6 @@ define(function(require, exports, module) {
function updateTheme(noquestion, type) { function updateTheme(noquestion, type) {
var sTheme = settings.get("user/general/@skin"); var sTheme = settings.get("user/general/@skin");
if (!allowedThemes[sTheme])
sTheme = "dark";
if (noquestion === undefined) if (noquestion === undefined)
noquestion = !theme; noquestion = !theme;
@ -164,10 +162,13 @@ define(function(require, exports, module) {
if (ui.packedThemes) { if (ui.packedThemes) {
preload.getTheme(theme, function(err, themeCss) { preload.getTheme(theme, function(err, themeCss) {
if (err)
return;
if (sTheme !== theme) if (sTheme !== theme)
return; return;
if (err) {
if (!allowedThemes[sTheme])
settings.set("user/general/@skin", "dark");
return;
}
// Remove Current Theme // Remove Current Theme
if (removeTheme) if (removeTheme)
removeTheme(); removeTheme();

2
plugins/c9.ide.layout.classic/preload.js
Wyświetl plik

@ -48,6 +48,8 @@ define(function(require, exports, module) {
} else { } else {
var url = themePrefix + "/" + name + ".css"; var url = themePrefix + "/" + name + ".css";
require(["text!" + url], function(data) { require(["text!" + url], function(data) {
if (!data)
return callback(new Error());
// set sourceurl so that sourcemaps work when theme is inserted as a style tag // set sourceurl so that sourcemaps work when theme is inserted as a style tag
data += "\n/*# sourceURL=" + url + " */"; data += "\n/*# sourceURL=" + url + " */";
themes[name] = data; themes[name] = data;

2
plugins/c9.ide.theme.jett/less/overrides.less
Wyświetl plik

@ -1746,7 +1746,7 @@ body .runner-form-header {
font-family: c9; font-family: c9;
font-size: 22px; font-size: 22px;
line-height: 26px; line-height: 26px;
padding-left: 7px; padding-left: 11px;
} }
.dark.session_btn.curbtn .sessiontab_title { .dark.session_btn.curbtn .sessiontab_title {

24
plugins/c9.ide.theme.jett/less/variables.less
Wyświetl plik

@ -692,11 +692,11 @@
@datagrid-font-family: @general-font-family; @datagrid-font-family: @general-font-family;
@datagrid-font-size: 11px; @datagrid-font-size: 11px;
@datagrid-color: #333; @datagrid-color: #333;
@datagrid-background: #fff; @datagrid-background: #1c1d21;
@datagrid-heading-color: #9c9c9c; @datagrid-heading-color: #9c9c9c;
@datagrid-heading-background: #fff; @datagrid-heading-background: #373b3e;
@datagrid-heading-padding: 6px 4px 5px 7px; @datagrid-heading-padding: 6px 4px 5px 7px;
@datagrid-heading-border-color: rgb(241, 241, 241); @datagrid-heading-border-color: #565252;
@datagrid-heading-hover-color: lighten(@datagrid-heading-color, 10%); @datagrid-heading-hover-color: lighten(@datagrid-heading-color, 10%);
@datagrid-heading-hover-background: @datagrid-heading-background; @datagrid-heading-hover-background: @datagrid-heading-background;
@ -1129,7 +1129,7 @@
@preview-icon-goback-disabled-position: 0 -161px; @preview-icon-goback-disabled-position: 0 -161px;
// Preferences // Preferences
@preference-menu-button-padding: 18px; @preference-menu-button-padding: 21px;
@preference-menu-button-margin-left: 0; @preference-menu-button-margin-left: 0;
@preference-menu-button-icon-top: 5px; @preference-menu-button-icon-top: 5px;
@preference-menu-button-icon-height: 25px; @preference-menu-button-icon-height: 25px;
@ -1665,22 +1665,22 @@
@stats-button-width: 100px; @stats-button-width: 100px;
@stats-button-margin-left: 0; @stats-button-margin-left: 0;
@stats-button-padding: 2px 5px 2px 7px; @stats-button-padding: 2px 5px 2px 7px;
@stats-button-border-left: 1px solid #e0e0e0; @stats-button-border-left: 1px solid #4c4e57;
@stats-button-border-right: 1px solid #e0e0e0; @stats-button-border-right: 1px solid #4c4e57;
@stats-button-box-shadow: none; @stats-button-box-shadow: none;
@stats-button-color: #666666; @stats-button-color: #bdbdbd;
@stats-button-hover-background: #E9E9E9; @stats-button-hover-background: #3a3b40;
@stats-button-active-background: white; @stats-button-active-background: white;
@stats-button-active-box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.09); @stats-button-active-box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.09);
@stats-button-item-padding: 4px 0 0 0; @stats-button-item-padding: 3px 0 0 0;
@stats-button-item-font-size: 7px; @stats-button-item-font-size: 7px;
@stats-button-progress-highlight-color: #D3D3D3; @stats-button-progress-highlight-color: #b8bac1;
@stats-button-progress-highlight-hover-color: #6CC788; @stats-button-progress-highlight-hover-color: #6CC788;
@stats-button-progress-highlight-limit-color: #f06767; @stats-button-progress-highlight-limit-color: #f06767;
@stats-button-progress-background-color: #E8E8E8; @stats-button-progress-background-color: #4c4e57;
@stats-button-progress-background-hover-color: rgb(223, 223, 223); @stats-button-progress-background-hover-color: rgb(223, 223, 223);
@stats-button-progress-height: 9px; @stats-button-progress-height: 6px;
@stats-button-progress-margin-top: -2px; @stats-button-progress-margin-top: -2px;
@stats-menu-padding: 20px; @stats-menu-padding: 20px;