Skip to content

Commit

Permalink
fix: do not use tilde ~ (#80)
Browse files Browse the repository at this point in the history
  • Loading branch information
limonte committed Oct 19, 2021
1 parent fa1d5c8 commit 3f76134
Show file tree
Hide file tree
Showing 18 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ import Swal from 'sweetalert2/src/sweetalert2.js'

`your-app.scss`:
```scss
@import '~@sweetalert2/themes/dark/dark.scss';
@import 'node_modules/sweetalert2/themes/dark/dark.scss';
```

Contributing
Expand Down
2 changes: 1 addition & 1 deletion bootstrap-4/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ import Swal from 'sweetalert2/src/sweetalert2.js'

`your-app.scss`:
```scss
@import '~@sweetalert2/theme-bootstrap-4/bootstrap-4.scss';
@import 'node_modules/sweetalert2/theme-bootstrap-4/bootstrap-4.scss';
```
4 changes: 2 additions & 2 deletions bootstrap-4/bootstrap-4.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@use 'sass:math';

@import '~sweetalert2/src/variables';
@import 'node_modules/sweetalert2/src/variables';

// Function
@function str-replace($string, $search, $replace: '') {
Expand Down Expand Up @@ -220,7 +220,7 @@ $swal2-toast-input-font-size: $bootstrap-toast-font-size;
$swal2-toast-validation-font-size: $bootstrap-toast-font-size;
$swal2-toast-buttons-font-size: $bootstrap-toast-font-size;

@import '~sweetalert2/src/sweetalert2';
@import 'node_modules/sweetalert2/src/sweetalert2';

.swal2-confirm,
.swal2-deny,
Expand Down
2 changes: 1 addition & 1 deletion borderless/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ import Swal from 'sweetalert2/src/sweetalert2.js'

`your-app.scss`:
```scss
@import '~@sweetalert2/theme-borderless/borderless.scss';
@import 'node_modules/sweetalert2/theme-borderless/borderless.scss';
```
4 changes: 2 additions & 2 deletions borderless/borderless.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~sweetalert2/src/variables';
@import 'node_modules/sweetalert2/src/variables';

$borderless-theme-color: rgba(54, 70, 93, .99);
$borderless-outline-color: lighten($borderless-theme-color, 30%);
Expand Down Expand Up @@ -58,4 +58,4 @@ $swal2-button-focus-box-shadow: 0 0 0 1px $borderless-theme-color, 0 0 0 3px $bo
$swal2-toast-background: $borderless-theme-color;
$swal2-toast-button-focus-box-shadow: 0 0 0 1px $borderless-theme-color, 0 0 0 3px $borderless-outline-color;

@import '~sweetalert2/src/sweetalert2';
@import 'node_modules/sweetalert2/src/sweetalert2';
2 changes: 1 addition & 1 deletion bulma/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ import Swal from 'sweetalert2/src/sweetalert2.js'

`your-app.scss`:
```scss
@import '~@sweetalert2/theme-bulma/bulma.scss';
@import 'node_modules/sweetalert2/theme-bulma/bulma.scss';
```
4 changes: 2 additions & 2 deletions bulma/bulma.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "~sweetalert2/src/variables";
@import "node_modules/sweetalert2/src/variables.scss";

// override SASS variables here

Expand Down Expand Up @@ -192,7 +192,7 @@ $swal2-progress-step-color: $white;
$swal2-active-step-background: $blue;
$swal2-active-step-color: $white;

@import "~sweetalert2/src/sweetalert2";
@import "node_modules/sweetalert2/src/sweetalert2.scss";

.swal2-styled {
&.swal2-cancel {
Expand Down
2 changes: 1 addition & 1 deletion dark/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ import Swal from 'sweetalert2/src/sweetalert2.js'

`your-app.scss`:
```scss
@import '~@sweetalert2/theme-dark/dark.scss';
@import 'node_modules/sweetalert2/theme-dark/dark.scss';
```
4 changes: 2 additions & 2 deletions dark/dark.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~sweetalert2/src/variables';
@import 'node_modules/sweetalert2/src/variables';

$swal2-dark-theme-black: #19191a;
$swal2-dark-theme-white: #e1e1e1;
Expand Down Expand Up @@ -34,4 +34,4 @@ $swal2-button-focus-box-shadow: 0 0 0 1px $swal2-background, 0 0 0 3px $swal2-ou
$swal2-toast-background: $swal2-dark-theme-black;
$swal2-toast-button-focus-box-shadow: 0 0 0 1px $swal2-background, 0 0 0 3px $swal2-outline-color;

@import '~sweetalert2/src/sweetalert2';
@import 'node_modules/sweetalert2/src/sweetalert2';
2 changes: 1 addition & 1 deletion default/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ import Swal from 'sweetalert2/src/sweetalert2.js'

`your-app.scss`:
```scss
@import '~@sweetalert2/theme-default/default.scss';
@import 'node_modules/sweetalert2/theme-default/default.scss';
```
4 changes: 2 additions & 2 deletions default/default.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import '~sweetalert2/src/variables';
@import '~sweetalert2/src/sweetalert2';
@import 'node_modules/sweetalert2/src/variables';
@import 'node_modules/sweetalert2/src/sweetalert2';
2 changes: 1 addition & 1 deletion material-ui/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ import Swal from 'sweetalert2/src/sweetalert2.js'

`your-app.scss`:
```scss
@import '~@sweetalert2/theme-material-ui/material-ui.scss';
@import 'node_modules/sweetalert2/theme-material-ui/material-ui.scss';
```
4 changes: 2 additions & 2 deletions material-ui/material-ui.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@use 'sass:math';

@import '~sweetalert2/src/variables';
@import 'node_modules/sweetalert2/src/variables';

// Theme variables
$material-ui-blue: #2196f3;
Expand Down Expand Up @@ -52,7 +52,7 @@ $swal2-close-button-hover-color: $swal2-close-button-color;
$checkbox-size-px: 18;
$checkbox-left-px: -2;

@import '~sweetalert2/src/sweetalert2';
@import 'node_modules/sweetalert2/src/sweetalert2';

// Temporary / Permanent workarounds
// Input validation error
Expand Down
2 changes: 1 addition & 1 deletion minimal/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ import Swal from 'sweetalert2/src/sweetalert2.js'

`your-app.scss`:
```scss
@import '~@sweetalert2/theme-minimal/minimal.scss';
@import 'node_modules/sweetalert2/theme-minimal/minimal.scss';
```
4 changes: 2 additions & 2 deletions minimal/minimal.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~sweetalert2/src/variables';
@import 'node_modules/sweetalert2/src/variables';

// BOX MODEL
$swal2-border-radius: 0;
Expand Down Expand Up @@ -35,4 +35,4 @@ $swal2-toast-success-line-long-animation: none;
$swal2-toast-border: 1px solid lighten($swal2-black, 85);
$swal2-toast-box-shadow: none;

@import '~sweetalert2/src/sweetalert2';
@import 'node_modules/sweetalert2/src/sweetalert2';
4 changes: 2 additions & 2 deletions tools/create-new-theme.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ const sampleTheme = 'default'
// Create ${themeName}.scss
fs.writeFileSync(
join(themeName, `${themeName}.scss`),
`@import '~sweetalert2/src/variables';\n\n` +
`@import 'node_modules/sweetalert2/src/variables';\n\n` +
`// override SASS variables here\n\n` +
`@import '~sweetalert2/src/sweetalert2';\n`
`@import 'node_modules/sweetalert2/src/sweetalert2';\n`
)

await execute(`gulp watch --start-path ${themeName}`)
Expand Down
2 changes: 1 addition & 1 deletion wordpress-admin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import Swal from 'sweetalert2/src/sweetalert2.js'

`your-app.scss`:
```scss
@import '~@sweetalert2/theme-wordpress-admin/wordpress-admin.scss';
@import 'node_modules/sweetalert2/theme-wordpress-admin/wordpress-admin.scss';
```

Integration
Expand Down
4 changes: 2 additions & 2 deletions wordpress-admin/wordpress-admin.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~sweetalert2/src/variables';
@import 'node_modules/sweetalert2/src/variables';
@import './animations';

$wordpress-blue: rgb(0, 124, 186);
Expand Down Expand Up @@ -116,7 +116,7 @@ $swal2-toast-footer-font-size: 13px;
$swal2-timer-progress-bar-height: .25em;
$swal2-timer-progress-bar-background: $wordpress-blue;

@import '~sweetalert2/src/sweetalert2';
@import 'node_modules/sweetalert2/src/sweetalert2';

.swal2-success-ring {
display: none;
Expand Down

0 comments on commit 3f76134

Please sign in to comment.