Skip to content

Commit

Permalink
Merge branch 'release/0.8.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
arcticicestudio committed Nov 16, 2016
2 parents 95a9bb4 + f4f5468 commit 409e656
Show file tree
Hide file tree
Showing 10 changed files with 99 additions and 17 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
# + Node.js +
# +---------+
node_modules
npm-debug.log
19 changes: 18 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

<p align="center"><img src="https://cloud.githubusercontent.com/assets/7836623/20313180/636b4f48-ab56-11e6-8502-ad99f163c94b.png"/><br><strong>With default snow-inspired focus effect</strong><br><img src="https://cloud.githubusercontent.com/assets/7836623/20311958/f694259c-ab51-11e6-8c2e-cf9dae01b774.gif"/><br><strong>With enabled setting for darker focus color effect</strong><br><img src="https://cloud.githubusercontent.com/assets/7836623/20318435/871389f6-ab6a-11e6-8ab4-f33a5a63ae78.gif"/></p>

## 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)

<p align="center"><strong>Selected characters are now colored correctly</strong><br><img src="https://cloud.githubusercontent.com/assets/7836623/20318449/998233c6-ab6a-11e6-9242-b1fca03bee9b.gif"/><br><strong>With enabled "Darker Form-Focusing Effect" theme setting the current syntax highlighting remains preserved</strong><br><img src="https://cloud.githubusercontent.com/assets/7836623/20318452/9ccd68fc-ab6a-11e6-8886-1c2cacce14cf.gif"/></p>

# 0.7.0 (2016-11-12)
## Features
### Package Support
Implemented support for the community package <img src="https://avatars3.githubusercontent.com/u/25722" width=16 height=16/> [`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)
Expand All @@ -14,6 +26,11 @@ Implemented support for the community package <img src="https://avatars3.githubu
Implemented support for the community package <img src="https://avatars3.githubusercontent.com/u/7209979" width=16 height=16/> [`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)
<p align="center"><strong>Before</strong><br><img src="https://cloud.githubusercontent.com/assets/7836623/20238616/dcff8702-a8ef-11e6-9e7b-19e9aa813e87.png"/><br><strong>After</strong><br><img src="https://cloud.githubusercontent.com/assets/7836623/20238617/e3f5c8aa-a8ef-11e6-8acb-56e4acf568b8.png"/></p>

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

<p align="center"><img src="https://cloud.githubusercontent.com/assets/7836623/20320075/d9b84d6c-ab70-11e6-87ea-13707830719b.png"/></p>

# 0.5.1 (2016-11-01)
## Bug Fixes
### Documentation
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
2 changes: 1 addition & 1 deletion index.less
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected] +
Expand Down
12 changes: 12 additions & 0 deletions lib/main.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,27 @@ 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)
unsetTabSizing()
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')
8 changes: 7 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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.",
Expand Down
10 changes: 10 additions & 0 deletions spec/darker-form-focusing-effect-spec.coffee
Original file line number Diff line number Diff line change
@@ -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'
7 changes: 7 additions & 0 deletions styles/atom.less
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
51 changes: 40 additions & 11 deletions styles/ui-theme-settings.less
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,49 @@ author Arctic Ice Studio +
email [email protected] +
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();
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions styles/ui-variables.less
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 409e656

Please sign in to comment.