Download as
Browse Code »

Commit 2dd17623c9388fb98ae53ba80c904455e0c7f432

Authored by randx
1 parent 22d6dc2b
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Refactor code themes

Showing 7 changed files with 205 additions and 211 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @2dd1762
... ... @@ -581,7 +581,8 @@ li.note {
581 581 /* CHZN reset few styles */
582 582 .chzn-container-single .chzn-single {
583 583 background:#FFF;
584   - border: 1px solid #ccc;
  584 + border: 1px solid #bbb;
  585 + box-shadow:none;
585 586 }
586 587 .chzn-container-active .chzn-single {
587 588 background:#fff;
... ...
app/assets/stylesheets/gitlab_bootstrap.scss
  Diff comments   View file @2dd1762
... ... @@ -165,11 +165,11 @@ a:focus {
165 165 }
166 166  
167 167 .nav-pills a:hover {
168   - background-color:#ccc;
  168 + background-color:#888;
169 169 }
170 170  
171 171 .nav-pills .active a {
172   - background-color: #aaa;
  172 + background-color: $style_color;
173 173 }
174 174  
175 175 .label {
... ...
app/assets/stylesheets/highlight.black.scss
View file @22d6dc2
... ... @@ -1,67 +0,0 @@
1   -.black .highlighttable {
2   - td.linenos { border:none; }
3   - pre { color: #eee }
4   - .highlight { background: #333; border-left:1px solid #555; }
5   -
6   - .hll { background-color: #ffffff }
7   - .c { color: #888888; font-style: italic } /* Comment */
8   - .err { color: #a61717; background-color: #e3d2d2 } /* Error */
9   - .k { color: #CDA869; font-weight: bold } /* Keyword */
10   - .kp { color: #CDA869; font-weight: bold } /* Keyword */
11   - .cm { color: #888888 } /* Comment.Multiline */
12   - .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */
13   - .c1 { color: #888888 } /* Comment.Single */
14   - .cs { color: #cc0000; font-weight: bold; background-color: transparent } /* Comment.Special */
15   - .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
16   - .ge { font-style: italic } /* Generic.Emph */
17   - .gr { color: #aa0000 } /* Generic.Error */
18   - .gh { color: #303030 } /* Generic.Heading */
19   - .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
20   - .go { color: #888888 } /* Generic.Output */
21   - .gp { color: #555555 } /* Generic.Prompt */
22   - .gs { font-weight: bold } /* Generic.Strong */
23   - .gu { color: #606060 } /* Generic.Subheading */
24   - .gt { color: #aa0000 } /* Generic.Traceback */
25   - .highlight .kc{font-weight:bold;} /* Keyword.Constant */
26   - .highlight .kd{font-weight:bold;} /* Keyword.Declaration */
27   - .highlight .kn{font-weight:bold;} /* Keyword.Namespace */
28   - .highlight .kp{font-weight:bold;} /* Keyword.Pseudo */
29   - .highlight .kr{font-weight:bold;} /* Keyword.Reserved */
30   - .highlight .kt{color:#458;font-weight:bold;} /* Keyword.Type */
31   - .m { color: #0000DD; font-weight: bold } /* Literal.Number */
32   - .p { color: #eee; }
33   - .s { color: #0AD; background-color: transparent } /* Literal.String */
34   - .highlight .na{color:#008080;} /* Name.Attribute */
35   - .highlight .nb{color:#0086B3;} /* Name.Builtin */
36   - .highlight .nc{color:#ccc;font-weight:bold;} /* Name.Class */
37   - .highlight .no{color:turquoise;} /* Name.Constant */
38   - .highlight .ni{color:#800080;}
39   - .highlight .ne{color:#900;font-weight:bold;} /* Name.Exception */
40   - .highlight .nf{color:#ccc;font-weight:bold;} /* Name.Function */
41   - .highlight .nn{color:#79C3E0;font-weight:bold;} /* Name.Namespace */
42   - .highlight .nt{color:#fc5;} /* Name.Tag */
43   - .highlight .nv{color:#FA4;} /* Name.Variable */
44   - .py { color: #336699; font-weight: bold } /* Name.Property */
45   - .ow { color: #008800 } /* Operator.Word */
46   - .w { color: #bbbbbb } /* Text.Whitespace */
47   - .mf { color: #7AC; font-weight: bold } /* Literal.Number.Float */
48   - .mh { color: #7AC; font-weight: bold } /* Literal.Number.Hex */
49   - .highlight .mi {color:#099;} /* Literal.Number.Integer */
50   - .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */
51   - .sb { color: #dd2200; background-color: transparent; } /* Literal.String.Backtick */
52   - .highlight .sc{color:#d14;} /* Literal.String.Char */
53   - .sd { color: #dd2200; background-color: transparent; } /* Literal.String.Doc */
54   - .highlight .s2{color:orange;} /* Literal.String.Double */
55   - .highlight .se{color:orange;} /* Literal.String.Escape */
56   - .highlight .sh{color:orange;} /* Literal.String.Heredoc */
57   - .highlight .si{color:orange;} /* Literal.String.Interpol */
58   - .highlight .sx{color:orange;} /* Literal.String.Other */
59   - .highlight .sr{color:orange;} /* Literal.String.Regex */
60   - .highlight .s1{color:orange;} /* Literal.String.Single */
61   - .highlight .ss{color:orange;} /* Literal.String.Symbol */
62   - .bp { color: #003388 } /* Name.Builtin.Pseudo */
63   - .vc { color: #336699 } /* Name.Variable.Class */
64   - .vg { color: #dd7700 } /* Name.Variable.Global */
65   - .vi { color: cyan }
66   -}
67   -
app/assets/stylesheets/highlight.scss
View file @22d6dc2
... ... @@ -1,139 +0,0 @@
1   -@mixin round-borders-all($radius) {
2   - border: 1px solid #eaeaea;
3   - -moz-border-radius: $radius;
4   - -webkit-border-radius: $radius;
5   - border-radius: $radius;
6   -}
7   -
8   -table.highlighttable
9   -{
10   - margin:0px;
11   - padding:0px;
12   - font-size:12px;
13   - table-layout:fixed;
14   - background: #EEE;
15   -}
16   -
17   -td.code,
18   -td.linenos{
19   - padding:0;
20   - margin:0;
21   - border-top:0;
22   - vertical-align:top;
23   -}
24   -
25   -.highlighttable .highlight{
26   - background:none;
27   - padding:10px 0px 0px 10px;
28   - margin-left:0px;
29   - border-left: 1px solid #DEE2E3;
30   - background: white;
31   -}
32   -
33   -.linenodiv pre,
34   -.highlighttable .highlight pre{
35   - margin:0;
36   - padding:0;
37   - background:none;
38   - border:none;
39   -}
40   -
41   -.linenodiv pre {
42   - white-space:pre-line;
43   -}
44   -
45   -td.linenos {
46   - /*background:#F7F7F7;*/
47   - color:#666;
48   - padding:10px 0px 0px 10px;
49   - float:left;
50   - width:45px;
51   - border-right: 1px solid #ccc;
52   -
53   -}
54   -
55   -td.code .highlight {
56   - overflow: auto;
57   -}
58   -table.highlighttable pre{
59   - padding:0;
60   - margin:0;
61   - font-family: 'Menlo', 'Courier New', 'andale mono','lucida console',monospace;
62   - color: #333;
63   - text-align:left;
64   -}
65   -
66   -.git-empty .highlight {
67   - pre{
68   - padding:15px;
69   - line-height:2.0;
70   - margin:0;
71   - font-family: 'Menlo', 'Courier New', 'andale mono','lucida console',monospace;
72   - color: #333;
73   - text-align:left;}
74   - }
75   -
76   -.shadow{
77   - -webkit-box-shadow:0 5px 15px #000;
78   - -moz-box-shadow:0 5px 15px #000;
79   - box-shadow:0 5px 15px #000;
80   -}
81   -
82   -.hll { background-color: #ffffff }
83   -.c { color: #888888; font-style: italic } /* Comment */
84   -.err { color: #a61717; background-color: #e3d2d2 } /* Error */
85   -.k { color: #000000; font-weight: bold } /* Keyword */
86   -.cm { color: #888888 } /* Comment.Multiline */
87   -.cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */
88   -.c1 { color: #888888 } /* Comment.Single */
89   -.cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */
90   -.gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
91   -.ge { font-style: italic } /* Generic.Emph */
92   -.gr { color: #aa0000 } /* Generic.Error */
93   -.gh { color: #303030 } /* Generic.Heading */
94   -.gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
95   -.go { color: #888888 } /* Generic.Output */
96   -.gp { color: #555555 } /* Generic.Prompt */
97   -.gs { font-weight: bold } /* Generic.Strong */
98   -.gu { color: #606060 } /* Generic.Subheading */
99   -.gt { color: #aa0000 } /* Generic.Traceback */
100   -.highlight .kc{font-weight:bold;} /* Keyword.Constant */
101   -.highlight .kd{font-weight:bold;} /* Keyword.Declaration */
102   -.highlight .kn{font-weight:bold;} /* Keyword.Namespace */
103   -.highlight .kp{font-weight:bold;} /* Keyword.Pseudo */
104   -.highlight .kr{font-weight:bold;} /* Keyword.Reserved */
105   -.highlight .kt{color:#458;font-weight:bold;} /* Keyword.Type */
106   -.m { color: #0000DD; font-weight: bold } /* Literal.Number */
107   -.s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */
108   -.highlight .na{color:#008080;} /* Name.Attribute */
109   -.highlight .nb{color:#0086B3;} /* Name.Builtin */
110   -.highlight .nc{color:#458;font-weight:bold;} /* Name.Class */
111   -.highlight .no{color:#008080;} /* Name.Constant */
112   -.highlight .ni{color:#800080;}
113   -.highlight .ne{color:#900;font-weight:bold;} /* Name.Exception */
114   -.highlight .nf{color:#900;font-weight:bold;} /* Name.Function */
115   -.highlight .nn{color:#005;font-weight:bold;} /* Name.Namespace */
116   -.highlight .nt{color:#000080;} /* Name.Tag */
117   -.highlight .nv{color:#008080;} /* Name.Variable */
118   -.py { color: #336699; font-weight: bold } /* Name.Property */
119   -.ow { color: #008800 } /* Operator.Word */
120   -.w { color: #bbbbbb } /* Text.Whitespace */
121   -.mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */
122   -.mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */
123   -.highlight .mi {color:#099;} /* Literal.Number.Integer */
124   -.mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */
125   -.sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */
126   -.highlight .sc{color:#d14;} /* Literal.String.Char */
127   -.sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */
128   -.highlight .s2{color:#d14;} /* Literal.String.Double */
129   -.highlight .se{color:#d14;} /* Literal.String.Escape */
130   -.highlight .sh{color:#d14;} /* Literal.String.Heredoc */
131   -.highlight .si{color:#d14;} /* Literal.String.Interpol */
132   -.highlight .sx{color:#d14;} /* Literal.String.Other */
133   -.highlight .sr{color:#d14;} /* Literal.String.Regex */
134   -.highlight .s1{color:#d14;} /* Literal.String.Single */
135   -.highlight .ss{color:#d14;} /* Literal.String.Symbol */
136   -.bp { color: #003388 } /* Name.Builtin.Pseudo */
137   -.vc { color: #336699 } /* Name.Variable.Class */
138   -.vg { color: #dd7700 } /* Name.Variable.Global */
139   -.vi { color: #3333bb }
app/assets/stylesheets/highlight/dark.scss 0 → 100644
  Diff comments   View file @2dd1762
... ... @@ -0,0 +1,67 @@
  1 +.black .highlighttable {
  2 + td.linenos { border:none; }
  3 + pre { color: #eee }
  4 + .highlight { background: #333; border-left:1px solid #555; }
  5 +
  6 + .hll { background-color: #ffffff }
  7 + .c { color: #888888; font-style: italic } /* Comment */
  8 + .err { color: #a61717; background-color: #e3d2d2 } /* Error */
  9 + .k { color: #CDA869; font-weight: bold } /* Keyword */
  10 + .kp { color: #CDA869; font-weight: bold } /* Keyword */
  11 + .cm { color: #888888 } /* Comment.Multiline */
  12 + .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */
  13 + .c1 { color: #888888 } /* Comment.Single */
  14 + .cs { color: #cc0000; font-weight: bold; background-color: transparent } /* Comment.Special */
  15 + .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
  16 + .ge { font-style: italic } /* Generic.Emph */
  17 + .gr { color: #aa0000 } /* Generic.Error */
  18 + .gh { color: #303030 } /* Generic.Heading */
  19 + .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
  20 + .go { color: #888888 } /* Generic.Output */
  21 + .gp { color: #555555 } /* Generic.Prompt */
  22 + .gs { font-weight: bold } /* Generic.Strong */
  23 + .gu { color: #606060 } /* Generic.Subheading */
  24 + .gt { color: #aa0000 } /* Generic.Traceback */
  25 + .highlight .kc{font-weight:bold;} /* Keyword.Constant */
  26 + .highlight .kd{font-weight:bold;} /* Keyword.Declaration */
  27 + .highlight .kn{font-weight:bold;} /* Keyword.Namespace */
  28 + .highlight .kp{font-weight:bold;} /* Keyword.Pseudo */
  29 + .highlight .kr{font-weight:bold;} /* Keyword.Reserved */
  30 + .highlight .kt{color:#458;font-weight:bold;} /* Keyword.Type */
  31 + .m { color: #0000DD; font-weight: bold } /* Literal.Number */
  32 + .p { color: #eee; }
  33 + .s { color: #0AD; background-color: transparent } /* Literal.String */
  34 + .highlight .na{color:#008080;} /* Name.Attribute */
  35 + .highlight .nb{color:#0086B3;} /* Name.Builtin */
  36 + .highlight .nc{color:#ccc;font-weight:bold;} /* Name.Class */
  37 + .highlight .no{color:turquoise;} /* Name.Constant */
  38 + .highlight .ni{color:#800080;}
  39 + .highlight .ne{color:#900;font-weight:bold;} /* Name.Exception */
  40 + .highlight .nf{color:#ccc;font-weight:bold;} /* Name.Function */
  41 + .highlight .nn{color:#79C3E0;font-weight:bold;} /* Name.Namespace */
  42 + .highlight .nt{color:#fc5;} /* Name.Tag */
  43 + .highlight .nv{color:#FA4;} /* Name.Variable */
  44 + .py { color: #336699; font-weight: bold } /* Name.Property */
  45 + .ow { color: #008800 } /* Operator.Word */
  46 + .w { color: #bbbbbb } /* Text.Whitespace */
  47 + .mf { color: #7AC; font-weight: bold } /* Literal.Number.Float */
  48 + .mh { color: #7AC; font-weight: bold } /* Literal.Number.Hex */
  49 + .highlight .mi {color:#099;} /* Literal.Number.Integer */
  50 + .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */
  51 + .sb { color: #dd2200; background-color: transparent; } /* Literal.String.Backtick */
  52 + .highlight .sc{color:#d14;} /* Literal.String.Char */
  53 + .sd { color: #dd2200; background-color: transparent; } /* Literal.String.Doc */
  54 + .highlight .s2{color:orange;} /* Literal.String.Double */
  55 + .highlight .se{color:orange;} /* Literal.String.Escape */
  56 + .highlight .sh{color:orange;} /* Literal.String.Heredoc */
  57 + .highlight .si{color:orange;} /* Literal.String.Interpol */
  58 + .highlight .sx{color:orange;} /* Literal.String.Other */
  59 + .highlight .sr{color:orange;} /* Literal.String.Regex */
  60 + .highlight .s1{color:orange;} /* Literal.String.Single */
  61 + .highlight .ss{color:orange;} /* Literal.String.Symbol */
  62 + .bp { color: #D58 } /* Name.Builtin.Pseudo */
  63 + .vc { color: #336699 } /* Name.Variable.Class */
  64 + .vg { color: #dd7700 } /* Name.Variable.Global */
  65 + .vi { color: cyan }
  66 +}
  67 +
... ...
app/assets/stylesheets/highlight/white.scss 0 → 100644
  Diff comments   View file @2dd1762
... ... @@ -0,0 +1,132 @@
  1 +table.highlighttable
  2 +{
  3 + margin:0px;
  4 + padding:0px;
  5 + font-size:12px;
  6 + table-layout:fixed;
  7 + background: #EEE;
  8 +}
  9 +
  10 +td.code,
  11 +td.linenos{
  12 + padding:0;
  13 + margin:0;
  14 + border-top:0;
  15 + vertical-align:top;
  16 +}
  17 +
  18 +.highlighttable .highlight{
  19 + background:none;
  20 + padding:10px 0px 0px 10px;
  21 + margin-left:0px;
  22 + border-left: 1px solid #DEE2E3;
  23 + background: white;
  24 +}
  25 +
  26 +.linenodiv pre,
  27 +.highlighttable .highlight pre{
  28 + margin:0;
  29 + padding:0;
  30 + background:none;
  31 + border:none;
  32 +}
  33 +
  34 +.linenodiv pre {
  35 + white-space:pre-line;
  36 +}
  37 +
  38 +td.linenos {
  39 + /*background:#F7F7F7;*/
  40 + color:#666;
  41 + padding:10px 0px 0px 10px;
  42 + float:left;
  43 + width:45px;
  44 + border-right: 1px solid #ccc;
  45 +
  46 +}
  47 +
  48 +td.code .highlight {
  49 + overflow: auto;
  50 +}
  51 +table.highlighttable pre{
  52 + padding:0;
  53 + margin:0;
  54 + font-family: 'Menlo', 'Courier New', 'andale mono','lucida console',monospace;
  55 + color: #333;
  56 + text-align:left;
  57 +}
  58 +
  59 +.git-empty .highlight {
  60 + pre{
  61 + padding:15px;
  62 + line-height:2.0;
  63 + margin:0;
  64 + font-family: 'Menlo', 'Courier New', 'andale mono','lucida console',monospace;
  65 + color: #333;
  66 + text-align:left;}
  67 + }
  68 +
  69 +.shadow{
  70 + -webkit-box-shadow:0 5px 15px #000;
  71 + -moz-box-shadow:0 5px 15px #000;
  72 + box-shadow:0 5px 15px #000;
  73 +}
  74 +
  75 +.hll { background-color: #ffffff }
  76 +.c { color: #888888; font-style: italic } /* Comment */
  77 +.err { color: #a61717; background-color: #e3d2d2 } /* Error */
  78 +.k { color: #000000; font-weight: bold } /* Keyword */
  79 +.cm { color: #888888 } /* Comment.Multiline */
  80 +.cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */
  81 +.c1 { color: #888888 } /* Comment.Single */
  82 +.cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */
  83 +.gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
  84 +.ge { font-style: italic } /* Generic.Emph */
  85 +.gr { color: #aa0000 } /* Generic.Error */
  86 +.gh { color: #303030 } /* Generic.Heading */
  87 +.gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
  88 +.go { color: #888888 } /* Generic.Output */
  89 +.gp { color: #555555 } /* Generic.Prompt */
  90 +.gs { font-weight: bold } /* Generic.Strong */
  91 +.gu { color: #606060 } /* Generic.Subheading */
  92 +.gt { color: #aa0000 } /* Generic.Traceback */
  93 +.highlight .kc{font-weight:bold;} /* Keyword.Constant */
  94 +.highlight .kd{font-weight:bold;} /* Keyword.Declaration */
  95 +.highlight .kn{font-weight:bold;} /* Keyword.Namespace */
  96 +.highlight .kp{font-weight:bold;} /* Keyword.Pseudo */
  97 +.highlight .kr{font-weight:bold;} /* Keyword.Reserved */
  98 +.highlight .kt{color:#458;font-weight:bold;} /* Keyword.Type */
  99 +.m { color: #0000DD; font-weight: bold } /* Literal.Number */
  100 +.s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */
  101 +.highlight .na{color:#008080;} /* Name.Attribute */
  102 +.highlight .nb{color:#0086B3;} /* Name.Builtin */
  103 +.highlight .nc{color:#458;font-weight:bold;} /* Name.Class */
  104 +.highlight .no{color:#008080;} /* Name.Constant */
  105 +.highlight .ni{color:#800080;}
  106 +.highlight .ne{color:#900;font-weight:bold;} /* Name.Exception */
  107 +.highlight .nf{color:#900;font-weight:bold;} /* Name.Function */
  108 +.highlight .nn{color:#005;font-weight:bold;} /* Name.Namespace */
  109 +.highlight .nt{color:#000080;} /* Name.Tag */
  110 +.highlight .nv{color:#008080;} /* Name.Variable */
  111 +.py { color: #336699; font-weight: bold } /* Name.Property */
  112 +.ow { color: #008800 } /* Operator.Word */
  113 +.w { color: #bbbbbb } /* Text.Whitespace */
  114 +.mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */
  115 +.mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */
  116 +.highlight .mi {color:#099;} /* Literal.Number.Integer */
  117 +.mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */
  118 +.sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */
  119 +.highlight .sc{color:#d14;} /* Literal.String.Char */
  120 +.sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */
  121 +.highlight .s2{color:#d14;} /* Literal.String.Double */
  122 +.highlight .se{color:#d14;} /* Literal.String.Escape */
  123 +.highlight .sh{color:#d14;} /* Literal.String.Heredoc */
  124 +.highlight .si{color:#d14;} /* Literal.String.Interpol */
  125 +.highlight .sx{color:#d14;} /* Literal.String.Other */
  126 +.highlight .sr{color:#d14;} /* Literal.String.Regex */
  127 +.highlight .s1{color:#d14;} /* Literal.String.Single */
  128 +.highlight .ss{color:#d14;} /* Literal.String.Symbol */
  129 +.bp { color: #003388 } /* Name.Builtin.Pseudo */
  130 +.vc { color: #336699 } /* Name.Variable.Class */
  131 +.vg { color: #dd7700 } /* Name.Variable.Global */
  132 +.vi { color: #3333bb }
... ...
app/assets/stylesheets/main.scss
  Diff comments   View file @2dd1762
... ... @@ -152,13 +152,13 @@ $hover: #FDF5D9;
152 152 * CODE HIGHTLIGHT BASE
153 153 *
154 154 */
155   -@import "highlight.scss";
  155 +@import "highlight/white.scss";
156 156  
157 157 /**
158 158 * CODE HIGHTLIGHT DARK schema
159 159 *
160 160 */
161   -@import "highlight.black.scss";
  161 +@import "highlight/dark.scss";
162 162  
163 163 /**
164 164 * JQUERY UI ext
... ...