Skip to content

Commit

Permalink
fix(theme): move breakpoints in theme
Browse files Browse the repository at this point in the history
  • Loading branch information
alyleui committed Sep 14, 2018
1 parent 4529fa3 commit 28e8d42
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
7 changes: 3 additions & 4 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import { LyDrawerModule } from '@alyle/ui/drawer';
import { LyToolbarModule } from '@alyle/ui/toolbar';
import { LyMenuModule } from '@alyle/ui/menu';
import { LyIconButtonModule } from '@alyle/ui/icon-button';
import { LyCommonModule, LyThemeConfig, LY_THEME_CONFIG, LyHammerGestureConfig, LyThemeModule, ThemeVariables } from '@alyle/ui';
import { ResponsiveModule, Breakpoints } from '@alyle/ui/responsive';
import { LyCommonModule, LyThemeConfig, LY_THEME_CONFIG, LyHammerGestureConfig, LyThemeModule } from '@alyle/ui';
import { ResponsiveModule } from '@alyle/ui/responsive';
import { LyButtonModule } from '@alyle/ui/button';
import { LyRippleModule } from '@alyle/ui/ripple';

Expand Down Expand Up @@ -64,11 +64,10 @@ export class CustomMinimaDark extends MinimaDark {
myColor = 'teal';
}

export class GlobalVariables implements ThemeVariables {
export class GlobalVariables {
testVal = '#00bcd4';
Quepal = Quepal;
SublimeLight = SublimeLight;
breakpoints = Breakpoints;
}

/** Custom Theme */
Expand Down
2 changes: 2 additions & 0 deletions src/lib/themes/minima/dark.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { typography, iconButton, icon, input } from './variables';
import { ThemeConfig, LyStyleUtils, TypographyConfig } from '@alyle/ui';
import { Breakpoints } from '@alyle/ui/responsive';

const contrast = '#fff';
const shadow = 'rgba(0, 0, 0, 1)';
Expand Down Expand Up @@ -59,4 +60,5 @@ export class MinimaDark extends LyStyleUtils implements ThemeConfig {
};
iconButton = iconButton;
icon = icon;
breakpoints = Breakpoints;
}
2 changes: 2 additions & 0 deletions src/lib/themes/minima/light.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { typography, iconButton, icon, input } from './variables';
import { ThemeConfig, LyStyleUtils, TypographyConfig } from '@alyle/ui';
import { Breakpoints } from '@alyle/ui/responsive';

const contrast = '#fff';
const shadow = '#333';
Expand Down Expand Up @@ -60,4 +61,5 @@ export class MinimaLight extends LyStyleUtils implements ThemeConfig {
};
iconButton = iconButton;
icon = icon;
breakpoints = Breakpoints;
}

0 comments on commit 28e8d42

Please sign in to comment.