Skip to content

Commit 5890fb2

Browse files
iMattProiMattPro
committed
Update SCSS
Signed-off-by: Matt Friedman <[email protected]>
1 parent 0778399 commit 5890fb2

12 files changed

+46
-71
lines changed

‎scss/qi_bootstrap.css‎

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

‎scss/qi_bootstrap.css.map‎

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

‎scss/qi_bootstrap.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.

‎scss/qi_bootstrap.min.css.map‎

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

‎scss/qi_bootstrap.scss‎

Lines changed: 24 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -19,48 +19,35 @@ $enable-gradients: true;
1919
// Import Bootstrap (do not change or move this line)
2020
@import "../node_modules/bootstrap/scss/bootstrap.scss";
2121

22-
// Extend Bootstrap with new components
23-
.fw-strong {
24-
font-weight: 500;
25-
}
26-
27-
.lh-0 {
28-
line-height: 0;
29-
}
30-
22+
// Extend Bootstrap with new Callout component
3123
.callout {
3224
padding: $spacer 1.25rem;
3325
margin: $spacer 0;
3426
border-radius: $border-radius;
3527
border: $border-width solid $gray-200;
3628
border-left-width: $spacer * .25;
3729
border-radius: $spacer * .25;
38-
}
39-
40-
.callout h4 {
41-
margin-bottom: $spacer * .25;
42-
}
43-
44-
.callout p:last-child {
45-
margin-bottom: 0;
46-
}
47-
48-
.callout + .callout {
49-
margin-top: -($spacer * .25);
50-
}
51-
52-
.callout-primary {
53-
border-left-color: $primary;
54-
}
55-
56-
.callout-info {
57-
border-left-color: $info;
58-
}
59-
60-
.callout-warning {
61-
border-left-color: $warning;
62-
}
63-
64-
.callout-danger {
65-
border-left-color: $danger;
30+
h4 {
31+
margin-bottom: $spacer * .25;
32+
}
33+
p {
34+
&:last-child {
35+
margin-bottom: 0;
36+
}
37+
}
38+
+ .callout {
39+
margin-top: -($spacer * .25);
40+
}
41+
&-primary {
42+
border-left-color: $primary;
43+
}
44+
&-info {
45+
border-left-color: $info;
46+
}
47+
&-warning {
48+
border-left-color: $warning;
49+
}
50+
&-danger {
51+
border-left-color: $danger;
52+
}
6653
}

‎style/assets/css/qi_bootstrap.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.

‎style/assets/css/qi_bootstrap.min.css.map‎

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

‎style/assets/css/qi_style.css‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,22 @@
22
--darkside-color: hsl(0, 0%, 70%);
33
--darkside-color-dim: hsl(0, 0%, 50%);
44
--darkside-bg-color: hsl(219, 20%, 20%);
5-
--darkside-bg-hilight: rgba(255, 255, 255, 0.12);
5+
--darkside-bg-hilight: hsla(0, 0%, 100%, 0.12);
66
--night-bg-color: hsl(216, 28%, 7%);
77
--night-color: hsl(210, 17%, 82%);
88
--night-color-muted: hsl(212, 9%, 58%);
9+
/* SVG color filters https://codepen.io/sosuke/pen/Pjoqqp */
10+
--svg-filter-e1e1e1: brightness(0) saturate(100%) invert(74%) sepia(97%) saturate(1%) hue-rotate(315deg) brightness(98%) contrast(103%);
11+
--svg-filter-009bdf: brightness(0) saturate(100%) invert(46%) sepia(52%) saturate(3716%) hue-rotate(170deg) brightness(96%) contrast(101%);
12+
--svg-filter-fafafa: brightness(0) saturate(100%) invert(100%) sepia(5%) saturate(23%) hue-rotate(84deg) brightness(104%) contrast(96%);
913
}
1014

1115
.phpbb-logo-nb {
1216
background-image: url("../img/logo_small_white.svg");
1317
background-repeat: no-repeat;
1418
padding: 0.125rem 3rem;
1519
margin-left: 0.5rem;
16-
filter: brightness(0) saturate(100%) invert(46%) sepia(52%) saturate(3716%) hue-rotate(170deg) brightness(96%) contrast(101%); /* #009bdf */
20+
filter: var(--svg-filter-009bdf);
1721
}
1822

1923
.navbar-light .navbar-toggler-icon-qi-boards {
@@ -88,25 +92,24 @@ svg.bi {
8892
.navbar,
8993
.navbar.bg-secondary {
9094
background-color: var(--night-bg-color) !important; /* !important to override bootstrap's !important */
91-
color: var(--night-color) !important;
95+
color: var(--night-color) !important; /* !important to override bootstrap's !important */
9296
}
9397

9498
.text-muted {
95-
color: var(--night-color-muted) !important;
99+
color: var(--night-color-muted) !important; /* !important to override bootstrap's !important */
96100
}
97101

98102
.callout-primary { border-left-color: #375a7f; }
99103
.callout-info { border-left-color: #17a2b8; }
100104
.callout-warning { border-left-color: #f39c12; }
101105
.callout-danger { border-left-color: #e74c3c; }
102106

103-
/* https://codepen.io/sosuke/pen/Pjoqqp */
104107
.phpbb-logo-rm {
105-
filter: brightness(0) saturate(100%) invert(74%) sepia(97%) saturate(1%) hue-rotate(315deg) brightness(98%) contrast(103%); /* #E1E1E1 */
108+
filter: var(--svg-filter-e1e1e1);
106109
}
107110

108111
.navbar-brand {
109-
filter: brightness(0) saturate(100%) invert(100%) sepia(5%) saturate(23%) hue-rotate(84deg) brightness(104%) contrast(96%); /* #FAFAFA */
112+
filter: var(--svg-filter-fafafa);
110113
}
111114

112115
.navbar-light .navbar-toggler-icon-qi-boards {

‎style/main_body.twig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151

152152
<div class="alert alert-primary">
153153
<div class="row">
154-
<div class="col-auto align-self-start lh-0">
154+
<div class="col-auto align-self-start lh-1">
155155
<svg class="bi text-primary" width="24" height="24" fill="currentColor">
156156
<use xlink:href="{{ QI_ROOT_PATH }}style/assets/img/bootstrap-icons.svg#info-square-fill"/>
157157
</svg>️
@@ -344,7 +344,7 @@
344344
</div>
345345
<div class="alert alert-primary">
346346
<div class="row">
347-
<div class="col-auto align-self-start lh-0">
347+
<div class="col-auto align-self-start lh-1">
348348
<svg class="bi text-primary" width="24" height="24" fill="currentColor">
349349
<use xlink:href="{{ QI_ROOT_PATH }}style/assets/img/bootstrap-icons.svg#info-square-fill"/>
350350
</svg>️

‎style/settings_body.twig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@
444444
</div>
445445
<div class="alert alert-primary">
446446
<div class="row">
447-
<div class="col-auto align-self-start lh-0">
447+
<div class="col-auto align-self-start lh-1">
448448
<svg class="bi text-primary" width="24" height="24" fill="currentColor">
449449
<use xlink:href="{{ QI_ROOT_PATH }}style/assets/img/bootstrap-icons.svg#info-square-fill"/>
450450
</svg>️
@@ -479,7 +479,7 @@
479479
<legend class="border-bottom">{{ lang('INSTALL_OPTIONS') }}</legend>
480480
<div class="alert alert-primary">
481481
<div class="row">
482-
<div class="col-auto align-self-start lh-0">
482+
<div class="col-auto align-self-start lh-1">
483483
<svg class="bi text-primary" width="24" height="24" fill="currentColor">
484484
<use xlink:href="{{ QI_ROOT_PATH }}style/assets/img/bootstrap-icons.svg#info-square-fill"/>
485485
</svg>️

0 commit comments

Comments
 (0)