Skip to content
This repository was archived by the owner on Jun 25, 2019. It is now read-only.

Commit f15256d

Browse files
author
Ben Centra
committed
fixed typos affecting color-info and color-warning, tweaked public theme colors
1 parent 4bec217 commit f15256d

File tree

6 files changed

+81
-74
lines changed

6 files changed

+81
-74
lines changed

‎dev/members.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,19 @@ a.btn {
4141
background-color: #4e8b12;
4242
border-color: #355e0c;
4343
}
44-
.btn.color-info {
44+
.btn.btn-info {
4545
background-color: #3d9ec9;
4646
border-color: #2e80a5;
4747
}
48-
.btn.color-info:hover {
48+
.btn.btn-info:hover {
4949
background-color: #3390b9;
5050
border-color: #287191;
5151
}
52-
.btn.color-warning {
52+
.btn.btn-warning {
5353
background-color: #ffb43f;
5454
border-color: #ffa00c;
5555
}
56-
.btn.color-warning:hover {
56+
.btn.btn-warning:hover {
5757
background-color: #ffaa25;
5858
border-color: #f29300;
5959
}

‎dev/members.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,15 @@ a {
6161
border-color: darken(@color-success, 15%);
6262
}
6363
}
64-
&.color-info {
64+
&.btn-info {
6565
background-color: @color-info;
6666
border-color: darken(@color-info, 10%);
6767
&:hover {
6868
background-color: darken(@color-info, 5%);
6969
border-color: darken(@color-info, 15%);
7070
}
7171
}
72-
&.color-warning {
72+
&.btn-warning {
7373
background-color: @color-warning;
7474
border-color: darken(@color-warning, 10%);
7575
&:hover {

‎dev/public.css

Lines changed: 45 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -26,45 +26,45 @@ a.btn {
2626
color: #4e8b12;
2727
}
2828
.btn.btn-primary {
29-
background-color: #5ba215;
30-
border-color: #4e8b12;
29+
background-color: #3b5fb8;
30+
border-color: #2f4b91;
3131
}
3232
.btn.btn-primary:hover {
33-
background-color: #4e8b12;
34-
border-color: #42750f;
33+
background-color: #3555a5;
34+
border-color: #28417e;
3535
}
3636
.btn.btn-success {
37-
background-color: #2a4fd4;
38-
border-color: #223fa9;
37+
background-color: #5ba215;
38+
border-color: #42750f;
3939
}
4040
.btn.btn-success:hover {
41-
background-color: #2647bf;
42-
border-color: #1d3794;
41+
background-color: #4e8b12;
42+
border-color: #355e0c;
4343
}
44-
.btn.color-info {
44+
.btn.btn-info {
4545
background-color: #3d9ec9;
4646
border-color: #2e80a5;
4747
}
48-
.btn.color-info:hover {
48+
.btn.btn-info:hover {
4949
background-color: #3390b9;
5050
border-color: #287191;
5151
}
52-
.btn.color-warning {
52+
.btn.btn-warning {
5353
background-color: #ffb43f;
5454
border-color: #ffa00c;
5555
}
56-
.btn.color-warning:hover {
56+
.btn.btn-warning:hover {
5757
background-color: #ffaa25;
5858
border-color: #f29300;
5959
}
6060
.btn.btn-danger {
6161
color: #ffffff;
62-
background-color: #cc201d;
63-
border-color: #9f1917;
62+
background-color: #cc4837;
63+
border-color: #a6382a;
6464
}
6565
.btn.btn-danger:hover {
66-
background-color: #b61c1a;
67-
border-color: #891513;
66+
background-color: #ba3f2f;
67+
border-color: #913125;
6868
}
6969
/*
7070
* Labels
@@ -73,10 +73,10 @@ a.btn {
7373
background-color: #bbbbbb;
7474
}
7575
.label.label-primary {
76-
background-color: #5ba215;
76+
background-color: #3b5fb8;
7777
}
7878
.label.label-success {
79-
background-color: #2a4fd4;
79+
background-color: #5ba215;
8080
}
8181
.label.label-info {
8282
background-color: #3d9ec9;
@@ -85,7 +85,7 @@ a.btn {
8585
background-color: #ffb43f;
8686
}
8787
.label.label-danger {
88-
background-color: #cc201d;
88+
background-color: #cc4837;
8989
}
9090
/*
9191
* Badges
@@ -261,9 +261,9 @@ a.btn {
261261
* Alerts
262262
*/
263263
.alert.alert-success {
264-
background-color: #fefeff;
265-
border-color: #d4dbf6;
266-
color: #2a4fd4;
264+
background-color: #dbf7bf;
265+
border-color: #c1f192;
266+
color: #5ba215;
267267
}
268268
.alert.alert-info {
269269
background-color: #ddeef5;
@@ -276,18 +276,18 @@ a.btn {
276276
color: #ffa00c;
277277
}
278278
.alert.alert-danger {
279-
background-color: #fcecec;
280-
border-color: #f6c0bf;
281-
color: #cc201d;
279+
background-color: #f5ddda;
280+
border-color: #ebb8b1;
281+
color: #cc4837;
282282
}
283283
/*
284284
* Progress Bars
285285
*/
286286
.progress .progress-bar {
287-
background-color: #5ba215;
287+
background-color: #3b5fb8;
288288
}
289289
.progress .progress-bar.progress-bar-success {
290-
background-color: #2a4fd4;
290+
background-color: #5ba215;
291291
}
292292
.progress .progress-bar.progress-bar-info {
293293
background-color: #3d9ec9;
@@ -296,7 +296,7 @@ a.btn {
296296
background-color: #ffb43f;
297297
}
298298
.progress .progress-bar.progress-bar-danger {
299-
background-color: #cc201d;
299+
background-color: #cc4837;
300300
}
301301
/*
302302
* List Groups
@@ -309,6 +309,9 @@ a.btn {
309309
.list-group a.list-group-item:active {
310310
color: #222222;
311311
}
312+
.list-group a.list-group-item.active .list-group-item-text {
313+
color: #c1f192;
314+
}
312315
.list-group a.list-group-item.active:link,
313316
.list-group a.list-group-item.active:visited {
314317
color: #ffffff;
@@ -328,21 +331,21 @@ a.btn {
328331
border-bottom: 2px solid #c1f192;
329332
}
330333
.panel.panel-primary {
331-
border-color: #4e8b12;
334+
border-color: #2f4b91;
332335
}
333336
.panel.panel-primary .panel-heading {
334-
background-color: #5ba215;
335-
border-color: #4e8b12;
336-
border-bottom: 2px solid #4e8b12;
337+
background-color: #3b5fb8;
338+
border-color: #2f4b91;
339+
border-bottom: 2px solid #2f4b91;
337340
}
338341
.panel.panel-success {
339-
border-color: #a9b8ee;
342+
border-color: #c1f192;
340343
}
341344
.panel.panel-success .panel-heading {
342-
background-color: #d4dbf6;
343-
border-color: #a9b8ee;
344-
border-bottom: 2px solid #2a4fd4;
345-
color: #2a4fd4;
345+
background-color: #dbf7bf;
346+
border-color: #c1f192;
347+
border-bottom: 2px solid #5ba215;
348+
color: #5ba215;
346349
}
347350
.panel.panel-info {
348351
border-color: #b5daea;
@@ -363,13 +366,13 @@ a.btn {
363366
color: #ffb43f;
364367
}
365368
.panel.panel-danger {
366-
border-color: #f6c0bf;
369+
border-color: #ebb8b1;
367370
}
368371
.panel.panel-danger .panel-heading {
369-
background-color: #fcecec;
370-
border-color: #f6c0bf;
371-
border-bottom: 2px solid #cc201d;
372-
color: #cc201d;
372+
background-color: #f5ddda;
373+
border-color: #ebb8b1;
374+
border-bottom: 2px solid #cc4837;
375+
color: #cc4837;
373376
}
374377
/*
375378
* Carousel

‎dev/public.less

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66
@gray: #bbb;
77
@white: #fff;
88

9-
@color-success: #2A4FD4;
9+
@color-primary: #3B5FB8;
10+
@color-success: @public-green;
1011
@color-info: #3d9ec9;
1112
@color-warning: #ffb43f;
12-
@color-danger: #CC201D;
13+
@color-danger: #CC4837;
1314

1415
/*
1516
* General
@@ -46,11 +47,11 @@ a {
4647
}
4748
}
4849
&.btn-primary {
49-
background-color: @public-green;
50-
border-color: @public-green-dark;
50+
background-color: @color-primary;
51+
border-color: darken(@color-primary, 10%);
5152
&:hover {
52-
background-color: darken(@public-green, 5%);
53-
border-color: darken(@public-green-dark, 5%);
53+
background-color: darken(@color-primary, 5%);
54+
border-color: darken(@color-primary, 15%);
5455
}
5556
}
5657
&.btn-success {
@@ -61,15 +62,15 @@ a {
6162
border-color: darken(@color-success, 15%);
6263
}
6364
}
64-
&.color-info {
65+
&.btn-info {
6566
background-color: @color-info;
6667
border-color: darken(@color-info, 10%);
6768
&:hover {
6869
background-color: darken(@color-info, 5%);
6970
border-color: darken(@color-info, 15%);
7071
}
7172
}
72-
&.color-warning {
73+
&.btn-warning {
7374
background-color: @color-warning;
7475
border-color: darken(@color-warning, 10%);
7576
&:hover {
@@ -97,7 +98,7 @@ a {
9798
background-color: @gray;
9899
}
99100
&.label-primary {
100-
background-color: @public-green;
101+
background-color: @color-primary;
101102
}
102103
&.label-success {
103104
background-color: @color-success;
@@ -304,8 +305,8 @@ a {
304305
color: darken(@color-warning, 10%);
305306
}
306307
&.alert-danger {
307-
background-color: lighten(@color-danger, 50%);
308-
border-color: lighten(@color-danger, 40%);
308+
background-color: lighten(@color-danger, 40%);
309+
border-color: lighten(@color-danger, 30%);
309310
color: @color-danger;
310311
}
311312
}
@@ -316,7 +317,7 @@ a {
316317

317318
.progress {
318319
.progress-bar {
319-
background-color: @public-green;
320+
background-color: @color-primary;
320321
&.progress-bar-success {
321322
background-color: @color-success;
322323
}
@@ -345,6 +346,9 @@ a {
345346
color: @charcoal;
346347
}
347348
&.active {
349+
.list-group-item-text {
350+
color: @public-green-light;
351+
}
348352
&:link, &:visited {
349353
color: @white;
350354
background-color: @public-green;
@@ -370,18 +374,18 @@ a {
370374
}
371375
}
372376
&.panel-primary {
373-
border-color: @public-green-dark;
377+
border-color: darken(@color-primary, 10%);
374378
.panel-heading {
375-
background-color: @public-green;
376-
border-color: @public-green-dark;
377-
border-bottom: 2px solid @public-green-dark;
379+
background-color: @color-primary;
380+
border-color: darken(@color-primary, 10%);
381+
border-bottom: 2px solid darken(@color-primary, 10%);
378382
}
379383
}
380384
&.panel-success {
381-
border-color: lighten(@color-success, 30%);
385+
border-color: lighten(@color-success, 40%);
382386
.panel-heading {
383-
background-color: lighten(@color-success, 40%);
384-
border-color: lighten(@color-success, 30%);
387+
background-color: lighten(@color-success, 50%);
388+
border-color: lighten(@color-success, 40%);
385389
border-bottom: 2px solid @color-success;
386390
color: @color-success;
387391
}
@@ -405,10 +409,10 @@ a {
405409
}
406410
}
407411
&.panel-danger {
408-
border-color: lighten(@color-danger, 40%);
412+
border-color: lighten(@color-danger, 30%);
409413
.panel-heading {
410-
background-color: lighten(@color-danger, 50%);
411-
border-color: lighten(@color-danger, 40%);
414+
background-color: lighten(@color-danger, 40%);
415+
border-color: lighten(@color-danger, 30%);
412416
border-bottom: 2px solid @color-danger;
413417
color: @color-danger;
414418
}

0 commit comments

Comments
 (0)