Skip to content

Commit

Permalink
Improve colors docs and update experimentals page order
Browse files Browse the repository at this point in the history
  • Loading branch information
@picturepan2
picturepan2 committed Mar 19, 2017
1 parent 0beec03 commit 1d63c12
Show file tree
Hide file tree
Showing 10 changed files with 65 additions and 67 deletions.
3 changes: 3 additions & 0 deletions docs/components.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@
<li class="nav-item">
<a href="utilities.html">Utilities</a>
</li>
<li class="nav-item">
<a href="experimentals.html">Experimentals</a>
</li>
</ul>
</div>
<a href="#sidebar-close" id="sidebar-close" class="docs-nav-clear"></a>
Expand Down
1 change: 1 addition & 0 deletions docs/css/docs.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@
}
.docs-content .docs-color {
border-radius: .2rem;
margin: .5rem 0;
padding: 1rem;
}
.docs-content .docs-color .color-subtitle {
Expand Down
2 changes: 1 addition & 1 deletion docs/css/docs.min.css
View file

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

6 changes: 3 additions & 3 deletions docs/elements.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,6 @@
<li class="nav-item">
<a href="elements.html#media">Media</a>
</li>
<li class="nav-item">
<a href="experimentals.html">Experimentals</a>
</li>
</ul>
</li>
<li class="nav-item">
Expand All @@ -72,6 +69,9 @@
<li class="nav-item">
<a href="utilities.html">Utilities</a>
</li>
<li class="nav-item">
<a href="experimentals.html">Experimentals</a>
</li>
</ul>
</div>
<a href="#sidebar-close" id="sidebar-close" class="docs-nav-clear"></a>
Expand Down
71 changes: 21 additions & 50 deletions docs/experimentals.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,64 +35,41 @@
<li class="nav-item">
<a href="index.html">Getting started</a>
</li>
<li class="nav-item active">
<li class="nav-item">
<a href="elements.html">Elements</a>
</li>
<li class="nav-item">
<a href="layout.html">Layout</a>
</li>
<li class="nav-item">
<a href="components.html">Components</a>
</li>
<li class="nav-item">
<a href="utilities.html">Utilities</a>
</li>
<li class="nav-item active">
<a href="experimentals.html">Experimentals</a>
<ul class="nav">
<li class="nav-item">
<a href="elements.html#typography">Typography</a>
<a href="experimentals.html#calendars">Calendars</a>
</li>
<li class="nav-item">
<a href="elements.html#tables">Tables</a>
<a href="experimentals.html#carousels">Carousels</a>
</li>
<li class="nav-item">
<a href="elements.html#buttons">Buttons</a>
<a href="experimentals.html#meters">Meters</a>
</li>
<li class="nav-item">
<a href="elements.html#forms">Forms</a>
<a href="experimentals.html#parallax">Parallax</a>
</li>
<li class="nav-item">
<a href="elements.html#labels">Labels</a>
<a href="experimentals.html#progress">Progress</a>
</li>
<li class="nav-item">
<a href="elements.html#codes">Codes</a>
</li>
<li class="nav-item">
<a href="elements.html#media">Media</a>
</li>
<li class="nav-item active">
<a href="experimentals.html">Experimentals</a>
<ul class="nav">
<li class="nav-item">
<a href="experimentals.html#calendars">Calendars</a>
</li>
<li class="nav-item">
<a href="experimentals.html#carousels">Carousels</a>
</li>
<li class="nav-item">
<a href="experimentals.html#meters">Meters</a>
</li>
<li class="nav-item">
<a href="experimentals.html#parallax">Parallax</a>
</li>
<li class="nav-item">
<a href="experimentals.html#progress">Progress</a>
</li>
<li class="nav-item">
<a href="experimentals.html#sliders">Sliders</a>
</li>
</ul>
<a href="experimentals.html#sliders">Sliders</a>
</li>
</ul>
</li>
<li class="nav-item">
<a href="layout.html">Layout</a>
</li>
<li class="nav-item">
<a href="components.html">Components</a>
</li>
<li class="nav-item">
<a href="utilities.html">Utilities</a>
</li>
</ul>
</div>
<a href="#sidebar-close" id="sidebar-close" class="docs-nav-clear"></a>
Expand Down Expand Up @@ -455,15 +432,9 @@
<div class="divider"></div>
<ul class="pagination">
<li class="page-item page-prev">
<a href="index.html">
<a href="utilities.html">
<p class="page-item-subtitle">Previous</p>
<h4 class="page-item-title">Getting started</h4>
</a>
</li>
<li class="page-item page-next">
<a href="layout.html">
<p class="page-item-subtitle">Next</p>
<h4 class="page-item-title">Layout</h4>
<h4 class="page-item-title">Utilities</h4>
</a>
</li>
</ul>
Expand Down
34 changes: 22 additions & 12 deletions docs/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,67 +205,77 @@ <h5>Colors</h5>
<div class="column col-3 col-md-6">
<div class="docs-color" style="background:#5764c6;color:#fff;">
<div class="color-title">#5764c6</div>
<div class="color-subtitle">Primary color</div>
<div class="color-subtitle">Primary</div>
</div>
</div>
<div class="column col-3 col-md-6">
<div class="docs-color" style="background:#eff1fa;color:#5764c6;">
<div class="color-title">#eff1fa</div>
<div class="color-subtitle">Secondary color</div>
<div class="color-subtitle">Secondary</div>
</div>
</div>
</div>
<div class="columns">
<div class="column col-3 col-md-6">
<div class="docs-color" style="background:#454d5d;color:#fff;">
<div class="color-title">#454d5d</div>
<div class="color-subtitle">Dark color</div>
<div class="color-subtitle">Dark</div>
</div>
</div>
<div class="column col-3 col-md-6">
<div class="docs-color" style="background:#727e96;color:#fff;">
<div class="color-title">#727e96</div>
<div class="color-subtitle">Gray dark color</div>
<div class="color-subtitle">Gray dark</div>
</div>
</div>
<div class="column col-3 col-md-6">
<div class="docs-color" style="background:#acb3c2;color:#fff;">
<div class="color-title">#acb3c2</div>
<div class="color-subtitle">Gray color</div>
<div class="color-subtitle">Gray</div>
</div>
</div>
<div class="column col-3 col-md-6">
<div class="docs-color" style="background:#e7e9ed;color:#727e96;">
<div class="color-title">#e7e9ed</div>
<div class="color-subtitle">Gray light color</div>
<div class="color-subtitle">Gray light</div>
</div>
</div>
<div class="column col-3 col-md-6">
<div class="docs-color" style="background:#f0f1f4;color:#727e96;">
<div class="color-title">#f0f1f4</div>
<div class="color-subtitle">Border</div>
</div>
</div>
<div class="column col-3 col-md-6">
<div class="docs-color" style="background:#f8f9fa;color:#727e96;">
<div class="color-title">#f8f9fa</div>
<div class="color-subtitle">Background</div>
</div>
</div>
</div>
<div class="columns">
<div class="column col-3 col-md-6">
<div class="docs-color" style="background:#fff;color:#727e96;">
<div class="color-title">#fff</div>
<div class="color-subtitle">Light color</div>
<div class="color-subtitle">Light</div>
</div>
</div>
</div>
<div class="columns">
<div class="column col-3 col-md-6">
<div class="docs-color" style="background:#32b643;color:#fff;">
<div class="color-title">#32b643</div>
<div class="color-subtitle">Success color</div>
<div class="color-subtitle">Success</div>
</div>
</div>
<div class="column col-3 col-md-6">
<div class="docs-color" style="background:#ffb700;color:#fff;">
<div class="color-title">#ffb700</div>
<div class="color-subtitle">Warning color</div>
<div class="color-subtitle">Warning</div>
</div>
</div>
<div class="column col-3 col-md-6">
<div class="docs-color" style="background:#e85600;color:#fff;">
<div class="color-title">#e85600</div>
<div class="color-subtitle">Danger color</div>
<div class="color-subtitle">Danger</div>
</div>
</div>
</div>
Expand Down
3 changes: 3 additions & 0 deletions docs/layout.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@
<li class="nav-item">
<a href="utilities.html">Utilities</a>
</li>
<li class="nav-item">
<a href="experimentals.html">Experimentals</a>
</li>
</ul>
</div>
<a href="#sidebar-close" id="sidebar-close" class="docs-nav-clear"></a>
Expand Down
1 change: 1 addition & 0 deletions docs/src/docs.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@

.docs-color {
border-radius: @border-radius;
margin: .5rem 0;
padding: 1rem;

.color-subtitle {
Expand Down
9 changes: 9 additions & 0 deletions docs/utilities.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@
</li>
</ul>
</li>
<li class="nav-item">
<a href="experimentals.html">Experimentals</a>
</li>
</ul>
</div>
<a href="#sidebar-close" id="sidebar-close" class="docs-nav-clear"></a>
Expand Down Expand Up @@ -239,6 +242,12 @@
<h4 class="page-item-title">Components</h4>
</a>
</li>
<li class="page-item page-next">
<a href="experimentals.html">
<p class="page-item-subtitle">Previous</p>
<h4 class="page-item-title">Experimentals</h4>
</a>
</li>
</ul>
</section>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/variables.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// Global
@html-font-size: 10px;
@html-line-height: 1.428571429;
@body-bg: #fff;
@body-bg: @bg-color-light;
@body-font-color: lighten(@dark-color, 5%);
@font-size: 1.4rem;
@font-size-sm: 1.2rem;
Expand Down

0 comments on commit 1d63c12

Please sign in to comment.