Skip to content
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

Extract appbar variables into separate files #1883

Merged
merged 2 commits into from
Sep 17, 2020
Merged

Extract appbar variables into separate files #1883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39951b5
fix(appbar): extract appbar variables into separate files
joneff Sep 17, 2020
5ff6032
Merge branch 'develop' into appbar-variables
joneff Sep 17, 2020
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
22 changes: 0 additions & 22 deletions packages/bootstrap/scss/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1791,28 +1791,6 @@ $actions-gradient: null !default;
$actions-stretched-border: $base-border !default;


// Appbar
$appbar-margin-y: null !default;
$appbar-margin-x: null !default;
$appbar-padding-y: map-get( $spacing, 2 ) !default;
$appbar-padding-x: map-get( $spacing, 4 ) !default;
$appbar-border-width: 0px !default;

$appbar-font-size: $font-size !default;
$appbar-line-height: $line-height !default;
$appbar-font-family: $font-family !default;
$appbar-gap: map-get( $spacing, 2 ) !default;

$appbar-light-bg: #ffffff !default;
$appbar-light-text: #6c757d !default;

$appbar-dark-bg: #343a40 !default;
$appbar-dark-text: rgba(#f8f9fa, .6) !default;

$appbar-box-shadow: 0px 1px 1px rgba(0, 0, 0, .16);
$appbar-bottom-box-shadow: 0px -1px 1px rgba(0, 0, 0, .16);


// Toolbar

/// The horizontal padding of the container.
Expand Down
1 change: 1 addition & 0 deletions packages/bootstrap/scss/appbar/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@


// Component
@import "_variables.scss";
@import "_layout.scss";
@import "_theme.scss";
20 changes: 20 additions & 0 deletions packages/bootstrap/scss/appbar/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Appbar
$appbar-margin-y: null !default;
$appbar-margin-x: null !default;
$appbar-padding-y: map-get( $spacing, 2 ) !default;
$appbar-padding-x: map-get( $spacing, 4 ) !default;
$appbar-border-width: 0px !default;

$appbar-font-size: $font-size !default;
$appbar-line-height: $line-height !default;
$appbar-font-family: $font-family !default;
$appbar-gap: map-get( $spacing, 2 ) !default;

$appbar-light-bg: #ffffff !default;
$appbar-light-text: #6c757d !default;

$appbar-dark-bg: #343a40 !default;
$appbar-dark-text: rgba(#f8f9fa, .6) !default;

$appbar-box-shadow: 0px 1px 1px rgba(0, 0, 0, .16);
$appbar-bottom-box-shadow: 0px -1px 1px rgba(0, 0, 0, .16);
22 changes: 0 additions & 22 deletions packages/classic/scss/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1743,28 +1743,6 @@ $actions-gradient: null !default;
$actions-stretched-border: $base-border !default;


// Appbar
$appbar-margin-y: null !default;
$appbar-margin-x: null !default;
$appbar-padding-y: map-get( $spacing, 2 ) !default;
$appbar-padding-x: map-get( $spacing, 4 ) !default;
$appbar-border-width: 0px !default;

$appbar-font-size: $font-size !default;
$appbar-line-height: $line-height !default;
$appbar-font-family: $font-family !default;
$appbar-gap: map-get( $spacing, 2 ) !default;

$appbar-light-bg: $bg-color !default;
$appbar-light-text: $text-color !default;

$appbar-dark-bg: $text-color !default;
$appbar-dark-text: $bg-color !default;

$appbar-box-shadow: 0px 1px 1px rgba(0, 0, 0, .16);
$appbar-bottom-box-shadow: 0px -1px 1px rgba(0, 0, 0, .16);


// Toolbar

$toolbar-bg: $button-bg !default;
Expand Down
2 changes: 2 additions & 0 deletions packages/classic/scss/appbar/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
// Component
@import "_variables.scss";
@import "~@progress/kendo-theme-default/scss/appbar/_layout.scss";
@import "~@progress/kendo-theme-default/scss/appbar/_theme.scss";
20 changes: 20 additions & 0 deletions packages/classic/scss/appbar/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Appbar
$appbar-margin-y: null !default;
$appbar-margin-x: null !default;
$appbar-padding-y: map-get( $spacing, 2 ) !default;
$appbar-padding-x: map-get( $spacing, 4 ) !default;
$appbar-border-width: 0px !default;

$appbar-font-size: $font-size !default;
$appbar-line-height: $line-height !default;
$appbar-font-family: $font-family !default;
$appbar-gap: map-get( $spacing, 2 ) !default;

$appbar-light-bg: $bg-color !default;
$appbar-light-text: $text-color !default;

$appbar-dark-bg: $text-color !default;
$appbar-dark-text: $bg-color !default;

$appbar-box-shadow: 0px 1px 1px rgba(0, 0, 0, .16);
$appbar-bottom-box-shadow: 0px -1px 1px rgba(0, 0, 0, .16);
22 changes: 0 additions & 22 deletions packages/default/scss/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1799,28 +1799,6 @@ $actions-gradient: null !default;
$actions-stretched-border: $base-border !default;


// Appbar
$appbar-margin-y: null !default;
$appbar-margin-x: null !default;
$appbar-padding-y: map-get( $spacing, 2 ) !default;
$appbar-padding-x: map-get( $spacing, 4 ) !default;
$appbar-border-width: 0px !default;

$appbar-font-size: $font-size !default;
$appbar-line-height: $line-height !default;
$appbar-font-family: $font-family !default;
$appbar-gap: map-get( $spacing, 2 ) !default;

$appbar-light-bg: $bg-color !default;
$appbar-light-text: $text-color !default;

$appbar-dark-bg: $text-color !default;
$appbar-dark-text: $bg-color !default;

$appbar-box-shadow: 0px 1px 1px rgba(0, 0, 0, .16);
$appbar-bottom-box-shadow: 0px -1px 1px rgba(0, 0, 0, .16);


// Toolbar

/// The horizontal padding of the container.
Expand Down
1 change: 1 addition & 0 deletions packages/default/scss/appbar/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@


// Component
@import "_variables.scss";
@import "_layout.scss";
@import "_theme.scss";
12 changes: 7 additions & 5 deletions packages/default/scss/appbar/_theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
@include exports("appbar/theme") {
.k-appbar {
@include box-shadow($appbar-box-shadow);

&.k-appbar-bottom {
@include box-shadow($appbar-bottom-box-shadow);
}
.k-appbar {
@include box-shadow( $appbar-box-shadow );
}
.k-appbar-bottom {
@include box-shadow( $appbar-bottom-box-shadow );
}


// AppBar theme colors
@each $name, $color in $theme-colors {
Expand All @@ -22,4 +23,5 @@
}
}
}

}
20 changes: 20 additions & 0 deletions packages/default/scss/appbar/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Appbar
$appbar-margin-y: null !default;
$appbar-margin-x: null !default;
$appbar-padding-y: map-get( $spacing, 2 ) !default;
$appbar-padding-x: map-get( $spacing, 4 ) !default;
$appbar-border-width: 0px !default;

$appbar-font-size: $font-size !default;
$appbar-line-height: $line-height !default;
$appbar-font-family: $font-family !default;
$appbar-gap: map-get( $spacing, 2 ) !default;

$appbar-light-bg: $bg-color !default;
$appbar-light-text: $text-color !default;

$appbar-dark-bg: $text-color !default;
$appbar-dark-text: $bg-color !default;

$appbar-box-shadow: 0px 1px 1px rgba(0, 0, 0, .16);
$appbar-bottom-box-shadow: 0px -1px 1px rgba(0, 0, 0, .16);
22 changes: 0 additions & 22 deletions packages/material/scss/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1842,28 +1842,6 @@ $actions-gradient: null !default;
$actions-stretched-border: $base-border !default;


// Appbar
$appbar-margin-y: null !default;
$appbar-margin-x: null !default;
$appbar-padding-y: map-get( $spacing, 2 ) !default;
$appbar-padding-x: map-get( $spacing, 6 ) !default;
$appbar-border-width: 0px !default;

$appbar-font-size: $font-size !default;
$appbar-line-height: $line-height !default;
$appbar-font-family: $font-family !default;
$appbar-gap: map-get( $spacing, 2 ) !default;

$appbar-light-bg: #ffffff !default;
$appbar-light-text: #000000 !default;

$appbar-dark-bg: #121212 !default;
$appbar-dark-text: rgba(#ffffff, .87) !default;

$appbar-box-shadow: 0px 2px 3px rgba(0, 0, 0, .24);
$appbar-bottom-box-shadow: 0px -2px 3px rgba(0, 0, 0, .24);


// Toolbar

/// The horizontal padding of the container.
Expand Down
1 change: 1 addition & 0 deletions packages/material/scss/appbar/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@


// Component
@import "_variables.scss";
@import "_layout.scss";
@import "_theme.scss";
20 changes: 20 additions & 0 deletions packages/material/scss/appbar/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Appbar
$appbar-margin-y: null !default;
$appbar-margin-x: null !default;
$appbar-padding-y: map-get( $spacing, 2 ) !default;
$appbar-padding-x: map-get( $spacing, 6 ) !default;
$appbar-border-width: 0px !default;

$appbar-font-size: $font-size !default;
$appbar-line-height: $line-height !default;
$appbar-font-family: $font-family !default;
$appbar-gap: map-get( $spacing, 2 ) !default;

$appbar-light-bg: #ffffff !default;
$appbar-light-text: #000000 !default;

$appbar-dark-bg: #121212 !default;
$appbar-dark-text: rgba(#ffffff, .87) !default;

$appbar-box-shadow: 0px 2px 3px rgba(0, 0, 0, .24);
$appbar-bottom-box-shadow: 0px -2px 3px rgba(0, 0, 0, .24);