From 6539ba21cabd90f5532019bdaf3300f52b41188e Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Sun, 8 Jan 2023 17:19:08 +0800 Subject: [PATCH] update --- src/_sass/_colors.scss | 14 +- src/_sass/_nord-palette.scss | 227 ++---------------------------- src/gnome-shell/sass/_colors.scss | 5 +- 3 files changed, 24 insertions(+), 222 deletions(-) diff --git a/src/_sass/_colors.scss b/src/_sass/_colors.scss index e049cee..e9f05d1 100644 --- a/src/_sass/_colors.scss +++ b/src/_sass/_colors.scss @@ -120,10 +120,10 @@ $titlebar: if($topbar == 'dark', background(g), bac $titlebar-backdrop: if($topbar == 'dark', background(g), background(a)); @if $theme == 'nord' { - $tooltip: darken(background(e), 5%); - $scrim: darken(background(e), 5%); - $scrim-alt: darken(background(e), 25%); - $scrim-inverse: rgba($primary, 0.1); + $tooltip: darken(background(e), 5%); + $scrim: darken(background(e), 5%); + $scrim-alt: darken(background(e), 25%); + $scrim-inverse: rgba($primary, 0.1); } @@ -199,9 +199,9 @@ $titlebutton-max: #38c76a; $titlebutton-min: #fdbe04; @if $theme == 'nord' { - $titlebutton-close: $nord11; - $titlebutton-max: $nord7; - $titlebutton-min: $nord13; + $titlebutton-close: $nord11; + $titlebutton-max: $nord7; + $titlebutton-min: $nord13; } // workaround for GTK3 @placeholder_text_color which doesn't allow translucent colors diff --git a/src/_sass/_nord-palette.scss b/src/_sass/_nord-palette.scss index 33c400c..92ad5aa 100644 --- a/src/_sass/_nord-palette.scss +++ b/src/_sass/_nord-palette.scss @@ -6,230 +6,31 @@ // Repository: https://github.com/arcticicestudio/nord // License: MIT // References: -// http://sass-lang.com -// http://sassdoc.com +// http://sass-lang.com +// http://sassdoc.com -//// -/// An arctic, north-bluish color palette. -/// Created for the clean- and minimal flat design pattern to achieve a optimal focus and readability for code syntax -/// highlighting and UI. -/// It consists of a total of sixteen, carefully selected, dimmed pastel colors for a eye-comfortable, but yet colorful -/// ambiance. -/// -/// @author Arctic Ice Studio -//// -/// Base component color of "Polar Night". -/// -/// Used for texts, backgrounds, carets and structuring characters like curly- and square brackets. -/// -/// @access public -/// @example scss - SCSS -/// /* For dark ambiance themes */ -/// .background { -/// background-color: $nord0; -/// } -/// /* For light ambiance themes */ -/// .text { -/// color: $nord0; -/// } -/// @group polarnight -/// @since 0.1.0 -$nord0: #2e3440; +// An arctic, north-bluish color palette. +// Created for the clean- and minimal flat design pattern to achieve a optimal focus and readability for code syntax +// highlighting and UI. +// It consists of a total of sixteen, carefully selected, dimmed pastel colors for a eye-comfortable, but yet colorful +// ambiance. -/// Lighter shade color of the base component color. -/// -/// Used as a lighter background color for UI elements like status bars. -/// -/// @access public -/// @group polarnight -/// @see $nord0 -/// @since 0.1.0 -$nord1: #3b4252; +// @author Arctic Ice Studio -/// Lighter shade color of the base component color. -/// -/// Used as line highlighting in the editor. -/// In the UI scope it may be used as selection- and highlight color. -/// -/// @access public -/// @example scss - SCSS -/// /* Code Syntax Highlighting scope */ -/// .editor { -/// &.line { -/// background-color: $nord2; -/// } -/// } -/// -/// /* UI scope */ -/// button { -/// &:selected { -/// background-color: $nord2; -/// } -/// } -/// @group polarnight -/// @see $nord0 -/// @since 0.1.0 +$nord0: #2e3440; +$nord1: #3b4252; $nord2: #434c5e; - -/// Lighter shade color of the base component color. -/// -/// Used for comments, invisibles, indent- and wrap guide marker. -/// In the UI scope used as pseudoclass color for disabled elements. -/// -/// @access public -/// @example scss - SCSS -/// /* Code Syntax Highlighting scope */ -/// .editor { -/// &.indent-guide, -/// &.wrap-guide { -/// &.marker { -/// color: $nord3; -/// } -/// } -/// } -/// .comment, -/// .invisible { -/// color: $nord3; -/// } -/// -/// /* UI scope */ -/// button { -/// &:disabled { -/// background-color: $nord3; -/// } -/// } -/// @group polarnight -/// @see $nord0 -/// @since 0.1.0 $nord3: #4c566a; - -/// Base component color of "Snow Storm". -/// -/// 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 -/// /* For light ambiance themes */ -/// .background { -/// background-color: $nord4; -/// } -/// /* For dark ambiance themes */ -/// .text { -/// color: $nord4; -/// } -/// @group snowstorm -/// @since 0.1.0 $nord4: #d8dee9; - -/// Lighter shade color of the base component color. -/// -/// Used as a lighter background color for UI elements like status bars. -/// Used as semi-light background depending on the theme shading design. -/// -/// @access public -/// @group snowstorm -/// @see $nord4 -/// @since 0.1.0 $nord5: #e5e9f0; - -/// Lighter shade color of the base component color. -/// -/// Used for punctuations, carets and structuring characters like curly- and square brackets. -/// In the UI scope used as background, selection- and highlight color depending on the theme shading design. -/// -/// @access public -/// @group snowstorm -/// @see $nord4 -/// @since 0.1.0 $nord6: #eceff4; - -/// Bluish core color. -/// -/// Used for classes, types and documentation tags. -/// -/// @access public -/// @group frost -/// @since 0.1.0 -$nord7: #8fbcbb; - -/// Bluish core accent color. -/// -/// Represents the accent color of the color palette. -/// Main color for primary UI elements and methods/functions. -/// -/// Can be used for -/// - Markup quotes -/// - Markup link URLs -/// -/// @access public -/// @group frost -/// @since 0.1.0 -$nord8: #88c0d0; - -/// Bluish core color. -/// -/// 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 -/// @since 0.1.0 -$nord9: #81a1c1; - -/// Bluish core color. -/// -/// Used for markup doctypes, import/include/require statements, pre-processor statements and at-rules (`@`). -/// -/// @access public -/// @group frost -/// @since 0.1.0 +$nord7: #8fbcbb; +$nord8: #88c0d0; +$nord9: #81a1c1; $nord10: #5e81ac; - -/// Colorful component color. -/// -/// Used for errors, git/diff deletion and linter marker. -/// -/// @access public -/// @group aurora -/// @since 0.1.0 $nord11: #bf616a; - -/// Colorful component color. -/// -/// Used for annotations. -/// -/// @access public -/// @group aurora -/// @since 0.1.0 $nord12: #d08770; - -/// Colorful component color. -/// -/// Used for escape characters, regular expressions and markup entities. -/// In the UI scope used for warnings and git/diff renamings. -/// -/// @access public -/// @group aurora -/// @since 0.1.0 $nord13: #ebcb8b; - -/// Colorful component color. -/// -/// Main color for strings and attribute values. -/// In the UI scope used for git/diff additions and success visualizations. -/// -/// @access public -/// @group aurora -/// @since 0.1.0 $nord14: #a3be8c; - -/// Colorful component color. -/// -/// Used for numbers. -/// -/// @access public -/// @group aurora -/// @since 0.1.0 -$nord15: #b48ead; \ No newline at end of file +$nord15: #b48ead; diff --git a/src/gnome-shell/sass/_colors.scss b/src/gnome-shell/sass/_colors.scss index 03f6da6..afd5233 100644 --- a/src/gnome-shell/sass/_colors.scss +++ b/src/gnome-shell/sass/_colors.scss @@ -97,8 +97,9 @@ $alt_keyboard_bg_color: if($variant == 'light', $grey_300, fade($grey_900)); // $primary_color: theme(color); $alt_primary_color: darken($primary_color, 3%); $accent_color: lighten($primary_color, 3%); -@if ($theme == 'nord'){ - $accent_color: darken($primary_color, 3%); + +@if ($theme == 'nord') { + $accent_color: darken($primary_color, 3%); } $panel_bg: if($blackness == 'true', $black, $bg_base_dark);