Skip to content

Commit

Permalink
fix linting
Browse files Browse the repository at this point in the history
  • Loading branch information
Roxanne Panthaky committed Nov 23, 2016
1 parent fc819ce commit 619c85a
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 30 deletions.
8 changes: 4 additions & 4 deletions addon/styles/_colors.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/** The content of this file must stay in sync
* with app/styles/ember-frost-core/_colors
* Any changes here should be duplicated in there
*/
// The content of this file must stay in sync with
// app/styles/ember-frost-core/_colors
// Any changes here should be duplicated in there


$frost-color-white: #fff !default;

Expand Down
10 changes: 5 additions & 5 deletions addon/styles/_flex.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/** The content of this file must stay in sync
* with app/styles/ember-frost-core/_flex
* Any changes here should be duplicated in there
*/
html {
// The content of this file must stay in sync
// with app/styles/ember-frost-core/_flex
// Any changes here should be duplicated in there

html {
height: 100%;
}

Expand Down
10 changes: 5 additions & 5 deletions addon/styles/_typography.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/** The content of this file must stay in sync
* with app/styles/ember-frost-core/_typography
* Any changes here should be duplicated in there
*/
$frost-font-family: Roboto, Arial, sans-serif;
// The content of this file must stay in sync
// with app/styles/ember-frost-core/_typography
// Any changes here should be duplicated in there

$frost-font-family: Roboto, Arial, sans-serif;

$frost-font-xxxl: 45px !default;
$frost-font-xxl: 36px !default;
Expand Down
11 changes: 5 additions & 6 deletions addon/styles/_z-index.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
/** The content of this file must stay in sync
* with app/styles/ember-frost-core/_z-index
* Any changes here should be duplicated in there
*/

// TODO Proper aliases - the following are samples
// The content of this file must stay in sync
// with app/styles/ember-frost-core/_z-index
// Any changes here should be duplicated in there

// TODO Proper aliases - the following are samples
$frost-z-index-application-bar: 9000;
$frost-z-index-modal: 8000;
$frost-z-index-navigation: 7000;
Expand Down
9 changes: 4 additions & 5 deletions addon/styles/frost-app.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
/** The content of this file must stay in sync
* with app/styles/ember-frost-core/frost-app
* Any changes here should be duplicated in there
*/
// The content of this file must stay in sync
// with app/styles/ember-frost-core/frost-app
// Any changes here should be duplicated in there

@import 'normalize';
@import 'normalize';
@import 'flex';
@import 'z-index';
9 changes: 4 additions & 5 deletions addon/styles/frost-theme.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
/** The content of this file must stay in sync
* with app/styles/ember-frost-core/frost-theme
* Any changes here should be duplicated in there
*/
// The content of this file must stay in sync
// with app/styles/ember-frost-core/frost-theme
// Any changes here should be duplicated in there

@import 'colors';
@import 'colors';
@import 'typography';

// ================================================================
Expand Down

0 comments on commit 619c85a

Please sign in to comment.