Skip to content

Commit

Permalink
Updates boostrap, node-sass and other dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
tabuna committed Jan 18, 2024
1 parent e0c7d9e commit bdcc6c4
Show file tree
Hide file tree
Showing 12 changed files with 34 additions and 40 deletions.
7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@hotwired/turbo": "^7.2.0",
"@popperjs/core": "^2.9.2",
"axios": "^1.1.3",
"bootstrap": "~5.2.0",
"bootstrap": "~5.3.0",
"codeflask": "^1.4.0",
"cropperjs": "^1.5.11",
"cross-env": "^7.0.0",
Expand All @@ -29,15 +29,14 @@
"inputmask": "^5.0.6",
"laravel-mix": "^6.0.16",
"leaflet": "^1.7.1",
"node-sass": "^9.0.0",
"quill": "^1.3.7",
"simplemde": "^1.11",
"sortablejs": "^1.13.0",
"tom-select": "2.2.2",
"tom-select": "^2.3.1",
"postcss": "^8.2.10",
"resolve-url-loader": "^5.0.0",
"rtlcss": "^4.0.0",
"sass": "^1.32.8",
"sass": "^1.69.7",
"sass-loader": "^13.0.2",
"vue-template-compiler": "^2.6.12"
}
Expand Down
18 changes: 6 additions & 12 deletions public/css/orchid.css

Large diffs are not rendered by default.

21 changes: 8 additions & 13 deletions public/css/orchid.rtl.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/css/orchid.rtl.css.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions public/js/orchid.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/orchid.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/vendor.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/vendor.js.map

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions public/mix-manifest.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions resources/sass/core/tables.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
.table {
@extend .rounded;
overflow: hidden;
thead {
tr {
th {
Expand Down
4 changes: 4 additions & 0 deletions resources/sass/theme/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ $font-size-lg: $font-size-base * 1.25;
$link-color: darken($text-color, 15%);
$link-hover-color: darken($text-color, 30%);

$dropdown-bg: $white;
$dropdown-border-radius: 0.35rem;
$border-radius-base: 0.2rem;
$border-color: darken($light, 5%);
Expand Down Expand Up @@ -69,13 +70,15 @@ $nav-bg: lighten($light, 3%);
$nav-bg-black: #313d4f;
$badge-bg: darken($light, 10%);

$list-group-bg: $white;
$list-group-item-border: lighten($border-color, 3%);
$list-group-item-hover: lighten($light, 3%);
$list-group-item-focus: darken($light, 3%);
$list-group-select-color: #dbeef9;
$list-group-active-color: $cyan;


$table-bg: $white;
$table-border-color: lighten($border-color, 2%);
$table-group-separator-color: lighten($border-color, 2%);
$table-striped-color: lighten($dark, 4.5%);
Expand Down Expand Up @@ -144,5 +147,6 @@ $breadcrumb-active-color: #495057;

// modals

$modal-content-bg: $white;
$modal-backdrop-opacity: .75;
$modal-content-border-width: 0;
2 changes: 1 addition & 1 deletion webpack.mix.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ if (!mix.inProduction()) {

mix
.sass('resources/sass/app.scss', 'css/orchid.css', {
implementation: require('node-sass'),
implementation: require('sass'),
})
.options({
processCssUrls: false,
Expand Down

0 comments on commit bdcc6c4

Please sign in to comment.