Skip to content

Commit

Permalink
fix(utilities): make $utilities effect sr/disp/elev styles (#16670)
Browse files Browse the repository at this point in the history
Co-authored-by: Kael <kaelwd@gmail.com>
  • Loading branch information
johnleider and KaelWD committed Mar 6, 2023
1 parent 6cc6070 commit e790898
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 35 deletions.
10 changes: 0 additions & 10 deletions packages/vuetify/src/styles/generic/_elevation.scss

This file was deleted.

1 change: 0 additions & 1 deletion packages/vuetify/src/styles/generic/_index.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@use './animations';
@use './colors';
@use './reset';
@use './elevation';
@use './transitions';
@use './rtl';
9 changes: 3 additions & 6 deletions packages/vuetify/src/styles/tools/_sheet.sass
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
@use './elevation' as *
@use './radius' as *

@mixin paper ($elevation, $radius, $shaped-radius)
@include radius($radius)
@include tools.radius($radius)

&:not(.v-sheet--outlined)
@include elevation($elevation)
@include tools.elevation($elevation)

@if ($shaped-radius)
&.v-sheet--shaped
@include radius($shaped-radius)
@include tools.radius($shaped-radius)


@mixin sheet ($component, $elevation, $radius, $shaped-radius)
Expand Down
11 changes: 6 additions & 5 deletions packages/vuetify/src/styles/utilities/_display.sass
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
@use '../settings'

@each $size, $media_query in settings.$display-breakpoints
.hidden
&-#{$size}
@media #{$media_query}
display: none !important
@if (settings.$utilities != false and length(settings.$utilities) > 0)
@each $size, $media_query in settings.$display-breakpoints
.hidden
&-#{$size}
@media #{$media_query}
display: none !important
13 changes: 13 additions & 0 deletions packages/vuetify/src/styles/utilities/_elevation.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
@use '../tools';
@use '../settings';

@if (settings.$utilities != false and length(settings.$utilities) > 0) {
$z: 24;
@while $z >= 0 {
.elevation-#{$z} {
@include tools.elevation($z, $important: true);
}

$z: $z - 1;
}
}
5 changes: 3 additions & 2 deletions packages/vuetify/src/styles/utilities/_index.sass
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
@use 'sass:string'
@use 'sass:map'
@use 'sass:meta'
@use './display.sass'
@use './screenreaders.sass'
@use '../settings'
@use '../tools'
@use './display'
@use './elevation'
@use './screenreaders'

// Utilities
@each $breakpoint in map.keys(settings.$grid-breakpoints)
Expand Down
24 changes: 13 additions & 11 deletions packages/vuetify/src/styles/utilities/_screenreaders.sass
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
// Source: https://github.com/twbs/bootstrap/blob/master/scss/mixins/_screen-reader.scss
@use '../settings'

.d-sr-only,
.d-sr-only-focusable:not(:focus)
border: 0 !important
clip: rect(0, 0, 0, 0) !important
height: 1px !important
margin: -1px !important // Fix for https://github.com/twbs/bootstrap/issues/25686
overflow: hidden !important
padding: 0 !important
position: absolute !important
white-space: nowrap !important
width: 1px !important
@if (settings.$utilities != false and length(settings.$utilities) > 0)
.d-sr-only,
.d-sr-only-focusable:not(:focus)
border: 0 !important
clip: rect(0, 0, 0, 0) !important
height: 1px !important
margin: -1px !important // Fix for https://github.com/twbs/bootstrap/issues/25686
overflow: hidden !important
padding: 0 !important
position: absolute !important
white-space: nowrap !important
width: 1px !important

0 comments on commit e790898

Please sign in to comment.