Skip to content
This repository has been archived by the owner on May 3, 2024. It is now read-only.

Commit

Permalink
pretty menu, re-organize, add routing for examples
Browse files Browse the repository at this point in the history
  • Loading branch information
cellog committed May 1, 2017
1 parent 9758499 commit 6b9785f
Show file tree
Hide file tree
Showing 8 changed files with 172 additions and 14 deletions.
1 change: 1 addition & 0 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"prismjs-loader": "^0.0.4",
"prop-types": "^15.5.8",
"react": "^15.5.4",
"react-burger-menu": "^2.0.1",
"react-dom": "^15.5.4",
"react-redux": "^5.0.4",
"redux": "^3.6.0"
Expand Down
67 changes: 66 additions & 1 deletion docs/src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,69 @@
padding-left: 30px;
overflow-y: scroll;
height: 100vh;
}
}

/* Position and sizing of burger button */
.bm-burger-button {
position: fixed;
width: 36px;
height: 30px;
left: 36px;
top: 36px;
}

/* Color/shape of burger icon bars */
.bm-burger-bars {
background: white; /*#373a47;*/
}

/* Position and sizing of clickable cross button */
.bm-cross-button {
height: 24px;
width: 24px;
}

/* Color/shape of close button cross */
.bm-cross {
background: #bdc3c7;
}

/* General sidebar styles */
.bm-menu {
background: #373a47;
padding: 2.5em 1.5em 0;
font-size: 1.15em;
text-align: left;
}

/* Morph shape necessary with bubble or elastic */
.bm-morph-shape {
fill: #373a47;
}

/* Wrapper for item list */
.bm-item-list {
color: #b8b7ad;
padding: 0.8em;
}

.bm-item-list li {
list-style: none;
}
.bm-item-list ul {
margin: 0;
}

/* Styling of overlay */
.bm-overlay {
background: rgba(0, 0, 0, 0.3);
}

.menu-item {
color: white;
text-decoration: none;
padding-bottom: 20px;
}
.menu-item:hover {
color: red;
}
30 changes: 24 additions & 6 deletions docs/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,42 @@ import React, { Component } from 'react'
import Routes from 'ion-router/Routes'
import Route from 'ion-router/Route'
import Link from 'ion-router/Link'
import Menu from 'react-burger-menu/lib/menus/scaleRotate'

import './App.css'
import Examples from './components/Examples'
import Example from './components/Example'
import ExamplesToggle from './toggles/ExamplesToggle'
import * as actions from './redux/actions'
import examples from './examples'

class App extends Component {
render() {
return (
<div className="App">
<div className="App-header">
<h2>Welcome</h2>
</div>
<div className="App-intro">
<Menu pageWrapId="page-wrap" outerContainerId="outer-container">
<Link to="/" className="menu-item">Home</Link>
<Link route="examples" className="menu-item">Examples</Link>
<ul>
<li><Link route="examples">Examples</Link></li>
{Object.keys(examples).map(example => <li>
<Link route="examples" example={example} className="menu-item">{example}</Link>
</li>)}
</ul>
<ExamplesToggle component={Examples} />
</Menu>
<div id="outer-container">
<div id="page-wrap">
<div className="App-header">
<h2>ion-router</h2>
</div>
<div className="App-intro">
<ExamplesToggle
component={Examples}
else={() => (
<Example example="basic" />
)}
/>
</div>
</div>
</div>
<Routes>
<Route name="home" path="/">
Expand Down
2 changes: 1 addition & 1 deletion docs/src/components/Example.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import routing from 'ion-router/reducer'

import Browser from './Browser'
import ShowSource from './ShowSource'
import examples from './examples'
import examples from '../examples'

const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose // eslint-disable-line

Expand Down
4 changes: 0 additions & 4 deletions docs/src/components/Examples.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from 'react'
import { connect } from 'react-redux'
import Link from 'ion-router/Link'
import ExampleToggle from '../toggles/ExampleToggle'
import thing from './Example'

Expand All @@ -11,9 +10,6 @@ const Example = connect(state => ({
export default function Examples() {
return (
<div>
<ul>
<li><Link route="examples" example="basic">Basic</Link></li>
</ul>
<ExampleToggle component={Example} />
</div>
)
Expand Down
File renamed without changes.
File renamed without changes.
82 changes: 80 additions & 2 deletions docs/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,22 @@ assert@^1.1.1:
dependencies:
util "0.10.3"

[email protected]:
version "0.0.0"
resolved "https://registry.yarnpkg.com/ast-transform/-/ast-transform-0.0.0.tgz#74944058887d8283e189d954600947bc98fe0062"
dependencies:
escodegen "~1.2.0"
esprima "~1.0.4"
through "~2.3.4"

[email protected]:
version "0.0.7"
resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"

ast-types@^0.7.0:
version "0.7.8"
resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.7.8.tgz#902d2e0d60d071bdcd46dc115e1809ed11c138a9"

async-each@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
Expand Down Expand Up @@ -942,7 +954,7 @@ braces@^1.8.2:
preserve "^0.2.0"
repeat-element "^1.1.2"

browser-resolve@^1.11.2:
browser-resolve@^1.11.2, browser-resolve@^1.8.1:
version "1.11.2"
resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.2.tgz#8ff09b0a2c421718a1051c260b32e48f442938ce"
dependencies:
Expand All @@ -954,6 +966,14 @@ [email protected]:
dependencies:
inherits "^2.0.1"

browserify-optional@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/browserify-optional/-/browserify-optional-1.0.0.tgz#20cf7ab1e7bf014cbf63782d35d75b62dab4b6f1"
dependencies:
ast-transform "0.0.0"
ast-types "^0.7.0"
browser-resolve "^1.8.1"

browserify-zlib@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d"
Expand Down Expand Up @@ -1100,6 +1120,10 @@ clap@^1.0.9:
dependencies:
chalk "^1.1.3"

classnames@^2.1.1:
version "2.2.5"
resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"

[email protected]:
version "4.0.12"
resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.0.12.tgz#a02e61707f1840bd3338f54dbc9acbda4e772fa3"
Expand Down Expand Up @@ -1762,6 +1786,16 @@ escodegen@^1.6.1:
optionalDependencies:
source-map "~0.2.0"

escodegen@~1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.2.0.tgz#09de7967791cc958b7f89a2ddb6d23451af327e1"
dependencies:
esprima "~1.0.4"
estraverse "~1.5.0"
esutils "~1.0.0"
optionalDependencies:
source-map "~0.1.30"

escope@^3.6.0:
version "3.6.0"
resolved "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3"
Expand Down Expand Up @@ -1891,6 +1925,10 @@ esprima@^3.1.1:
version "3.1.3"
resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"

esprima@~1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.0.4.tgz#9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"

esprima@~3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.0.0.tgz#53cf247acda77313e551c3aa2e73342d3fb4f7d9"
Expand All @@ -1910,6 +1948,10 @@ estraverse@^4.1.1, estraverse@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"

estraverse@~1.5.0:
version "1.5.1"
resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.5.1.tgz#867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71"

estraverse@~4.1.0:
version "4.1.1"
resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.1.1.tgz#f6caca728933a850ef90661d0e17982ba47111a2"
Expand All @@ -1918,10 +1960,18 @@ esutils@^2.0.0, esutils@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"

esutils@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/esutils/-/esutils-1.0.0.tgz#8151d358e20c8acc7fb745e7472c0025fe496570"

etag@~1.8.0:
version "1.8.0"
resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.0.tgz#6f631aef336d6c46362b51764044ce216be3c051"

eve@~0.4.2:
version "0.4.2"
resolved "https://registry.yarnpkg.com/eve/-/eve-0.4.2.tgz#7eea0afc0e4efb7c9365615315a3576833ead2ae"

event-emitter@~0.3.5:
version "0.3.5"
resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
Expand Down Expand Up @@ -4201,6 +4251,16 @@ rc@^1.1.7:
minimist "^1.2.0"
strip-json-comments "~2.0.1"

react-burger-menu@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/react-burger-menu/-/react-burger-menu-2.0.1.tgz#35b4a04fdd7c2208596850cebab16c0655a5bc4b"
dependencies:
browserify-optional "^1.0.0"
classnames "^2.1.1"
eve "~0.4.2"
prop-types "^15.5.8"
snapsvg-cjs "0.0.4"

react-dev-utils@^0.5.2:
version "0.5.2"
resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-0.5.2.tgz#50d0b962d3a94b6c2e8f2011ed6468e4124bc410"
Expand Down Expand Up @@ -4681,6 +4741,18 @@ [email protected]:
version "0.0.4"
resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"

[email protected]:
version "0.0.4"
resolved "https://registry.yarnpkg.com/snapsvg-cjs/-/snapsvg-cjs-0.0.4.tgz#106ca5b82a79824101f06c568e1a2563659c451d"
dependencies:
snapsvg "0.4.0"

[email protected]:
version "0.4.0"
resolved "https://registry.yarnpkg.com/snapsvg/-/snapsvg-0.4.0.tgz#e0767014167825957de7e125c29b0fa89796ea03"
dependencies:
eve "~0.4.2"

[email protected]:
version "1.0.9"
resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
Expand Down Expand Up @@ -4742,6 +4814,12 @@ source-map@^0.4.4, source-map@~0.4.1:
dependencies:
amdefine ">=0.0.4"

source-map@~0.1.30:
version "0.1.43"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
dependencies:
amdefine ">=0.0.4"

source-map@~0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
Expand Down Expand Up @@ -4953,7 +5031,7 @@ throat@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/throat/-/throat-3.0.0.tgz#e7c64c867cbb3845f10877642f7b60055b8ec0d6"

through@^2.3.6:
through@^2.3.6, through@~2.3.4:
version "2.3.8"
resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"

Expand Down

0 comments on commit 6b9785f

Please sign in to comment.