Skip to content
This repository has been archived by the owner on Mar 30, 2018. It is now read-only.

Commit

Permalink
fixing the navbar and updating the logo to match v3
Browse files Browse the repository at this point in the history
  • Loading branch information
stipsan committed Mar 17, 2017
1 parent 0190e78 commit ce41d43
Show file tree
Hide file tree
Showing 5 changed files with 85 additions and 40 deletions.
17 changes: 3 additions & 14 deletions .storybook/Logo.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,11 @@
import src from './static/logo.svg'

const linkStyle = Object.freeze({
height: '40px',
overflow: 'hidden',
paddingRight: 0,
paddingLeft: 0,
marginLeft: '-15px',
})

const logoStyle = Object.freeze({
height: '70px',
marginTop: '-15px',
opacity: 0.9,
width: '82px',
height: '50px',
})

const Logo = () => <a className="uk-navbar-brand" style={linkStyle}>
<img role="presentation" src={src} style={logoStyle} title="UIkit React Logo" />
const Logo = () => <a className="uk-navbar-item uk-logo">
<img alt="UIkit React Logo" src={src} style={logoStyle} />
</a>

export default Logo
56 changes: 35 additions & 21 deletions .storybook/config.js
Original file line number Diff line number Diff line change
@@ -1,33 +1,47 @@
import './uikit.less'

import infoAddon from '@kadira/react-storybook-addon-info'
import { configure, setAddon, addDecorator } from '@kadira/storybook'

import './uikit.less'

import Logo from './Logo'

setAddon(infoAddon)

const iframeWrapperStyle = Object.freeze({
height: '80px',
})

addDecorator((fn, { kind, story }) => <div>
<nav className="tm-navbar uk-navbar uk-navbar-attached">
<Logo />
<ul className="uk-navbar-nav">
<li className="uk-active">
<a className="uk-navbar-nav-subtitle">
{kind}
<div>{story}</div>
</a>
</li>
</ul>
<div className="uk-navbar-content">
<iframe
frameBorder="0"
height="20px"
scrolling="0"
src="https://ghbtns.com/github-btn.html?user=stipsan&repo=uikit-react&type=star&count=true"
width="170px"
/>
<nav className="uk-navbar-container uk-navbar">
<div className="uk-navbar-left">
<ul className="uk-navbar-nav">
<li className="uk-active">
<a>
<div>
{kind}
<div className="uk-navbar-subtitle">{story}</div>
</div>
</a>
</li>
</ul>
</div>
<div className="uk-navbar-center">
<Logo />
<div className="uk-navbar-center-right">
<div>
<div className="uk-flex uk-flex-middle" style={iframeWrapperStyle}>
<iframe
frameBorder="0"
height="20px"
scrolling="0"
src="https://ghbtns.com/github-btn.html?user=stipsan&repo=uikit-react&type=star&count=true"
width="170px"
/>
</div>
</div>
</div>
</div>
<div className="uk-navbar-flip">
<div className="uk-navbar-right">
<ul className="uk-navbar-nav">
<li>
<a
Expand Down
33 changes: 33 additions & 0 deletions .storybook/static/logo-inverse.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 13 additions & 4 deletions .storybook/static/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ uikit-react
[![NPM](https://nodei.co/npm/uikit-react.png?downloadRank=true)](https://www.npmjs.com/package/uikit-react)
[![NPM](https://nodei.co/npm-dl/uikit-react.png?months=3&height=2)](https://nodei.co/npm/uikit-react/)

<img src="https://uikit-react.io/public/logo.svg" width="256"/>
<img src="https://uikit-react.io/logo-inverse.svg" width="256"/>

## Installation

Expand Down

0 comments on commit ce41d43

Please sign in to comment.