Skip to content

Commit 84d48a4

Browse files
author
Alex Tiller
committed
Moved some styles out of the root sass files
1 parent 4a57563 commit 84d48a4

9 files changed

Lines changed: 80 additions & 74 deletions

dist/tower-dark-theme.css

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11338,6 +11338,31 @@ fieldset legend {
1133811338
border-color: #2f2f33;
1133911339
}
1134011340

11341+
.btn.btn-secondary:hover, .btn.btn-secondary:focus {
11342+
background: #3d3d43;
11343+
border-color: #3d3d43;
11344+
}
11345+
11346+
.btn-secondary:not(:disabled):not(.disabled).active,
11347+
.btn-secondary:not(:disabled):not(.disabled):active,
11348+
.show > .btn-secondary.dropdown-toggle {
11349+
background: #39393e;
11350+
border-color: #39393e;
11351+
}
11352+
11353+
.btn.btn-dark:hover, .btn.btn-dark:focus {
11354+
background: #1b1b1e;
11355+
border-color: #1b1b1e;
11356+
}
11357+
11358+
.fw-semibold, .fw-bold, strong {
11359+
color: #fff;
11360+
}
11361+
11362+
::-webkit-calendar-picker-indicator {
11363+
filter: invert(70%);
11364+
}
11365+
1134111366
.select2-container.select2-container--default .select2-selection--single, .select2-container.select2-container--default .select2-selection--multiple {
1134211367
background: #313136;
1134311368
border-bottom: 1px solid #424249;
@@ -11402,29 +11427,4 @@ div.note-editor.note-frame .note-editing-area .note-editable {
1140211427
div.note-editor.note-frame .note-statusbar {
1140311428
background: #252529;
1140411429
border-top-color: #424249;
11405-
}
11406-
11407-
.btn.btn-secondary:hover, .btn.btn-secondary:focus {
11408-
background: #3d3d43;
11409-
border-color: #3d3d43;
11410-
}
11411-
11412-
.btn-secondary:not(:disabled):not(.disabled).active,
11413-
.btn-secondary:not(:disabled):not(.disabled):active,
11414-
.show > .btn-secondary.dropdown-toggle {
11415-
background: #39393e;
11416-
border-color: #39393e;
11417-
}
11418-
11419-
.btn.btn-dark:hover, .btn.btn-dark:focus {
11420-
background: #1b1b1e;
11421-
border-color: #1b1b1e;
11422-
}
11423-
11424-
.fw-semibold, .fw-bold, strong {
11425-
color: #fff;
11426-
}
11427-
11428-
::-webkit-calendar-picker-indicator {
11429-
filter: invert(70%);
1143011430
}

dist/tower-dark-theme.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/tower-light-theme.css

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11218,6 +11218,15 @@ label.form-check, label.form-check-inline {
1121811218
text-shadow: 2px 2px 5px black;
1121911219
}
1122011220

11221+
.btn.btn-outline-light {
11222+
color: #aaa;
11223+
border-color: #ccc;
11224+
}
11225+
11226+
::-webkit-calendar-picker-indicator {
11227+
filter: invert(30%);
11228+
}
11229+
1122111230
.text-faded {
1122211231
opacity: 0.7;
1122311232
}
@@ -11281,13 +11290,4 @@ fieldset legend {
1128111290
padding-left: 0.3rem;
1128211291
padding-right: 0.3rem;
1128311292
margin-bottom: 0;
11284-
}
11285-
11286-
.btn.btn-outline-light {
11287-
color: #aaa;
11288-
border-color: #ccc;
11289-
}
11290-
11291-
::-webkit-calendar-picker-indicator {
11292-
filter: invert(30%);
1129311293
}

dist/tower-light-theme.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "tower-bootstrap-theme",
3-
"version": "5.2.0",
3+
"version": "5.2.1",
44
"description": "",
55
"main": "index.js",
66
"author": "StrutTower",
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,29 @@
5757
background-color: darken($dark, 2);
5858
border-color: lighten($dark, 6);
5959
}
60+
61+
.btn.btn-secondary:hover, .btn.btn-secondary:focus {
62+
background: darken($secondary,2);
63+
border-color: darken($secondary, 2);
64+
}
65+
66+
.btn-secondary:not(:disabled):not(.disabled).active,
67+
.btn-secondary:not(:disabled):not(.disabled):active,
68+
.show > .btn-secondary.dropdown-toggle {
69+
background: darken($secondary, 4);
70+
border-color: darken($secondary, 4);
71+
}
72+
73+
.btn.btn-dark:hover, .btn.btn-dark:focus {
74+
background: darken($dark,2);
75+
border-color: darken($dark, 2);
76+
}
77+
78+
// Set bold font to white to help it stand out more like it does in the light theme
79+
.fw-semibold, .fw-bold, strong {
80+
color: #fff;
81+
}
82+
83+
::-webkit-calendar-picker-indicator {
84+
filter: invert(70%);
85+
}

src/_fixesLight.scss

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
///<reference path="variables.scss" />
2+
///<reference path="../node_modules/bootstrap/scss/_variables.scss" />
3+
4+
// Includes fixes that couldn't be fixed with Sass variables alone.
5+
// When compiling Sass, this should be loaded after Bootstrap's Sass files
6+
7+
.btn.btn-outline-light {
8+
color: #aaa;
9+
border-color: #ccc;
10+
}
11+
12+
::-webkit-calendar-picker-indicator {
13+
filter: invert(30%);
14+
}

src/dark-theme.scss

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,5 @@
1010
@import "carousel";
1111
@import "breadcrumbs";
1212
@import "other";
13-
@import "darkFixes";
14-
@import "plugins/allPlugins";
15-
16-
.btn.btn-secondary:hover, .btn.btn-secondary:focus {
17-
background: darken($secondary,2);
18-
border-color: darken($secondary, 2);
19-
}
20-
21-
.btn-secondary:not(:disabled):not(.disabled).active,
22-
.btn-secondary:not(:disabled):not(.disabled):active,
23-
.show > .btn-secondary.dropdown-toggle {
24-
background: darken($secondary, 4);
25-
border-color: darken($secondary, 4);
26-
}
27-
28-
.btn.btn-dark:hover, .btn.btn-dark:focus {
29-
background: darken($dark,2);
30-
border-color: darken($dark, 2);
31-
}
32-
33-
// Set bold font to white to help it stand out more like it does in the light theme
34-
.fw-semibold, .fw-bold, strong {
35-
color: #fff;
36-
}
37-
38-
::-webkit-calendar-picker-indicator {
39-
filter: invert(70%);
40-
}
13+
@import "fixesDark";
14+
@import "plugins/allPlugins";

src/light-theme.scss

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,5 @@
88
@import "input";
99
@import "carousel";
1010
@import "breadcrumbs";
11+
@import "fixesLight";
1112
@import "other";
12-
13-
.btn.btn-outline-light {
14-
color:#aaa;
15-
border-color:#ccc;
16-
}
17-
18-
::-webkit-calendar-picker-indicator {
19-
filter: invert(30%);
20-
}

0 commit comments

Comments
 (0)