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

Ensure each component can be built separately with all required dependencies #2040

Merged
merged 32 commits into from
Nov 5, 2020
Merged

Ensure each component can be built separately with all required dependencies #2040

Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
98b8234
chore(sass-build): add option for dry run
joneff Nov 4, 2020
55c6dcf
fix(switch): do not depend on $button- variables
joneff Nov 4, 2020
63d096b
fix(input): require button variables explictly
joneff Nov 4, 2020
41a1645
fix(forms): move fieldset and label styles to forms
joneff Nov 4, 2020
e2139da
refactor(popup): remove unused styles
joneff Nov 4, 2020
f7fcfd2
fix(adaptive): require toolbar styles explictly
joneff Nov 4, 2020
afca59a
fix(popup): remove fixed height from filter container
joneff Nov 4, 2020
d184454
fix(chat): require toolbar styles explictly
joneff Nov 4, 2020
b8e234a
fix(popoup): require button styles explicitly
joneff Nov 4, 2020
2957bac
fix(dropdowngrid): require toolbar variables explicitly
joneff Nov 4, 2020
5913992
fix(editor): require toolbar styles before upload styles
joneff Nov 4, 2020
a592b54
fix(file-manager): require toolbar styles before upload styles
joneff Nov 4, 2020
045bf44
fix(forms): require common styles explicitly
joneff Nov 4, 2020
4d76eb7
fix(pager): require toolbar variables explicitly
joneff Nov 4, 2020
1ce36f7
fix(menu): require popup styles explicitly
joneff Nov 4, 2020
1d5ee72
fix(splitter): do not base splitbar variables on button variables
joneff Nov 4, 2020
8e8bf67
fix(spreadsheet): require toolbar styles before upload styles
joneff Nov 4, 2020
08e4bb6
fix(textbox): base variables on input variables
joneff Nov 4, 2020
454c663
fix(treeview): do not base treeview variables on button variables
joneff Nov 4, 2020
2e3f7b0
fix(upload): require toolbar variables explicitly
joneff Nov 4, 2020
1b7b752
fix(checkbox): do not base checkbox variables on input variables
joneff Nov 4, 2020
9621eab
fix(popup): require input styles explicitly
joneff Nov 4, 2020
2826e37
fix(dataviz): remove stray files
joneff Nov 4, 2020
6c28ffe
fix(floating-label): require input variables explicitly
joneff Nov 4, 2020
c73927e
chore: remove stray files
joneff Nov 4, 2020
0df70e7
fix(utils): require typography variables explicitly
joneff Nov 4, 2020
dc5170f
fix(checkbox): use correct hover border
joneff Nov 4, 2020
00832d4
fix(dataviz): require tooltip styles explicitly
joneff Nov 4, 2020
48e69e0
chore(toolbar): cleanup toolbar styles and variables
joneff Nov 4, 2020
3753e02
infra: include 'ensure standalone build' in CI
joneff Nov 4, 2020
b61af30
chore: update visual previews
kendo-bot Nov 4, 2020
96ddf1a
Merge branch 'develop' into verify-sass
joneff Nov 5, 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
3 changes: 3 additions & 0 deletions .github/workflows/ci_nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ jobs:
- name: Check docs
run: npm run docs:check

- name: Ensure standalone build
run: npm run sass:standalone

- name: Build themes using dart-sass (full)
run: npm run dart

Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/ci_unit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ jobs:
- name: Bootstrap
run: npm run bootstrap

- name: Ensure standalone build
run: npm run sass:standalone

- name: Build themes
run: npm run sass:flat

Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/release_dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ jobs:
- name: Check docs
run: npm run docs:check

- name: Ensure standalone build
run: npm run sass:standalone

- name: Build themes
run: |
npm run dart:flat
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/release_stable.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ jobs:
- name: Check docs
run: npm run docs:check

- name: Ensure standalone build
run: npm run sass:standalone

- name: Build themes
run: |
npm run dart:flat
Expand Down
6 changes: 4 additions & 2 deletions gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,9 @@ gulp.task("sass", function( done ) {
let file = getArg('--file') || paths.sass.theme;
let dest = getArg('--dest') || paths.sass.dist;
let themes = glob.sync( getArg('--theme') || paths.sass.themes );
let dryRun = getArg('--dry-run') || false;

buildAll( themes, { file, dest, compiler: nodeSass, postcssPlugins } );
buildAll( themes, { file, dest, dryRun, compiler: nodeSass, postcssPlugins } );

done();
});
Expand Down Expand Up @@ -120,8 +121,9 @@ gulp.task("dart", function( done ) {
let file = getArg('--file') || paths.sass.theme;
let dest = getArg('--dest') || paths.sass.dist;
let themes = glob.sync( getArg('--theme') || paths.sass.themes );
let dryRun = getArg('--dry-run') || false;

buildAll( themes, { file, dest, compiler: dartSass, postcssPlugins } );
buildAll( themes, { file, dest, dryRun, compiler: dartSass, postcssPlugins } );

done();
});
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"sass:flat": "gulp sass:flat",
"sass:watch": "gulp sass:watch",
"sass:swatches": "gulp sass:swatches",
"sass:standalone": "gulp sass --file 'scss/!(common|styling)*/_index.scss' --dry-run",
"dart": "gulp dart",
"dart:flat": "gulp dart:flat",
"dart:watch": "gulp dart:watch",
Expand Down
3 changes: 3 additions & 0 deletions packages/bootstrap/scss/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ $zindex-window: 2 !default;
// Color settings
$is-dark-theme: false;

$white: #ffffff !default;
$black: #000000 !default;

// Deprecated
/// The color that focuses the user attention.
/// @deprecated Will be removed in v5. Use `$primary` variable instead.
Expand Down
3 changes: 2 additions & 1 deletion packages/bootstrap/scss/adaptive/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
@import "../mixins/_index.scss";


// Dependencies
// Dependencies (TODO: extract variables)
@import "../listgroup/_index.scss";
@import "../checkbox/_index.scss";
@import "../radio/_index.scss";
@import "../switch/_index.scss";
@import "../toolbar/_index.scss";


// Component
Expand Down
1 change: 1 addition & 0 deletions packages/bootstrap/scss/chat/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
@import "../input/_index.scss";
@import "../card/_index.scss";
@import "../icons/_index.scss";
@import "../toolbar/_index.scss";


// Component
Expand Down
1 change: 1 addition & 0 deletions packages/bootstrap/scss/dataviz/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
// Dependencies
@import "../common/_index.scss";
@import "../popup/_index.scss";
@import "../tooltip/_index.scss";


// Component
Expand Down
1 change: 1 addition & 0 deletions packages/bootstrap/scss/dropdowngrid/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
@import "../floating-label/_index.scss";
@import "../combobox/_index.scss";
@import "../popup/_index.scss";
@import "../toolbar/_variables.scss";
@import "../grid/_variables.scss";


Expand Down
2 changes: 1 addition & 1 deletion packages/bootstrap/scss/editor/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
@import "../colorpicker/_index.scss";
@import "../combobox/_index.scss";
@import "../dropdownlist/_index.scss";
@import "../upload/_index.scss";
@import "../toolbar/_index.scss";
@import "../upload/_index.scss";
@import "../window/_index.scss";


Expand Down
2 changes: 1 addition & 1 deletion packages/bootstrap/scss/filemanager/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
// Dependencies
@import "../common/_index.scss";
@import "../input/_index.scss";
@import "../toolbar/_index.scss";
@import "../upload/_index.scss";
@import "../switch/_index.scss";
@import "../menu/_index.scss";
@import "../toolbar/_index.scss";
@import "../dialog/_index.scss";
@import "../breadcrumb/_index.scss";
@import "../treeview/_index.scss";
Expand Down
1 change: 1 addition & 0 deletions packages/bootstrap/scss/floating-label/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

// Dependencies
@import "../common/_index.scss";
@import "../input/_index.scss";


// Component
Expand Down
3 changes: 2 additions & 1 deletion packages/bootstrap/scss/forms/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@


// Dependencies // TODO: extract variables
@import "../tooltip/variables";
@import "../common/_index.scss";
@import "../tooltip/_variables.scss";
@import "../button/_variables.scss";
@import "../input/_variables.scss";
@import "../toolbar/_index.scss";
Expand Down
1 change: 1 addition & 0 deletions packages/bootstrap/scss/input/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

// Dependencies
@import "../common/_index.scss";
@import "../button/_variables.scss";


// Component
Expand Down
1 change: 1 addition & 0 deletions packages/bootstrap/scss/menu/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

// Dependencies
@import "../common/_index.scss";
@import "../popup/_index.scss";
@import "../icons/_index.scss";


Expand Down
1 change: 1 addition & 0 deletions packages/bootstrap/scss/pager/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
@import "../common/_index.scss";
@import "../dropdownlist/_index.scss";
@import "../icons/_index.scss";
@import "../toolbar/_variables.scss";


// Component
Expand Down
2 changes: 2 additions & 0 deletions packages/bootstrap/scss/popup/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
// Dependencies
@import "../common/_index.scss";
@import "../icons/_index.scss";
@import "../button/_index.scss";
@import "../input/_index.scss";
@import "../forms/_variables.scss";


Expand Down
4 changes: 0 additions & 4 deletions packages/bootstrap/scss/popup/_theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,6 @@

.k-list-container {

.k-list-optionlabel {
border-bottom-color: $input-border;
}

// Button normal state
.k-button {}

Expand Down
8 changes: 4 additions & 4 deletions packages/bootstrap/scss/splitter/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ $splitter-drag-handle-length: 20px !default;
$splitter-drag-handle-thickness: 2px !default;
$splitter-drag-icon-margin: 7px !default;

$splitbar-bg: darken($button-bg, 5) !default;
$splitbar-text: $button-text !default;
$splitbar-bg: try-shade( $base-bg, .5 ) !default;
$splitbar-text: $base-text !default;

$splitbar-hovered-bg: darken($button-hovered-bg, 5) !default;
$splitbar-hovered-text: $button-hovered-text !default;
$splitbar-hover-bg: try-shade( $splitbar-bg, .5 ) !default;
$splitbar-hover-text: $splitbar-text !default;

$splitbar-selected-bg: $selected-bg !default;
$splitbar-selected-text: $selected-text !default;
2 changes: 1 addition & 1 deletion packages/bootstrap/scss/spreadsheet/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
@import "../combobox/_index.scss";
@import "../datetime/_index.scss";
@import "../dropdownlist/_index.scss";
@import "../toolbar/_index.scss";
@import "../upload/_index.scss";
@import "../menu/_index.scss";
@import "../toolbar/_index.scss";
@import "../window/_index.scss";
@import "../tabstrip/_index.scss";
@import "../treeview/_index.scss";
Expand Down
6 changes: 3 additions & 3 deletions packages/bootstrap/scss/switch/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ $switch-on-focused-border: null !default;
$switch-on-focused-gradient: null !default;
$switch-on-focused-shadow: 0 0 1px 2px tint( $switch-on-bg, 6 ) !default;

$switch-on-hovered-bg: $primary-button-hovered-bg !default;
$switch-on-hovered-bg: try-darken( $switch-on-bg, 7.5% ) !default;
$switch-on-hovered-text: $switch-on-text !default;
$switch-on-hovered-border: null !default;
$switch-on-hovered-gradient: null !default;
Expand All @@ -58,7 +58,7 @@ $switch-on-handle-hovered-text: $switch-on-text !default;
$switch-on-handle-hovered-border: null !default;
$switch-on-handle-hovered-gradient: null !default;

$switch-off-bg: $button-bg !default;
$switch-off-bg: $secondary !default;
$switch-off-text: black !default;
$switch-off-border: null !default;
$switch-off-gradient: null !default;
Expand All @@ -70,7 +70,7 @@ $switch-off-focused-border: null !default;
$switch-off-focused-gradient: null !default;
$switch-off-focused-shadow: 0 0 1px 2px tint( $switch-off-bg, 6 ) !default;

$switch-off-hovered-bg: $button-hovered-bg !default;
$switch-off-hovered-bg: try-darken( $switch-off-bg, 7.5% ) !default;
$switch-off-hovered-text: $switch-off-text !default;
$switch-off-hovered-border: null !default;
$switch-off-hovered-gradient: null !default;
Expand Down
2 changes: 1 addition & 1 deletion packages/bootstrap/scss/textbox/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Textboxe
$textbox-line-height: $form-line-height-em !default;
$textbox-line-height: $input-line-height !default;
$textbox-icon-width: calc( #{$icon-size} + #{$input-padding-x * 2} ) !default;
$textbox-icon-padding-x: 6px !default;
$textbox-icon-padding-y: $textbox-icon-padding-x !default;
Expand Down
3 changes: 0 additions & 3 deletions packages/bootstrap/scss/toolbar/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,4 @@ $toolbar-border: $header-border !default;
$toolbar-gradient: null !default;
$toolbar-shadow: null !default;

$toolbar-button-expanded-bg: null !default;
$toolbar-button-expanded-shadow: none !default;

$toolbar-separator-border: inherit !default;
6 changes: 3 additions & 3 deletions packages/bootstrap/scss/treeview/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ $treeview-padding-x: 2px !default;
$treeview-padding-y: $treeview-padding-x !default;
$treeview-font-family: $font-family !default;
$treeview-font-size: $font-size !default;
$treeview-line-height: $form-line-height !default;
$treeview-line-height: $line-height !default;

$treeview-indent: 16px !default;

$treeview-item-padding-x: $button-padding-y !default;
$treeview-item-padding-x: ( map-get( $spacing, 1 ) * 1.5 ) !default;
$treeview-item-padding-y: $treeview-item-padding-x !default;
$treeview-item-border-width: 1px !default;
$treeview-item-border-radius: $border-radius !default;
$treeview-item-border-radius: map-get( $spacing, 1 ) !default;

$treeview-bg: null !default;
$treeview-text: $component-text !default;
Expand Down
2 changes: 2 additions & 0 deletions packages/bootstrap/scss/upload/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
@import "../button/_index.scss";
@import "../action-buttons/_index.scss";
@import "../icons/_index.scss";
@import "../dropzone/_index.scss";
@import "../toolbar/_variables.scss";


// Component
Expand Down
1 change: 1 addition & 0 deletions packages/bootstrap/scss/utils/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@


// Dependencies
@import "../typography/_variables.scss";


// Component
Expand Down
3 changes: 3 additions & 0 deletions packages/classic/scss/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@ $zindex-window: 2 !default;
// Color settings
$is-dark-theme: false !default;

$white: #ffffff !default;
$black: #000000 !default;


// Theme colors
/// The color that focuses the user attention.
Expand Down
3 changes: 2 additions & 1 deletion packages/classic/scss/adaptive/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
@import "../mixins/_index.scss";


// Dependencies
// Dependencies (TODO: extract variables)
@import "../listgroup/_index.scss";
@import "../checkbox/_index.scss";
@import "../radio/_index.scss";
@import "../switch/_index.scss";
@import "../toolbar/_index.scss";


// Component
Expand Down
3 changes: 0 additions & 3 deletions packages/classic/scss/barcode/_index.scss
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions packages/classic/scss/chat/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
@import "../input/_index.scss";
@import "../card/_index.scss";
@import "../icons/_index.scss";
@import "../toolbar/_index.scss";


// Component
Expand Down
12 changes: 6 additions & 6 deletions packages/classic/scss/checkbox/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ $checkbox-square-height: ( $checkbox-size / 2 ) !default;

$checkbox-label-margin-x: 8px !default;

$checkbox-bg: $input-bg !default;
$checkbox-text: $input-text !default;
$checkbox-border: $input-border !default;
$checkbox-hovered-bg: $checkbox-bg !default;
$checkbox-hovered-text: $primary !default;
$checkbox-hovered-border: $input-hovered-border !default;
$checkbox-bg: $white !default;
$checkbox-text: transparent !default;
$checkbox-border: $base-border !default;
$checkbox-hovered-bg: null !default;
$checkbox-hovered-text: null !default;
$checkbox-hovered-border: $hovered-border !default;
$checkbox-checked-bg: $primary !default;
$checkbox-checked-text: contrast-wcag( $checkbox-checked-bg ) !default;
$checkbox-checked-border: $checkbox-checked-bg !default;
Expand Down
1 change: 1 addition & 0 deletions packages/classic/scss/dropdowngrid/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
@import "../floating-label/_index.scss";
@import "../combobox/_index.scss";
@import "../popup/_index.scss";
@import "../toolbar/_variables.scss";
@import "../grid/_variables.scss";


Expand Down
3 changes: 0 additions & 3 deletions packages/classic/scss/edit-form/_index.scss
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/classic/scss/editor/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
@import "../colorpicker/_index.scss";
@import "../combobox/_index.scss";
@import "../dropdownlist/_index.scss";
@import "../upload/_index.scss";
@import "../toolbar/_index.scss";
@import "../upload/_index.scss";
@import "../window/_index.scss";


Expand Down
2 changes: 1 addition & 1 deletion packages/classic/scss/filemanager/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
// Dependencies
@import "../common/_index.scss";
@import "../input/_index.scss";
@import "../toolbar/_index.scss";
@import "../upload/_index.scss";
@import "../switch/_index.scss";
@import "../menu/_index.scss";
@import "../toolbar/_index.scss";
@import "../dialog/_index.scss";
@import "../breadcrumb/_index.scss";
@import "../treeview/_index.scss";
Expand Down
Loading