Skip to content

Commit

Permalink
Merge pull request #53 from dev-onenetworkecommerce/loaders
Browse files Browse the repository at this point in the history
[WIP] Init loaders.
  • Loading branch information
srph committed Nov 4, 2015
2 parents a7b36e4 + 345bda8 commit e0119f1
Show file tree
Hide file tree
Showing 10 changed files with 946 additions and 704 deletions.
1,493 changes: 800 additions & 693 deletions docs/dist/script.js

Large diffs are not rendered by default.

38 changes: 38 additions & 0 deletions docs/dist/style.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions docs/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export default (
<Route path="list-group" component={require('./sections/Docs-ListGroup')} />
<Route path="nav" component={require('./sections/Docs-Nav')} />
<Route path="slate" component={require('./sections/Docs-Slate')} />
<Route path="loaders" component={require('./sections/Docs-Loaders')} />
<Route path="utilities" component={require('./sections/Docs-Utilities')} />
<Route path="dropdown" component={require('./sections/Docs-Dropdown')} />
<Route path="modal" component={require('./sections/Docs-Modal')} />
Expand Down
23 changes: 22 additions & 1 deletion docs/sections/Docs-Buttons/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,27 @@ export default class Buttons extends React.Component {
</div>
</section>

<section className="doc-bottom-space-large">
<h3 className="doc-heading"> Button with Loader </h3>
<div className="doc-btn-group">
<button className="btn -default">
<div className="tri-circle-loader">
<div />
<div />
<div />
</div>
</button>

<button className="btn -primary">
<div className="tri-circle-loader -light">
<div />
<div />
<div />
</div>
</button>
</div>
</section>

<section className="doc-bottom-space-large">
<h3 className="doc-heading">Disabled</h3>
<button className="btn -default -disabled">Button</button>
Expand All @@ -80,7 +101,7 @@ export default class Buttons extends React.Component {
<i className="icon icon-user3" />
</button>

<button className="btn -emerald">Button <i className="icon icon-user3" /> </button>
<button className="btn -emerald"> Button <i className="icon icon-user3" /> </button>
</div>

<div className="doc-btn-group">
Expand Down
19 changes: 19 additions & 0 deletions docs/sections/Docs-Loaders/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import React from 'react';

export default class Loader extends React.Component {
render() {
return (
<div>
<h1 className="doc-heading">Loaders</h1>
<p className="lead">Loaders are a great way to indicate that a process is still in progress.</p>
<p>Our loader is mainly inspired by <a href="https://heroku.com">Heroku</a> and <a href="https://travis-ci.org">Travis CI</a>.</p>

<div className="tri-circle-loader">
<div />
<div />
<div />
</div>
</div>
);
}
}
12 changes: 12 additions & 0 deletions docs/sections/Docs-Slate/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,18 @@ export default class Slate extends React.Component {
</div>
</section>

<section className="doc-bottom-space-large">
<h3 className="doc-heading"> Loading Slate </h3>
<div className="slate">
<div className="tri-circle-loader">
<div />
<div />
<div />
</div>
<h3> I am a Loading Slate </h3>
</div>
</section>

<section className="doc-bottom-space">
<h3 className="doc-heading">Plain Slate</h3>
<p>You can make a plain slate by adding the .-plain modifier class</p>
Expand Down
1 change: 1 addition & 0 deletions docs/sections/Docs/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export default class Docs extends React.Component {
<Link to="/slate" activeClassName="-selected" className="menuitem">Slate</Link>
<Link to="/dropdown" activeClassName="-selected" className="menuitem">Dropdown</Link>
<Link to="/modal" activeClassName="-selected" className="menuitem">Modal</Link>
<Link to="/loaders" activeClassName="-selected" className="menuitem">Loaders</Link>
<Link to="/steps" activeClassName="-selected" className="menuitem">Steps</Link>
</nav>

Expand Down
1 change: 1 addition & 0 deletions styles/_main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@
@import "components/modal";
@import "components/tooltip";
@import "components/slate";
@import "components/tri-circle-loader";
14 changes: 4 additions & 10 deletions styles/components/_slate.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,14 @@
background: $brand-gray-lt;
border-radius: $border-radius-base;

&.-spacious {
padding: 60px;
}

&.-plain {
background: $brand-white;
}
&.-spacious { padding: 60px; }
&.-plain { background: $brand-white; }

> .icon:first-child {
display: block;
margin-bottom: $spacer-large;
}

> *:last-child {
margin-bottom: 0;
}
> *:last-child { margin-bottom: 0; }
> .tri-circle-loader { margin-bottom: $spacer-large; }
}
48 changes: 48 additions & 0 deletions styles/components/tri-circle-loader.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
@mixin tri-circle-loader-variant($color) {
& > div {
background: $color;
}
}

.tri-circle-loader {
&.-light { @include tri-circle-loader-variant($brand-white); }
&.-sky { @include tri-circle-loader-variant($brand-sky); }
&.-emerald { @include tri-circle-loader-variant($brand-emerald); }
&.-sun { @include tri-circle-loader-variant($brand-sun); }
&.-crimson { @include tri-circle-loader-variant($brand-crimson); }

> div {
display: inline-block;
width: 8px;
height: 8px;
background-color: $brand-black;
border-radius: 100%;
animation: fadeDelay 1.4s infinite ease-in-out;
animation-fill-mode: both;
}

> div:not(:last-child) {
margin-right: 2px;
}

> div:first-child {
-webkit-animation-delay: -0.32s;
animation-delay: -0.32s;
}

> div:nth-child(2) {
-webkit-animation-delay: -0.16s;
animation-delay: -0.16s;
}

> div:last-child {
-webkit-animation-delay: -0.08s;
animation-delay: -0.08s;
}

@keyframes fadeDelay {
0% { opacity: 1; }
50% { opacity: 0; }
100% { opacity: 1; }
}
}

0 comments on commit e0119f1

Please sign in to comment.