Skip to content

Commit 3b30e3e

Browse files
leenooksleenooks
committed
Upgrade ArchitectUI to 4.2.0
1 parent 441ece8 commit 3b30e3e

File tree

21 files changed

+118
-100
lines changed

21 files changed

+118
-100
lines changed

‎package-lock.json‎

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
@@ -17,7 +17,7 @@
1717
"bootstrap": "^5.2.3",
1818
"bootstrap-icons": "^1.11.3",
1919
"jquery": "^3.6.3",
20-
"jquery-ui": "^1.13.2",
20+
"jquery-ui": "^1.14.1",
2121
"jquery.fancytree": "^2.38.3",
2222
"laravel-mix": "^6.0.49",
2323
"less-loader": "^11.1.0",

‎resources/js/app.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import 'jquery.fancytree/dist/modules/jquery.fancytree.edit';
1010
import 'jquery.fancytree/dist/modules/jquery.fancytree.filter';
1111
import 'jquery.fancytree/dist/modules/jquery.fancytree.glyph';
1212
import 'jquery.fancytree/dist/modules/jquery.fancytree.persist';
13-
// import 'jquery-ui/dist/jquery-ui'; // USED?
1413

1514
// Bootstrap - included in architectui
1615
// import 'bootstrap/dist/js/bootstrap.bundle';

‎resources/sass/app.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
@import "select2-bootstrap-5-theme/dist/select2-bootstrap-5-theme";
1010

1111
// Bootstrap icons
12-
@import "bootstrap-icons"
12+
@import "bootstrap-icons";

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

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,19 @@
99
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
1010
*/
1111

12+
// SASS MODULES (new syntax)
13+
@use "sass:map";
14+
@use "sass:math";
15+
@use "sass:color";
16+
1217
// BOOTSTRAP 5 VARIABLES
1318

1419
// 1. Include functions first (so you can manipulate colors, SVGs, calc, etc)
1520
@import "components/bootstrap5/functions";
1621

1722
// 2. Include any default variable overrides here
1823

24+
//@import "bootstrap/scss/variables";
1925
@import "themes/layout-variables";
2026

2127
// 3. Include remainder of required Bootstrap stylesheets
@@ -39,26 +45,27 @@
3945
@import "components/bootstrap5/buttons";
4046
@import "components/bootstrap5/transitions";
4147
@import "components/bootstrap5/dropdown";
48+
//@import "bootstrap/scss/dropdown";
4249
@import "components/bootstrap5/button-group";
4350
@import "components/bootstrap5/nav";
4451
@import "components/bootstrap5/navbar";
4552
@import "components/bootstrap5/card";
46-
// @import "components/bootstrap5/accordion";
53+
//@import "components/bootstrap5/accordion";
4754
@import "components/bootstrap5/breadcrumb";
4855
@import "components/bootstrap5/pagination";
4956
@import "components/bootstrap5/badge";
5057
@import "components/bootstrap5/alert";
51-
// @import "components/bootstrap5/progress";
58+
//@import "components/bootstrap5/progress";
5259
@import "components/bootstrap5/list-group";
5360
@import "components/bootstrap5/close";
54-
// @import "components/bootstrap5/toasts";
61+
//@import "components/bootstrap5/toasts";
5562
@import "components/bootstrap5/modal";
5663
@import "components/bootstrap5/tooltip";
57-
// @import "components/bootstrap5/popover";
58-
// @import "components/bootstrap5/carousel";
59-
// @import "components/bootstrap5/spinners";
60-
// @import "components/bootstrap5/offcanvas";
61-
// @import "components/bootstrap5/placeholders";
64+
//@import "components/bootstrap5/popover";
65+
//@import "components/bootstrap5/carousel";
66+
//@import "components/bootstrap5/spinners";
67+
//@import "components/bootstrap5/offcanvas";
68+
//@import "components/bootstrap5/placeholders";
6269
@import "components/bootstrap5/helpers";
6370
@import "components/bootstrap5/utilities/api";
6471

@@ -80,7 +87,7 @@
8087
@import "elements/badges";
8188
@import "elements/cards";
8289
@import "elements/tabs";
83-
// @import "elements/accordions";
90+
//@import "elements/accordions";
8491
@import "elements/modals";
8592
@import "elements/navs";
8693
@import "elements/listgroup";
@@ -93,7 +100,7 @@
93100

94101
// COMPONENTS
95102
// Perfect Scrollbar
96-
// @import "components/perfect-scrollbar/perfect-scrollbar";
103+
//@import "components/perfect-scrollbar/perfect-scrollbar";
97104

98105
// FontAwesome
99106
@import "components/icons/fontawesome/fontawesome";
@@ -102,14 +109,14 @@
102109
// Hamburger button
103110
@import "components/hamburgers/hamburgers";
104111
// Notifications
105-
// @import "components/notifications/toastr";
112+
//@import "components/notifications/toastr";
106113
// Popovers & Tooltips
107114
@import "components/popovers-tooltips/popovers-tooltips";
108115
// Calendar
109-
// @import "components/calendar/calendar";
116+
//@import "components/calendar/calendar";
110117
// Maps
111-
// @import "components/maps/vector-maps";
118+
//@import "components/maps/vector-maps";
112119
// Responsive
113120
@import "layout/responsive/responsive-base";
114121
// DEMO
115-
// @import "demo-ui/demo";
122+
//@import "demo-ui/demo";

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1705,10 +1705,11 @@ $btn-close-padding-x: .25em !default;
17051705
$btn-close-padding-y: $btn-close-padding-x !default;
17061706
$btn-close-color: $black !default;
17071707
$btn-close-bg: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#{$btn-close-color}'><path d='M.293.293a1 1 0 0 1 1.414 0L8 6.586 14.293.293a1 1 0 1 1 1.414 1.414L9.414 8l6.293 6.293a1 1 0 0 1-1.414 1.414L8 9.414l-6.293 6.293a1 1 0 0 1-1.414-1.414L6.586 8 .293 1.707a1 1 0 0 1 0-1.414z'/></svg>") !default;
1708-
$btn-close-color-dark: $black !default;
1709-
$btn-close-color-light: $gray-100 !default;
1710-
$btn-close-bg-dark: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#{$btn-close-color-dark}'><path d='M.293.293a1 1 0 0 1 1.414 0L8 6.586 14.293.293a1 1 0 1 1 1.414 1.414L9.414 8l6.293 6.293a1 1 0 0 1-1.414 1.414L8 9.414l-6.293 6.293a1 1 0 0 1-1.414-1.414L6.586 8 .293 1.707a1 1 0 0 1 0-1.414z'/></svg>") !default;
1711-
$btn-close-bg-light: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#{$btn-close-color-light}'><path d='M.293.293a1 1 0 0 1 1.414 0L8 6.586 14.293.293a1 1 0 1 1 1.414 1.414L9.414 8l6.293 6.293a1 1 0 0 1-1.414 1.414L8 9.414l-6.293 6.293a1 1 0 0 1-1.414-1.414L6.586 8 .293 1.707a1 1 0 0 1 0-1.414z'/></svg>") !default;
1708+
$btn-close-color-dark: $black !default;
1709+
$btn-close-color-light: $gray-100 !default;
1710+
$btn-close-bg-dark: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#{$btn-close-color-dark}'><path d='M.293.293a1 1 0 0 1 1.414 0L8 6.586 14.293.293a1 1 0 1 1 1.414 1.414L9.414 8l6.293 6.293a1 1 0 0 1-1.414 1.414L8 9.414l-6.293 6.293a1 1 0 0 1-1.414-1.414L6.586 8 .293 1.707a1 1 0 0 1 0-1.414z'/></svg>") !default;
1711+
$btn-close-bg-light: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#{$btn-close-color-light}'><path d='M.293.293a1 1 0 0 1 1.414 0L8 6.586 14.293.293a1 1 0 1 1 1.414 1.414L9.414 8l6.293 6.293a1 1 0 0 1-1.414 1.414L8 9.414l-6.293 6.293a1 1 0 0 1-1.414-1.414L6.586 8 .293 1.707a1 1 0 0 1 0-1.414z'/></svg>") !default;
1712+
17121713
$btn-close-focus-shadow: $focus-ring-box-shadow !default;
17131714
$btn-close-opacity: .5 !default;
17141715
$btn-close-hover-opacity: .75 !default;

‎resources/themes/architect/src/elements/_buttons.scss‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use "sass:math";
2+
13
// Buttons
24

35
// 2x Outline Border
@@ -49,13 +51,13 @@ $btn-block-spacing-y: .5rem !default;
4951

5052
&.btn-icon-right {
5153
.btn-icon-wrapper {
52-
margin-left: divide($spacer, 2);
54+
margin-left: math.div($spacer, 2);
5355
margin-right: 0;
5456
}
5557
}
5658

5759
.btn-icon-wrapper {
58-
margin-right: divide($spacer, 2);
60+
margin-right: math.div($spacer, 2);
5961
margin-left: 0;
6062
margin-top: 0;
6163
font-size: 17px;
@@ -159,7 +161,7 @@ $btn-block-spacing-y: .5rem !default;
159161

160162
&.btn-icon-bottom {
161163
.btn-icon-wrapper {
162-
margin: divide($spacer, 5) 0 5px;
164+
margin: math.div($spacer, 5) 0 5px;
163165
}
164166
}
165167

‎resources/themes/architect/src/elements/_dropdown.scss‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use "sass:math";
2+
13
// Dropdown
24

35
.dropdown-menu {
@@ -14,7 +16,7 @@
1416

1517
.dropdown-header {
1618
text-transform: uppercase;
17-
font-size: divide($font-size-base, 1.2);
19+
font-size: math.div($font-size-base, 1.2);
1820
color: $primary;
1921
font-weight: bold;
2022
}
@@ -30,7 +32,7 @@
3032

3133
.dropdown-icon {
3234
font-size: 1rem;
33-
margin-right: divide($dropdown-padding-y, 2);
35+
margin-right: math.div($dropdown-padding-y, 2);
3436
width: 30px;
3537
text-align: center;
3638
opacity: .3;
@@ -124,7 +126,7 @@
124126

125127
.dropdown-menu-header-inner {
126128
margin: -1px -1px 0;
127-
padding: ($spacer * 1.5) divide($spacer, 2);
129+
padding: ($spacer * 1.5) math.div($spacer, 2);
128130
position: relative;
129131
}
130132

@@ -146,12 +148,12 @@
146148
z-index: 10;
147149

148150
&.text-start {
149-
padding-left: divide($spacer, 2);
151+
padding-left: math.div($spacer, 2);
150152
}
151153

152154
&.btn-pane-right {
153-
padding-left: divide($spacer, 2);
154-
padding-right: divide($spacer, 2);
155+
padding-left: math.div($spacer, 2);
156+
padding-right: math.div($spacer, 2);
155157
display: flex;
156158
align-content: center;
157159
align-items: center;
@@ -196,7 +198,7 @@
196198
}
197199

198200
.grid-menu-xl {
199-
margin-bottom: divide($dropdown-padding-y, -1.35);
201+
margin-bottom: math.div($dropdown-padding-y, -1.35);
200202

201203
[class*="col-"] {
202204
padding: 0;

‎resources/themes/architect/src/elements/_navs.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
.nav-item {
4242
&.nav-item-header {
4343
text-transform: uppercase;
44-
font-size: divide($font-size-base, 1.2);
44+
font-size: math.div($font-size-base, 1.2);
4545
color: $gray-600;
4646
font-weight: bold;
4747
padding: $nav-link-padding-y $nav-link-padding-x;

‎resources/themes/architect/src/elements/_tabs.scss‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use "sass:math";
2+
13
// TABS
24

35
.nav-pills,
@@ -106,8 +108,8 @@
106108
.tabs-animated {
107109
.nav-link {
108110
position: relative;
109-
padding: divide($layout-spacer-x, 1.5);
110-
margin: 0 divide($layout-spacer-x, 2) 0 0;
111+
padding: math.div($layout-spacer-x, 1.5);
112+
margin: 0 math.div($layout-spacer-x, 2) 0 0;
111113
color: $body-color;
112114

113115
&::before {
@@ -138,8 +140,8 @@
138140

139141
.tabs-animated-shadow {
140142
.nav-link {
141-
padding: divide($layout-spacer-x, 3) divide($layout-spacer-x, 2);
142-
margin-bottom: divide($layout-spacer-x, 2);
143+
padding: math.div($layout-spacer-x, 3) math.div($layout-spacer-x, 2);
144+
margin-bottom: math.div($layout-spacer-x, 2);
143145

144146
span {
145147
position: relative;
@@ -189,7 +191,7 @@
189191
.body-tabs-shadow {
190192

191193
.body-tabs-animated {
192-
padding: divide($layout-spacer-x, 2) 0;
194+
padding: math.div($layout-spacer-x, 2) 0;
193195

194196
.nav-link {
195197

@@ -235,13 +237,13 @@
235237
.tabs-rounded-lg {
236238
@include border-radius(120px);
237239
background: $white;
238-
padding: divide($layout-spacer-x, 2);
240+
padding: math.div($layout-spacer-x, 2);
239241
margin-bottom: $layout-spacer-x;
240242

241243
.nav-link {
242244
margin-bottom: 0;
243245
font-size: $font-size-lg;
244-
padding: divide($layout-spacer-x, 2) divide($layout-spacer-x, 3);
246+
padding: math.div($layout-spacer-x, 2) math.div($layout-spacer-x, 3);
245247

246248
&::before {
247249
@include border-radius(120px !important);

0 commit comments

Comments
 (0)