Skip to content

Commit

Permalink
fix: align how we use module system with the rest of the themes
Browse files Browse the repository at this point in the history
  • Loading branch information
joneff committed Mar 31, 2023
1 parent e7c714d commit 690aafa
Show file tree
Hide file tree
Showing 320 changed files with 1,285 additions and 1,490 deletions.
2 changes: 2 additions & 0 deletions packages/nouvelle/scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ $kendo-use-input-button-width: false !default;
$kendo-use-input-spinner-width: false !default;
$kendo-use-input-spinner-icon-offset: false !default;

$kendo-auto-bootstrap: false !default;


// Spacing
$kendo-spacing: (
Expand Down
5 changes: 0 additions & 5 deletions packages/nouvelle/scss/action-sheet/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,3 @@
}

}




@mixin kendo-action-sheet--extended-layout() {}
5 changes: 0 additions & 5 deletions packages/nouvelle/scss/action-sheet/_theme.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
@mixin kendo-action-sheet--theme() {}




@mixin kendo-action-sheet--extended-theme() {}
12 changes: 9 additions & 3 deletions packages/nouvelle/scss/action-sheet/index.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@import "../core/index.import.scss";


// Module meta
$_kendo-module-meta: (
name: "action-sheet",
Expand All @@ -14,15 +17,18 @@ $_kendo-module-meta: (


// Register
@import "../core/module-system/index.import.scss";
@include module-register( $_kendo-module-meta... );


// Expose
@mixin action-sheet-styles() {
@mixin kendo-action-sheet--styles() {
@include module-render( "action-sheet" ) {
@include kendo-action-sheet--layout();
@include kendo-action-sheet--extended-layout();
@include kendo-action-sheet--theme();
@include kendo-action-sheet--extended-theme();
}
}

@if $kendo-auto-bootstrap {
@include kendo-action-sheet--styles();
}
5 changes: 0 additions & 5 deletions packages/nouvelle/scss/actions/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,3 @@
}

}




@mixin kendo-actions--extended-layout() {}
6 changes: 1 addition & 5 deletions packages/nouvelle/scss/actions/_theme.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@mixin kendo-actions--theme() {

// Actions
.k-actions {
--INTERNAL--kendo-actions-bg: var( --kendo-actions-bg, #{$kendo-actions-bg} );
--INTERNAL--kendo-actions-text: var( --kendo-actions-text, #{$kendo-actions-text} );
Expand All @@ -11,8 +12,3 @@
}

}




@mixin kendo-actions--extended-theme() {}
12 changes: 9 additions & 3 deletions packages/nouvelle/scss/actions/index.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@import "../core/index.import.scss";


// Module meta
$_kendo-module-meta: (
name: "actions",
Expand All @@ -12,15 +15,18 @@ $_kendo-module-meta: (


// Register
@import "../core/module-system/index.import.scss";
@include module-register( $_kendo-module-meta... );


// Expose
@mixin actions-styles() {
@mixin kendo-actions--styles() {
@include module-render( "actions" ) {
@include kendo-actions--layout();
@include kendo-actions--extended-layout();
@include kendo-actions--theme();
@include kendo-actions--extended-theme();
}
}

@if $kendo-auto-bootstrap {
@include kendo-actions--styles();
}
5 changes: 0 additions & 5 deletions packages/nouvelle/scss/adaptive/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,3 @@
}

}




@mixin kendo-adaptive--extended-layout() {}
5 changes: 0 additions & 5 deletions packages/nouvelle/scss/adaptive/_theme.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
@mixin kendo-adaptive--theme() {}




@mixin kendo-adaptive--extended-theme() {}
12 changes: 9 additions & 3 deletions packages/nouvelle/scss/adaptive/index.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@import "../core/index.import.scss";


// Module meta
$_kendo-module-meta: (
name: "adaptive",
Expand All @@ -12,15 +15,18 @@ $_kendo-module-meta: (


// Register
@import "../core/module-system/index.import.scss";
@include module-register( $_kendo-module-meta... );


// Expose
@mixin adaptive-styles() {
@mixin kendo-adaptive--styles() {
@include module-render( "adaptive" ) {
@include kendo-adaptive--layout();
@include kendo-adaptive--extended-layout();
@include kendo-adaptive--theme();
@include kendo-adaptive--extended-theme();
}
}

@if $kendo-auto-bootstrap {
@include kendo-adaptive--styles();
}
6 changes: 5 additions & 1 deletion packages/nouvelle/scss/all.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
@import "./index.scss";

@include kendo-styles();

@if not $kendo-auto-bootstrap {
@include kendo-theme--config();
@include kendo-theme--styles();
}
5 changes: 0 additions & 5 deletions packages/nouvelle/scss/appbar/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,3 @@
}

}




@mixin kendo-appbar--extended-layout() {}
5 changes: 0 additions & 5 deletions packages/nouvelle/scss/appbar/_theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,3 @@
}

}




@mixin kendo-appbar--extended-theme() {}
3 changes: 3 additions & 0 deletions packages/nouvelle/scss/appbar/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@import "../_variables.scss";


// Appbar
$kendo-appbar-margin-y: null !default;
$kendo-appbar-margin-x: null !default;
Expand Down
12 changes: 9 additions & 3 deletions packages/nouvelle/scss/appbar/index.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@import "../core/index.import.scss";


// Module meta
$_kendo-module-meta: (
name: "appbar",
Expand All @@ -12,15 +15,18 @@ $_kendo-module-meta: (


// Register
@import "../core/module-system/index.import.scss";
@include module-register( $_kendo-module-meta... );


// Expose
@mixin appbar-styles() {
@mixin kendo-appbar--styles() {
@include module-render( "appbar" ) {
@include kendo-appbar--layout();
@include kendo-appbar--extended-layout();
@include kendo-appbar--theme();
@include kendo-appbar--extended-theme();
}
}

@if $kendo-auto-bootstrap {
@include kendo-appbar--styles();
}
5 changes: 0 additions & 5 deletions packages/nouvelle/scss/autocomplete/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,3 @@
.k-autocomplete {}

}




@mixin kendo-autocomplete--extended-layout() {}
5 changes: 0 additions & 5 deletions packages/nouvelle/scss/autocomplete/_theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,3 @@
.k-autocomplete {}

}




@mixin kendo-autocomplete--extended-theme() {}
12 changes: 9 additions & 3 deletions packages/nouvelle/scss/autocomplete/index.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@import "../core/index.import.scss";


// Module meta
$_kendo-module-meta: (
name: "autocomplete",
Expand All @@ -17,15 +20,18 @@ $_kendo-module-meta: (


// Register
@import "../core/module-system/index.import.scss";
@include module-register( $_kendo-module-meta... );


// Expose
@mixin autocomplete-styles() {
@mixin kendo-autocomplete--styles() {
@include module-render( "autocomplete" ) {
@include kendo-autocomplete--layout();
@include kendo-autocomplete--extended-layout();
@include kendo-autocomplete--theme();
@include kendo-autocomplete--extended-theme();
}
}

@if $kendo-auto-bootstrap {
@include kendo-autocomplete--styles();
}
5 changes: 0 additions & 5 deletions packages/nouvelle/scss/avatar/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,3 @@
}

}




@mixin kendo-avatar--extended-layout() {}
5 changes: 0 additions & 5 deletions packages/nouvelle/scss/avatar/_theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,3 @@
}

}




@mixin kendo-avatar--extended-theme() {}
12 changes: 9 additions & 3 deletions packages/nouvelle/scss/avatar/index.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@import "../core/index.import.scss";


// Module meta
$_kendo-module-meta: (
name: "avatar",
Expand All @@ -12,15 +15,18 @@ $_kendo-module-meta: (


// Register
@import "../core/module-system/index.import.scss";
@include module-register( $_kendo-module-meta... );


// Expose
@mixin avatar-styles() {
@mixin kendo-avatar--styles() {
@include module-render( "avatar" ) {
@include kendo-avatar--layout();
@include kendo-avatar--extended-layout();
@include kendo-avatar--theme();
@include kendo-avatar--extended-theme();
}
}

@if $kendo-auto-bootstrap {
@include kendo-avatar--styles();
}
5 changes: 0 additions & 5 deletions packages/nouvelle/scss/badge/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,3 @@
}

}




@mixin kendo-badge--extended-layout() {}
5 changes: 0 additions & 5 deletions packages/nouvelle/scss/badge/_theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,3 @@
}

}




@mixin kendo-badge--extended-theme() {}
12 changes: 9 additions & 3 deletions packages/nouvelle/scss/badge/index.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@import "../core/index.import.scss";


// Module meta
$_kendo-module-meta: (
name: "badge",
Expand All @@ -14,15 +17,18 @@ $_kendo-module-meta: (


// Register
@import "../core/module-system/index.import.scss";
@include module-register( $_kendo-module-meta... );


// Expose
@mixin badge-styles() {
@mixin kendo-badge--styles() {
@include module-render( "badge" ) {
@include kendo-badge--layout();
@include kendo-badge--extended-layout();
@include kendo-badge--theme();
@include kendo-badge--extended-theme();
}
}

@if $kendo-auto-bootstrap {
@include kendo-badge--styles();
}
7 changes: 1 addition & 6 deletions packages/nouvelle/scss/bottom-nav/_layout.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@mixin kendo-bottom-nav--layout() {
@mixin kendo-bottom-navigation--layout() {

// Bottom Navigation
.k-bottom-nav {
Expand Down Expand Up @@ -113,8 +113,3 @@
}

}




@mixin kendo-bottom-nav--extended-layout() {}
7 changes: 1 addition & 6 deletions packages/nouvelle/scss/bottom-nav/_theme.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@mixin kendo-bottom-nav--theme() {
@mixin kendo-bottom-navigation--theme() {

// Bottom navigation
.k-bottom-nav {
Expand Down Expand Up @@ -218,8 +218,3 @@
}

}




@mixin kendo-bottom-nav--extended-theme() {}
Loading

0 comments on commit 690aafa

Please sign in to comment.