Skip to content

Commit

Permalink
fix(home): home button is now using theme
Browse files Browse the repository at this point in the history
  • Loading branch information
mbarbeau committed Sep 12, 2019
1 parent 237d9cd commit b43184b
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 3 deletions.
5 changes: 5 additions & 0 deletions src/app/app.theming.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@import './pages/portal/portal.theming';

@mixin app-theming($theme) {
@include app-portal-theming($theme);
}
5 changes: 5 additions & 0 deletions src/app/pages/portal/portal.theming.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@import './sidenav/sidenav.theming';

@mixin app-portal-theming($theme) {
@include app-sidenav-theming($theme);
}
3 changes: 1 addition & 2 deletions src/app/pages/portal/sidenav/sidenav.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ div.toolActived > igo-panel ::ng-deep > div.igo-panel-header {
position: absolute;
top: 50px;
left: 0px;
background-color: #1976d2;
color: white;
border-radius: 0;
height: 46px;
Expand All @@ -63,4 +62,4 @@ igo-toolbox {
@include mobile {
overflow: auto;
}
}
}
7 changes: 7 additions & 0 deletions src/app/pages/portal/sidenav/sidenav.theming.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
@mixin app-sidenav-theming($theme) {
$primary: map-get($theme, primary);

app-sidenav #homeButton {
background-color: mat-color($primary);
}
}
2 changes: 1 addition & 1 deletion src/config/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
}
},
"sidenavTitle": "IGO",
"theme": "blue-theme"
"theme": "indigo-theme"
}
8 changes: 8 additions & 0 deletions src/style/theme.scss
Original file line number Diff line number Diff line change
@@ -1,36 +1,44 @@
@import '~@igo2/core/style/all.theming';
@import '../app/app.theming';

.blue-theme {
@import '~@igo2/core/style/themes/blue.theme';
@include igo-all-theming($theme);
@include app-theming($theme);
}

.indigo-theme {
@import '~@igo2/core/style/themes/indigo.theme';
@include igo-all-theming($theme);
@include app-theming($theme);
}

.deeppurple-theme {
@import '~@igo2/core/style/themes/deeppurple.theme';
@include igo-all-theming($theme);
@include app-theming($theme);
}

.orange-theme {
@import '~@igo2/core/style/themes/orange.theme';
@include igo-all-theming($theme);
@include app-theming($theme);
}

.bluegrey-theme {
@import '~@igo2/core/style/themes/bluegrey.theme';
@include igo-all-theming($theme);
@include app-theming($theme);
}

.dark-theme {
@import '~@igo2/core/style/themes/dark.theme';
@include igo-all-theming($theme);
@include app-theming($theme);
}

.teal-theme {
@import '~@igo2/core/style/themes/teal.theme';
@include igo-all-theming($theme);
@include app-theming($theme);
}

0 comments on commit b43184b

Please sign in to comment.