Skip to content

Commit 27d98fb

Browse files
snipesnipe
authored
Merge pull request #16429 from snipe/bug/sc-28609
Updated HTML label colors in blue skin
2 parents 7a312d0 + 0e1f406 commit 27d98fb

File tree

6 files changed

+77
-15
lines changed

6 files changed

+77
-15
lines changed

‎public/css/dist/skins/_all-skins.css‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -966,9 +966,9 @@ a.btn-default:hover,
966966
/* Use same as Header picker */
967967
--text-main: #BBB;
968968
--text-sub: #9b9b9b;
969-
--link: #003366;
969+
--link: #296282;
970970
/* Use same as Header picker, lighten by 70% */
971-
--visited-link: #0066cc;
971+
--visited-link: #5fa4cc;
972972
/* Use same as Header picker, lighten by 70% */
973973
--hover-link: #86bad8;
974974
/* Use same as Header picker, lighten by 70% */
@@ -1017,6 +1017,18 @@ a.settings_button:visited,
10171017
a.settings_button:hover {
10181018
color: #3c8dbc;
10191019
}
1020+
a.label.label-default:link {
1021+
color: #307095;
1022+
/* Use same as Header picker, lighten by 70% */
1023+
}
1024+
a.label.label-default:visited {
1025+
color: #23536f;
1026+
/* Use same as Header picker, lighten by 70% */
1027+
}
1028+
a.label.label-default:hover {
1029+
background-color: #BBB;
1030+
color: #296282;
1031+
}
10201032
/*
10211033
* Skin: blue dark
10221034
* ----------

‎public/css/dist/skins/_all-skins.min.css‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -966,9 +966,9 @@ a.btn-default:hover,
966966
/* Use same as Header picker */
967967
--text-main: #BBB;
968968
--text-sub: #9b9b9b;
969-
--link: #003366;
969+
--link: #296282;
970970
/* Use same as Header picker, lighten by 70% */
971-
--visited-link: #0066cc;
971+
--visited-link: #5fa4cc;
972972
/* Use same as Header picker, lighten by 70% */
973973
--hover-link: #86bad8;
974974
/* Use same as Header picker, lighten by 70% */
@@ -1017,6 +1017,18 @@ a.settings_button:visited,
10171017
a.settings_button:hover {
10181018
color: #3c8dbc;
10191019
}
1020+
a.label.label-default:link {
1021+
color: #307095;
1022+
/* Use same as Header picker, lighten by 70% */
1023+
}
1024+
a.label.label-default:visited {
1025+
color: #23536f;
1026+
/* Use same as Header picker, lighten by 70% */
1027+
}
1028+
a.label.label-default:hover {
1029+
background-color: #BBB;
1030+
color: #296282;
1031+
}
10201032
/*
10211033
* Skin: blue dark
10221034
* ----------

‎public/css/dist/skins/skin-blue.css‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,9 @@ a.btn-default:hover,
185185
/* Use same as Header picker */
186186
--text-main: #BBB;
187187
--text-sub: #9b9b9b;
188-
--link: #003366;
188+
--link: #296282;
189189
/* Use same as Header picker, lighten by 70% */
190-
--visited-link: #0066cc;
190+
--visited-link: #5fa4cc;
191191
/* Use same as Header picker, lighten by 70% */
192192
--hover-link: #86bad8;
193193
/* Use same as Header picker, lighten by 70% */
@@ -236,4 +236,16 @@ a.settings_button:visited,
236236
a.settings_button:hover {
237237
color: #3c8dbc;
238238
}
239+
a.label.label-default:link {
240+
color: #307095;
241+
/* Use same as Header picker, lighten by 70% */
242+
}
243+
a.label.label-default:visited {
244+
color: #23536f;
245+
/* Use same as Header picker, lighten by 70% */
246+
}
247+
a.label.label-default:hover {
248+
background-color: #BBB;
249+
color: #296282;
250+
}
239251

‎public/css/dist/skins/skin-blue.min.css‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,9 @@ a.btn-default:hover,
185185
/* Use same as Header picker */
186186
--text-main: #BBB;
187187
--text-sub: #9b9b9b;
188-
--link: #003366;
188+
--link: #296282;
189189
/* Use same as Header picker, lighten by 70% */
190-
--visited-link: #0066cc;
190+
--visited-link: #5fa4cc;
191191
/* Use same as Header picker, lighten by 70% */
192192
--hover-link: #86bad8;
193193
/* Use same as Header picker, lighten by 70% */
@@ -236,4 +236,16 @@ a.settings_button:visited,
236236
a.settings_button:hover {
237237
color: #3c8dbc;
238238
}
239+
a.label.label-default:link {
240+
color: #307095;
241+
/* Use same as Header picker, lighten by 70% */
242+
}
243+
a.label.label-default:visited {
244+
color: #23536f;
245+
/* Use same as Header picker, lighten by 70% */
246+
}
247+
a.label.label-default:hover {
248+
background-color: #BBB;
249+
color: #296282;
250+
}
239251

‎public/mix-manifest.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"/js/build/app.js": "/js/build/app.js?id=65d7af7b9fa7fd0e05737526a0d1d282",
33
"/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=06c13e817cc022028b3f4a33c0ca303a",
4-
"/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=a134dd4a0ba684f97088d0698e3e5b78",
4+
"/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=79aa889a1a6691013be6c342ca7391cd",
55
"/css/build/overrides.css": "/css/build/overrides.css?id=6528155ed5ed8fddf4047de7f0d0298d",
66
"/css/build/app.css": "/css/build/app.css?id=3422f2ca2056b952c3c361adf00c10b8",
77
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=4ea0068716c1bb2434d87a16d51b98c9",
@@ -16,7 +16,7 @@
1616
"/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=0a82a6ae6bb4e58fe62d162c4fb50397",
1717
"/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=bb302302d9566adf783a2b7dc31e840c",
1818
"/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=da6c7997d9de2f8329142399f0ce50da",
19-
"/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=00459cc19228b28e7a4d70ce6a2ae1df",
19+
"/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=a82b065847bf3cd5d713c04ee8dc86c6",
2020
"/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=6ea836d8126de101081c49abbdb89417",
2121
"/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=76482123f6c70e866d6b971ba91de7bb",
2222
"/css/dist/all.css": "/css/dist/all.css?id=18ebb9c284b49dcf6c8e4fdb923ad923",
@@ -92,11 +92,11 @@
9292
"/css/webfonts/fa-v4compatibility.woff2": "/css/webfonts/fa-v4compatibility.woff2?id=331c85bd61ffa93af09273d1bc2add5a",
9393
"/js/dist/bootstrap-table-locale-all.min.js": "/js/dist/bootstrap-table-locale-all.min.js?id=02dfc50d5b951dc6d260bd508968d319",
9494
"/js/dist/bootstrap-table-en-US.min.js": "/js/dist/bootstrap-table-en-US.min.js?id=1c350eabf064c309f67d6779e5cc4afa",
95-
"/css/dist/skins/_all-skins.min.css": "/css/dist/skins/_all-skins.min.css?id=a134dd4a0ba684f97088d0698e3e5b78",
95+
"/css/dist/skins/_all-skins.min.css": "/css/dist/skins/_all-skins.min.css?id=79aa889a1a6691013be6c342ca7391cd",
9696
"/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=06c13e817cc022028b3f4a33c0ca303a",
9797
"/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=76482123f6c70e866d6b971ba91de7bb",
9898
"/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=6ea836d8126de101081c49abbdb89417",
99-
"/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=00459cc19228b28e7a4d70ce6a2ae1df",
99+
"/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=a82b065847bf3cd5d713c04ee8dc86c6",
100100
"/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=da6c7997d9de2f8329142399f0ce50da",
101101
"/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=bb302302d9566adf783a2b7dc31e840c",
102102
"/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=0a82a6ae6bb4e58fe62d162c4fb50397",

‎resources/assets/less/skins/skin-blue.less‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@
111111
--header: @blue; /* Use same as Header picker */
112112
--text-main: #BBB;
113113
--text-sub: #9b9b9b;
114-
--link: #003366; /* Use same as Header picker, lighten by 70% */
115-
--visited-link: lighten(#003366,20%); /* Use same as Header picker, lighten by 70% */
114+
--link:darken(@blue, 15%); /* Use same as Header picker, lighten by 70% */
115+
--visited-link: lighten(@blue,10%); /* Use same as Header picker, lighten by 70% */
116116
--hover-link: lighten(@blue,20%); /* Use same as Header picker, lighten by 70% */
117117
--nav-link: #FFF; /* Use same as Header picker */
118118
--light-link: #fff; /* Use same as Header picker */
@@ -156,4 +156,18 @@ a:hover {
156156
// Link colors for the settings page
157157
a.settings_button:link, a.settings_button:visited, a.settings_button:hover {
158158
color: @light-blue;
159-
}
159+
}
160+
161+
a.label.label-default:link {
162+
color: darken(#3c8dbc, 10%); /* Use same as Header picker, lighten by 70% */
163+
}
164+
165+
a.label.label-default:visited {
166+
color: darken(#3c8dbc,20%); /* Use same as Header picker, lighten by 70% */
167+
}
168+
169+
a.label.label-default:hover {
170+
background-color: #BBB;
171+
color: darken(#3c8dbc,15%);
172+
}
173+

0 commit comments

Comments
 (0)