Skip to content
This repository has been archived by the owner on Apr 24, 2024. It is now read-only.

Removed deprecated tilde in imports #38

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions docs/getting-started/introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ For the moment, the theme package can be installed using something like this in

```json
"devDependencies": {
"@bcgov/bootstrap-theme": "https://github.com/bcgov/bootstrap-theme/releases/download/v1.1.1/bcgov-bootstrap-theme-1.1.1.tgz",
"@bcgov/bootstrap-theme": "https://github.com/bcgov/bootstrap-theme/releases/download/v1.1.4/bcgov-bootstrap-theme-1.1.4.tgz",
"bootstrap": "~4.3.1",
}
```
Expand All @@ -28,20 +28,20 @@ of Bootstrap functions and mixins. The SCSS source can be included using the fol

```scss
$bcgov-font-path: "../node_modules/@bcgov/bootstrap-theme/dist/fonts/";
@import "~@bcgov/bootstrap-theme/dist/scss/bootstrap-theme";
@import "@bcgov/bootstrap-theme/dist/scss/bootstrap-theme";
```

SCSS variables and mixins defined by Bootstrap and the theme can be imported independent of
any display rules for use in isolated components:

```scss
@import "~@bcgov/bootstrap-theme/dist/scss/common";
@import "@bcgov/bootstrap-theme/dist/scss/common";
```

Generated CSS can be imported using the following (paths may vary):

```css
@import "~@bcgov/bootstrap-theme/dist/css/bootstrap-theme.min.css";
@import "@bcgov/bootstrap-theme/dist/css/bootstrap-theme.min.css";
```

## Javascript support
Expand Down
6 changes: 3 additions & 3 deletions src/styles/_common.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Includes in this file should not define any CSS classes, it is only meant for
// defining variables and functions for use by isolated components

@import "~bootstrap/scss/functions";
@import "bootstrap/scss/functions";

@import "variables";

@import "~bootstrap/scss/variables";
@import "~bootstrap/scss/mixins";
@import "bootstrap/scss/variables";
@import "bootstrap/scss/mixins";
2 changes: 1 addition & 1 deletion src/styles/bootstrap-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@import "common";

// Now bring in the rest of bootstrap!
@import "~bootstrap/scss/bootstrap";
@import "bootstrap/scss/bootstrap";

// Overrides of bootstrap classes
@import "overrides";
Expand Down