adding notes about the duplicate style files

ciena-frost · Nov 22, 2016 · fc819ce · fc819ce
1 parent c23c256
commit fc819ce
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 6 deletions.
diff --git a/addon/styles/_colors.scss b/addon/styles/_colors.scss
@@ -1,3 +1,8 @@
+/** 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;
 
 $frost-color-blue-1: #009eef !default;

diff --git a/addon/styles/_flex.scss b/addon/styles/_flex.scss
@@ -1,4 +1,8 @@
-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/_normalize.scss b/addon/styles/_normalize.scss
@@ -1,4 +1,8 @@
-@import 'typography';
+/** The content of this file must stay in sync
+ * with app/styles/ember-frost-core/_normalize
+ * Any changes here should be duplicated in there
+ */
+ @import 'typography';
 
 $frost-normalize-mark-bg: #ff0;
 $frost-normalize-mark-color: #000;

diff --git a/addon/styles/_typography.scss b/addon/styles/_typography.scss
@@ -1,4 +1,8 @@
-$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
@@ -1,4 +1,9 @@
-// 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
@@ -1,3 +1,8 @@
-@import 'normalize';
+/** 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 'flex';
 @import 'z-index';
diff --git a/addon/styles/frost-theme.scss b/addon/styles/frost-theme.scss
@@ -1,4 +1,9 @@
-@import 'colors';
+/** 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 'typography';
 
 // ================================================================