Skip to content

Commit

Permalink
Merge branch 'local-v4-dev' into v4-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@ygatesoupe
ygatesoupe committed Jun 27, 2016
2 parents 517ffc9 + 9349824 commit a98fc96
Show file tree
Hide file tree
Showing 9 changed files with 236 additions and 153 deletions.
82 changes: 42 additions & 40 deletions docs-orange/_includes/boostwatch/buttons.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,44 +2,46 @@
================================================== -->

<h2 id="buttons">Buttons</h2>
<h3>Default</h3>
<p>
<button type="button" class="btn btn-secondary">Submit</button>
<button type="button" class="btn btn-info">Submit</button>
<button type="button" class="btn btn-primary">Buy now</button>
<button type="button" class="btn btn-success">Save</button>
<button type="button" class="btn btn-danger">Delete</button>
</p>

<h3>Hover</h3>
<p>
<button type="button" class="btn btn-info" style="pointer-events: none;">Submit</button>
<button type="button" class="btn btn-secondary" style="pointer-events: none;">Submit</button>
<button type="button" class="btn btn-info" style="pointer-events: none;">Buy now</button>
<button type="button" class="btn btn-info" style="pointer-events: none;">Save</button>
<button type="button" class="btn btn-info" style="pointer-events: none;">Delete</button>
</p>

<h3>Pressed</h3>
<p>
<button type="button" class="btn btn-secondary active">Submit</button>
<button type="button" class="btn btn-info active">Submit</button>
<button type="button" class="btn btn-primary active">Buy now</button>
<button type="button" class="btn btn-success active">Save</button>
<button type="button" class="btn btn-danger active">Delete</button>
</p>

<h3>Disabled</h3>
<p>
<button type="button" class="btn btn-secondary" disabled>Submit</button>
<button type="button" class="btn btn-info" disabled>Submit</button>
<button type="button" class="btn btn-primary" disabled>Buy now</button>
<button type="button" class="btn btn-success" disabled>Save</button>
<button type="button" class="btn btn-danger" disabled>Delete</button>
</p>
<div id="buttons_default">
<h3>Default</h3>
<p>
<button type="button" class="btn btn-secondary">Submit</button>
<button type="button" class="btn btn-info">Submit</button>
<button type="button" class="btn btn-primary">Buy now</button>
<button type="button" class="btn btn-success">Save</button>
<button type="button" class="btn btn-danger">Delete</button>
</p>

<h3>Hover</h3>
<p>
<button type="button" class="btn btn-info" style="pointer-events: none;">Submit</button>
<button type="button" class="btn btn-secondary" style="pointer-events: none;">Submit</button>
<button type="button" class="btn btn-info" style="pointer-events: none;">Buy now</button>
<button type="button" class="btn btn-info" style="pointer-events: none;">Save</button>
<button type="button" class="btn btn-info" style="pointer-events: none;">Delete</button>
</p>

<h3>Pressed</h3>
<p>
<button type="button" class="btn btn-secondary active">Submit</button>
<button type="button" class="btn btn-info active">Submit</button>
<button type="button" class="btn btn-primary active">Buy now</button>
<button type="button" class="btn btn-success active">Save</button>
<button type="button" class="btn btn-danger active">Delete</button>
</p>

<h3>Disabled</h3>
<p>
<button type="button" class="btn btn-secondary" disabled>Submit</button>
<button type="button" class="btn btn-info" disabled>Submit</button>
<button type="button" class="btn btn-primary" disabled>Buy now</button>
<button type="button" class="btn btn-success" disabled>Save</button>
<button type="button" class="btn btn-danger" disabled>Delete</button>
</p>
</div>

<div style="background-color: black; padding: 2rem;">
<h3 id="default-black-bg" style="color: white;">Default</h3>
<div id="buttons_inverse">
<h3 id="default-black-bg">Default</h3>
<p>
<button type="button" class="btn btn-inverse btn-secondary">Submit</button>
<button type="button" class="btn btn-inverse btn-info">Submit</button>
Expand All @@ -48,7 +50,7 @@ <h3 id="default-black-bg" style="color: white;">Default</h3>
<button type="button" class="btn btn-inverse btn-danger">Delete</button>
</p>

<h3 id="hover-black-bg" style="color: white;">Hover</h3>
<h3 id="hover-black-bg">Hover</h3>
<p>
<button type="button" class="btn btn-inverse btn-info" style="pointer-events: none;">Submit</button>
<button type="button" class="btn btn-inverse btn-secondary" style="pointer-events: none;">Submit</button>
Expand All @@ -57,7 +59,7 @@ <h3 id="hover-black-bg" style="color: white;">Hover</h3>
<button type="button" class="btn btn-inverse btn-secondary" style="pointer-events: none;">Delete</button>
</p>

<h3 id="pressed-black-bg" style="color: white;">Pressed</h3>
<h3 id="pressed-black-bg">Pressed</h3>
<p>
<button type="button" class="btn btn-inverse btn-secondary active">Submit</button>
<button type="button" class="btn btn-inverse btn-info active">Submit</button>
Expand All @@ -66,7 +68,7 @@ <h3 id="pressed-black-bg" style="color: white;">Pressed</h3>
<button type="button" class="btn btn-inverse btn-danger active">Delete</button>
</p>

<h3 id="disabled-black-bg" style="color: white;">Disabled</h3>
<h3 id="disabled-black-bg">Disabled</h3>
<p>
<button type="button" class="btn btn-inverse btn-secondary" disabled>Submit</button>
<button type="button" class="btn btn-inverse btn-info" disabled>Submit</button>
Expand Down
40 changes: 8 additions & 32 deletions docs-orange/_includes/boostwatch/pagination.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,15 @@ <h2 id="pagination">Pagination</h2>
<nav>
<ul class="pagination">
<li class="page-item bordered">
<a class="page-link disabled" href="#" aria-label="Previous">
<span aria-hidden="true" class="icon-arrow-previous"></span>
<span class="sr-only">Previous</span>
</a>
<a class="page-link prev disabled" href="#" aria-label="Previous"></a>
</li>
<li class="page-item"><a class="page-link active" href="#" aria-label="Go to page 1">1</a></li>
<li class="page-item"><a class="page-link" href="#" aria-label="Go to page 2">2</a></li>
<li class="page-item"><a class="page-link" href="#" aria-label="Go to page 3">3</a></li>
<li class="page-item"><a class="page-link" href="#" aria-label="Go to page 4">4</a></li>
<li class="page-item"><a class="page-link" href="#" aria-label="Go to page 5">5</a></li>
<li class="page-item bordered">
<a class="page-link" href="#" aria-label="Next">
<span aria-hidden="true" class="icon-arrow-next"></span>
<span class="sr-only">Next</span>
</a>
<a class="page-link next" href="#" aria-label="Next"></a>
</li>
</ul>
</nav>
Expand All @@ -28,16 +22,10 @@ <h2 id="pagination">Pagination</h2>
<nav>
<ul class="pagination">
<li class="page-item bordered">
<a class="page-link" href="#" aria-label="Previous">
<span aria-hidden="true" class="icon-arrow-previous"></span>
<span class="sr-only">Previous</span>
</a>
<a class="page-link prev" href="#" aria-label="Previous"></a>
</li>
<li class="page-item bordered">
<a class="page-link" href="#" aria-label="Next">
<span aria-hidden="true" class="icon-arrow-next"></span>
<span class="sr-only">Next</span>
</a>
<a class="page-link next" href="#" aria-label="Next"></a>
</li>
</ul>
</nav>
Expand All @@ -48,16 +36,10 @@ <h2 id="pagination">Pagination</h2>
<ul class="pagination">
<li class="page-item presentation" role="presentation">Page 2 of 10</li>
<li class="page-item bordered">
<a class="page-link" href="#" aria-label="Previous">
<span aria-hidden="true" class="icon-arrow-previous"></span>
<span class="sr-only">Previous</span>
</a>
<a class="page-link prev" href="#" aria-label="Previous"></a>
</li>
<li class="page-item bordered">
<a class="page-link" href="#" aria-label="Next">
<span aria-hidden="true" class="icon-arrow-next"></span>
<span class="sr-only">Next</span>
</a>
<a class="page-link next" href="#" aria-label="Next"></a>
</li>
</ul>
</nav>
Expand All @@ -67,16 +49,10 @@ <h2 id="pagination">Pagination</h2>
<nav>
<ul class="pagination">
<li class="page-item bordered">
<a class="page-link page-item-labelled" href="#" aria-label="Previous">
<span aria-hidden="true" class="icon-arrow-previous"></span>
<span>Back</span>
</a>
<a class="page-link prev" href="#" aria-label="Previous"><span class="label">Back</span></a>
</li>
<li class="page-item bordered">
<a class="page-link page-item-labelled" href="#" aria-label="Next">
<span>Next</span>
<span aria-hidden="true" class="icon-arrow-next"></span>
</a>
<a class="page-link next" href="#" aria-label="Next"><span class="label">Next</span></a>
</li>
</ul>
</nav>
Expand Down
23 changes: 21 additions & 2 deletions docs-orange/assets/scss/_boosted-docs.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,8 @@
#nav,
#color-schemes,
#containers,
#placement {
#placement,
#sizing {
@include brand-warning;
}

Expand Down Expand Up @@ -315,4 +316,22 @@ $back-top-btn-height: 3.75rem;
padding: 0;
position: absolute;
width: 1px;
}
}

// boostwatch

// buttons dipslay
#buttons_default,
#buttons_inverse {
padding-left: 1.25rem;

button {
margin-right: .625rem;
}
}

#buttons_inverse {
color: #fff;
background-color: #000;
padding: 1.25rem;
}
45 changes: 9 additions & 36 deletions docs-orange/components/pagination.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,15 @@ Simple pagination inspired by Rdio, great for apps and search results. The large
<nav>
<ul class="pagination">
<li class="page-item">
<a class="page-link disabled" href="#" aria-label="Go to previous page">
<span aria-hidden="true" class="icon-arrow-previous"></span>
<span class="sr-only">Previous</span>
</a>
<a class="page-link prev disabled" href="#" aria-label="Go to previous page"></a>
</li>
<li class="page-item"><a class="page-link" href="#" aria-label="Go to page 1">1</a></li>
<li class="page-item"><a class="page-link" href="#" aria-label="Go to page 2">2</a></li>
<li class="page-item"><a class="page-link" href="#" aria-label="Go to page 3">3</a></li>
<li class="page-item"><a class="page-link" href="#" aria-label="Go to page 4">4</a></li>
<li class="page-item"><a class="page-link" href="#" aria-label="Go to page 5">5</a></li>
<li class="page-item">
<a class="page-link" href="#" aria-label="Go to next page">
<span aria-hidden="true" class="icon-arrow-next"></span>
<span class="sr-only">Next</span>
</a>
<a class="page-link next" href="#" aria-label="Go to next page"></a>
</li>
</ul>
</nav>
Expand All @@ -53,10 +47,7 @@ The `.disabled` class uses `pointer-events: none` to try to disable the link fun
<nav>
<ul class="pagination">
<li class="page-item ">
<a class="page-link disabled" href="#" aria-label="Go to previous page">
<span aria-hidden="true" class="icon-arrow-previous"></span>
<span class="sr-only">Previous</span>
</a>
<a class="page-link prev disabled" href="#" aria-label="Go to previous page"></a>
</li>
<li class="page-item ">
<a class="page-link active" href="#" aria-label="Go to page 1">1 <span class="sr-only">(current)</span></a>
Expand All @@ -66,10 +57,7 @@ The `.disabled` class uses `pointer-events: none` to try to disable the link fun
<li class="page-item"><a class="page-link" href="#" aria-label="Go to page 4">4</a></li>
<li class="page-item"><a class="page-link" href="#" aria-label="Go to page 5">5</a></li>
<li class="page-item">
<a class="page-link" href="#" aria-label="Go to next page">
<span aria-hidden="true" class="icon-arrow-next"></span>
<span class="sr-only">Next</span>
</a>
<a class="page-link next" href="#" aria-label="Go to next page"></a>
</li>
</ul>
</nav>
Expand All @@ -81,10 +69,7 @@ You can optionally swap out active or disabled anchors for `<span>`, or omit the
<nav>
<ul class="pagination">
<li class="page-item ">
<span class="page-link disabled" aria-label="Go to previous page">
<span aria-hidden="true" class="icon-arrow-previous"></span>
<span class="sr-only">Previous</span>
</span>
<span class="page-link prev disabled" aria-label="Go to previous page"></span>
</li>
<li class="page-item "><span class="page-link active">1 <span class="sr-only">(current)</span></span></li>
</ul>
Expand All @@ -100,19 +85,13 @@ Fancy larger or smaller pagination? Add `.pagination-lg` or `.pagination-sm` for
<nav>
<ul class="pagination pagination-lg">
<li class="page-item">
<a class="page-link disabled" href="#" aria-label="Go to previous page">
<span aria-hidden="true" class="icon-arrow-previous"></span>
<span class="sr-only">Previous</span>
</a>
<a class="page-link prev disabled" href="#" aria-label="Go to previous page"></a>
</li>
<li class="page-item"><a class="page-link" href="#" aria-label="Go to page 1">1</a></li>
<li class="page-item"><a class="page-link" href="#" aria-label="Go to page 2">2</a></li>
<li class="page-item"><a class="page-link" href="#" aria-label="Go to page 3">3</a></li>
<li class="page-item">
<a class="page-link" href="#" aria-label="Go to next page">
<span aria-hidden="true" class="icon-arrow-next"></span>
<span class="sr-only">Next</span>
</a>
<a class="page-link next" href="#" aria-label="Go to next page"></a>
</li>
</ul>
</nav>
Expand All @@ -122,19 +101,13 @@ Fancy larger or smaller pagination? Add `.pagination-lg` or `.pagination-sm` for
<nav>
<ul class="pagination pagination-sm">
<li class="page-item">
<a class="page-link disabled" href="#" aria-label="Go to previous page">
<span aria-hidden="true" class="icon-arrow-previous"></span>
<span class="sr-only">Previous</span>
</a>
<a class="page-link prev disabled" href="#" aria-label="Go to previous page"></a>
</li>
<li class="page-item"><a class="page-link" href="#" aria-label="Go to page 1">1</a></li>
<li class="page-item"><a class="page-link" href="#" aria-label="Go to page 2">2</a></li>
<li class="page-item"><a class="page-link" href="#" aria-label="Go to page 3">3</a></li>
<li class="page-item">
<a class="page-link" href="#" aria-label="Go to next page">
<span aria-hidden="true" class="icon-arrow-next"></span>
<span class="sr-only">Next</span>
</a>
<a class="page-link next" href="#" aria-label="Go to next page"></a>
</li>
</ul>
</nav>
Expand Down
5 changes: 5 additions & 0 deletions scss/_custom.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,11 @@ $pagination-disabled-color: $gray;
$pagination-disabled-bg: #fff;
$pagination-disabled-border: #000;

$pagination-icon-prev: url("data:image/svg+xml;charset=utf8, %3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%209%2014%22%3E%3Cpath%20d%3D%22M9%202L7%200%200%207l7%207%202-2-5-5%205-5z%22%2F%3E%3C%2Fsvg%3E") !default;
$pagination-icon-prev-disabled: url("data:image/svg+xml;charset=utf8, %3Csvg%20viewBox%3D%220%200%209%2014%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M9%202L7%200%200%207l7%207%202-2-5-5%205-5z%22%20fill%3D%22%23DDD%22%2F%3E%3C%2Fsvg%3E") !default;
$pagination-icon-next: url("data:image/svg+xml;charset=utf8, %3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%209%2014%22%3E%3Cpath%20d%3D%22M0%202l2-2%207%207-7%207-2-2%205-5-5-5z%22%2F%3E%3C%2Fsvg%3E") !default;
$pagination-icon-next-disabled: url("data:image/svg+xml;charset=utf8, %3Csvg%20viewBox%3D%220%200%209%2014%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M0%202l2-2%207%207-7%207-2-2%205-5-5-5z%22%20fill%3D%22%23DDD%22%2F%3E%3C%2Fsvg%3E") !default;


// Jumbotron

Expand Down
2 changes: 1 addition & 1 deletion scss/_o-nav-local.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
}

.nav-link {
padding: 1.0625rem 0;
padding: 1rem 0;
font-weight: bold;
line-height: 1;

Expand Down
Loading

0 comments on commit a98fc96

Please sign in to comment.