Skip to content

Commit 142e04c

Browse files
mrholekmrholek
committed
Merge branch 'bs-v5.2.0-beta1' of https://github.com/coreui/coreui into merge-bs-v5.2.0-beta1
2 parents 7a8da6b + 08bde97 commit 142e04c

File tree

15 files changed

+363
-135
lines changed

15 files changed

+363
-135
lines changed

‎docs/content/components/callout.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,14 @@ Callout component is prepared for any length of text, as well as an optional ele
2727

2828
## Customizing
2929

30-
### CSS variables
30+
### CSS Variables
3131

32-
Callouts use local CSS variables on .callout for enhanced real-time customization. Values for the CSS variables are set via Sass, so Sass customization is still supported, too.
32+
Callouts use local CSS variables on `.callout` for enhanced real-time customization. Values for the CSS variables are set via Sass, so Sass customization is still supported, too.
33+
34+
{{< scss-docs name="callout-css-vars" file="scss/_callout.scss" >}}
35+
36+
### SASS variables
3337

34-
{{< css-vars-docs file="scss/_callout.scss" >}}
35-
### SASS
3638
{{< scss-docs name="callout-variables" file="scss/_variables.scss" >}}
3739

3840
#### Variants

‎docs/content/components/footer.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,12 @@ Here's what you need to know before getting started with the aside menu:
3939

4040
## Customizing
4141

42-
### SASS
42+
### CSS variables
4343

44-
#### Variables
45-
{{< scss-docs name="footer-variables" file="scss/_variables.scss" >}}
44+
Sidebars use local CSS variables on `.footer` for enhanced real-time customization. Values for the CSS variables are set via Sass, so Sass customization is still supported, too.
45+
46+
{{< scss-docs name="footer-css-vars" file="scss/_footer.scss" >}}
4647

47-
### CSS Vars
48-
{{< css-vars-docs file="scss/_footer.scss" >}}
48+
### SASS variables
49+
50+
{{< scss-docs name="footer-variables" file="scss/_variables.scss" >}}

‎docs/content/components/header.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -275,10 +275,12 @@ When the container is within your header, its horizontal padding is removed at b
275275

276276
## Customizing
277277

278-
### SASS
278+
### CSS variables
279279

280-
#### Variables
281-
{{< scss-docs name="header-variables" file="scss/_variables.scss" >}}
280+
Sidebars use local CSS variables on `.header` for enhanced real-time customization. Values for the CSS variables are set via Sass, so Sass customization is still supported, too.
281+
282+
{{< scss-docs name="header-css-vars" file="scss/_header.scss" >}}
282283

283-
### CSS Vars
284-
{{< css-vars-docs file="scss/_header.scss" >}}
284+
### SASS variables
285+
286+
{{< scss-docs name="header-variables" file="scss/_variables.scss" >}}

‎docs/content/components/sidebar.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,15 @@ mySidebar.addEventListener('closed.coreui.sidebar', function () {
132132

133133
## Customizing
134134

135-
### SASS
135+
### CSS variables
136+
137+
Sidebars use local CSS variables on `.sidebar` and `.sidebar-backdrop` for enhanced real-time customization. Values for the CSS variables are set via Sass, so Sass customization is still supported, too.
138+
139+
{{< scss-docs name="sidebar-css-vars" file="scss/sidebar/_sidebar.scss" >}}
140+
141+
{{< scss-docs name="sidebar-backdrop-css-vars" file="scss/sidebar/_sidebar.scss" >}}
142+
143+
### SASS variables
144+
136145
{{< scss-docs name="sidebar-variables" file="scss/_variables.scss" >}}
137146

138-
### CSS Vars
139-
{{< css-vars-docs file="scss/sidebar/_sidebar.scss" >}}

‎docs/content/templates.md

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
---
2+
layout: docs
3+
title: Bootstrap Templates
4+
description: Develop modern, beautiful, and responsive applications in half the time with high-performing and easy-to-customize react admin panels to cover any requirement.
5+
group: templates
6+
aliases: "/templates/"
7+
toc: true
8+
---
9+
10+
## Bootstrap Admin & Dashboard Templates
11+
12+
Check out the fully-featured, ready-to-use admin dashboard templates built using CoreUI for React.js, and CoreUI PRO for React.js
13+
14+
<div class="row">
15+
<div class="col-md-6">
16+
<div class="card mb-4">
17+
<div class="card-body">
18+
<a class="text-decoration-none text-reset" href="https://coreui.io/product/free-bootstrap-admin-template/?theme=default-v3" target="_blank">
19+
<h5 class="card-title">Free Bootstrap Admin Template</h5>
20+
<h6 class="card-subtitle mb-3 text-muted">Default Theme</h6>
21+
<img class="img-fluid rounded shadow-sm" src="https://coreui.io/images/templates/coreui_free_1440.webp" alt="">
22+
</a>
23+
</div>
24+
</div>
25+
</div>
26+
<div class="col-md-6">
27+
<div class="card mb-4">
28+
<div class="card-body">
29+
<a class="text-decoration-none text-reset" href="https://coreui.io/product/bootstrap-dashboard-template/?theme=default-v3" target="_blank">
30+
<h5 class="card-title">Bootstrap Dashboard Template</h5>
31+
<h6 class="card-subtitle mb-3 text-muted">Default Theme v3</h6>
32+
<img class="img-fluid rounded shadow-sm" src="https://coreui.io/images/templates/coreui_pro_default_v3_1440.webp" alt="">
33+
</a>
34+
</div>
35+
</div>
36+
</div>
37+
<div class="col-md-6">
38+
<div class="card mb-4">
39+
<div class="card-body">
40+
<a class="text-decoration-none text-reset" href="https://coreui.io/product/bootstrap-dashboard-template/?theme=light-v3" target="_blank">
41+
<h5 class="card-title">Bootstrap Dashboard Template</h5>
42+
<h6 class="card-subtitle mb-3 text-muted">Light Theme v3</h6>
43+
<img class="img-fluid rounded shadow-sm" src="https://coreui.io/images/templates/coreui_pro_light_v3_1440.webp" alt="">
44+
</a>
45+
</div>
46+
</div>
47+
</div>
48+
<div class="col-md-6">
49+
<div class="card mb-4">
50+
<div class="card-body">
51+
<a class="text-decoration-none text-reset" href="https://coreui.io/product/bootstrap-dashboard-template/?theme=default" target="_blank">
52+
<h5 class="card-title">Bootstrap Dashboard Template</h5>
53+
<h6 class="card-subtitle mb-3 text-muted">Default Theme</h6>
54+
<img class="img-fluid rounded shadow-sm" src="https://coreui.io/images/templates/coreui_pro_default_1440.webp" alt="">
55+
</a>
56+
</div>
57+
</div>
58+
</div>
59+
<div class="col-md-6">
60+
<div class="card mb-4">
61+
<div class="card-body">
62+
<a class="text-decoration-none text-reset" href="https://coreui.io/product/bootstrap-dashboard-template/?theme=light" target="_blank">
63+
<h5 class="card-title">Bootstrap Dashboard Template</h5>
64+
<h6 class="card-subtitle mb-3 text-muted">Light Theme</h6>
65+
<img class="img-fluid rounded shadow-sm" src="https://coreui.io/images/templates/coreui_pro_light_1440.webp" alt="">
66+
</a>
67+
</div>
68+
</div>
69+
</div>
70+
<div class="col-md-6">
71+
<div class="card mb-4">
72+
<div class="card-body">
73+
<a class="text-decoration-none text-reset" href="https://coreui.io/product/bootstrap-dashboard-template/?theme=dark" target="_blank">
74+
<h5 class="card-title">Bootstrap Dashboard Template</h5>
75+
<h6 class="card-subtitle mb-3 text-muted">Dark Theme</h6>
76+
<img class="img-fluid rounded shadow-sm" src="https://coreui.io/images/templates/coreui_pro_dark_1440.webp" alt="">
77+
</a>
78+
</div>
79+
</div>
80+
</div>
81+
</div>

‎docs/layouts/_default/docs.html

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,20 @@
33
<main class="docs-main order-1">
44
<div class="docs-intro ps-lg-4">
55
{{ partial "breadcrumb" . }}
6+
<div class="bg-info bg-opacity-10 border-start border-start-5 border-start-info p-4 pb-3 mb-5">
7+
<h3 class="mb-4">Support CoreUI Development</h3>
8+
<p>
9+
CoreUI is an MIT-licensed open source project and is completely free to use. However, the amount of effort needed to maintain and develop new features for the project is not sustainable without proper financial backing.
10+
</p>
11+
<p>
12+
You can support our Open Source software development in the following ways:
13+
</p>
14+
<ul>
15+
<li>Buy the <a href="https://coreui.io/pricing/?support=coreui">CoreUI PRO</a>, and get access to PRO components, and dedicated support.</li>
16+
<li><a href="https://opencollective.com/coreui" target="_blank">Became a sponsor</a>, and get your logo on BACKERS.md/README.md files or each site of this/ documentation</li>
17+
<li>Give us a star ⭐️ on <a href="https://github.com/coreui/coreui" target="_blank">Github</a>.</li>
18+
</ul>
19+
</div>
620
<h1 class="docs-title" id="content">{{ .Title | markdownify }}</h1>
721
<p class="docs-lead">{{ .Page.Params.Description | markdownify }}</p>
822
{{ partial "ads" . }}

‎docs/layouts/partials/icons/devices.svg

Lines changed: 3 additions & 0 deletions
Loading

‎docs/layouts/partials/sidebar.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,12 @@
6262
<span class="ms-3">{{ partial "icons/external-link.svg" (dict "class" "icon icon-xs text-secondary") }}</span>
6363
</a>
6464
</li>
65+
<li class="nav-item">
66+
<a href="/templates/" class="nav-link">
67+
{{ partial "icons/devices.svg" (dict "class" "nav-icon text-primary") }}
68+
Templates
69+
</a>
70+
</li>
6571
<li class="nav-item">
6672
<a href="/migration/" class="nav-link">
6773
{{ partial "icons/update.svg" (dict "class" "nav-icon text-primary") }}

‎scss/_callout.scss

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,28 @@
11
.callout {
2-
padding: $callout-padding-y $callout-padding-x;
3-
margin: $callout-margin-y $callout-margin-x;
4-
border: var(--#{$prefix}callout-border-width, $callout-border-width) solid var(--#{$prefix}callout-border-color, $callout-border-color);
5-
@include ltr-rtl("border-left-width", var(--#{$prefix}callout-border-left-width, $callout-border-left-width));
6-
@include border-radius($callout-border-radius);
2+
// scss-docs-start callout-css-vars
3+
--#{$prefix}callout-padding-x: #{$callout-padding-x};
4+
--#{$prefix}callout-padding-y: #{$callout-padding-y};
5+
--#{$prefix}callout-margin-x: #{$callout-margin-x};
6+
--#{$prefix}callout-margin-y: #{$callout-margin-y};
7+
--#{$prefix}callout-border-width: #{$callout-border-width};
8+
--#{$prefix}callout-border-color: #{$callout-border-color};
9+
--#{$prefix}callout-border-left-width: #{$callout-border-left-width};
10+
--#{$prefix}callout-border-radius: #{$callout-border-radius};
11+
// scss-docs-end callout-css-vars
12+
13+
padding: var(--#{$prefix}callout-padding-y) var(--#{$prefix}callout-padding-x);
14+
margin: var(--#{$prefix}callout-margin-y) var(--#{$prefix}callout-margin-x);
15+
border: var(--#{$prefix}callout-border-width) solid var(--#{$prefix}callout-border-color);
16+
@include ltr-rtl("border-left-width", var(--#{$prefix}callout-border-left-width));
17+
@include ltr-rtl("border-left-color", var(--#{$prefix}callout-border-left-color));
18+
@include border-radius(var(--#{$prefix}callout-border-radius));
719
}
820

921
// scss-docs-start callout-modifiers
1022
// Generate contextual modifier classes for colorizing the collor.
1123
@each $state, $value in $callout-variants {
1224
.callout-#{$state} {
13-
@include ltr-rtl("border-left-color", var(--#{$prefix}callout-border-left-color, $value));
25+
--#{$prefix}callout-border-left-color: #{$value};
1426
}
1527
}
1628
// scss-docs-end callout-modifiers

‎scss/_footer.scss

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,23 @@
11
.footer {
2+
// scss-docs-start footer-css-vars
3+
--#{$prefix}footer-min-height: #{$footer-min-height};
4+
--#{$prefix}footer-padding-x: #{$footer-padding-x};
5+
--#{$prefix}footer-padding-y: #{$footer-padding-y};
6+
--#{$prefix}footer-color: #{$footer-color};
7+
--#{$prefix}footer-bg: #{$footer-bg};
8+
--#{$prefix}footer-border-color: #{$footer-border-color};
9+
--#{$prefix}footer-border: #{$footer-border-width} solid var(--#{$prefix}footer-border-color);
10+
// scss-docs-end footer-css-vars
11+
212
display: flex;
313
flex-wrap: wrap; // allow us to do the line break for collapsing content
414
align-items: center;
515
justify-content: space-between;
6-
min-height: $footer-min-height;
7-
padding: $footer-padding-y $footer-padding-x;
8-
color: var(--#{$prefix}footer-color, $footer-color);
9-
background: var(--#{$prefix}footer-bg, $footer-bg);
10-
border-top: var(--#{$prefix}footer-border-width, $footer-border-width) solid var(--#{$prefix}footer-border-color, $footer-border-color);
16+
min-height: var(--#{$prefix}footer-min-height);
17+
padding: var(--#{$prefix}footer-padding-y) var(--#{$prefix}footer-padding-x);
18+
color: var(--#{$prefix}footer-color);
19+
background: var(--#{$prefix}footer-bg);
20+
border-top: var(--#{$prefix}footer-border);
1121
}
1222

1323
.footer-sticky {

0 commit comments

Comments
 (0)