Skip to content

Commit

Permalink
refactor: change @import in favor of @use and @forward.
Browse files Browse the repository at this point in the history
  • Loading branch information
sciborrudnicki committed May 20, 2022
1 parent 9277d9d commit 4110d67
Show file tree
Hide file tree
Showing 71 changed files with 250 additions and 96 deletions.
2 changes: 2 additions & 0 deletions src/_accordions.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'variables' as *;

// Accordions
.accordion {
input:checked ~,
Expand Down
2 changes: 2 additions & 0 deletions src/_animations.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'variables' as *;

// Animations
@keyframes loading {
0% {
Expand Down
2 changes: 2 additions & 0 deletions src/_asian.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'variables' as *;

// Optimized for East Asian CJK
html:lang(zh),
html:lang(zh-Hans),
Expand Down
3 changes: 3 additions & 0 deletions src/_autocomplete.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use 'mixins/shadow' as *;
@use 'variables' as *;

// Autocomplete
.form-autocomplete {
position: relative;
Expand Down
5 changes: 4 additions & 1 deletion src/_avatars.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use 'mixins/avatar' as *;
@use 'variables' as *;

// Avatars
.avatar {
@include avatar-base();
Expand Down Expand Up @@ -74,4 +77,4 @@
transform: translate(-50%, -50%);
z-index: $zindex-0;
}
}
}
2 changes: 2 additions & 0 deletions src/_badges.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'variables' as *;

// Badges
.badge {
position: relative;
Expand Down
2 changes: 2 additions & 0 deletions src/_bars.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'variables' as *;

// Bars
.bar {
background: $bg-color-dark;
Expand Down
3 changes: 3 additions & 0 deletions src/_base.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use 'variables' as *;
@use 'mixins/shadow' as *;

// Base
*,
*::before,
Expand Down
2 changes: 2 additions & 0 deletions src/_breadcrumbs.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'variables' as *;

// Breadcrumbs
.breadcrumb {
list-style: none;
Expand Down
4 changes: 4 additions & 0 deletions src/_buttons.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
@use 'mixins/button' as *;
@use 'mixins/shadow' as *;
@use 'variables' as *;

// Buttons
.btn {
appearance: none;
Expand Down
3 changes: 3 additions & 0 deletions src/_calendars.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use 'mixins/shadow' as *;
@use 'variables' as *;

// Calendars
.calendar {
border: $border-width solid $border-color;
Expand Down
2 changes: 2 additions & 0 deletions src/_cards.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'variables' as *;

// Cards
.card {
background: $bg-color-light;
Expand Down
6 changes: 4 additions & 2 deletions src/_carousels.scss
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
@use 'variables' as *;

// Carousels
// The number of carousel images
$carousel-number: 8;

%carousel-image-checked {
%carousel-image-checked {
animation: carousel-slidein .75s ease-in-out 1;
opacity: 1;
z-index: $zindex-1;
}

%carousel-nav-checked {
%carousel-nav-checked {
color: $gray-color-light;
}

Expand Down
2 changes: 2 additions & 0 deletions src/_chips.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'variables' as *;

// Chips
.chip {
align-items: center;
Expand Down
3 changes: 3 additions & 0 deletions src/_codes.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use 'mixins/label' as *;
@use 'variables' as *;

// Codes
code {
@include label-base();
Expand Down
2 changes: 2 additions & 0 deletions src/_columns-order.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'variables' as *;

// Columns order
@for $i from 1 through $columns-count {
.order-#{$i} { -ms-flex-order: $i; order: $i; }
Expand Down
2 changes: 2 additions & 0 deletions src/_comparison-sliders.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'variables' as *;

// Image comparison slider
// Credit: http://codepen.io/solipsistacp/pen/Gpmaq
.comparison-slider {
Expand Down
2 changes: 2 additions & 0 deletions src/_dropdowns.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'variables' as *;

// Dropdown
.dropdown {
display: inline-block;
Expand Down
2 changes: 2 additions & 0 deletions src/_empty.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'variables' as *;

// Empty states (or Blank slates)
.empty {
background: $bg-color;
Expand Down
10 changes: 6 additions & 4 deletions src/_filters.scss
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
// Filters
// The number of filter options
@use 'variables' as *;

// Filters
// The number of filter options
$filter-number: 8 !default;

%filter-checked-nav {
%filter-checked-nav {
background: $primary-color;
color: $light-color;
}

%filter-checked-body {
%filter-checked-body {
display: none;
}

Expand Down
5 changes: 4 additions & 1 deletion src/_forms.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use 'mixins/shadow' as *;
@use 'variables' as *;

// Forms
.form-group {
&:not(:last-child) {
Expand Down Expand Up @@ -122,7 +125,7 @@ textarea.form-input {
padding: $control-padding-y $control-padding-x;
vertical-align: middle;
width: 100%;
background: $bg-color-light;
background: $bg-color-light;
&:focus {
@include control-shadow();
border-color: $primary-color;
Expand Down
4 changes: 3 additions & 1 deletion src/_hero.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'variables' as *;

// Hero
.hero {
display: flex;
Expand All @@ -19,4 +21,4 @@
.hero-body {
padding: $layout-spacing;
}
}
}
8 changes: 4 additions & 4 deletions src/_icons.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// CSS Icons
@import "icons/icons-core";
@import "icons/icons-navigation";
@import "icons/icons-action";
@import "icons/icons-object";
@forward 'icons/icons-core';
@forward 'icons/icons-navigation';
@forward 'icons/icons-action';
@forward 'icons/icons-object';
5 changes: 4 additions & 1 deletion src/_labels.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use 'variables' as *;
@use 'mixins/label' as *;

// Labels
.label {
@include label-base();
Expand All @@ -8,7 +11,7 @@
&.label-rounded {
border-radius: 5rem;
padding-left: .4rem;
padding-right: .4rem;
padding-right: .4rem;
}

// Label colors
Expand Down
2 changes: 2 additions & 0 deletions src/_layout.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'variables' as *;

// Layout
.container {
margin-left: auto;
Expand Down
2 changes: 2 additions & 0 deletions src/_media.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'variables' as *;

// Media
// Image responsive
.img-responsive {
Expand Down
5 changes: 4 additions & 1 deletion src/_menus.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use 'mixins/shadow' as *;
@use 'variables' as *;

// Menus
.menu {
@include shadow-variant(.05rem);
Expand Down Expand Up @@ -63,4 +66,4 @@
margin-right: $unit-2;
}
}
}
}
2 changes: 2 additions & 0 deletions src/_meters.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'variables' as *;

// Meters
// Credit: https://css-tricks.com/html5-meter-element/
.meter {
Expand Down
18 changes: 9 additions & 9 deletions src/_mixins.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// Mixins
@import "mixins/avatar";
@import "mixins/button";
@import "mixins/clearfix";
@import "mixins/color";
@import "mixins/label";
@import "mixins/position";
@import "mixins/shadow";
@import "mixins/text";
@import "mixins/toast";
@forward 'mixins/avatar';
@forward 'mixins/button';
@forward 'mixins/clearfix';
@forward 'mixins/color';
@forward 'mixins/label';
@forward 'mixins/position';
@forward 'mixins/shadow';
@forward 'mixins/text';
@forward 'mixins/toast';
3 changes: 3 additions & 0 deletions src/_modals.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use 'mixins/shadow' as *;
@use 'variables' as *;

// Modals
.modal {
align-items: center;
Expand Down
2 changes: 2 additions & 0 deletions src/_navbar.scss
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'variables' as *;

// Navbar
.navbar {
align-items: stretch;
Expand Down
2 changes: 2 additions & 0 deletions src/_navs.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'variables' as *;

// Navs
.nav {
display: flex;
Expand Down
2 changes: 2 additions & 0 deletions src/_normalize.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'variables' as *;

/* Manually forked from Normalize.css */
/* normalize.css v5.0.0 | MIT License | github.com/necolas/normalize.css */

Expand Down
4 changes: 3 additions & 1 deletion src/_off-canvas.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'variables' as *;

// Off canvas menus
$off-canvas-breakpoint: $size-lg !default;

Expand Down Expand Up @@ -80,7 +82,7 @@ $off-canvas-breakpoint: $size-lg !default;
.off-canvas-toggle {
display: none;
}

.off-canvas-sidebar {
flex: 0 0 auto;
position: relative;
Expand Down
2 changes: 2 additions & 0 deletions src/_pagination.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'variables' as *;

// Pagination
.pagination {
display: flex;
Expand Down
2 changes: 2 additions & 0 deletions src/_panels.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'variables' as *;

// Panels
.panel {
border: $border-width solid $border-color;
Expand Down
3 changes: 3 additions & 0 deletions src/_parallax.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use './mixins/shadow' as *;
@use 'variables' as *;

// Parallax
$parallax-deg: 3deg !default;
$parallax-offset: 4.5px !default;
Expand Down
3 changes: 3 additions & 0 deletions src/_popovers.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use 'mixins/shadow' as *;
@use 'variables' as *;

// Popovers
.popover {
display: inline-block;
Expand Down
2 changes: 2 additions & 0 deletions src/_progress.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'variables' as *;

// Progress
// Credit: https://css-tricks.com/html5-progress-element/
.progress {
Expand Down
3 changes: 3 additions & 0 deletions src/_sliders.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use 'mixins/shadow' as *;
@use 'variables' as *;

// Sliders
// Credit: https://css-tricks.com/styling-cross-browser-compatible-range-inputs-css/
.slider {
Expand Down
2 changes: 2 additions & 0 deletions src/_steps.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'variables' as *;

// Steps
.step {
display: flex;
Expand Down
2 changes: 2 additions & 0 deletions src/_tables.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'variables' as *;

// Tables
.table {
border-collapse: collapse;
Expand Down
2 changes: 2 additions & 0 deletions src/_tabs.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'variables' as *;

// Tabs
.tab {
align-items: center;
Expand Down
3 changes: 3 additions & 0 deletions src/_tiles.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use 'mixins/text.scss' as *;
@use 'variables' as *;

// Tiles
.tile {
align-content: space-between;
Expand Down
2 changes: 2 additions & 0 deletions src/_timelines.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'variables' as *;

// Timelines
.timeline {
.timeline-item {
Expand Down
5 changes: 4 additions & 1 deletion src/_toasts.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use 'mixins/toast' as *;
@use 'variables' as *;

// Toasts
.toast {
@include toast-variant($dark-color);
Expand Down Expand Up @@ -27,7 +30,7 @@
a {
color: $light-color;
text-decoration: underline;

&:focus,
&:hover,
&:active,
Expand Down

0 comments on commit 4110d67

Please sign in to comment.