Skip to content

Commit

Permalink
Update a Bootstrap v5.2.0-beta1
Browse files Browse the repository at this point in the history
  • Loading branch information
rogertm committed May 25, 2022
1 parent c7abbce commit e31ff80
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 91 deletions.
43 changes: 29 additions & 14 deletions assets/src/scss/_bootstrap.scss
Original file line number Diff line number Diff line change
@@ -1,22 +1,43 @@
// Import Bootstrap

// Custom.scss
// Option A: Include all of Bootstrap
// @import '../../../node_modules/bootstrap/scss/bootstrap';

// Include any default variable overrides here (though functions won't be available)

// @import "../../../node_modules/bootstrap/scss/bootstrap";

// Then add additional custom code here

// Custom.scss
// Option B: Include parts of Bootstrap
// Configuration

// 1. Include functions first (so you can manipulate colors, SVGs, calc, etc)
@import "../../../node_modules/bootstrap/scss/functions";

// 2. Include any default variable overrides here

// 3. Include remainder of required Bootstrap stylesheets
@import "../../../node_modules/bootstrap/scss/variables";
@import "../../../node_modules/bootstrap/scss/mixins";
@import "../../../node_modules/bootstrap/scss/utilities";

// Layout & components
// 4. Include any default map overrides here

// 5. Include remainder of required parts
@import "../../../node_modules/bootstrap/scss/maps";
@import "../../../node_modules/bootstrap/scss/mixins";
@import "../../../node_modules/bootstrap/scss/root";

// 6. Optionally include any other parts as needed
@import "../../../node_modules/bootstrap/scss/utilities";
@import "../../../node_modules/bootstrap/scss/reboot";
@import "../../../node_modules/bootstrap/scss/type";
@import "../../../node_modules/bootstrap/scss/images";
@import "../../../node_modules/bootstrap/scss/containers";
@import "../../../node_modules/bootstrap/scss/grid";
@import "../../../node_modules/bootstrap/scss/helpers";

// 7. Optionally include utilities API last to generate classes based on the Sass map in `_utilities.scss`
@import "../../../node_modules/bootstrap/scss/utilities/api";

// 8. Add additional custom code here
// @import "../../../node_modules/bootstrap/scss/tables";
@import "../../../node_modules/bootstrap/scss/forms";
@import "../../../node_modules/bootstrap/scss/buttons";
Expand All @@ -41,10 +62,4 @@
// @import "../../../node_modules/bootstrap/scss/carousel";
// @import "../../../node_modules/bootstrap/scss/spinners";
// @import "../../../node_modules/bootstrap/scss/offcanvas";

// Helpers
@import "../../../node_modules/bootstrap/scss/helpers";

// Utilities
@import "../../../node_modules/bootstrap/scss/utilities/api";

// @import "../../../node_modules/bootstrap/scss/placeholders";
47 changes: 0 additions & 47 deletions assets/src/scss/admin.scss

This file was deleted.

11 changes: 0 additions & 11 deletions classes/class.theming-enqueue.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,6 @@ public function scripts()
endif;
}

/**
* Handle admin styles
*
* @since Theming_ 0.0.1
*/
public function admin_styles()
{
wp_register_style( 'theming-admin', get_theme_file_uri( '/assets/dist/css/admin.css' ) );
wp_enqueue_style( 'theming-admin' );
}

/**
* Get Instance
*
Expand Down
42 changes: 24 additions & 18 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"devDependencies": {
"@popperjs/core": "^2.11.5",
"autoprefixer": "^10.4.7",
"bootstrap": "^5.1.3",
"bootstrap": "^5.2.0-beta1",
"clean-webpack-plugin": "^4.0.0",
"node-sass": "^7.0.1",
"nodemon": "^2.0.16",
Expand Down

0 comments on commit e31ff80

Please sign in to comment.