Skip to content

Commit

Permalink
Revise positioning rules for slate.
Browse files Browse the repository at this point in the history
  • Loading branch information
srph committed Nov 12, 2015
1 parent 75f7325 commit b8eabe7
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
10 changes: 5 additions & 5 deletions docs/dist/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -29859,7 +29859,7 @@
"Simple Slate"
),
_react2["default"].createElement(
"small",
"p",
null,
"simple slate with padding 30px on all sides and 10px margin on all sides."
)
Expand Down Expand Up @@ -29887,7 +29887,7 @@
"Slate spacious"
),
_react2["default"].createElement(
"small",
"p",
null,
"Adds padding to your contents"
)
Expand Down Expand Up @@ -29918,7 +29918,7 @@
"Slate with No Background"
),
_react2["default"].createElement(
"small",
"p",
null,
"No border-radius and white background"
)
Expand Down Expand Up @@ -29947,7 +29947,7 @@
"Centered Half Slate"
),
_react2["default"].createElement(
"small",
"p",
null,
"Centered slate with 50% width"
)
Expand Down Expand Up @@ -29982,7 +29982,7 @@
"Half Slate with Icons"
),
_react2["default"].createElement(
"small",
"p",
null,
"Centered slate with 50% width"
)
Expand Down
7 changes: 3 additions & 4 deletions docs/dist/style.css

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

10 changes: 5 additions & 5 deletions docs/sections/Docs-Slate/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default class Slate extends React.Component {
<p className="lead">Use this for empty collections or loading resources.</p>
<div className="slate">
<h2>Simple Slate</h2>
<small>simple slate with padding 30px on all sides and 10px margin on all sides.</small>
<p>simple slate with padding 30px on all sides and 10px margin on all sides.</p>
</div>
</section>

Expand All @@ -18,7 +18,7 @@ export default class Slate extends React.Component {
<p>Add the .-spacious class to your slate.</p>
<div className="slate -spacious">
<h3>Slate spacious</h3>
<small>Adds padding to your contents</small>
<p>Adds padding to your contents</p>
</div>
</section>

Expand All @@ -28,7 +28,7 @@ export default class Slate extends React.Component {
<div className="row">
<div className="slate -plain">
<h2>Slate with No Background</h2>
<small>No border-radius and white background</small>
<p>No border-radius and white background</p>
</div>
</div>
</section>
Expand All @@ -38,7 +38,7 @@ export default class Slate extends React.Component {
<p>With the centered grid column, you can center a slate.</p>
<div className="slate col-md-6 _centered">
<h2>Centered Half Slate</h2>
<small>Centered slate with 50% width</small>
<p>Centered slate with 50% width</p>
</div>
</div>

Expand All @@ -48,7 +48,7 @@ export default class Slate extends React.Component {
<div className="slate">
<i className="icon icon-cog -x8" />
<h2>Half Slate with Icons</h2>
<small>Centered slate with 50% width</small>
<p>Centered slate with 50% width</p>
</div>
</section>

Expand Down
11 changes: 6 additions & 5 deletions styles/components/_slate.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@
&.-spacious { padding: 60px; }
&.-plain { background: $brand-white; }

> .icon:first-child {
display: block;
// For consistency
h1, h2, h3, h4, h5, h6, p {
margin-bottom: $spacer-large;
}

> .icon:first-child,
> .tri-circle-loader:first-child {
margin-bottom: $spacer-large;
// To put a margin for preceding elements like icon and loader
h1, h2, h3, h4, h5, h6 {
margin-top: $spacer-large;
}

> *:last-child { margin-bottom: 0; }
Expand Down

0 comments on commit b8eabe7

Please sign in to comment.