Skip to content

Commit

Permalink
Merge branch 'improvement/ghi-#2-switch-color-of-punctuations-and-var…
Browse files Browse the repository at this point in the history
…iables' into develop
  • Loading branch information
arcticicestudio committed Sep 27, 2016
2 parents 2a95e4c + be12d63 commit f8231ac
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 42 deletions.
15 changes: 6 additions & 9 deletions src/lesscss/nord.less
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ kss-node

// Base component color of "Snow Storm".
//
// Used for texts, carets and structuring characters like curly- and square brackets.
// In the UI scope it may be used as semi-light background depending on the theme shading design.
// Main color for text, variables, constants and attributes.
// In the UI scope used as semi-light background depending on the theme shading design.
//
// Markup:
// <div style="background-color:#D8DEE9; width=60; height=60"></div>
Expand All @@ -90,8 +90,8 @@ kss-node

// Lighter shade color of the base component color.
//
// Usually be used as background depending on the theme shading design.
// In the UI scope it may be used as selection- and hightlight color.
// Used for punctuations, carets and structuring characters like curly- and square brackets.
// In the UI scope used as background, selection- and hightlight color depending on the theme shading design.
//
// Markup:
// <div style="background-color:#ECEFF4; width=60; height=60"></div>
Expand All @@ -101,10 +101,7 @@ kss-node

// Bluish core color.
//
// Most commonly used for
// - classes/types
// - attributes
// - constants
// Used for classes, types and documentation tags.
//
// Markup:
// <div style="background-color:#8FBCBB; width=60; height=60"></div>
Expand Down Expand Up @@ -169,7 +166,7 @@ kss-node

// Colorful component color.
//
// Most commonly used for annotation- and documentation tags.
// Used for annotations.
//
// Markup:
// <div style="background-color:#D08770; width=60; height=60"></div>
Expand Down
30 changes: 6 additions & 24 deletions src/sass/nord.scss
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,8 @@ $nord3: #4C566A;

/// Base component color of "Snow Storm".
///
/// Used for texts, carets and structuring characters like curly- and square brackets.
/// In the UI scope it may be used as semi-light background depending on the theme shading design.
///
/// Main color for text, variables, constants and attributes.
/// In the UI scope used as semi-light background depending on the theme shading design.
///
/// @access public
/// @example scss - SCSS
Expand Down Expand Up @@ -143,35 +142,18 @@ $nord5: #E5E9F0;

/// Lighter shade color of the base component color.
///
/// Usually be used as background depending on the theme shading design.
/// In the UI scope it may be used as selection- and hightlight color.
/// Used for punctuations, carets and structuring characters like curly- and square brackets.
/// In the UI scope used as background, selection- and hightlight color depending on the theme shading design.
///
/// @access public
/// @example scss - SCSS
/// /* Code Syntax Highlighting scope */
/// .editor {
/// &.line {
/// background-color: $nord2;
/// }
/// }
///
/// /* UI scope */
/// button {
/// &:selected {
/// background-color: $nord2;
/// }
/// }
/// @group snowstorm
/// @see $nord4
/// @since 0.1.0
$nord6: #ECEFF4;

/// Bluish core color.
///
/// Most commonly used for
/// - classes/types
/// - attributes
/// - constants
/// Used for classes, types and documentation tags.
///
/// @access public
/// @group frost
Expand Down Expand Up @@ -231,7 +213,7 @@ $nord11: #BF616A;

/// Colorful component color.
///
/// Most commonly used for annotation- and documentation tags.
/// Used for annotations.
///
/// @access public
/// @group aurora
Expand Down
15 changes: 6 additions & 9 deletions src/sass/template-css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ Styleguide Nord
/*
Base component color of "Snow Storm".
Used for texts, carets and structuring characters like curly- and square brackets.
In the UI scope it may be used as semi-light background depending on the theme shading design.
Main color for text, variables, constants and attributes.
In the UI scope used as semi-light background depending on the theme shading design.
Markup:
<div style="background-color:#D8DEE9; width=60; height=60"></div>
Expand All @@ -115,8 +115,8 @@ Styleguide Nord
/*
Lighter shade color of the base component color.
Usually be used as background depending on the theme shading design.
In the UI scope it may be used as selection- and hightlight color.
Used for punctuations, carets and structuring characters like curly- and square brackets.
In the UI scope used as background, selection- and hightlight color depending on the theme shading design.
Markup:
<div style="background-color:#ECEFF4; width=60; height=60"></div>
Expand All @@ -128,10 +128,7 @@ Styleguide Nord
/*
Bluish core color.
Most commonly used for
- classes/types
- attributes
- constants
Used for classes, types and documentation tags.
Markup:
<div style="background-color:#8FBCBB; width=60; height=60"></div>
Expand Down Expand Up @@ -206,7 +203,7 @@ Styleguide Nord
/*
Colorful component color.
Most commonly used for annotation- and documentation tags.
Used for annotations.
Markup:
<div style="background-color:#D08770; width=60; height=60"></div>
Expand Down

0 comments on commit f8231ac

Please sign in to comment.