Skip to content

Commit

Permalink
Merge branch 'improvement/ghi-#3-add-regexp-coloring-description' int…
Browse files Browse the repository at this point in the history
…o develop
  • Loading branch information
arcticicestudio committed Sep 27, 2016
2 parents f8231ac + 415675d commit adfcac5
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 51 deletions.
26 changes: 9 additions & 17 deletions src/lesscss/nord.less
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ kss-node
// Lighter shade color of the base component color.
//
// Used for comments, invisibles, indent- and wrap guide marker.
// In the UI scope it may be used as pseudeoclass color for disabled elements.
// In the UI scope used as pseudoclass color for disabled elements.
//
// Markup:
// <div style="background-color:#4C566A; width=60; height=60"></div>
Expand All @@ -80,7 +80,7 @@ kss-node
// Lighter shade color of the base component color.
//
// Used as a lighter background color for UI elements like status bars.
// It may also be used as semi-light background depending on the theme shading design.
// Used as semi-light background depending on the theme shading design.
//
// Markup:
// <div style="background-color:#E5E9F0; width=60; height=60"></div>
Expand Down Expand Up @@ -126,13 +126,8 @@ kss-node

// Bluish core color.
//
// Most commonly used for
// - language-specific syntactic/reserved keywords
// - operators
// - tags
// - punctuations like colon/semicolon, comma and braces
//
// Can optionally be used for units and language-specific reserved special support characters (px/em, $, %).
// Used for language-specific syntactic/reserved support characters and keywords, operators, tags, units and
// punctuations like (semi)colons,commas and braces.
//
// Markup:
// <div style="background-color:#81A1C1; width=60; height=60"></div>
Expand All @@ -142,11 +137,7 @@ kss-node

// Bluish core color.
//
// Most commonly used for
// - Markup doctypes
// - import/include/require statements
// - pre-processor statements
// - at-rules (@)
// Used for markup doctypes, import/include/require statements, pre-processor statements and at-rules (`@`).
//
// Markup:
// <div style="background-color:#5E81AC; width=60; height=60"></div>
Expand All @@ -156,7 +147,7 @@ kss-node

// Colorful component color.
//
// Most commonly used for errors, git/diff deletion and linter marker.
// Used for errors, git/diff deletion and linter marker.
//
// Markup:
// <div style="background-color:#BF616A; width=60; height=60"></div>
Expand All @@ -176,7 +167,8 @@ kss-node

// Colorful component color.
//
// Most commonly used for escape characters, warnings, git/diff renamings and Markup entities.
// Used for escape characters, regular expressions and markup entities.
// In the UI scope used for warnings and git/diff renamings.
//
// Markup:
// <div style="background-color:#EBCB8B; width=60; height=60"></div>
Expand All @@ -197,7 +189,7 @@ kss-node

// Colorful component color.
//
// Most commonly used for numbers.
// Used for numbers.
//
// Markup:
// <div style="background-color:#B48EAD; width=60; height=60"></div>
Expand Down
26 changes: 9 additions & 17 deletions src/sass/nord.scss
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ $nord2: #434C5E;
/// Lighter shade color of the base component color.
///
/// Used for comments, invisibles, indent- and wrap guide marker.
/// In the UI scope it may be used as pseudeoclass color for disabled elements.
/// In the UI scope used as pseudoclass color for disabled elements.
///
/// @access public
/// @example scss - SCSS
Expand Down Expand Up @@ -132,7 +132,7 @@ $nord4: #D8DEE9;
/// Lighter shade color of the base component color.
///
/// Used as a lighter background color for UI elements like status bars.
/// It may also be used as semi-light background depending on the theme shading design.
/// Used as semi-light background depending on the theme shading design.
///
/// @access public
/// @group snowstorm
Expand Down Expand Up @@ -176,13 +176,8 @@ $nord8: #88C0D0;

/// Bluish core color.
///
/// Most commonly used for
/// - language-specific syntactic/reserved keywords
/// - operators
/// - tags
/// - punctuations like colon/semicolon, comma and braces
///
/// Can optionally be used for units and language-specific reserved special support characters (`px`/`em`, `$`, `%`).
/// Used for language-specific syntactic/reserved support characters and keywords, operators, tags, units and
/// punctuations like (semi)colons,commas and braces.
///
/// @access public
/// @group frost
Expand All @@ -191,11 +186,7 @@ $nord9: #81A1C1;

/// Bluish core color.
///
/// Most commonly used for
/// - Markup doctypes
/// - import/include/require statements
/// - pre-processor statements
/// - at-rules (`@`)
/// Used for markup doctypes, import/include/require statements, pre-processor statements and at-rules (`@`).
///
/// @access public
/// @group frost
Expand All @@ -204,7 +195,7 @@ $nord10: #5E81AC;

/// Colorful component color.
///
/// Most commonly used for errors, git/diff deletion and linter marker.
/// Used for errors, git/diff deletion and linter marker.
///
/// @access public
/// @group aurora
Expand All @@ -222,7 +213,8 @@ $nord12: #D08770;

/// Colorful component color.
///
/// Most commonly used for escape characters, warnings, git/diff renamings and Markup entities.
/// Used for escape characters, regular expressions and markup entities.
/// In the UI scope used for warnings and git/diff renamings.
///
/// @access public
/// @group aurora
Expand All @@ -241,7 +233,7 @@ $nord14: #A3BE8C;

/// Colorful component color.
///
/// Most commonly used for numbers.
/// Used for numbers.
///
/// @access public
/// @group aurora
Expand Down
26 changes: 9 additions & 17 deletions src/sass/template-css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Styleguide Nord
Lighter shade color of the base component color.
Used for comments, invisibles, indent- and wrap guide marker.
In the UI scope it may be used as pseudeoclass color for disabled elements.
In the UI scope used as pseudoclass color for disabled elements.
Markup:
<div style="background-color:#4C566A; width=60; height=60"></div>
Expand All @@ -103,7 +103,7 @@ Styleguide Nord
Lighter shade color of the base component color.
Used as a lighter background color for UI elements like status bars.
It may also be used as semi-light background depending on the theme shading design.
Used as semi-light background depending on the theme shading design.
Markup:
<div style="background-color:#E5E9F0; width=60; height=60"></div>
Expand Down Expand Up @@ -157,13 +157,8 @@ Styleguide Nord
/*
Bluish core color.
Most commonly used for
- language-specific syntactic/reserved keywords
- operators
- tags
- punctuations like colon/semicolon, comma and braces
Can optionally be used for units and language-specific reserved special support characters (px/em, $, %).
Used for language-specific syntactic/reserved support characters and keywords, operators, tags, units and
punctuations like (semi)colons,commas and braces.
Markup:
<div style="background-color:#81A1C1; width=60; height=60"></div>
Expand All @@ -175,11 +170,7 @@ Styleguide Nord
/*
Bluish core color.
Most commonly used for
- Markup doctypes
- import/include/require statements
- pre-processor statements
- at-rules (@)
Used for markup doctypes, import/include/require statements, pre-processor statements and at-rules (`@`).
Markup:
<div style="background-color:#5E81AC; width=60; height=60"></div>
Expand All @@ -191,7 +182,7 @@ Styleguide Nord
/*
Colorful component color.
Most commonly used for errors, git/diff deletion and linter marker.
Used for errors, git/diff deletion and linter marker.
Markup:
<div style="background-color:#BF616A; width=60; height=60"></div>
Expand All @@ -215,7 +206,8 @@ Styleguide Nord
/*
Colorful component color.
Most commonly used for escape characters, warnings, git/diff renamings and Markup entities.
Used for escape characters, regular expressions and markup entities.
In the UI scope used for warnings and git/diff renamings.
Markup:
<div style="background-color:#EBCB8B; width=60; height=60"></div>
Expand All @@ -240,7 +232,7 @@ Styleguide Nord
/*
Colorful component color.
Most commonly used for numbers.
Used for numbers.
Markup:
<div style="background-color:#B48EAD; width=60; height=60"></div>
Expand Down

0 comments on commit adfcac5

Please sign in to comment.