Skip to content

Commit

Permalink
Bulk update;
Browse files Browse the repository at this point in the history
Rename `$brand-neutral-dk` and `$brand-neutral-dker` to `$brand-sidebar` and `$brand-sidebar-dk` respectively.
Add `$font-size-small` variable.
  • Loading branch information
srph committed Sep 23, 2015
1 parent 6cf06c9 commit e2e2fec
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 6 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Changelog

## v0.2.1 (September 22, 2015) - commit
## v0.3.0 (September 23, 2015) - commit
- Rename `$brand-neutral-dk` and `$brand-neutral-dker` to `$brand-sidebar` and `$brand-sidebar-dk` respectively.
- Add `$font-size-small` variable.

## v0.2.1 (September 23, 2015) - commit
- Remove horizontal margins from button-button sibling.
- Vertically center icons.

Expand Down
2 changes: 1 addition & 1 deletion dist/aia.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/styles/nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
height: 50px;
width: 100%;
line-height: 50px;
background: $brand-neutral-dk;
background: $brand-sidebar;
margin-bottom: 25px;

.right {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aia",
"version": "0.2.1",
"version": "0.3.0",
"description": "The UI Toolkit that powers ONE's internal projects",
"main": "dist/aia.js",
"scripts": {
Expand Down
5 changes: 3 additions & 2 deletions styles/_colors.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ $brand-gray-dk: #78828A !default;

$brand-neutral: #647A8A !default; // awkward light blue
// used for sidebar, darkbg, etc
$brand-neutral-dk: #19273F !default; // a touch of dark blue
$brand-neutral-dker: #0B121F !default;
$brand-sidebar: #19273F !default; // a touch of dark blue
$brand-sidebar-lt: #19273F !default; // a touch of dark blue
$brand-sidebar-dk: #0B121F !default;

// color variations
$brand-primary: #3A569B !default;
Expand Down
1 change: 1 addition & 0 deletions styles/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ $container-max-widths: (
) !default;

// type base
$font-size-small: 12px !default;
$font-size-base: 14px !default;
$line-height-base: 1.7 !default;

Expand Down

0 comments on commit e2e2fec

Please sign in to comment.