feat(theme): add corporate theme #1727
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
denStrigo
force-pushed
the
feat/corporate_theme
branch
from
d2f86e8
to
2b658d9
Compare
nnixaa
requested changes
Jun 20, 2018
| <nb-search type="rotate-layout" (click)="startSearch()"></nb-search> | ||
| </nb-action> | ||
| </nb-actions> | ||
|
|
| @import '~@nebular/theme/styles/core/functions'; | ||
|
|
||
| @include nb-install-component() { | ||
| $default-switcher-background: #ebeff5; |
There was a problem hiding this comment.
should we move these variables to the theme?
|
|
||
| &::before { | ||
| // Hack for IE11, IE11 should not set background | ||
| background: -webkit-linear-gradient(#01dbb5, #0bbb79); |
There was a problem hiding this comment.
should we move these variables to the theme?
| color: #0bbb79; | ||
|
|
||
| // Hack for IE11, IE11 should not set background | ||
| background: -webkit-linear-gradient(#01dbb5, #0bbb79); |
There was a problem hiding this comment.
should we move these variables to the theme?
|
|
||
| constructor(protected themeService: NbThemeService) { | ||
| this.themeSubscription = this.themeService.getJsTheme().subscribe(theme => { | ||
| this.currentTheme = theme.name; |
There was a problem hiding this comment.
let's re-do this with alive
|
|
||
| constructor(private themeService: NbThemeService) { | ||
| this.themeSubscription = this.themeService.getJsTheme().subscribe(theme => { | ||
| this.currentTheme = theme.name; |
There was a problem hiding this comment.
let's re-do this with alive
| @@ -212,6 +220,45 @@ | |||
| } | |||
| } | |||
|
|
|||
| @include nb-for-theme(corporate) { | |||
| nb-tabset /deep/ ul li.active { | |||
There was a problem hiding this comment.
what are these styles for?
| &.warning, | ||
| &.danger, | ||
| &.secondary { | ||
| box-shadow: none; |
There was a problem hiding this comment.
what if we keep the shadow?
| @@ -34,19 +34,29 @@ | |||
| <div class="container-title">Pagination</div> | |||
| <div class="btn-group btn-group-toggle btn-outline-toggle-group" data-toggle="buttons" | |||
| [(ngModel)]="paginationModel" ngbRadioGroup> | |||
| <label ngbButtonLabel class="btn btn-outline-success"> | |||
| <label ngbButtonLabel | |||
| currentTheme: string; | ||
| themeSubscription: Subscription; | ||
|
|
||
| constructor(private themeService: NbThemeService) { |
nnixaa
requested changes
Jun 21, 2018
| } | ||
|
|
||
| i { | ||
| $icon-color-default: #0bbb79; |
| cursor: pointer; | ||
|
|
||
| &:hover { | ||
| span { |
| theme: NbJSThemeOptions; | ||
|
|
||
| themes = [{ | ||
| title: 'Light', |
There was a problem hiding this comment.
array-object styling looks strange to me
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please read and mark the following check list before creating a pull request (check one with "x"):
Short description of what this resolves: