Skip to content

Commit 63f128f

Browse files
committed
fix(sass): move global style imports to component variable files
fixes #9323
1 parent 15ba83b commit 63f128f

File tree

103 files changed

+92
-58
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+92
-58
lines changed

packages/vuetify/src/components/VAlert/VAlert.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// Imports
2-
@import '../../styles/styles.sass'
32
@import './_variables.scss'
43

54
// Theme

packages/vuetify/src/components/VAlert/_variables.scss

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import '../../styles/styles.sass';
2+
13
$alert-border-opacity: 0.26 !default;
24
$alert-border-radius: $border-radius-root !default;
35
$alert-border-width: 4px !default;

packages/vuetify/src/components/VAppBar/VAppBar.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import '../../styles/styles.sass'
21
@import './_variables.scss'
32

43
// Block
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
@import '../../styles/styles.sass';
2+
13
$app-bar-transition: .4s opacity map-get($transition, 'fast-out-slow-in') !default;
24
$app-bar-scrolled-title-padding-bottom: 9px !default;
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
@import '../../styles/styles.sass';
2+
13
$autocomplete-enclosed-input-margin-top: 24px;
24
$autocomplete-dense-enclosed-input-margin-top: 20px;

packages/vuetify/src/components/VBadge/VBadge.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// Imports
2-
@import '../../styles/styles.sass'
32
@import './_variables.scss'
43

54
.v-badge

packages/vuetify/src/components/VBadge/_variables.scss

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import '../../styles/styles.sass';
2+
13
$badge-border-radius: 11px !default;
24
$badge-color: map-get($shades, 'white') !default;
35
$badge-font-family: $body-font-family !default;

packages/vuetify/src/components/VBanner/VBanner.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// Imports
2-
@import '../../styles/styles.sass'
32
@import './_variables.scss'
43

54
// Theme
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@import '../../styles/styles.sass';

packages/vuetify/src/components/VBottomNavigation/VBottomNavigation.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import '../../styles/styles.sass'
21
@import './_variables.scss'
32

43
// Theme

packages/vuetify/src/components/VBottomNavigation/_variables.scss

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import '../../styles/styles.sass';
2+
13
$bottom-nav-btn-font-size: map-deep-get($headings, 'caption', 'size') !default;
24
$bottom-nav-btn-min-width: 80px !default;
35
$bottom-nav-btn-max-width: 168px !default;

packages/vuetify/src/components/VBreadcrumbs/VBreadcrumbs.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import '../../styles/styles.sass'
21
@import './_variables'
32

43
// Theme

packages/vuetify/src/components/VBreadcrumbs/_variables.scss

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import '../../styles/styles.sass';
2+
13
$breadcrumbs-flex: 0 1 auto !default;
24
$breadcrumbs-padding: 18px 12px !default;
35
$breadcrumbs-even-child-padding: 0 12px !default;

packages/vuetify/src/components/VBtn/VBtn.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// Imports
2-
@import '../../styles/styles.sass'
32
@import './_variables.scss'
43

54
// Theme

packages/vuetify/src/components/VBtn/_variables.scss

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@import '../../styles/styles.sass';
12
@import '../../styles/tools/_functions.sass';
23

34
$btn-active-opacity: 0.18 !default;

packages/vuetify/src/components/VBtnToggle/VBtnToggle.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// Imports
2-
@import '../../styles/styles.sass'
32
@import './_variables.scss'
43

54
// Theme

packages/vuetify/src/components/VBtnToggle/_variables.scss

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import '../../styles/styles.sass';
2+
13
$btn-toggle-border-radius: $border-radius-root !default;
24
$btn-toggle-shaped-border-radius: 24px !default;
35
$btn-toggle-btn-height: 48px !default;

packages/vuetify/src/components/VCalendar/VCalendarDaily.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import '../../styles/styles.sass'
21
@import './_variables.scss'
32

43
// Theme

packages/vuetify/src/components/VCalendar/VCalendarWeekly.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import '../../styles/styles.sass'
21
@import './_variables.scss'
32

43
// Theme

packages/vuetify/src/components/VCalendar/_variables.scss

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import '../../styles/styles.sass';
2+
13
$calendar-daily-weekday-padding: 3px 0px 0px 0px !default;
24
$calendar-daily-weekday-font-size: 11px !default;
35
$calendar-daily-day-padding: 0px 0px 3px 0px !default;

packages/vuetify/src/components/VCard/VCard.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import '../../styles/styles.sass'
21
@import './_variables.scss'
32

43
// Theme

packages/vuetify/src/components/VCard/_variables.scss

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import '../../styles/styles.sass';
2+
13
$card-border-radius: $border-radius-root !default;
24
$card-shaped-border-radius: 24px !default;
35
$card-title-font-size: map-deep-get($headings, 'h6', 'size') !default;

packages/vuetify/src/components/VCheckbox/VCheckbox.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import '../../styles/styles.sass'
21
@import './_variables.scss'
32

43
.v-input--checkbox
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
@import '../../styles/styles.sass';
2+
13
$checkbox-disabled-opacity: .6 !default;

packages/vuetify/src/components/VChip/VChip.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// Imports
2-
@import '../../styles/styles.sass'
32
@import './_variables.scss'
43

54
// Theme

packages/vuetify/src/components/VChip/_variables.scss

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@import '../../styles/styles.sass';
12
@import '../../styles/tools/_functions.sass';
23

34
$chip-avatar-size: 24px !default;

packages/vuetify/src/components/VChipGroup/VChipGroup.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import '../../styles/styles.sass'
21
@import './_variables.sass'
32

43
// Theme
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
@import '../../styles/styles.sass'
2+
13
$chip-group-margin: 4px 8px 4px 0 !default
24
$chip-group-content-padding: 4px 0 !default

packages/vuetify/src/components/VColorPicker/VColorPicker.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import '../../styles/styles.sass'
21
@import './_variables.scss'
32

43
+theme(v-color-picker) using ($material)

packages/vuetify/src/components/VColorPicker/VColorPickerEdit.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import '../../styles/styles.sass'
21
@import './_variables.scss'
32

43
.v-color-picker__edit

packages/vuetify/src/components/VColorPicker/VColorPickerPreview.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import '../../styles/styles.sass'
21
@import './_variables.scss'
32

43
.v-color-picker

packages/vuetify/src/components/VColorPicker/VColorPickerSwatches.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import '../../styles/styles.sass'
21
@import './_variables.scss'
32

43
.v-color-picker__swatches

packages/vuetify/src/components/VColorPicker/_variables.scss

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import '../../styles/styles.sass';
2+
13
$color-picker-border-radius: $border-radius-root !default;
24
$color-picker-checkerboard: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAGElEQVQYlWNgYGCQwoKxgqGgcJA5h3yFAAs8BRWVSwooAAAAAElFTkSuQmCC) repeat;
35
$color-picker-swatch-color-width: 45px !default;

packages/vuetify/src/components/VCounter/VCounter.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import '../../styles/styles.sass'
21
@import './_variables.scss'
32

43
/* Theme */
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
@import '../../styles/styles.sass';
2+
13
$counter-font-size: 12px !default;
24
$counter-min-height: 12px !default;

packages/vuetify/src/components/VDataTable/VDataTable.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// Imports
2-
@import '../../styles/styles.sass'
32
@import './_variables.scss'
43

54
// Theme

packages/vuetify/src/components/VDataTable/VDataTableHeader.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// Imports
2-
@import '../../styles/styles.sass'
32
@import './_variables.scss'
43

54
// Theme

packages/vuetify/src/components/VDataTable/VSimpleTable.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// Imports
2-
@import '../../styles/styles.sass'
32
@import './_variables.scss'
43

54
// Theme

packages/vuetify/src/components/VDataTable/VVirtualTable.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// Imports
2-
@import '../../styles/styles.sass'
32
@import './_variables.scss'
43

54
.v-virtual-table

packages/vuetify/src/components/VDataTable/_variables.scss

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import '../../styles/styles.sass';
2+
13
$data-table-scroll-bar-width: 17px !default;
24
$data-table-regular-row-height: 48px !default;
35
$data-table-regular-header-height: 48px !default;

packages/vuetify/src/components/VDialog/VDialog.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import '../../styles/styles.sass'
21
@import './_variables.scss'
32

43
// Block
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
@import '../../styles/styles.sass';
2+
13
$dialog-border-radius: $border-radius-root !default;

packages/vuetify/src/components/VDivider/VDivider.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import '../../styles/styles.sass'
21
@import './_variables.scss'
32

43
+theme(v-divider) using ($material)
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
@import '../../styles/styles.sass';
2+
13
$divider-inset-margin: 72px !default;

packages/vuetify/src/components/VExpansionPanel/VExpansionPanel.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import '../../styles/styles.sass'
21
@import './_variables.scss'
32

43
// Theme

packages/vuetify/src/components/VExpansionPanel/_variables.scss

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import '../../styles/styles.sass';
2+
13
$expansion-panel-border-radius: $border-radius-root !default;
24
$expansion-panel-active-margin: 16px !default;
35
$expansion-panel-header-font-size: 0.9375rem !default;

packages/vuetify/src/components/VFooter/VFooter.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import '../../styles/styles.sass'
21
@import './_variables.scss'
32

43
// Theme
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
@import '../../styles/styles.sass';
2+
13
$footer-padding: 6px 16px !default;
24
$footer-padless-padding: 0px !default;

packages/vuetify/src/components/VIcon/VIcon.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// Imports
2-
@import '../../styles/styles.sass'
32
@import './_variables.scss'
43

54
// Theme
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
@import '../../styles/styles.sass';
2+
13
$icon-size: 24px !default;
24
$icon-size-dense: 20px !default;

packages/vuetify/src/components/VItemGroup/VItemGroup.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import '../../styles/styles.sass'
21
@import './_variables.sass'
32

43
.v-item-group
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
@import '../../styles/styles.sass'
2+
13
$item-group-transition: $primary-transition !default

packages/vuetify/src/components/VList/VList.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import '../../styles/styles.sass'
21
@import './_variables.scss'
32
@import './_mixins.sass'
43

packages/vuetify/src/components/VList/VListGroup.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import '../../styles/styles.sass'
21
@import './_variables.scss'
32
@import './_mixins.sass'
43

packages/vuetify/src/components/VList/VListItem.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import '../../styles/styles.sass'
21
@import './_variables.scss'
32

43
// Theme

packages/vuetify/src/components/VList/_variables.scss

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import '../../styles/styles.sass';
2+
13
$avatar-margin-x: 16px !default;
24
$list-border-radius: $border-radius-root !default;
35
$list-dense-subheader-font-size: 0.75rem !default;

packages/vuetify/src/components/VMenu/VMenu.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import '../../styles/styles.sass'
21
@import './_variables.scss'
32

43
.v-menu
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
@import '../../styles/styles.sass';
2+
13
$menu-content-border-radius: $border-radius-root !default;

packages/vuetify/src/components/VPagination/VPagination.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import '../../styles/styles.sass'
21
@import './_variables.scss'
32

43
// Theme
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
@import '../../styles/styles.sass';
2+
13
$pagination-border-radius: $border-radius-root !default;

packages/vuetify/src/components/VPicker/VPicker.sass

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import '../../styles/styles.sass'
21
@import './_variables.scss'
32

43
// Theme
@@ -18,7 +17,7 @@
1817

1918
.v-picker--full-width
2019
display: flex
21-
20+
2221
> .v-picker__body
2322
margin: initial
2423

packages/vuetify/src/components/VPicker/_variables.scss

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import '../../styles/styles.sass';
2+
13
$picker-border-radius: $border-radius-root !default;
24
$picker-title-padding: 16px !default;
35
$picker-inactive-btn-opacity: .6 !default;

packages/vuetify/src/components/VProgressCircular/VProgressCircular.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import '../../styles/styles.sass'
21
@import './_variables.scss'
32

43
.v-progress-circular

packages/vuetify/src/components/VProgressCircular/_variables.scss

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import '../../styles/styles.sass';
2+
13
$progress-circular-rotate-animation: progress-circular-rotate 1.4s linear infinite !default;
24
$progress-circular-rotate-dash: progress-circular-dash 1.4s ease-in-out infinite !default;
35
$process-circular-intermediate-svg-transition: all .2s ease-in-out !default;

packages/vuetify/src/components/VProgressLinear/VProgressLinear.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import '../../styles/styles.sass'
21
@import './_variables.scss'
32

43
+theme(v-progress-linear) using ($material)

packages/vuetify/src/components/VProgressLinear/_variables.scss

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import '../../styles/styles.sass';
2+
13
$progress-linear-border-radius: $border-radius-root !default;
24
$progress-linear-stripe-gradient: linear-gradient(
35
135deg,

packages/vuetify/src/components/VSheet/VSheet.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// Imports
2-
@import '../../styles/styles.sass'
32
@import './_variables.scss'
43

54
// Theme
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
@import '../../styles/styles.sass';
2+
13
$sheet-border-radius: 0px !default;

packages/vuetify/src/components/VSkeletonLoader/VSkeletonLoader.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// Imports
2-
@import '../../styles/styles.sass'
32
@import './_variables.scss'
43

54
// Theme

packages/vuetify/src/components/VSkeletonLoader/_variables.scss

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import '../../styles/styles.sass';
2+
13
$skeleton-loader-border-radius: $border-radius-root !default;
24
$skeleton-loader-button-border-radius: $border-radius-root !default;
35
$skeleton-loader-chip-border-radius: 16px !default;

packages/vuetify/src/components/VSlideGroup/VSlideGroup.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// Imports
2-
@import '../../styles/styles.sass'
32
@import './_variables.scss'
43

54
// Block
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
@import '../../styles/styles.sass';
2+
13
$slide-group-prev-basis: 52px !default;

packages/vuetify/src/components/VSlider/VSlider.sass

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// Imports
2-
@import '../../styles/styles.sass'
32
@import './_variables.scss'
43

54
// Theme

packages/vuetify/src/components/VSlider/_variables.scss

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import '../../styles/styles.sass';
2+
13
$slider-track-width: 2px !default;
24
$slider-track-border-radius: 0 !default;
35
$slider-thumb-size: 12px !default;

0 commit comments

Comments
 (0)