Skip to content

Commit ba9124c

Browse files
leenooksleenooks
committed
Update ArchitectUI to v4
1 parent 949c7f3 commit ba9124c

File tree

127 files changed

+4608
-2912
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+4608
-2912
lines changed

‎resources/themes/architect/src/app.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import 'metismenu';
77
// Stylesheets
88

99
// import './assets/base.scss';
10-
// import '../../themes/architect/src/base.scss';
1110

1211
$(document).ready(() => {
1312

‎resources/themes/architect/src/base.scss‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*!
22
=========================================================
3-
* ArchitectUI HTML Theme Dashboard - v2.0.0
3+
* ArchitectUI HTML Theme Dashboard - v4.0.0
44
=========================================================
55
* Product Page: https://dashboardpack.com
6-
* Copyright 2021 DashboardPack (https://dashboardpack.com)
6+
* Copyright 2023 DashboardPack (https://dashboardpack.com)
77
* Licensed under MIT (https://github.com/DashboardPack/architectui-html-theme-free/blob/master/LICENSE)
88
=========================================================
99
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
@@ -21,6 +21,8 @@
2121
// 3. Include remainder of required Bootstrap stylesheets
2222

2323
@import "components/bootstrap5/variables";
24+
@import "components/bootstrap5/variables-dark";
25+
@import "components/bootstrap5/maps";
2426
@import "components/bootstrap5/mixins";
2527
@import "components/bootstrap5/utilities";
2628

@@ -56,9 +58,10 @@
5658
// @import "components/bootstrap5/carousel";
5759
// @import "components/bootstrap5/spinners";
5860
// @import "components/bootstrap5/offcanvas";
59-
// @import "components/bootstrap5/jumbotron";
61+
// @import "components/bootstrap5/placeholders";
6062
@import "components/bootstrap5/helpers";
6163
@import "components/bootstrap5/utilities/api";
64+
6265
// LAYOUT
6366

6467
@import "layout/layout";

‎resources/themes/architect/src/components/bootstrap5/_alert.scss‎

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,25 @@
33
//
44

55
.alert {
6+
// scss-docs-start alert-css-vars
7+
--#{$prefix}alert-bg: transparent;
8+
--#{$prefix}alert-padding-x: #{$alert-padding-x};
9+
--#{$prefix}alert-padding-y: #{$alert-padding-y};
10+
--#{$prefix}alert-margin-bottom: #{$alert-margin-bottom};
11+
--#{$prefix}alert-color: inherit;
12+
--#{$prefix}alert-border-color: transparent;
13+
--#{$prefix}alert-border: #{$alert-border-width} solid var(--#{$prefix}alert-border-color);
14+
--#{$prefix}alert-border-radius: #{$alert-border-radius};
15+
--#{$prefix}alert-link-color: inherit;
16+
// scss-docs-end alert-css-vars
17+
618
position: relative;
7-
padding: $alert-padding-y $alert-padding-x;
8-
margin-bottom: $alert-margin-bottom;
9-
border: $alert-border-width solid transparent;
10-
@include border-radius($alert-border-radius);
19+
padding: var(--#{$prefix}alert-padding-y) var(--#{$prefix}alert-padding-x);
20+
margin-bottom: var(--#{$prefix}alert-margin-bottom);
21+
color: var(--#{$prefix}alert-color);
22+
background-color: var(--#{$prefix}alert-bg);
23+
border: var(--#{$prefix}alert-border);
24+
@include border-radius(var(--#{$prefix}alert-border-radius));
1125
}
1226

1327
// Headings for larger alerts
@@ -19,6 +33,7 @@
1933
// Provide class for links that match alerts
2034
.alert-link {
2135
font-weight: $alert-link-font-weight;
36+
color: var(--#{$prefix}alert-link-color);
2237
}
2338

2439

@@ -41,17 +56,13 @@
4156

4257

4358
// scss-docs-start alert-modifiers
44-
// Generate contextual modifier classes for colorizing the alert.
45-
46-
@each $state, $value in $theme-colors {
47-
$alert-background: shift-color($value, $alert-bg-scale);
48-
$alert-border: shift-color($value, $alert-border-scale);
49-
$alert-color: shift-color($value, $alert-color-scale);
50-
@if (contrast-ratio($alert-background, $alert-color) < $min-contrast-ratio) {
51-
$alert-color: mix($value, color-contrast($alert-background), abs($alert-color-scale));
52-
}
59+
// Generate contextual modifier classes for colorizing the alert
60+
@each $state in map-keys($theme-colors) {
5361
.alert-#{$state} {
54-
@include alert-variant($alert-background, $alert-border, $alert-color);
62+
--#{$prefix}alert-color: var(--#{$prefix}#{$state}-text-emphasis);
63+
--#{$prefix}alert-bg: var(--#{$prefix}#{$state}-bg-subtle);
64+
--#{$prefix}alert-border-color: var(--#{$prefix}#{$state}-border-subtle);
65+
--#{$prefix}alert-link-color: var(--#{$prefix}#{$state}-text-emphasis);
5566
}
5667
}
5768
// scss-docs-end alert-modifiers

‎resources/themes/architect/src/components/bootstrap5/_badge.scss‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,25 @@
44
// `background-color`.
55

66
.badge {
7+
// scss-docs-start badge-css-vars
8+
--#{$prefix}badge-padding-x: #{$badge-padding-x};
9+
--#{$prefix}badge-padding-y: #{$badge-padding-y};
10+
@include rfs($badge-font-size, --#{$prefix}badge-font-size);
11+
--#{$prefix}badge-font-weight: #{$badge-font-weight};
12+
--#{$prefix}badge-color: #{$badge-color};
13+
--#{$prefix}badge-border-radius: #{$badge-border-radius};
14+
// scss-docs-end badge-css-vars
15+
716
display: inline-block;
8-
padding: $badge-padding-y $badge-padding-x;
9-
@include font-size($badge-font-size);
10-
font-weight: $badge-font-weight;
17+
padding: var(--#{$prefix}badge-padding-y) var(--#{$prefix}badge-padding-x);
18+
@include font-size(var(--#{$prefix}badge-font-size));
19+
font-weight: var(--#{$prefix}badge-font-weight);
1120
line-height: 1;
12-
color: $badge-color;
21+
color: var(--#{$prefix}badge-color);
1322
text-align: center;
1423
white-space: nowrap;
1524
vertical-align: baseline;
16-
@include border-radius($badge-border-radius);
25+
@include border-radius(var(--#{$prefix}badge-border-radius));
1726
@include gradient-bg();
1827

1928
// Empty badges collapse automatically

‎resources/themes/architect/src/components/bootstrap5/_breadcrumb.scss‎

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,40 @@
11
.breadcrumb {
2+
// scss-docs-start breadcrumb-css-vars
3+
--#{$prefix}breadcrumb-padding-x: #{$breadcrumb-padding-x};
4+
--#{$prefix}breadcrumb-padding-y: #{$breadcrumb-padding-y};
5+
--#{$prefix}breadcrumb-margin-bottom: #{$breadcrumb-margin-bottom};
6+
@include rfs($breadcrumb-font-size, --#{$prefix}breadcrumb-font-size);
7+
--#{$prefix}breadcrumb-bg: #{$breadcrumb-bg};
8+
--#{$prefix}breadcrumb-border-radius: #{$breadcrumb-border-radius};
9+
--#{$prefix}breadcrumb-divider-color: #{$breadcrumb-divider-color};
10+
--#{$prefix}breadcrumb-item-padding-x: #{$breadcrumb-item-padding-x};
11+
--#{$prefix}breadcrumb-item-active-color: #{$breadcrumb-active-color};
12+
// scss-docs-end breadcrumb-css-vars
13+
214
display: flex;
315
flex-wrap: wrap;
4-
padding: $breadcrumb-padding-y $breadcrumb-padding-x;
5-
margin-bottom: $breadcrumb-margin-bottom;
6-
@include font-size($breadcrumb-font-size);
16+
padding: var(--#{$prefix}breadcrumb-padding-y) var(--#{$prefix}breadcrumb-padding-x);
17+
margin-bottom: var(--#{$prefix}breadcrumb-margin-bottom);
18+
@include font-size(var(--#{$prefix}breadcrumb-font-size));
719
list-style: none;
8-
background-color: $breadcrumb-bg;
9-
@include border-radius($breadcrumb-border-radius);
20+
background-color: var(--#{$prefix}breadcrumb-bg);
21+
@include border-radius(var(--#{$prefix}breadcrumb-border-radius));
1022
}
1123

1224
.breadcrumb-item {
1325
// The separator between breadcrumbs (by default, a forward-slash: "/")
1426
+ .breadcrumb-item {
15-
padding-left: $breadcrumb-item-padding-x;
27+
padding-left: var(--#{$prefix}breadcrumb-item-padding-x);
1628

1729
&::before {
1830
float: left; // Suppress inline spacings and underlining of the separator
19-
padding-right: $breadcrumb-item-padding-x;
20-
color: $breadcrumb-divider-color;
21-
content: var(--#{$variable-prefix}breadcrumb-divider, escape-svg($breadcrumb-divider)) #{"/* rtl:"} var(--#{$variable-prefix}breadcrumb-divider, escape-svg($breadcrumb-divider-flipped)) #{"*/"};
31+
padding-right: var(--#{$prefix}breadcrumb-item-padding-x);
32+
color: var(--#{$prefix}breadcrumb-divider-color);
33+
content: var(--#{$prefix}breadcrumb-divider, escape-svg($breadcrumb-divider)) #{"/* rtl:"} var(--#{$prefix}breadcrumb-divider, escape-svg($breadcrumb-divider-flipped)) #{"*/"};
2234
}
2335
}
2436

2537
&.active {
26-
color: $breadcrumb-active-color;
38+
color: var(--#{$prefix}breadcrumb-item-active-color);
2739
}
2840
}

‎resources/themes/architect/src/components/bootstrap5/_button-group.scss‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,17 @@
3434
}
3535

3636
.btn-group {
37+
@include border-radius($btn-border-radius);
38+
3739
// Prevent double borders when buttons are next to each other
38-
> .btn:not(:first-child),
40+
> :not(.btn-check:first-child) + .btn,
3941
> .btn-group:not(:first-child) {
40-
margin-left: -$btn-border-width;
42+
margin-left: calc(#{$btn-border-width} * -1); // stylelint-disable-line function-disallowed-list
4143
}
4244

4345
// Reset rounded corners
4446
> .btn:not(:last-child):not(.dropdown-toggle),
47+
> .btn.dropdown-toggle-split:first-child,
4548
> .btn-group:not(:last-child) > .btn {
4649
@include border-end-radius(0);
4750
}
@@ -123,7 +126,7 @@
123126

124127
> .btn:not(:first-child),
125128
> .btn-group:not(:first-child) {
126-
margin-top: -$btn-border-width;
129+
margin-top: calc(#{$btn-border-width} * -1); // stylelint-disable-line function-disallowed-list
127130
}
128131

129132
// Reset rounded corners

0 commit comments

Comments
 (0)