Merge branch 'improvement/ghi-#1-switch-color-of-methods-and-strings'…

… into develop
nordtheme · Sep 27, 2016 · 2a95e4c · 2a95e4c
2 parents 203f199 + 29d7268
commit 2a95e4c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 23 deletions.
diff --git a/src/lesscss/nord.less b/src/lesscss/nord.less
@@ -115,12 +115,9 @@ kss-node
 // Bluish core color.
 //
 // Represents the accent color of the color palette.  
-// Can be used as main color for primary UI elements.  
-// Optionally used for methods/functions instead of @nord14
+// Main color for primary UI elements and methods/functions.  
 //
-// Also commonly used for
-//   - documentation/annotation tags
-//   - attribute values
+// Can be used for
 //   - Markup quotes
 //   - Markup link URLs
 //
@@ -172,7 +169,7 @@ kss-node
 
 // Colorful component color.
 //
-// Most commonly used for annotations and regular expressions.
+// Most commonly used for annotation- and documentation tags.
 //
 // Markup:
 // <div style="background-color:#D08770; width=60; height=60"></div>
@@ -192,7 +189,8 @@ kss-node
 
 // Colorful component color.
 //
-// Most commonly used for methods/functions, git/diff additions and success visualizations.
+// Main color for strings and attribute values.  
+// In the UI scope used for git/diff additions and success visualizations.
 //
 // Markup:
 // <div style="background-color:#A3BE8C; width=60; height=60"></div>

diff --git a/src/sass/nord.scss b/src/sass/nord.scss
@@ -178,15 +178,12 @@ $nord6: #ECEFF4;
 /// @since 0.1.0
 $nord7:  #8FBCBB;
 
-/// Bluish core color.
+/// Bluish core accent color.
 ///
 /// Represents the accent color of the color palette.  
-/// Can be used as main color for primary UI elements.  
-/// Optionally used for methods/functions instead of `$nord14`.
+/// Main color for primary UI elements and methods/functions.  
 ///
-/// Also commonly used for
-///   - documentation/annotation tags
-///   - attribute values
+/// Can be used for
 ///   - Markup quotes
 ///   - Markup link URLs
 ///
@@ -234,7 +231,7 @@ $nord11: #BF616A;
 
 /// Colorful component color.
 ///
-/// Most commonly used for annotations and regular expressions.
+/// Most commonly used for annotation- and documentation tags.
 ///
 /// @access public
 /// @group aurora
@@ -252,7 +249,8 @@ $nord13: #EBCB8B;
 
 /// Colorful component color.
 ///
-/// Most commonly used for methods/functions, git/diff additions and success visualizations.
+/// Main color for strings and attribute values.  
+/// In the UI scope used for git/diff additions and success visualizations.
 ///
 /// @access public
 /// @group aurora

diff --git a/src/sass/template-css.scss b/src/sass/template-css.scss
@@ -141,15 +141,12 @@ Styleguide Nord
   --nord7: $nord7;
 
   /*
-  Bluish core color.
+  Bluish core accent color.
 
   Represents the accent color of the color palette.  
-  Can be used as main color for primary UI elements.  
-  Optionally used for methods/functions instead of @nord14
+  Main color for primary UI elements and methods/functions.
 
-  Also commonly used for
-    - documentation/annotation tags
-    - attribute values
+  Can be used for
     - Markup quotes
     - Markup link URLs
 
@@ -209,7 +206,7 @@ Styleguide Nord
   /*
   Colorful component color.
 
-  Most commonly used for annotations and regular expressions.
+  Most commonly used for annotation- and documentation tags.
 
   Markup:
   <div style="background-color:#D08770; width=60; height=60"></div>
@@ -233,7 +230,8 @@ Styleguide Nord
   /*
   Colorful component color.
 
-  Most commonly used for methods/functions, git/diff additions and success visualizations.
+  Main color for strings and attribute values.  
+  In the UI scope used for git/diff additions and success visualizations.
 
   Markup:
   <div style="background-color:#A3BE8C; width=60; height=60"></div>