Skip to content

Commit

Permalink
Merge pull request #196 from dabapps/nav-bar-variables
Browse files Browse the repository at this point in the history
Nav bar variables
  • Loading branch information
JakeSidSmith authored Jan 31, 2018
2 parents 75c6f9a + 1080ab5 commit d477091
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 1 deletion.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dabapps/roe",
"version": "0.8.31",
"version": "0.8.32",
"description": "A Collection of React Components for Project Development",
"main": "dist/js/index.js",
"types": "dist/js/index.d.ts",
Expand Down
5 changes: 5 additions & 0 deletions src/less/nav-bar.less
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ body.with-fixed-nav-bar {
box-shadow: @shadow-hard;
height: @nav-bar-height;
transition: ease-in-out 0.2s transform, ease-in-out 0.2s box-shadow;
color: @nav-bar-text-color;

a {
color: @nav-bar-link-color;
}

&.no-shaddow {
box-shadow: @shadow-none;
Expand Down
2 changes: 2 additions & 0 deletions src/less/variables.less
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@

@container-background: @white;

@nav-bar-text-color: @font-color-base;
@nav-bar-link-color: @link-color;
@nav-bar-background: @body-background;
@nav-bar-border: @border-base;
@nav-bar-height: @input-height + @padding-base * 2;
Expand Down
8 changes: 8 additions & 0 deletions src/ts/components/navigation/nav-bar.examples.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ class NavBarExample extends React.Component {
<NavBar fixed={type === 'fixed'} shy={type === 'shy'}>
<Column>
<SpacedGroup>
<h1 className="font-size-large display-inline">
Title
</h1>
<a>
Link
</a>
<Button>
Home
</Button>
Expand Down Expand Up @@ -65,6 +71,8 @@ class NavBarExample extends React.Component {
#### Less variables

```less
@nav-bar-text-color: @font-color-base; // @grey-dark
@nav-bar-link-color: @link-color;
@nav-bar-background: @body-background; // @white;
@nav-bar-border: @border-base;
@nav-bar-height: @input-height + @padding-base * 2;
Expand Down

0 comments on commit d477091

Please sign in to comment.