From 6e50362ec94ab6f0a065ee66724da518d74b4752 Mon Sep 17 00:00:00 2001 From: nightwing Date: Thu, 10 Sep 2015 23:11:34 +0400 Subject: [PATCH] fix old themes and make sure build doesn't succeed without them --- plugins/c9.ide.ace/themes.js | 2 +- .../themes/default-dark-gray.less | 27 ++++++++++++++++--- .../themes/default-light-gray.less | 21 ++++++++++++++- .../themes/default-light.less | 21 ++++++++++++++- plugins/c9.static/cdn.cli.js | 3 ++- 5 files changed, 66 insertions(+), 8 deletions(-) diff --git a/plugins/c9.ide.ace/themes.js b/plugins/c9.ide.ace/themes.js index a1cd5ea5..0abada87 100644 --- a/plugins/c9.ide.ace/themes.js +++ b/plugins/c9.ide.ace/themes.js @@ -118,7 +118,7 @@ define(function(require, exports, module) { class: "themepicker", style: "background:#3f3f3f;", value: "dark-gray" - }) + }), // rb3 = new ui.radiobutton({ // group: "theme-color", // class: "themepicker", diff --git a/plugins/c9.ide.layout.classic/themes/default-dark-gray.less b/plugins/c9.ide.layout.classic/themes/default-dark-gray.less index 3d09cdb2..c889ee4b 100644 --- a/plugins/c9.ide.layout.classic/themes/default-dark-gray.less +++ b/plugins/c9.ide.layout.classic/themes/default-dark-gray.less @@ -41,6 +41,7 @@ @highlight-selected-color: darken(#f1f1f1, @darken-font); @empty-message-color: darken(#f1f1f1, @darken-font); +@inactive-font-color: #636363; @general-font-family: Arial, Helvetica, sans-serif; @general-font-size: 12px; @@ -1688,8 +1689,26 @@ @coverage-button-font-size: 14px; -@detail-label-color: #333333; -@detail-label-background: #F6F6F6; +@detail-label-color: #f1f1f1; +@detail-label-background: #3F3F3F; +@detail-label-margin: 2px 0 0 67px; +@detail-label-border-bottom: 1px solid rgba(0,0,0,0.7); +@detail-label-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.06), 0 1px 0 rgba(255, 255, 255, 0.06) inset; -@detail-label-hash-border: 1px solid #DDDE33; -@detail-label-hash-background: #f9f796; +@detail-label-hash-border: 1px solid #95AD0A; +@detail-label-hash-color: @highlight-color; +@detail-label-hash-background: #545D21; + +@log-hash-color: #f1f1f1; +@log-hash-background: #545D21; +@log-hash-border: 1px solid #95AD0A; + +@diff-toolbar-buttons-background: @border-highlight; +@diff-toolbar-buttons-border: none; + +@form-bar-padding: 10px 35px 10px 10px; +@form-bar-background: @menu-button-active-background; +@form-bar-border-bottom: 1px solid black; +@form-bar-box-shadow: 0 1px @border-highlight; + +@panel-settings-changes-top: 33px; diff --git a/plugins/c9.ide.layout.classic/themes/default-light-gray.less b/plugins/c9.ide.layout.classic/themes/default-light-gray.less index 5979981b..c5572bef 100644 --- a/plugins/c9.ide.layout.classic/themes/default-light-gray.less +++ b/plugins/c9.ide.layout.classic/themes/default-light-gray.less @@ -41,6 +41,7 @@ @highlight-selected-color: #f1f1f1; @empty-message-color: darken(#333, @darken-font); +@inactive-font-color: #636363; @general-font-family: Arial, Helvetica, sans-serif; @general-font-size: 12px; @@ -1025,7 +1026,7 @@ @tree-first-row-margin-right: 20px; @tree-heading-color: darken(#747474, @darken-chrome); -@tree-heading-text-shadow: 0 1px rgb(26, 26, 26); +@tree-heading-text-shadow: none; @tree-editor-color: darken(#101010, @darken-chrome); @tree-editor-background: darken(rgb(245, 247, 234), @darken-chrome); @@ -1690,6 +1691,24 @@ @detail-label-color: #333333; @detail-label-background: #F6F6F6; +@detail-label-margin: 2px 0 0 67px; +@detail-label-border-bottom: 1px solid rgb(182, 182, 182); +@detail-label-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.06), 0 1px 0 rgba(255, 255, 255, 0.06) inset; @detail-label-hash-border: 1px solid #DDDE33; +@detail-label-hash-color: @highlight-color; @detail-label-hash-background: #f9f796; + +@log-hash-color: @detail-label-hash-color; +@log-hash-background: @detail-label-hash-background; +@log-hash-border: @detail-label-hash-border; + +@diff-toolbar-buttons-background: @border-highlight; +@diff-toolbar-buttons-border: none; + +@form-bar-padding: 10px 35px 10px 10px; +@form-bar-background: @menu-button-active-background; +@form-bar-border-bottom: 1px solid black; +@form-bar-box-shadow: 0 1px @border-highlight; + +@panel-settings-changes-top: 33px; diff --git a/plugins/c9.ide.layout.classic/themes/default-light.less b/plugins/c9.ide.layout.classic/themes/default-light.less index d8bd8648..cf27da42 100644 --- a/plugins/c9.ide.layout.classic/themes/default-light.less +++ b/plugins/c9.ide.layout.classic/themes/default-light.less @@ -41,6 +41,7 @@ @highlight-selected-color: #f1f1f1; @empty-message-color: darken(#333, @darken-font); +@inactive-font-color: #636363; @general-font-family: Arial, Helvetica, sans-serif; @general-font-size: 12px; @@ -1025,7 +1026,7 @@ @tree-first-row-margin-right: 20px; @tree-heading-color: darken(#747474, @darken-chrome); -@tree-heading-text-shadow: 0 1px rgb(26, 26, 26); +@tree-heading-text-shadow: none; @tree-editor-color: darken(#101010, @darken-chrome); @tree-editor-background: darken(rgb(245, 247, 234), @darken-chrome); @@ -1690,6 +1691,24 @@ @detail-label-color: #333333; @detail-label-background: #F6F6F6; +@detail-label-margin: 2px 0 0 67px; +@detail-label-border-bottom: 1px solid rgb(182, 182, 182); +@detail-label-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.06), 0 1px 0 rgba(255, 255, 255, 0.06) inset; @detail-label-hash-border: 1px solid #DDDE33; +@detail-label-hash-color: @highlight-color; @detail-label-hash-background: #f9f796; + +@log-hash-color: @detail-label-hash-color; +@log-hash-background: @detail-label-hash-background; +@log-hash-border: @detail-label-hash-border; + +@diff-toolbar-buttons-background: @border-highlight; +@diff-toolbar-buttons-border: none; + +@form-bar-padding: 10px 35px 10px 10px; +@form-bar-background: @menu-button-active-background; +@form-bar-border-bottom: 1px solid black; +@form-bar-box-shadow: 0 1px @border-highlight; + +@panel-settings-changes-top: 33px; diff --git a/plugins/c9.static/cdn.cli.js b/plugins/c9.static/cdn.cli.js index 3dda4d00..e200cdf9 100644 --- a/plugins/c9.static/cdn.cli.js +++ b/plugins/c9.static/cdn.cli.js @@ -45,7 +45,8 @@ define(function(require, exports, module) { else skins = skins ? skins.split(/,\s*/) : []; - build.buildConfig(config, pathConfig, save(["config", path.basename(config) + ".js"], function next() { + build.buildConfig(config, pathConfig, save(["config", path.basename(config) + ".js"], function next(err) { + if (err) return done(err); var skin = skins.pop(); if (!skin) return buildConfig(); build.buildSkin(config, skin, pathConfig, save(["skin", config, skin + ".css"], next));