Skip to content

Commit

Permalink
chore: streamline components deps and vars
Browse files Browse the repository at this point in the history
  • Loading branch information
inikolova committed Oct 18, 2024
1 parent f1107be commit 5155b81
Show file tree
Hide file tree
Showing 361 changed files with 745 additions and 1,274 deletions.
56 changes: 55 additions & 1 deletion packages/bootstrap/scss/_bootstrap_vars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -403,8 +403,26 @@ $line-height-base: 1.5 !default;
$line-height-sm: 1.25 !default;
$line-height-lg: 2 !default;

$h1-font-size: $font-size-base * 2.5 !default;
$h2-font-size: $font-size-base * 2 !default;
$h3-font-size: $font-size-base * 1.75 !default;
$h4-font-size: $font-size-base * 1.5 !default;
$h5-font-size: $font-size-base * 1.25 !default;
$h6-font-size: $font-size-base !default;

$headings-margin-bottom: $spacer * .5 !default;
$headings-font-family: null !default;
$headings-font-style: null !default;
$headings-font-weight: 500 !default;
$headings-line-height: 1.2 !default;
$headings-color: null !default;

$display-font-family: null !default;
$display-font-style: null !default;
$display-font-weight: 300 !default;
$display-line-height: $headings-line-height !default;

$paragraph-margin-bottom: 1rem !default;
// scss-docs-start headings-variables
$headings-margin-bottom: $spacer * .5 !default;
$headings-font-family: null !default;
Expand Down Expand Up @@ -678,7 +696,43 @@ $card-group-margin: $grid-gutter-width * .5 !default;
// scss-docs-end card-variables



$badge-font-size: .75em !default;
$badge-font-weight: $font-weight-bold !default;
$badge-color: $white !default;
$badge-padding-y: .35em !default;
$badge-padding-x: .65em !default;
$badge-border-radius: $border-radius !default;

// Progress bars

// scss-docs-start progress-variables
$progress-height: 1rem !default;
$progress-font-size: $font-size-base * .75 !default;
$progress-bg: $gray-200 !default;
$progress-border-radius: $border-radius !default;
$progress-box-shadow: $box-shadow-inset !default;
$progress-bar-color: $white !default;
$progress-bar-bg: $primary !default;
$progress-bar-animation-timing: 1s linear infinite !default;
$progress-bar-transition: width .6s ease !default;

// Tooltips

// scss-docs-start tooltip-variables
$tooltip-font-size: $font-size-sm !default;
$tooltip-max-width: 200px !default;
$tooltip-color: $white !default;
$tooltip-bg: $black !default;
$tooltip-border-radius: $border-radius !default;
$tooltip-opacity: .9 !default;
$tooltip-padding-y: $spacer * .25 !default;
$tooltip-padding-x: $spacer * .5 !default;
$tooltip-margin: null !default; // TODO: remove this in v6

$tooltip-arrow-width: .8rem !default;
$tooltip-arrow-height: .4rem !default;
// fusv-disable
$tooltip-arrow-color: null !default; // Deprecated in Bootstrap 5.2.0 for CSS variables

// Close

Expand Down
21 changes: 0 additions & 21 deletions packages/bootstrap/scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,24 +33,3 @@ $kendo-zindex-window: 2 !default;
$kendo-focus-shadow: null !default;

$kendo-transition: color .2s ease-in-out, background-color .2s ease-in-out, border-color .2s ease-in-out, box-shadow .2s ease-in-out !default;


// Generic styles

// TODO: refactor once we extract drag drop as separate module


/* @forward "@progress/kendo-theme-default/scss/scss/_variables.scss" with (
// $kendo-enable-shadows: $kendo-enable-shadows,
$kendo-enable-gradients: $kendo-enable-gradients,
$kendo-enable-transitions: $kendo-enable-transitions,
$kendo-enable-focus-contrast: $kendo-enable-focus-contrast,
$kendo-enable-typography: $kendo-enable-typography,
$kendo-use-input-button-width: $kendo-use-input-button-width,
$kendo-use-input-spinner-width: $kendo-use-input-spinner-width,
$kendo-use-input-spinner-icon-offset: $kendo-use-input-spinner-icon-offset,
$kendo-zindex-popup: $kendo-zindex-popup,
$kendo-zindex-window: $kendo-zindex-window,
$kendo-focus-shadow: $kendo-focus-shadow,
$kendo-transition: $kendo-transition
); */
11 changes: 5 additions & 6 deletions packages/bootstrap/scss/action-buttons/_index.scss
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
// Dependencies
@use "../core/_index.scss" as *;
@use "../utils/_index.scss" as *;
@use "../button/_index.scss" as *;

// Component
@forward "./_variables.scss";
@use "./_layout.scss" as *;
@use "./_theme.scss" as *;


// Dependencies
@use "../button/_index.scss" as *;
@use "../core/_index.scss" as *;
@use "../utils/_index.scss" as *;


// Expose
@mixin kendo-action-buttons--styles() {
@include import-once( "action-buttons" ) {
Expand Down
4 changes: 2 additions & 2 deletions packages/bootstrap/scss/action-buttons/_layout.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use "../_variables.scss" as *;
@use "./_variables.scss" as *;
// @use "../_variables.scss" as *;
// @use "./_variables.scss" as *;
@use "@progress/kendo-theme-default/scss/action-buttons/_layout.scss" as *;

@mixin kendo-action-buttons--layout() {
Expand Down
2 changes: 1 addition & 1 deletion packages/bootstrap/scss/action-buttons/_theme.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use "./_variables.scss" as *;
// @use "./_variables.scss" as *;
@use "@progress/kendo-theme-default/scss/action-buttons/_theme.scss" as *;


Expand Down
13 changes: 6 additions & 7 deletions packages/bootstrap/scss/action-sheet/_index.scss
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
// Component
@forward "./_variables.scss";
@use "./_layout.scss" as *;
@use "./_theme.scss" as *;


// Dependencies
@use "../core/_index.scss" as *;
@use "../utils/_index.scss" as *;
@use "../icons/_index.scss" as *;
@use "../utils/_index.scss" as *;
@use "../listgroup/_index.scss" as *;
@use "../popup/_index.scss" as *;

// Component
@forward "./_variables.scss";
@use "./_layout.scss" as *;
@use "./_theme.scss" as *;


// Expose
@mixin kendo-action-sheet--styles() {
Expand Down
4 changes: 2 additions & 2 deletions packages/bootstrap/scss/action-sheet/_layout.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use "../_variables.scss" as *;
@use "./_variables.scss" as *;
// @use "../_variables.scss" as *;
// @use "./_variables.scss" as *;
@use "@progress/kendo-theme-default/scss/action-sheet/_layout.scss" as *;


Expand Down
2 changes: 1 addition & 1 deletion packages/bootstrap/scss/action-sheet/_theme.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use "./_variables.scss" as *;
// @use "./_variables.scss" as *;
@use "@progress/kendo-theme-default/scss/action-sheet/_theme.scss" as *;


Expand Down
10 changes: 4 additions & 6 deletions packages/bootstrap/scss/adaptive/_index.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
// Component
@forward "./_variables.scss";
@use "./_layout.scss" as *;
@use "./_theme.scss" as *;


// Dependencies (TODO: extract variables)
@use "../core/_index.scss" as *;
@use "../listgroup/_index.scss" as *;
Expand All @@ -12,6 +6,10 @@
@use "../switch/_index.scss" as *;
@use "../toolbar/_index.scss" as *;

// Component
@forward "./_variables.scss";
@use "./_layout.scss" as *;
@use "./_theme.scss" as *;

// Expose
@mixin kendo-adaptive--styles() {
Expand Down
4 changes: 2 additions & 2 deletions packages/bootstrap/scss/adaptive/_layout.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use "../_variables.scss" as *;
@use "./_variables.scss" as *;
// @use "../_variables.scss" as *;
// @use "./_variables.scss" as *;
@use "@progress/kendo-theme-default/scss/adaptive/_layout.scss" as *;


Expand Down
2 changes: 1 addition & 1 deletion packages/bootstrap/scss/adaptive/_theme.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use "./_variables.scss" as *;
// @use "./_variables.scss" as *;
@use "@progress/kendo-theme-default/scss/adaptive/_theme.scss" as *;


Expand Down
6 changes: 3 additions & 3 deletions packages/bootstrap/scss/appbar/_index.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// Dependencies
@use "../core/_index.scss" as *;

// Component
@forward "./_variables.scss";
@use "./_layout.scss" as *;
@use "./_theme.scss" as *;


// Dependencies
@use "../core/_index.scss" as *;


// Expose
@mixin kendo-appbar--styles() {
Expand Down
4 changes: 2 additions & 2 deletions packages/bootstrap/scss/appbar/_layout.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use "../_variables.scss" as *;
@use "./_variables.scss" as *;
// @use "../_variables.scss" as *;
// @use "./_variables.scss" as *;
@use "@progress/kendo-theme-default/scss/appbar/_layout.scss" as *;


Expand Down
2 changes: 1 addition & 1 deletion packages/bootstrap/scss/appbar/_theme.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use "./_variables.scss" as *;
// @use "./_variables.scss" as *;
@use "@progress/kendo-theme-default/scss/appbar/_theme.scss" as *;


Expand Down
14 changes: 6 additions & 8 deletions packages/bootstrap/scss/autocomplete/_index.scss
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
// Component
@forward "./_variables.scss";
@use "./_layout.scss" as *;
@use "./_theme.scss" as *;



// Dependencies
@use "../core/_index.scss" as *;
@use "../icons/_index.scss" as *;
@use "../input/_index.scss" as *;
@use "../floating-label/_index.scss" as *;
@use "../popup/_index.scss" as *;
@use "../list/_index.scss" as *;
@use "../icons/_index.scss" as *;

// Component
@forward "./_variables.scss";
@use "./_layout.scss" as *;
@use "./_theme.scss" as *;


// Expose
Expand Down
4 changes: 2 additions & 2 deletions packages/bootstrap/scss/autocomplete/_layout.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use "../_variables.scss" as *;
@use "./_variables.scss" as *;
// @use "../_variables.scss" as *;
// @use "./_variables.scss" as *;
@use "@progress/kendo-theme-default/scss/autocomplete/_layout.scss" as *;


Expand Down
2 changes: 1 addition & 1 deletion packages/bootstrap/scss/autocomplete/_theme.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use "./_variables.scss" as *;
// @use "./_variables.scss" as *;
@use "@progress/kendo-theme-default/scss/autocomplete/_theme.scss" as *;


Expand Down
8 changes: 3 additions & 5 deletions packages/bootstrap/scss/avatar/_index.scss
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
// Dependencies
@use "../core/_index.scss" as *;

// Component
@forward "./_variables.scss";
@use "./_layout.scss" as *;
@use "./_theme.scss" as *;


// Dependencies
@use "../core/_index.scss" as *;


// Expose
@mixin kendo-avatar--styles() {
@include import-once( "avatar" ) {
Expand Down
2 changes: 0 additions & 2 deletions packages/bootstrap/scss/avatar/_layout.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@use "../_variables.scss" as *;
@use "./_variables.scss" as *;
@use "@progress/kendo-theme-default/scss/avatar/_layout.scss" as *;


Expand Down
2 changes: 0 additions & 2 deletions packages/bootstrap/scss/avatar/_theme.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
@use "./_variables.scss" as *;
@use "@progress/kendo-theme-default/scss/avatar/_theme.scss" as *;


@mixin kendo-avatar--theme() {
@include kendo-avatar--theme-base();
}
2 changes: 1 addition & 1 deletion packages/bootstrap/scss/avatar/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use "sass:map";
// @use "sass:map";
@use "../core/_index.scss" as *;

// Avatar
Expand Down
9 changes: 4 additions & 5 deletions packages/bootstrap/scss/badge/_index.scss
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
// Dependencies
@use "../core/_index.scss" as *;
@use "../icons/_index.scss" as *;

// Component
@forward "./_variables.scss";
@use "./_layout.scss" as *;
@use "./_theme.scss" as *;


// Dependencies
@use "../core/_index.scss" as *;
@use "../icons/_index.scss" as *;


// Expose
@mixin kendo-badge--styles() {
@include import-once( "badge" ) {
Expand Down
4 changes: 2 additions & 2 deletions packages/bootstrap/scss/badge/_layout.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use "../_variables.scss" as *;
@use "./_variables.scss" as *;
// @use "../_variables.scss" as *;
// @use "./_variables.scss" as *;
@use "@progress/kendo-theme-default/scss/badge/_layout.scss" as *;


Expand Down
2 changes: 1 addition & 1 deletion packages/bootstrap/scss/badge/_theme.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use "./_variables.scss" as *;
// @use "./_variables.scss" as *;
@use "@progress/kendo-theme-default/scss/badge/_theme.scss" as *;


Expand Down
3 changes: 2 additions & 1 deletion packages/bootstrap/scss/badge/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@use "../core/_index.scss" as *;
@use "bootstrap/scss/bootstrap.scss" as *;
@use "../bootstrap_vars.scss" as *;
// @use "bootstrap/scss/bootstrap.scss" as *;

// Badge

Expand Down
12 changes: 5 additions & 7 deletions packages/bootstrap/scss/bottom-navigation/_index.scss
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
// Component
@forward "./_variables.scss";
@use "./_layout.scss" as *;
@use "./_theme.scss" as *;


// Dependencies
@use "../core/_index.scss" as *;
@use "../utils/_index.scss" as *;
@use "../icons/_index.scss" as *;
@use "../utils/_index.scss" as *;

// Component
@forward "./_variables.scss";
@use "./_layout.scss" as *;
@use "./_theme.scss" as *;

// Expose
@mixin kendo-bottom-navigation--styles() {
Expand Down
4 changes: 2 additions & 2 deletions packages/bootstrap/scss/bottom-navigation/_layout.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use "../_variables.scss" as *;
@use "./_variables.scss" as *;
// @use "../_variables.scss" as *;
// @use "./_variables.scss" as *;
@use "@progress/kendo-theme-default/scss/bottom-navigation/_layout.scss" as *;


Expand Down
2 changes: 1 addition & 1 deletion packages/bootstrap/scss/bottom-navigation/_theme.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use "./_variables.scss" as *;
// @use "./_variables.scss" as *;
@use "@progress/kendo-theme-default/scss/bottom-navigation/_theme.scss" as *;


Expand Down
Loading

0 comments on commit 5155b81

Please sign in to comment.