Skip to content

Modernize Bootstrap Sass: Migrate from @import to @use/@forward syntax #9123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
seuros wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Modernize Bootstrap Sass: Migrate from @import to @use/@forward syntax #9123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions src/opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap-dialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@import "config/colors";
@use "sass:map";
@use "config/colors" as colors;

.modal-backdrop {
z-index: -1;
Expand Down Expand Up @@ -50,7 +51,7 @@

&.type-primary {
.modal-header {
background-color: map-get($colors, brand-primary);
background-color: map.get(colors.$colors, brand-primary);
}
}

Expand Down
7 changes: 4 additions & 3 deletions src/opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap-select.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
@use "sass:map";
/*!
* Bootstrap-select v1.13.18 (https://developer.snapappointments.com/bootstrap-select)
*
* Copyright 2012-2020 SnapAppointments, LLC
* Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE)
*/

@import "config/colors";
@use "config/colors" as colors;

@-webkit-keyframes bs-notify-fadeOut {
0% {
Expand Down Expand Up @@ -310,7 +311,7 @@ select.selectpicker {
margin: 0 2%;
min-height: 26px;
padding: 3px 5px;
background: map-get($colors, content-background);
background: map.get(colors.$colors, content-background);
border: 1px solid #e3e3e3;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
Expand All @@ -327,7 +328,7 @@ select.selectpicker {
}
.bootstrap-select .no-results {
padding: 3px;
background: map-get($colors, content-background);
background: map.get(colors.$colors, content-background);
margin: 0 5px;
white-space: nowrap;
}
Expand Down
3 changes: 3 additions & 0 deletions src/opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap/_alerts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "variables" as *;
@use "mixins" as *;

//
// Alerts
// --------------------------------------------------
Expand Down
3 changes: 3 additions & 0 deletions src/opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap/_badges.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "variables" as *;
@use "mixins" as *;

//
// Badges
// --------------------------------------------------
Expand Down
3 changes: 3 additions & 0 deletions src/opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap/_breadcrumbs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "variables" as *;
@use "mixins" as *;

//
// Breadcrumbs
// --------------------------------------------------
Expand Down
9 changes: 6 additions & 3 deletions src/opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap/_button-groups.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "variables" as *;
@use "mixins" as *;

//
// Button groups
// --------------------------------------------------
Expand Down Expand Up @@ -96,9 +99,9 @@
//
// Remix the default button sizing classes into new ones for easier manipulation.

.btn-group-xs > .btn { @extend .btn-xs; }
.btn-group-sm > .btn { @extend .btn-sm; }
.btn-group-lg > .btn { @extend .btn-lg; }
.btn-group-xs > .btn { @extend .btn-xs !optional; }
.btn-group-sm > .btn { @extend .btn-sm !optional; }
.btn-group-lg > .btn { @extend .btn-lg !optional; }


// Split button dropdowns
Expand Down
3 changes: 3 additions & 0 deletions src/opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "variables" as *;
@use "mixins" as *;

//
// Buttons
// --------------------------------------------------
Expand Down
3 changes: 3 additions & 0 deletions src/opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap/_carousel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "variables" as *;
@use "mixins" as *;

//
// Carousel
// --------------------------------------------------
Expand Down
3 changes: 3 additions & 0 deletions src/opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap/_close.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "variables" as *;
@use "mixins" as *;

//
// Close icons
// --------------------------------------------------
Expand Down
2 changes: 2 additions & 0 deletions src/opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap/_code.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "variables" as *;

//
// Code (inline and block)
// --------------------------------------------------
Expand Down
3 changes: 3 additions & 0 deletions ...opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap/_component-animations.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "variables" as *;
@use "mixins" as *;

//
// Component animations
// --------------------------------------------------
Expand Down
3 changes: 3 additions & 0 deletions src/opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap/_dropdowns.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "variables" as *;
@use "mixins" as *;

//
// Dropdown menus
// --------------------------------------------------
Expand Down
6 changes: 5 additions & 1 deletion src/opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap/_forms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
@use "sass:color";
@use "variables" as *;
@use "mixins" as *;

//
// Forms
// --------------------------------------------------
Expand Down Expand Up @@ -378,7 +382,7 @@ input[type="checkbox"] {
display: block; // account for any element using help-block
margin-top: 5px;
margin-bottom: 10px;
color: lighten($text-color, 25%); // lighten the text some for contrast
color: color.adjust($text-color, $lightness: 25%); // lighten the text some for contrast
}


Expand Down
2 changes: 2 additions & 0 deletions src/opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap/_glyphicons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "variables" as *;

//= depend_on "bootstrap/glyphicons-halflings-regular.eot"
//= depend_on "bootstrap/glyphicons-halflings-regular.svg"
//= depend_on "bootstrap/glyphicons-halflings-regular.ttf"
Expand Down
3 changes: 3 additions & 0 deletions src/opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap/_grid.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "variables" as *;
@use "mixins" as *;

//
// Grid system
// --------------------------------------------------
Expand Down
3 changes: 3 additions & 0 deletions src/opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap/_input-groups.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "variables" as *;
@use "mixins" as *;

//
// Input groups
// --------------------------------------------------
Expand Down
6 changes: 5 additions & 1 deletion src/opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap/_jumbotron.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
@use "sass:color";
@use "variables" as *;
@use "mixins" as *;

//
// Jumbotron
// --------------------------------------------------
Expand All @@ -20,7 +24,7 @@
}

> hr {
border-top-color: darken($jumbotron-bg, 10%);
border-top-color: color.adjust($jumbotron-bg, $lightness: -10%);
}

.container & {
Expand Down
3 changes: 3 additions & 0 deletions src/opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap/_labels.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "variables" as *;
@use "mixins" as *;

//
// Labels
// --------------------------------------------------
Expand Down
3 changes: 3 additions & 0 deletions src/opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap/_list-group.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "variables" as *;
@use "mixins" as *;

//
// List groups
// --------------------------------------------------
Expand Down
3 changes: 3 additions & 0 deletions src/opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap/_media.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "variables" as *;
@use "mixins" as *;

// Media objects
// Source: http://stubbornella.org/content/?p=497
// --------------------------------------------------
Expand Down
58 changes: 29 additions & 29 deletions src/opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,38 @@
// --------------------------------------------------

// Utilities
@import "mixins/hide-text";
@import "mixins/opacity";
@import "mixins/image";
@import "mixins/labels";
@import "mixins/reset-filter";
@import "mixins/resize";
@import "mixins/responsive-visibility";
@import "mixins/size";
@import "mixins/tab-focus";
@import "mixins/text-emphasis";
@import "mixins/text-overflow";
@import "mixins/vendor-prefixes";
@forward "mixins/hide-text";
@forward "mixins/opacity";
@forward "mixins/image";
@forward "mixins/labels";
@forward "mixins/reset-filter";
@forward "mixins/resize";
@forward "mixins/responsive-visibility";
@forward "mixins/size";
@forward "mixins/tab-focus";
@forward "mixins/text-emphasis";
@forward "mixins/text-overflow";
@forward "mixins/vendor-prefixes";

// Components
@import "mixins/alerts";
@import "mixins/buttons";
@import "mixins/panels";
@import "mixins/pagination";
@import "mixins/list-group";
@import "mixins/nav-divider";
@import "mixins/forms";
@import "mixins/progress-bar";
@import "mixins/table-row";
@forward "mixins/alerts";
@forward "mixins/buttons";
@forward "mixins/panels";
@forward "mixins/pagination";
@forward "mixins/list-group";
@forward "mixins/nav-divider";
@forward "mixins/forms";
@forward "mixins/progress-bar";
@forward "mixins/table-row";

// Skins
@import "mixins/background-variant";
@import "mixins/border-radius";
@import "mixins/gradients";
@forward "mixins/background-variant";
@forward "mixins/border-radius";
@forward "mixins/gradients";

// Layout
@import "mixins/clearfix";
@import "mixins/center-block";
@import "mixins/nav-vertical-align";
@import "mixins/grid-framework";
@import "mixins/grid";
@forward "mixins/clearfix";
@forward "mixins/center-block";
@forward "mixins/nav-vertical-align";
@forward "mixins/grid-framework";
@forward "mixins/grid";
3 changes: 3 additions & 0 deletions src/opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap/_modals.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "variables" as *;
@use "mixins" as *;

//
// Modals
// --------------------------------------------------
Expand Down
8 changes: 6 additions & 2 deletions src/opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap/_navbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
@use "sass:color";
@use "variables" as *;
@use "mixins" as *;

//
// Navbars
// --------------------------------------------------
Expand Down Expand Up @@ -309,7 +313,7 @@
@include box-shadow($shadow);

// Mixin behavior for optimum display
@extend .form-inline;
@extend .form-inline !optional;

.form-group {
@media (max-width: $grid-float-breakpoint-max) {
Expand Down Expand Up @@ -583,7 +587,7 @@

.navbar-collapse,
.navbar-form {
border-color: darken($navbar-inverse-bg, 7%);
border-color: color.adjust($navbar-inverse-bg, $lightness: -7%);
}

// Dropdowns
Expand Down
3 changes: 3 additions & 0 deletions src/opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap/_navs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "variables" as *;
@use "mixins" as *;

//
// Navs
// --------------------------------------------------
Expand Down
3 changes: 3 additions & 0 deletions src/opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap/_normalize.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "variables" as *;
@use "mixins" as *;

/*! normalize.css v3.0.1 | MIT License | git.io/normalize */

//
Expand Down
3 changes: 3 additions & 0 deletions src/opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap/_pager.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "variables" as *;
@use "mixins" as *;

//
// Pager pagination
// --------------------------------------------------
Expand Down
3 changes: 3 additions & 0 deletions src/opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap/_pagination.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "variables" as *;
@use "mixins" as *;

//
// Pagination (multiple pages)
// --------------------------------------------------
Expand Down
3 changes: 3 additions & 0 deletions src/opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap/_panels.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "variables" as *;
@use "mixins" as *;

//
// Panels
// --------------------------------------------------
Expand Down
3 changes: 2 additions & 1 deletion src/opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap/_popovers.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@use "sass:color";
//
// Popovers
// --------------------------------------------------
Expand Down Expand Up @@ -36,7 +37,7 @@
font-weight: normal;
line-height: 18px;
background-color: $popover-title-bg;
border-bottom: 1px solid darken($popover-title-bg, 5%);
border-bottom: 1px solid color.adjust($popover-title-bg, $lightness: -5%);
border-radius: ($border-radius-large - 1) ($border-radius-large - 1) 0 0;
}

Expand Down
3 changes: 3 additions & 0 deletions src/opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap/_print.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "variables" as *;
@use "mixins" as *;

//
// Basic print styles
// --------------------------------------------------
Expand Down
3 changes: 3 additions & 0 deletions src/opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap/_progress-bars.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "variables" as *;
@use "mixins" as *;

//
// Progress bars
// --------------------------------------------------
Expand Down
3 changes: 3 additions & 0 deletions src/opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap/_responsive-embed.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "variables" as *;
@use "mixins" as *;

// Embeds responsive
//
// Credit: Nicolas Gallagher and SUIT CSS.
Expand Down
3 changes: 3 additions & 0 deletions ...opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap/_responsive-utilities.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "variables" as *;
@use "mixins" as *;

//
// Responsive: Utility classes
// --------------------------------------------------
Expand Down
3 changes: 3 additions & 0 deletions src/opnsense/www/themes/opnsense-dark/assets/stylesheets/bootstrap/_scaffolding.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "variables" as *;
@use "mixins" as *;

//
// Scaffolding
// --------------------------------------------------
Expand Down
Loading