Skip to content

Commit d36fcf9

Browse files
Merge branch 'dev' of https://github.com/asu/asu-unity-stack into uds-1958
2 parents d9efa19 + 5cfff9b commit d36fcf9

File tree

5 files changed

+36
-22
lines changed

5 files changed

+36
-22
lines changed

packages/unity-bootstrap-theme/CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
# [@asu/unity-bootstrap-theme-v1.23.0](https://github.com/ASU/asu-unity-stack/compare/@asu/unity-bootstrap-theme-v1.22.0...@asu/unity-bootstrap-theme-v1.23.0) (2025-04-16)
2+
3+
4+
### Bug Fixes
5+
6+
* **unity-bootstrap-theme:** added style for small and medium hero ([64002b9](https://github.com/ASU/asu-unity-stack/commit/64002b904d50c4ae9aee7377327fc9b58425b0cd))
7+
* **unity-bootstrap-theme:** changed height to min-height on hero-overlay classes ([f1b2991](https://github.com/ASU/asu-unity-stack/commit/f1b299190c384c97793d1aecbf690b7737dcaf15))
8+
9+
10+
### Features
11+
12+
* **unity-bootstrap-theme:** changed heigth to min-heigth on div.uds-hero-lg ([0e0c04b](https://github.com/ASU/asu-unity-stack/commit/0e0c04b558758836963fdffc526dbdbe7e793445))
13+
114
# [@asu/unity-bootstrap-theme-v1.22.0](https://github.com/ASU/asu-unity-stack/compare/@asu/unity-bootstrap-theme-v1.21.6...@asu/unity-bootstrap-theme-v1.22.0) (2025-04-09)
215

316

packages/unity-bootstrap-theme/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@asu/unity-bootstrap-theme",
3-
"version": "1.22.0",
3+
"version": "1.23.0",
44
"description": "Please see @asu/unity-react-core for up-to-date stories and examples.\nBase UI theme for ASU Web Standards 2.0 developed with Bootstrap 5",
55
"homepage": "https://github.com/ASU/asu-unity-stack#readme",
66
"license": "MIT",

packages/unity-bootstrap-theme/src/scss/extends/_heroes.scss

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ div[class^="uds-hero"] {
7979
grid-row: 2;
8080
grid-template-columns: 1fr;
8181
grid-template-rows: 1fr 1fr;
82+
margin-top: $uds-size-spacing-10;
8283

8384
p {
8485
margin: 0;
@@ -211,7 +212,7 @@ div[class^="uds-hero"] {
211212
}
212213

213214
div.uds-hero-sm {
214-
height: $uds-size-spacing-32;
215+
min-height: $uds-size-spacing-32;
215216
grid-template-rows: 1fr auto auto 3rem;
216217

217218
h1,
@@ -244,7 +245,7 @@ div.uds-hero-sm {
244245
}
245246

246247
.hero-overlay {
247-
height: $uds-size-spacing-32;
248+
min-height: $uds-size-spacing-32;
248249
}
249250
}
250251

@@ -254,7 +255,7 @@ div.uds-hero-sm {
254255
}
255256

256257
div.uds-hero-md {
257-
height: 21rem;
258+
min-height: 21rem;
258259
// by design, the hero-md has no content on mobile, change grid template rows and hide .content
259260
grid-template-rows: 1fr auto auto 3rem;
260261

@@ -270,7 +271,7 @@ div.uds-hero-md {
270271
}
271272

272273
.hero-overlay {
273-
height: 21rem;
274+
min-height: 21rem;
274275
}
275276
}
276277

@@ -281,7 +282,7 @@ div.uds-hero-md {
281282
}
282283

283284
div.uds-hero-lg {
284-
height: $uds-size-spacing-64;
285+
min-height: $uds-size-spacing-64;
285286

286287
.content {
287288
display: none;
@@ -307,7 +308,7 @@ div.uds-hero-lg {
307308
}
308309

309310
.hero-overlay {
310-
height: $uds-size-spacing-64;
311+
min-height: $uds-size-spacing-64;
311312
}
312313
}
313314

@@ -378,7 +379,7 @@ div.uds-hero-lg {
378379
grid-template-rows: 1fr auto auto $uds-size-spacing-7;
379380
&.has-btn-row {
380381
.btn-row {
381-
top: 14.5rem;
382+
top: 92%;
382383
}
383384
}
384385

@@ -390,7 +391,7 @@ div.uds-hero-lg {
390391
}
391392

392393
div.uds-hero-md {
393-
height: $uds-size-spacing-64;
394+
min-height: $uds-size-spacing-64;
394395
// TODO; remove this, it's a fallback for buttons without has-btn-row
395396
grid-template-rows: 1fr repeat(4, auto) $uds-size-spacing-6;
396397
h1 {
@@ -419,13 +420,13 @@ div.uds-hero-lg {
419420
}
420421

421422
.hero-overlay {
422-
height: $uds-size-spacing-64;
423+
min-height: $uds-size-spacing-64;
423424
}
424425
}
425426
}
426427

427428
div.uds-hero-lg {
428-
height: 42.75rem;
429+
min-height: 42.75rem;
429430
// TODO; remove this, it's a fallback for buttons without has-btn-row
430431
grid-template-rows: 1fr repeat(4, auto) $uds-size-spacing-6;
431432

@@ -448,7 +449,7 @@ div.uds-hero-lg {
448449
}
449450

450451
.hero-overlay {
451-
height: 42.75rem;
452+
min-height: 42.75rem;
452453
}
453454
}
454455

@@ -497,7 +498,7 @@ div.uds-hero-lg {
497498
}
498499

499500
div.uds-hero-lg {
500-
height: 42.75rem;
501+
min-height: 42.75rem;
501502

502503
&.uds-video-hero {
503504
position: relative;

packages/unity-bootstrap-theme/src/scss/extends/_xx_Hero-Competing.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,18 @@ div[class^='uds-hero'] {
6161
}
6262

6363
&.uds-hero-sm {
64-
height: $uds-size-spacing-32;
64+
min-height: $uds-size-spacing-32;
6565
.hero-body {
6666
display: none;
6767
}
6868
}
6969

7070
&.uds-hero-md {
71-
height: $uds-size-spacing-64;
71+
min-height: $uds-size-spacing-64;
7272
}
7373

7474
&.uds-hero-lg {
75-
height: 42.75rem;
75+
min-height: 42.75rem;
7676
}
7777
}
7878

yarn.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32559,8 +32559,8 @@ __metadata:
3255932559
linkType: hard
3256032560

3256132561
"vite@npm:^5.0.0 || ^6.0.0":
32562-
version: 6.2.5
32563-
resolution: "vite@npm:6.2.5"
32562+
version: 6.2.6
32563+
resolution: "vite@npm:6.2.6"
3256432564
dependencies:
3256532565
esbuild: "npm:^0.25.0"
3256632566
fsevents: "npm:~2.3.3"
@@ -32606,13 +32606,13 @@ __metadata:
3260632606
optional: true
3260732607
bin:
3260832608
vite: bin/vite.js
32609-
checksum: 10c0/226bb3c1875e1982559007007580e8d083b81f5289f18e28841d622ba030599e1bd9926adccc8264879e319e9f9e4f48a38a0dc52a5dfcdf2a9cb7313bfc1816
32609+
checksum: 10c0/68a2ed3e61bdd654c59b817b4f3203065241c66d1739faa707499130f3007bc3a666c7a8320a4198e275e62b5e4d34d9b78a6533f69e321d366e76f5093b2071
3261032610
languageName: node
3261132611
linkType: hard
3261232612

3261332613
"vite@npm:^5.0.0, vite@npm:^5.3.5, vite@npm:^5.4.0":
32614-
version: 5.4.17
32615-
resolution: "vite@npm:5.4.17"
32614+
version: 5.4.18
32615+
resolution: "vite@npm:5.4.18"
3261632616
dependencies:
3261732617
esbuild: "npm:^0.21.3"
3261832618
fsevents: "npm:~2.3.3"
@@ -32649,7 +32649,7 @@ __metadata:
3264932649
optional: true
3265032650
bin:
3265132651
vite: bin/vite.js
32652-
checksum: 10c0/3322bd6d8da30cbc87b1b24cd14fdbca75abb36de81217d1062c8b4c574a1a0d28d11dfe23a3eed08b3d179d2bdc1510e0d7b9f3e1b722a45bd7631c7cec72eb
32652+
checksum: 10c0/a8cbbec6bdf399e62c386d70b8485e4f2f1b427beb19bc7c5d52b402a0c3750b7ff469fc20a8333755ea13bc1b0af5df3f22c8fd37d1739ee51d709b7a4740b6
3265332653
languageName: node
3265432654
linkType: hard
3265532655

0 commit comments

Comments
 (0)