Add some missing styles #207
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| // | ||
| // Mixins used for ember-frost-navigation styles | ||
| // | ||
|
|
||
| @mixin category-styles { | ||
| display: flex; | ||
| flex-direction: row; | ||
| align-items: center; | ||
| padding: 10px 20px; | ||
| transition: background .5s ease; | ||
| border-right: 1px solid $frost-color-nav-category-border-right; | ||
| cursor: pointer; | ||
| user-select: none; | ||
|
|
||
| .nav-category-icon { | ||
| .frost-icon { | ||
| width: 30px; | ||
| height: 30px; | ||
| margin-right: 10px; | ||
| } | ||
| } | ||
|
|
||
| .nav-category-name { | ||
| transition: color .5s ease; | ||
| color: $frost-color-grey-6; | ||
| font-size: 18px; | ||
| font-weight: 300; | ||
| } | ||
|
|
||
| &:hover { | ||
| .nav-category-name { | ||
| color: $frost-color-white; | ||
| } | ||
| } | ||
|
|
||
| &.active { | ||
| background: $frost-color-nav-category-active-bg; | ||
|
|
||
| .nav-category-name { | ||
| color: $frost-color-white; | ||
| } | ||
| } | ||
|
|
||
| &.disabled { | ||
| color: $frost-color-grey-5; | ||
| } | ||
| } | ||
|
|
||
| @mixin tertiary-button-color ($color) { | ||
| .frost-button { | ||
| &.tertiary { | ||
| color: $color; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @mixin do-not-expand-links { | ||
| .frost-link { | ||
| .content { | ||
| min-width: inherit; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // In some instances, the <a> tag gets a color that we don't want, | ||
| // based on browser default styles, so we want to make sure the color | ||
| // of the link, and by extension the color on the frost-icon is inherited (ARM 2017-04-03) | ||
| @mixin keep-link-icon-colors-inherited { | ||
| .frost-link { | ||
| color: inherit; | ||
| } | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| // | ||
| // Variables used by | ||
| // | ||
|
|
||
| $frost-color-nav-bar-bg: $frost-color-night-2 !default; | ||
| $frost-color-nav-border-left: rgba($frost-color-white, .2) !default; | ||
| $frost-color-nav-category-border-right: rgba($frost-color-white, .2) !default; | ||
|
|
||
| // TODO: should this be a variable in ember-frost-core? (ARM 2017-04-03) | ||
| $frost-color-nav-category-active-bg: rgba(39, 36, 37, .5) !default; | ||
| $frost-color-nav-column-border: rgba($frost-color-white, .3) !default; | ||
|
|
||
| // TODO: should this be a variable in ember-frost-core? (ARM 2017-04-03) | ||
| $frost-color-nav-modal-bg: rgba(51, 66, 79, .97) !default; | ||
| $frost-color-nav-route-focus-bg: rgba(0, 0, 0, .2) !default; | ||
| $frost-color-nav-route-active-bg: rgba($frost-color-nav-route-focus-bg, .05) !default; | ||
| $frost-color-nav-route-focus-box-shadow: #fff !default; | ||
|
|
||
| $frost-navigation-bar-height: 50px !default; | ||
| $z-index-application-bar: 3 !default; | ||
| $z-index-modal: 2 !default; | ||
| $z-index-modal-hidden: -1 !default; | ||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -54,14 +54,15 @@ | |
| "ember-computed-decorators": "0.2.2", | ||
| "ember-concurrency": "0.7.19", | ||
| "ember-disable-proxy-controllers": "^1.0.1", | ||
| "ember-elsewhere": "0.4.1", | ||
| "ember-engines": "~0.3.4", | ||
| "ember-export-application-global": "^1.0.5", | ||
| "ember-frost-notifier": "4.2.1", | ||
| "ember-frost-popover": "4.2.5", | ||
| "ember-frost-test": "1.0.2", | ||
| "ember-hook": "1.4.1", | ||
| "ember-load-initializers": "^0.5.1", | ||
| "ember-prop-types": "3.10.4", | ||
| "ember-redux": "^1.0.0", | ||
| "ember-resolver": "^2.0.3", | ||
| "ember-sinon": "0.6.0", | ||
|
|
@@ -78,7 +79,7 @@ | |
| "remark-cli": "^2.0.0", | ||
| "remark-lint": "^5.1.0", | ||
| "sass-lint": "^1.0.0", | ||
| "sinon-chai": "^2.9.0", | ||
| "typescript": "^2.0.0" | ||
| }, | ||
| "keywords": [ | ||
|
|
@@ -90,6 +91,7 @@ | |
| "ember-computed-decorators": "^0.2.2", | ||
| "ember-cli-htmlbars": "^1.0.1", | ||
| "ember-cli-sass": "5.6.0", | ||
| "ember-frost-core": "^1.0.0", | ||
|
There was a problem hiding this comment. Are we at the stage where core can work without a blueprint run? @dafortin There was a problem hiding this comment. I thought I put a note, maybe it wasn't in this PR, where the core install won't actually work, but I don't think it really matters for addons that depend on core. I don't think anyone is getting core by installing some other addon in their app. I think it's safe (for this transition period at least) to just tell people to install core and test independently. There was a problem hiding this comment. Yeah, that's fine - I doubt we have any scenarios where only the nav is used currently anyway |
||
| "liquid-fire": "0.26.1" | ||
| }, | ||
| "ember-addon": { | ||
|
|
@@ -101,4 +103,4 @@ | |
| "pr-bumper": { | ||
| "coverage": 96.7 | ||
| } | ||
| } | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FYI I've been trying to centralize all z-index values in core so that we know how they'll compete https://github.com/ciena-frost/ember-frost-core/blob/master/addon/styles/_z-index.scss
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds good. I was just renaming existing variables and putting them in a variables file.