diff --git a/.gitignore b/.gitignore index 78ee03e..2fe2a8a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ # + Node.js + # +---------+ node_modules +npm-debug.log diff --git a/CHANGELOG.md b/CHANGELOG.md index e2e69b5..146818a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,19 @@ --- -# 0.6.0 (2016-11-12) +# 0.8.0 (2016-11-16) +## Features +### Theme Settings +Implemented a new theme setting to use darker colors for focused forms like the `find-and-replace`- and `project-search` inputs. (@arcticicestudio, #43, 38d1ca07) + +


With default snow-inspired focus effect

With enabled setting for darker focus color effect

+ +## Bug Fixes +Fixed regexp groups in the `find-and-replace` inputs getting obscured if the current syntax highlighting theme uses light colors for these pattern. (@arcticicestudio, #39, fca9d9f5) + +

Selected characters are now colored correctly

With enabled "Darker Form-Focusing Effect" theme setting the current syntax highlighting remains preserved

+ +# 0.7.0 (2016-11-12) ## Features ### Package Support Implemented support for the community package [`tool-bar`](https://atom.io/packages/tool-bar) by [suda](https://github.com/suda) to make the tool-bar package fit more with the surrounding UI. (@arcticicestudio, #41, 010119c6) @@ -14,6 +26,11 @@ Implemented support for the community package [`minimap-git-diff`](https://atom.io/packages/minimap-git-diff) by [atom-minimap](https://github.com/atom-minimap) to make the minimap-git-diff package fit more with the theme color palette. (@arcticicestudio, #42, e5251f7)

Before

After

+## Improvements +The current active tab is now colored with a slightly lighter background color to differ from inactive tabs. (@arcticicestudio, #40, bc213c13) + +

+ # 0.5.1 (2016-11-01) ## Bug Fixes ### Documentation diff --git a/README.md b/README.md index 4c120fd..178d35a 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ This theme contains optimized styles to achieve a consistent and uniform UI expe Detailed descriptions for supported packages can be found in the [project wiki](https://github.com/arcticicestudio/nord-atom-ui/wiki/Package-Support). ## Development -[![](https://img.shields.io/badge/Changelog-0.6.0-blue.svg)](https://github.com/arcticicestudio/nord-atom-ui/blob/v0.6.0/CHANGELOG.md) [![](https://img.shields.io/badge/Workflow-gitflow--branching--model-blue.svg)](http://nvie.com/posts/a-successful-git-branching-model) [![](https://img.shields.io/badge/Versioning-ArcVer_0.8.0-blue.svg)](https://github.com/arcticicestudio/arcver) +[![](https://img.shields.io/badge/Changelog-0.8.0-blue.svg)](https://github.com/arcticicestudio/nord-atom-ui/blob/v0.8.0/CHANGELOG.md) [![](https://img.shields.io/badge/Workflow-gitflow--branching--model-blue.svg)](http://nvie.com/posts/a-successful-git-branching-model) [![](https://img.shields.io/badge/Versioning-ArcVer_0.8.0-blue.svg)](https://github.com/arcticicestudio/arcver) ### Contribution Please report issues/bugs, feature requests and suggestions for improvements to the [issue tracker](https://github.com/arcticicestudio/nord-atom-ui/issues). diff --git a/index.less b/index.less index 7495759..0f737f0 100644 --- a/index.less +++ b/index.less @@ -2,7 +2,7 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ title Theme Index + project nord-atom-ui + -version 0.6.0 + +version 0.8.0 + repository https://github.com/arcticicestudio/nord-atom-ui + author Arctic Ice Studio + email development@arcticicestudio.com + diff --git a/lib/main.coffee b/lib/main.coffee index ef11bc2..e272849 100644 --- a/lib/main.coffee +++ b/lib/main.coffee @@ -4,9 +4,18 @@ module.exports = activate: (state) -> atom.config.observe 'nord-atom-ui.tabSizing', (noFullWidth) -> setTabSizing(noFullWidth) + atom.config.observe 'nord-atom-ui.darkerFormFocusEffect', (noSnowLight) -> + setFormFocusEffect(noSnowLight) deactivate: -> unsetTabSizing() + unsetFormFocusEffect() + +setFormFocusEffect = (noSnowLight) -> + if (noSnowLight) + root.setAttribute('theme-nord-atom-ui-form-focus-effect', "nosnowlight") + else + unsetFormFocusEffect() setTabSizing = (noFullWidth) -> if (noFullWidth) @@ -14,5 +23,8 @@ setTabSizing = (noFullWidth) -> else root.setAttribute('theme-nord-atom-ui-tabsizing', "nofullwidth") +unsetFormFocusEffect = -> + root.removeAttribute('theme-nord-atom-ui-form-focus-effect') + unsetTabSizing = -> root.removeAttribute('theme-nord-atom-ui-tabsizing') diff --git a/package.json b/package.json index 67d786d..7586a4c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "nord-atom-ui", "theme": "ui", - "version": "0.7.0", + "version": "0.8.0", "description": "A arctic, north-bluish clean and elegant minimal Atom UI.", "author": { "name": "Arctic Ice Studio", @@ -27,6 +27,12 @@ "atom": ">=1.0.0 <2.0.0" }, "configSchema": { + "darkerFormFocusEffect": { + "title": "Darker Form-Focusing Effect", + "description": "Use darker colors for focused forms instead of the snow-inspired light effect.", + "type": "boolean", + "default": false + }, "tabSizing": { "title": "Full-Width Tab Sizing", "description": "In full width mode, tabs will fill the whole tab bar.", diff --git a/spec/darker-form-focusing-effect-spec.coffee b/spec/darker-form-focusing-effect-spec.coffee new file mode 100644 index 0000000..85adcaf --- /dev/null +++ b/spec/darker-form-focusing-effect-spec.coffee @@ -0,0 +1,10 @@ +describe "Nord Atom UI theme", -> + beforeEach -> + waitsForPromise -> + atom.packages.activatePackage('nord-atom-ui') + + it "allows to use darker colors for focused forms to be set via theme settings", -> + expect(document.documentElement.getAttribute('theme-nord-atom-ui-form-focus-effect')).toBe null + + atom.config.set('nord-atom-ui.darkerFormFocusEffect', true) + expect(document.documentElement.getAttribute('theme-nord-atom-ui-form-focus-effect')).toBe 'nosnowlight' diff --git a/styles/atom.less b/styles/atom.less index beb6d70..adae099 100644 --- a/styles/atom.less +++ b/styles/atom.less @@ -20,6 +20,13 @@ copyright Copyright (C) 2016 + ++++++++++++++++++++*/ .project-find, .find-and-replace { + atom-text-editor[mini].is-focused, + atom-text-editor[mini].is-focused::shadow { + .source .regexp { + color: @base-background-color; + } + } + .btn-group-find .btn { .button-variant(@text-color-info); } diff --git a/styles/ui-theme-settings.less b/styles/ui-theme-settings.less index 164fbdf..b2257a0 100644 --- a/styles/ui-theme-settings.less +++ b/styles/ui-theme-settings.less @@ -7,20 +7,49 @@ author Arctic Ice Studio + email development@arcticicestudio.com + copyright Copyright (C) 2016 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -[Index] - > Variables - > User Interface - Full-Width Tab Sizing */ /*+-----------+ - + Variables + - +-----------+*/ ++ Variables + ++-----------+*/ +@theme-setting-formfocuseffect: ~'theme-@{ui-theme-name}-form-focus-effect'; @theme-setting-tabsizing: ~'theme-@{ui-theme-name}-tabsizing'; +@theme-setting-formfocuseffect-background-color: @nord3; +@theme-setting-formfocuseffect-border-color: @nord3; +@theme-setting-formfocuseffect-text-selection-color: @nord1; + /*+----------------+ - + User Interface + - +----------------+*/ ++ User Interface + ++----------------+*/ +/*+--- Darker Form-Focusing Effect ---+*/ +[@{theme-setting-formfocuseffect}="nosnowlight"] { + .theme-setting-formfocuseffect-nosnowlight(); +} + +.theme-setting-formfocuseffect-nosnowlight() { + .find-and-replace, + .settings-view { + atom-text-editor[mini].is-focused, + atom-text-editor[mini].is-focused::shadow { + border: 1px solid @theme-setting-formfocuseffect-border-color; + background-color: @theme-setting-formfocuseffect-background-color; + + .text, + .source { + color: @text-color; + + .regexp { + color: @text-color; + } + } + + .highlights .region { + background-color: @theme-setting-formfocuseffect-text-selection-color; + } + } + } +} + /*+--- Full Width Tab Sizing ---+*/ [@{theme-setting-tabsizing}="nofullwidth"] { .theme-setting-tabsizing-nofullwidth(); @@ -29,11 +58,11 @@ copyright Copyright (C) 2016 + .theme-setting-tabsizing-nofullwidth() { .tab-bar { width: auto; - + .tab { width: inherit; } - + .tab.active, .tab:hover.active { width: inherit; diff --git a/styles/ui-variables.less b/styles/ui-variables.less index a579791..7027577 100644 --- a/styles/ui-variables.less +++ b/styles/ui-variables.less @@ -98,8 +98,8 @@ copyright Copyright (C) 2016 + @input-background-color: @nord1; @input-border-color: @text-color; @input-border-color-active: @input-background-color-active; -@input-background-color-active: @nord3;//@text-color; -@input-text-color-active: @text-color;//@base-background-color; +@input-background-color-active: @text-color; +@input-text-color-active: @base-background-color; /*+--- Overlay ---+*/ @overlay-background-color: @tool-panel-background-color;