From 619c85a259a5c333eab5753835faa48012c63dac Mon Sep 17 00:00:00 2001 From: Roxanne Panthaky Date: Wed, 23 Nov 2016 10:21:28 -0500 Subject: [PATCH] fix linting --- addon/styles/_colors.scss | 8 ++++---- addon/styles/_flex.scss | 10 +++++----- addon/styles/_typography.scss | 10 +++++----- addon/styles/_z-index.scss | 11 +++++------ addon/styles/frost-app.scss | 9 ++++----- addon/styles/frost-theme.scss | 9 ++++----- 6 files changed, 27 insertions(+), 30 deletions(-) diff --git a/addon/styles/_colors.scss b/addon/styles/_colors.scss index fc61dff0..77803ec1 100644 --- a/addon/styles/_colors.scss +++ b/addon/styles/_colors.scss @@ -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; diff --git a/addon/styles/_flex.scss b/addon/styles/_flex.scss index 6b5e71e6..a500fc2b 100644 --- a/addon/styles/_flex.scss +++ b/addon/styles/_flex.scss @@ -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%; } diff --git a/addon/styles/_typography.scss b/addon/styles/_typography.scss index fbed5644..8e5060b0 100644 --- a/addon/styles/_typography.scss +++ b/addon/styles/_typography.scss @@ -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; diff --git a/addon/styles/_z-index.scss b/addon/styles/_z-index.scss index 69ddf8e0..b23a530c 100644 --- a/addon/styles/_z-index.scss +++ b/addon/styles/_z-index.scss @@ -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; diff --git a/addon/styles/frost-app.scss b/addon/styles/frost-app.scss index 55f6f88e..c21c5999 100644 --- a/addon/styles/frost-app.scss +++ b/addon/styles/frost-app.scss @@ -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'; diff --git a/addon/styles/frost-theme.scss b/addon/styles/frost-theme.scss index 85bda681..7d134f7c 100644 --- a/addon/styles/frost-theme.scss +++ b/addon/styles/frost-theme.scss @@ -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'; // ================================================================