Skip to content

Commit 126519e

Browse files
committed
Merge branch 'main' of https://github.com/coreui/coreui
2 parents 9623788 + de96ed2 commit 126519e

File tree

17 files changed

+270
-68
lines changed

17 files changed

+270
-68
lines changed

config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ params:
7373
source_pro: "https://github.com/coreui/coreui-pro/archive/v4.3.0-beta.1.zip"
7474
dist_pro: "https://github.com/coreui/coreui-pro/releases/download/v4.3.0-beta.1/coreui-4.3.0-beta.1-dist.zip"
7575

76+
download_template:
77+
website: "https://coreui.io/product/free-bootstrap-admin-template/"
78+
7679
cdn:
7780
# See https://www.srihash.org for info on how to generate the hashes
7881
css: "https://cdn.jsdelivr.net/npm/@coreui/[email protected]/dist/css/coreui.min.css"

docs/content/components/header.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ When the container is within your header, its horizontal padding is removed at b
277277

278278
### CSS variables
279279

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.
280+
Headers 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.
281281

282282
{{< scss-docs name="header-css-vars" file="scss/_header.scss" >}}
283283

docs/content/components/pagination.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -164,19 +164,16 @@ Or with `.justify-content-end`:
164164

165165
## Customizing
166166

167-
### SASS
167+
### CSS Variables
168168

169169
Pagination now uses local CSS variables on `.pagination` for enhanced real-time customization. Values for the CSS variables are set via Sass, so Sass customization is still supported, too.
170170

171171
{{< scss-docs name="pagination-css-vars" file="scss/_pagination.scss" >}}
172172

173-
### Sass variables
173+
### SASS variables
174174

175175
{{< scss-docs name="pagination-variables" file="scss/_variables.scss" >}}
176176

177-
### Sass mixins
177+
### SASS mixins
178178

179179
{{< scss-docs name="pagination-mixin" file="scss/mixins/_pagination.scss" >}}
180-
181-
### CSS Vars
182-
{{< scss-docs name="pagination-css-vars" file="scss/_pagination.scss" >}}

docs/content/customize/color.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,11 @@ Bootstrap doesn't include `color` and `background-color` utilities for every col
123123
Here's an example that generates text color utilities (e.g., `.text-purple-500`) using the above steps.
124124

125125
```scss
126-
@import "bootstrap/scss/functions";
127-
@import "bootstrap/scss/variables";
128-
@import "bootstrap/scss/maps";
129-
@import "bootstrap/scss/mixins";
130-
@import "bootstrap/scss/utilities";
126+
@import "@coreui/coreui/scss/functions";
127+
@import "@coreui/coreui/scss/variables";
128+
@import "@coreui/coreui/scss/maps";
129+
@import "@coreui/coreui/scss/mixins";
130+
@import "@coreui/coreui/scss/utilities";
131131

132132
$all-colors: map-merge-multiple($blues, $indigos, $purples, $pinks, $reds, $oranges, $yellows, $greens, $teals, $cyans);
133133

@@ -148,7 +148,7 @@ $utilities: map-merge(
148148
)
149149
);
150150

151-
@import "bootstrap/scss/utilities/api";
151+
@import "@coreui/coreui/scss/utilities/api";
152152
```
153153

154154
This will generate new `.text-{color}-{level}` utilities for every color and level. You can do the same for any other utility and property as well.

docs/content/customize/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ sections:
2626

2727
## Overview
2828

29-
There are multiple ways to customize Bootstrap. Your best path can depend on your project, the complexity of your build tools, the version of CoreUI for Bootstrap you're using, browser support, and more.
29+
There are multiple ways to customize CoreUI for Bootstrap. Your best path can depend on your project, the complexity of your build tools, the version of CoreUI for Bootstrap you're using, browser support, and more.
3030

3131
Our two preferred methods are:
3232

docs/content/customize/sass.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ your-project/
2525
└── scss
2626
```
2727

28-
If you've downloaded our source files and aren't using a package manager, you'll want to manually create something similar to that structure, keeping Bootstrap's source files separate from your own.
28+
If you've downloaded our source files and aren't using a package manager, you'll want to manually create something similar to that structure, keeping CoreUI's source files separate from your own.
2929

3030
```text
3131
your-project/
@@ -38,7 +38,7 @@ your-project/
3838

3939
## Importing
4040

41-
In your `custom.scss`, you'll import Bootstrap's source Sass files. You have two options: include all of Bootstrap, or pick the parts you need. We encourage the latter, though be aware there are some requirements and dependencies across our components. You also will need to include some JavaScript for our plugins.
41+
In your `custom.scss`, you'll import CoreUI's source Sass files. You have two options: include all of CoreUI, or pick the parts you need. We encourage the latter, though be aware there are some requirements and dependencies across our components. You also will need to include some JavaScript for our plugins.
4242

4343
```scss
4444
// Custom.scss

docs/content/getting-started/contents.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
layout: docs
33
title: Contents
4-
description: Discover what's included in Bootstrap, including our precompiled and source code flavors.
4+
description: Discover what's included in CoreUI, including our precompiled and source code flavors.
55
group: getting-started
66
aliases:
77
- "/getting-started/contents/"
@@ -65,7 +65,7 @@ coreui/
6565
└── coreui.min.js.map
6666
```
6767

68-
This is the most basic form of Bootstrap: precompiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (`coreui.*`), as well as compiled and minified CSS and JS (`coreui.min.*`). [source maps](https://developers.google.com/web/tools/chrome-devtools/javascript/source-maps) (`coreui.*.map`) are available for use with certain browsers' developer tools. Bundled JS files (`coreui.bundle.js` and minified `coreui.bundle.min.js`) include [Popper](https://popper.js.org/).
68+
This is the most basic form of CoreUI: precompiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (`coreui.*`), as well as compiled and minified CSS and JS (`coreui.min.*`). [source maps](https://developers.google.com/web/tools/chrome-devtools/javascript/source-maps) (`coreui.*.map`) are available for use with certain browsers' developer tools. Bundled JS files (`coreui.bundle.js` and minified `coreui.bundle.min.js`) include [Popper](https://popper.js.org/).
6969

7070
## CSS files
7171

docs/content/getting-started/introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Many of our components require the use of JavaScript to function. Specifically,
3737

3838
#### Bundle
3939

40-
Include every CoreUI for Bootstrap JavaScript plugin and dependency with one of our two bundles. Both `coreui.bundle.js` and `coreui.bundle.min.js` include [Popper](https://popper.js.org/) for our tooltips and popovers. For more information about what's included in Bootstrap, please see our [contents]({{< docsref "/getting-started/contents#precompiled-coreui" >}}) section.
40+
Include every CoreUI for Bootstrap JavaScript plugin and dependency with one of our two bundles. Both `coreui.bundle.js` and `coreui.bundle.min.js` include [Popper](https://popper.js.org/) for our tooltips and popovers. For more information about what's included in CoreUI, please see our [contents]({{< docsref "/getting-started/contents#precompiled-coreui" >}}) section.
4141

4242
```html
4343
<script src="{{< param "cdn.js_bundle" >}}" integrity="{{< param "cdn.js_bundle_hash" >}}" crossorigin="anonymous"></script>
File renamed without changes.

docs/content/templates/contents.md

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
---
2+
layout: docs
3+
title: Contents
4+
description: Discover what's included in CoreUI Bootstrap Admin Template, including our precompiled and source code flavors.
5+
group: templates
6+
toc: true
7+
---
8+
9+
## Project structure
10+
11+
Once downloaded, unzip the compressed folder and you'll see something like this:
12+
13+
```text
14+
coreui-bootstrap-admin-template/
15+
├── build/
16+
├── dist/
17+
├── src/
18+
│ ├── assets/
19+
│ │ ├── brand/
20+
│ │ ├── favicon/
21+
│ │ ├── icons/
22+
│ │ ├── img/
23+
│ ├── js/
24+
│ ├── pug/
25+
│ │ ├── _layout/
26+
│ │ ├── _partial/
27+
│ │ ├── base/
28+
│ │ ├── buttons/
29+
│ │ ├── icons/
30+
│ │ ├── notifications/
31+
│ │ ├── ...
32+
│ │ ├── index.pug
33+
│ │ └── ...
34+
│ ├── scss/
35+
│ ├── vendors/
36+
│ └── views/
37+
│ ├── base/
38+
│ ├── buttons/
39+
│ ├── css/
40+
│ ├── icons/
41+
│ ├── notifications/
42+
│ ├── ...
43+
│ ├── index.html
44+
│ └── ...
45+
└── package.json
46+
```
47+
48+
This is the most basic form of CoreUI Admin Templates. The `scss/` and `js/` are the source code for our CSS and JavaScript. The `dist/` folder includes precompiled files for quick drop-in usage in nearly any web project. Beyond that, any other included file provides support for packages, license information, and development.

0 commit comments

Comments
 (0)