From 2dd17623c9388fb98ae53ba80c904455e0c7f432 Mon Sep 17 00:00:00 2001 From: randx Date: Mon, 18 Jun 2012 20:18:14 +0300 Subject: Refactor code themes --- app/assets/stylesheets/common.scss | 3 +- app/assets/stylesheets/gitlab_bootstrap.scss | 4 +- app/assets/stylesheets/highlight.black.scss | 67 ------------- app/assets/stylesheets/highlight.scss | 139 --------------------------- app/assets/stylesheets/highlight/dark.scss | 67 +++++++++++++ app/assets/stylesheets/highlight/white.scss | 132 +++++++++++++++++++++++++ app/assets/stylesheets/main.scss | 4 +- 7 files changed, 205 insertions(+), 211 deletions(-) delete mode 100644 app/assets/stylesheets/highlight.black.scss delete mode 100644 app/assets/stylesheets/highlight.scss create mode 100644 app/assets/stylesheets/highlight/dark.scss create mode 100644 app/assets/stylesheets/highlight/white.scss (limited to 'app') diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 1507aab2484..82d43d4c83e 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -581,7 +581,8 @@ li.note { /* CHZN reset few styles */ .chzn-container-single .chzn-single { background:#FFF; - border: 1px solid #ccc; + border: 1px solid #bbb; + box-shadow:none; } .chzn-container-active .chzn-single { background:#fff; diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss index 04a55bf963e..8bab17791a0 100644 --- a/app/assets/stylesheets/gitlab_bootstrap.scss +++ b/app/assets/stylesheets/gitlab_bootstrap.scss @@ -165,11 +165,11 @@ a:focus { } .nav-pills a:hover { - background-color:#ccc; + background-color:#888; } .nav-pills .active a { - background-color: #aaa; + background-color: $style_color; } .label { diff --git a/app/assets/stylesheets/highlight.black.scss b/app/assets/stylesheets/highlight.black.scss deleted file mode 100644 index 61a0932775f..00000000000 --- a/app/assets/stylesheets/highlight.black.scss +++ /dev/null @@ -1,67 +0,0 @@ -.black .highlighttable { - td.linenos { border:none; } - pre { color: #eee } - .highlight { background: #333; border-left:1px solid #555; } - - .hll { background-color: #ffffff } - .c { color: #888888; font-style: italic } /* Comment */ - .err { color: #a61717; background-color: #e3d2d2 } /* Error */ - .k { color: #CDA869; font-weight: bold } /* Keyword */ - .kp { color: #CDA869; font-weight: bold } /* Keyword */ - .cm { color: #888888 } /* Comment.Multiline */ - .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */ - .c1 { color: #888888 } /* Comment.Single */ - .cs { color: #cc0000; font-weight: bold; background-color: transparent } /* Comment.Special */ - .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */ - .ge { font-style: italic } /* Generic.Emph */ - .gr { color: #aa0000 } /* Generic.Error */ - .gh { color: #303030 } /* Generic.Heading */ - .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */ - .go { color: #888888 } /* Generic.Output */ - .gp { color: #555555 } /* Generic.Prompt */ - .gs { font-weight: bold } /* Generic.Strong */ - .gu { color: #606060 } /* Generic.Subheading */ - .gt { color: #aa0000 } /* Generic.Traceback */ - .highlight .kc{font-weight:bold;} /* Keyword.Constant */ - .highlight .kd{font-weight:bold;} /* Keyword.Declaration */ - .highlight .kn{font-weight:bold;} /* Keyword.Namespace */ - .highlight .kp{font-weight:bold;} /* Keyword.Pseudo */ - .highlight .kr{font-weight:bold;} /* Keyword.Reserved */ - .highlight .kt{color:#458;font-weight:bold;} /* Keyword.Type */ - .m { color: #0000DD; font-weight: bold } /* Literal.Number */ - .p { color: #eee; } - .s { color: #0AD; background-color: transparent } /* Literal.String */ - .highlight .na{color:#008080;} /* Name.Attribute */ - .highlight .nb{color:#0086B3;} /* Name.Builtin */ - .highlight .nc{color:#ccc;font-weight:bold;} /* Name.Class */ - .highlight .no{color:turquoise;} /* Name.Constant */ - .highlight .ni{color:#800080;} - .highlight .ne{color:#900;font-weight:bold;} /* Name.Exception */ - .highlight .nf{color:#ccc;font-weight:bold;} /* Name.Function */ - .highlight .nn{color:#79C3E0;font-weight:bold;} /* Name.Namespace */ - .highlight .nt{color:#fc5;} /* Name.Tag */ - .highlight .nv{color:#FA4;} /* Name.Variable */ - .py { color: #336699; font-weight: bold } /* Name.Property */ - .ow { color: #008800 } /* Operator.Word */ - .w { color: #bbbbbb } /* Text.Whitespace */ - .mf { color: #7AC; font-weight: bold } /* Literal.Number.Float */ - .mh { color: #7AC; font-weight: bold } /* Literal.Number.Hex */ - .highlight .mi {color:#099;} /* Literal.Number.Integer */ - .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ - .sb { color: #dd2200; background-color: transparent; } /* Literal.String.Backtick */ - .highlight .sc{color:#d14;} /* Literal.String.Char */ - .sd { color: #dd2200; background-color: transparent; } /* Literal.String.Doc */ - .highlight .s2{color:orange;} /* Literal.String.Double */ - .highlight .se{color:orange;} /* Literal.String.Escape */ - .highlight .sh{color:orange;} /* Literal.String.Heredoc */ - .highlight .si{color:orange;} /* Literal.String.Interpol */ - .highlight .sx{color:orange;} /* Literal.String.Other */ - .highlight .sr{color:orange;} /* Literal.String.Regex */ - .highlight .s1{color:orange;} /* Literal.String.Single */ - .highlight .ss{color:orange;} /* Literal.String.Symbol */ - .bp { color: #003388 } /* Name.Builtin.Pseudo */ - .vc { color: #336699 } /* Name.Variable.Class */ - .vg { color: #dd7700 } /* Name.Variable.Global */ - .vi { color: cyan } -} - diff --git a/app/assets/stylesheets/highlight.scss b/app/assets/stylesheets/highlight.scss deleted file mode 100644 index 535ec3823db..00000000000 --- a/app/assets/stylesheets/highlight.scss +++ /dev/null @@ -1,139 +0,0 @@ -@mixin round-borders-all($radius) { - border: 1px solid #eaeaea; - -moz-border-radius: $radius; - -webkit-border-radius: $radius; - border-radius: $radius; -} - -table.highlighttable -{ - margin:0px; - padding:0px; - font-size:12px; - table-layout:fixed; - background: #EEE; -} - -td.code, -td.linenos{ - padding:0; - margin:0; - border-top:0; - vertical-align:top; -} - -.highlighttable .highlight{ - background:none; - padding:10px 0px 0px 10px; - margin-left:0px; - border-left: 1px solid #DEE2E3; - background: white; -} - -.linenodiv pre, -.highlighttable .highlight pre{ - margin:0; - padding:0; - background:none; - border:none; -} - -.linenodiv pre { - white-space:pre-line; -} - -td.linenos { - /*background:#F7F7F7;*/ - color:#666; - padding:10px 0px 0px 10px; - float:left; - width:45px; - border-right: 1px solid #ccc; - -} - -td.code .highlight { - overflow: auto; -} -table.highlighttable pre{ - padding:0; - margin:0; - font-family: 'Menlo', 'Courier New', 'andale mono','lucida console',monospace; - color: #333; - text-align:left; -} - -.git-empty .highlight { - pre{ - padding:15px; - line-height:2.0; - margin:0; - font-family: 'Menlo', 'Courier New', 'andale mono','lucida console',monospace; - color: #333; - text-align:left;} - } - -.shadow{ - -webkit-box-shadow:0 5px 15px #000; - -moz-box-shadow:0 5px 15px #000; - box-shadow:0 5px 15px #000; -} - -.hll { background-color: #ffffff } -.c { color: #888888; font-style: italic } /* Comment */ -.err { color: #a61717; background-color: #e3d2d2 } /* Error */ -.k { color: #000000; font-weight: bold } /* Keyword */ -.cm { color: #888888 } /* Comment.Multiline */ -.cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */ -.c1 { color: #888888 } /* Comment.Single */ -.cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */ -.gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */ -.ge { font-style: italic } /* Generic.Emph */ -.gr { color: #aa0000 } /* Generic.Error */ -.gh { color: #303030 } /* Generic.Heading */ -.gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */ -.go { color: #888888 } /* Generic.Output */ -.gp { color: #555555 } /* Generic.Prompt */ -.gs { font-weight: bold } /* Generic.Strong */ -.gu { color: #606060 } /* Generic.Subheading */ -.gt { color: #aa0000 } /* Generic.Traceback */ -.highlight .kc{font-weight:bold;} /* Keyword.Constant */ -.highlight .kd{font-weight:bold;} /* Keyword.Declaration */ -.highlight .kn{font-weight:bold;} /* Keyword.Namespace */ -.highlight .kp{font-weight:bold;} /* Keyword.Pseudo */ -.highlight .kr{font-weight:bold;} /* Keyword.Reserved */ -.highlight .kt{color:#458;font-weight:bold;} /* Keyword.Type */ -.m { color: #0000DD; font-weight: bold } /* Literal.Number */ -.s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */ -.highlight .na{color:#008080;} /* Name.Attribute */ -.highlight .nb{color:#0086B3;} /* Name.Builtin */ -.highlight .nc{color:#458;font-weight:bold;} /* Name.Class */ -.highlight .no{color:#008080;} /* Name.Constant */ -.highlight .ni{color:#800080;} -.highlight .ne{color:#900;font-weight:bold;} /* Name.Exception */ -.highlight .nf{color:#900;font-weight:bold;} /* Name.Function */ -.highlight .nn{color:#005;font-weight:bold;} /* Name.Namespace */ -.highlight .nt{color:#000080;} /* Name.Tag */ -.highlight .nv{color:#008080;} /* Name.Variable */ -.py { color: #336699; font-weight: bold } /* Name.Property */ -.ow { color: #008800 } /* Operator.Word */ -.w { color: #bbbbbb } /* Text.Whitespace */ -.mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ -.mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ -.highlight .mi {color:#099;} /* Literal.Number.Integer */ -.mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ -.sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ -.highlight .sc{color:#d14;} /* Literal.String.Char */ -.sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ -.highlight .s2{color:#d14;} /* Literal.String.Double */ -.highlight .se{color:#d14;} /* Literal.String.Escape */ -.highlight .sh{color:#d14;} /* Literal.String.Heredoc */ -.highlight .si{color:#d14;} /* Literal.String.Interpol */ -.highlight .sx{color:#d14;} /* Literal.String.Other */ -.highlight .sr{color:#d14;} /* Literal.String.Regex */ -.highlight .s1{color:#d14;} /* Literal.String.Single */ -.highlight .ss{color:#d14;} /* Literal.String.Symbol */ -.bp { color: #003388 } /* Name.Builtin.Pseudo */ -.vc { color: #336699 } /* Name.Variable.Class */ -.vg { color: #dd7700 } /* Name.Variable.Global */ -.vi { color: #3333bb } diff --git a/app/assets/stylesheets/highlight/dark.scss b/app/assets/stylesheets/highlight/dark.scss new file mode 100644 index 00000000000..97c57835b75 --- /dev/null +++ b/app/assets/stylesheets/highlight/dark.scss @@ -0,0 +1,67 @@ +.black .highlighttable { + td.linenos { border:none; } + pre { color: #eee } + .highlight { background: #333; border-left:1px solid #555; } + + .hll { background-color: #ffffff } + .c { color: #888888; font-style: italic } /* Comment */ + .err { color: #a61717; background-color: #e3d2d2 } /* Error */ + .k { color: #CDA869; font-weight: bold } /* Keyword */ + .kp { color: #CDA869; font-weight: bold } /* Keyword */ + .cm { color: #888888 } /* Comment.Multiline */ + .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */ + .c1 { color: #888888 } /* Comment.Single */ + .cs { color: #cc0000; font-weight: bold; background-color: transparent } /* Comment.Special */ + .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */ + .ge { font-style: italic } /* Generic.Emph */ + .gr { color: #aa0000 } /* Generic.Error */ + .gh { color: #303030 } /* Generic.Heading */ + .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */ + .go { color: #888888 } /* Generic.Output */ + .gp { color: #555555 } /* Generic.Prompt */ + .gs { font-weight: bold } /* Generic.Strong */ + .gu { color: #606060 } /* Generic.Subheading */ + .gt { color: #aa0000 } /* Generic.Traceback */ + .highlight .kc{font-weight:bold;} /* Keyword.Constant */ + .highlight .kd{font-weight:bold;} /* Keyword.Declaration */ + .highlight .kn{font-weight:bold;} /* Keyword.Namespace */ + .highlight .kp{font-weight:bold;} /* Keyword.Pseudo */ + .highlight .kr{font-weight:bold;} /* Keyword.Reserved */ + .highlight .kt{color:#458;font-weight:bold;} /* Keyword.Type */ + .m { color: #0000DD; font-weight: bold } /* Literal.Number */ + .p { color: #eee; } + .s { color: #0AD; background-color: transparent } /* Literal.String */ + .highlight .na{color:#008080;} /* Name.Attribute */ + .highlight .nb{color:#0086B3;} /* Name.Builtin */ + .highlight .nc{color:#ccc;font-weight:bold;} /* Name.Class */ + .highlight .no{color:turquoise;} /* Name.Constant */ + .highlight .ni{color:#800080;} + .highlight .ne{color:#900;font-weight:bold;} /* Name.Exception */ + .highlight .nf{color:#ccc;font-weight:bold;} /* Name.Function */ + .highlight .nn{color:#79C3E0;font-weight:bold;} /* Name.Namespace */ + .highlight .nt{color:#fc5;} /* Name.Tag */ + .highlight .nv{color:#FA4;} /* Name.Variable */ + .py { color: #336699; font-weight: bold } /* Name.Property */ + .ow { color: #008800 } /* Operator.Word */ + .w { color: #bbbbbb } /* Text.Whitespace */ + .mf { color: #7AC; font-weight: bold } /* Literal.Number.Float */ + .mh { color: #7AC; font-weight: bold } /* Literal.Number.Hex */ + .highlight .mi {color:#099;} /* Literal.Number.Integer */ + .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ + .sb { color: #dd2200; background-color: transparent; } /* Literal.String.Backtick */ + .highlight .sc{color:#d14;} /* Literal.String.Char */ + .sd { color: #dd2200; background-color: transparent; } /* Literal.String.Doc */ + .highlight .s2{color:orange;} /* Literal.String.Double */ + .highlight .se{color:orange;} /* Literal.String.Escape */ + .highlight .sh{color:orange;} /* Literal.String.Heredoc */ + .highlight .si{color:orange;} /* Literal.String.Interpol */ + .highlight .sx{color:orange;} /* Literal.String.Other */ + .highlight .sr{color:orange;} /* Literal.String.Regex */ + .highlight .s1{color:orange;} /* Literal.String.Single */ + .highlight .ss{color:orange;} /* Literal.String.Symbol */ + .bp { color: #D58 } /* Name.Builtin.Pseudo */ + .vc { color: #336699 } /* Name.Variable.Class */ + .vg { color: #dd7700 } /* Name.Variable.Global */ + .vi { color: cyan } +} + diff --git a/app/assets/stylesheets/highlight/white.scss b/app/assets/stylesheets/highlight/white.scss new file mode 100644 index 00000000000..2b95d4b5dd1 --- /dev/null +++ b/app/assets/stylesheets/highlight/white.scss @@ -0,0 +1,132 @@ +table.highlighttable +{ + margin:0px; + padding:0px; + font-size:12px; + table-layout:fixed; + background: #EEE; +} + +td.code, +td.linenos{ + padding:0; + margin:0; + border-top:0; + vertical-align:top; +} + +.highlighttable .highlight{ + background:none; + padding:10px 0px 0px 10px; + margin-left:0px; + border-left: 1px solid #DEE2E3; + background: white; +} + +.linenodiv pre, +.highlighttable .highlight pre{ + margin:0; + padding:0; + background:none; + border:none; +} + +.linenodiv pre { + white-space:pre-line; +} + +td.linenos { + /*background:#F7F7F7;*/ + color:#666; + padding:10px 0px 0px 10px; + float:left; + width:45px; + border-right: 1px solid #ccc; + +} + +td.code .highlight { + overflow: auto; +} +table.highlighttable pre{ + padding:0; + margin:0; + font-family: 'Menlo', 'Courier New', 'andale mono','lucida console',monospace; + color: #333; + text-align:left; +} + +.git-empty .highlight { + pre{ + padding:15px; + line-height:2.0; + margin:0; + font-family: 'Menlo', 'Courier New', 'andale mono','lucida console',monospace; + color: #333; + text-align:left;} + } + +.shadow{ + -webkit-box-shadow:0 5px 15px #000; + -moz-box-shadow:0 5px 15px #000; + box-shadow:0 5px 15px #000; +} + +.hll { background-color: #ffffff } +.c { color: #888888; font-style: italic } /* Comment */ +.err { color: #a61717; background-color: #e3d2d2 } /* Error */ +.k { color: #000000; font-weight: bold } /* Keyword */ +.cm { color: #888888 } /* Comment.Multiline */ +.cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */ +.c1 { color: #888888 } /* Comment.Single */ +.cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */ +.gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */ +.ge { font-style: italic } /* Generic.Emph */ +.gr { color: #aa0000 } /* Generic.Error */ +.gh { color: #303030 } /* Generic.Heading */ +.gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */ +.go { color: #888888 } /* Generic.Output */ +.gp { color: #555555 } /* Generic.Prompt */ +.gs { font-weight: bold } /* Generic.Strong */ +.gu { color: #606060 } /* Generic.Subheading */ +.gt { color: #aa0000 } /* Generic.Traceback */ +.highlight .kc{font-weight:bold;} /* Keyword.Constant */ +.highlight .kd{font-weight:bold;} /* Keyword.Declaration */ +.highlight .kn{font-weight:bold;} /* Keyword.Namespace */ +.highlight .kp{font-weight:bold;} /* Keyword.Pseudo */ +.highlight .kr{font-weight:bold;} /* Keyword.Reserved */ +.highlight .kt{color:#458;font-weight:bold;} /* Keyword.Type */ +.m { color: #0000DD; font-weight: bold } /* Literal.Number */ +.s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */ +.highlight .na{color:#008080;} /* Name.Attribute */ +.highlight .nb{color:#0086B3;} /* Name.Builtin */ +.highlight .nc{color:#458;font-weight:bold;} /* Name.Class */ +.highlight .no{color:#008080;} /* Name.Constant */ +.highlight .ni{color:#800080;} +.highlight .ne{color:#900;font-weight:bold;} /* Name.Exception */ +.highlight .nf{color:#900;font-weight:bold;} /* Name.Function */ +.highlight .nn{color:#005;font-weight:bold;} /* Name.Namespace */ +.highlight .nt{color:#000080;} /* Name.Tag */ +.highlight .nv{color:#008080;} /* Name.Variable */ +.py { color: #336699; font-weight: bold } /* Name.Property */ +.ow { color: #008800 } /* Operator.Word */ +.w { color: #bbbbbb } /* Text.Whitespace */ +.mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ +.mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ +.highlight .mi {color:#099;} /* Literal.Number.Integer */ +.mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ +.sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ +.highlight .sc{color:#d14;} /* Literal.String.Char */ +.sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ +.highlight .s2{color:#d14;} /* Literal.String.Double */ +.highlight .se{color:#d14;} /* Literal.String.Escape */ +.highlight .sh{color:#d14;} /* Literal.String.Heredoc */ +.highlight .si{color:#d14;} /* Literal.String.Interpol */ +.highlight .sx{color:#d14;} /* Literal.String.Other */ +.highlight .sr{color:#d14;} /* Literal.String.Regex */ +.highlight .s1{color:#d14;} /* Literal.String.Single */ +.highlight .ss{color:#d14;} /* Literal.String.Symbol */ +.bp { color: #003388 } /* Name.Builtin.Pseudo */ +.vc { color: #336699 } /* Name.Variable.Class */ +.vg { color: #dd7700 } /* Name.Variable.Global */ +.vi { color: #3333bb } diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index 5a09e564c60..bff24dd68b9 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -152,13 +152,13 @@ $hover: #FDF5D9; * CODE HIGHTLIGHT BASE * */ -@import "highlight.scss"; +@import "highlight/white.scss"; /** * CODE HIGHTLIGHT DARK schema * */ -@import "highlight.black.scss"; +@import "highlight/dark.scss"; /** * JQUERY UI ext -- cgit v1.2.3