Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Site: Buttons separate .btn-unstyled from Button examples and add s… #648

Merged
merged 2 commits into from
Feb 26, 2018
Merged

Site: Buttons separate .btn-unstyled from Button examples and add s… #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d34e767
Site: Buttons separate `.btn-unstyled` from Button examples and add s…
pat270 Feb 26, 2018
3b29701
Site: Badges update Badge Sizes docs
pat270 Feb 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/clay/src/content/badges_and_labels.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ <h3>Badge with Links Inside</h3>
<h3>Badge Sizes</h3>

<div class="alert alert-warning">
Badge Sizes have been removed, use the <code>badge-size($sassMap)</code> mixin to create custom badges sizes for your app.
Badge Sizes have been removed, use the <a href="https://github.com/liferay/clay/blob/master/packages/clay/src/scss/mixins/_badges.scss#L1">clay-badge-size($sassMap) mixin</a> to create custom badges sizes for your app.
</div>
</div>
</div>
Expand Down
23 changes: 18 additions & 5 deletions packages/clay/src/content/buttons.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,24 @@
section: Components
---

<div class="clay-site-row-spacer row">
<div class="col-md-12">
<h3>Button Unstyled</h3>

<blockquote class="blockquote">
<p>This is resets Boostrap 4's <code>.btn</code> styles so that a button can be styled like a link. You can omit the <code>.btn</code> class to retain the browser default focus style. This was created to help those that are concerned about the separation between content and presentation.</p>
</blockquote>

<div class="alert alert-warning">
Browsers will generally apply the focus outline on click for buttons which might throw off the presentation if buttons and links are mixed. It will require detailed attention to hover, focus, and active styles.
</div>

<button class="btn-unstyled" type="button">.btn-unstyled</button>
<a href="#1" role="button">Anchor</a>
<button class="btn btn-unstyled" type="button">.btn.btn-unstyled</button>
</div>
</div>

<div class="clay-site-row-spacer row">
<div class="col-md-12">
<h3>Button</h3>
Expand All @@ -21,7 +39,6 @@ <h6>Normal</h6>
<button class="btn btn-dark" type="button">Dark</button>

<button class="btn btn-link" type="button">Link</button>
<button class="btn btn-unstyled" type="button">Unstyled</button>

<h6>Focus</h6>
<button class="btn btn-primary focus" type="button">Primary</button>
Expand All @@ -37,7 +54,6 @@ <h6>Focus</h6>
<button class="btn btn-dark focus" type="button">Dark</button>

<button class="btn btn-link focus" type="button">Link</button>
<button class="btn btn-unstyled focus" type="button">Unstyled</button>

<h6>Active</h6>
<button class="active btn btn-primary" type="button">Primary</button>
Expand All @@ -53,7 +69,6 @@ <h6>Active</h6>
<button class="active btn btn-dark" type="button">Dark</button>

<button class="active btn btn-link" type="button">Link</button>
<button class="active btn btn-unstyled" type="button">Unstyled</button>

<h6>Disabled</h6>
<button class="btn btn-primary" disabled type="button">Primary</button>
Expand All @@ -70,7 +85,6 @@ <h6>Disabled</h6>
<button class="btn btn-dark" disabled type="button">Dark</button>

<button class="btn btn-link" disabled type="button">Link</button>
<button class="btn btn-unstyled" disabled type="button">Unstyled</button>

<h6>Anchor and Input Elements as Buttons</h6>
<input class="btn btn-primary" type="button" value="Input" />
Expand Down Expand Up @@ -257,7 +271,6 @@ <h3>Button Monospaced</h3>
<button class="btn btn-monospaced btn-dark" type="button">H</button>

<button class="btn btn-monospaced btn-link" type="button">I</button>
<button class="btn btn-monospaced btn-unstyled" type="button">J</button>

</div>
</div>
Expand Down