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

(#547) sheet-subtitle can contain an "add button" right aligned #549

Merged
merged 2 commits into from
Feb 13, 2018
Merged

(#547) sheet-subtitle can contain an "add button" right aligned #549

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
7385020
Update: (Fixes #547) Sheet Subtitle added `.autofit-row` support so w…
pat270 Feb 12, 2018
00325e3
Site: (#547) Sheet add `.sheet-subtitle` examples with `.autofit-row`
pat270 Feb 13, 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
35 changes: 35 additions & 0 deletions packages/clay/src/content/sheet.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,41 @@ <h2 class="sheet-title">Sheet Title</h2>
</div>
<div class="sheet-section">
<h3 class="sheet-subtitle">Sheet Subtitle</h3>
<h3 class="autofit-row sheet-subtitle">
<span class="autofit-col autofit-col-expand">
<span class="heading-text">Sheet Subtitle 2</span>
</span>
</h3>
<h3 class="autofit-row sheet-subtitle">
<span class="autofit-col autofit-col-expand">
<span class="heading-text">Sheet Subtitle 3 with Button and ReallySuperInsanelyJustIncrediblyLongAndTotallyNotPossibleWordButWeAreReallyTryingToCoverAllOurBasesHereJustInCaseSomeoneIsNutsAsPerUsual</span>
</span>
<span class="autofit-col">
<span class="heading-end">
<button class="btn btn-secondary btn-sm">Add</button>
</span>
</span>
</h3>
<h3 class="autofit-row autofit-float sheet-subtitle">
<span class="autofit-col">
<span class="heading-start">
<a class="component-action" href="#1">
<svg aria-hidden="true" class="lexicon-icon lexicon-icon-link">
<use xlink:href="{{rootPath}}/images/icons/icons.svg#link" />
</svg>
</a>
</span>
</span>
<span class="autofit-col autofit-col-expand">
<span class="heading-text">Sheet Subtitle 4 with Autofit Float</span>
</span>
<span class="autofit-col autofit-col-end">
<span class="heading-end">
<button class="btn btn-secondary btn-sm">Add</button>
<button class="btn btn-secondary btn-sm">Remove</button>
</span>
</span>
</h3>
<h4 class="sheet-tertiary-title">Sheet Tertiary Title</h4>
<div class="sheet-text">Sheet Subtitle and Sheet Tertiary Title are contained inside a sheet-section.</div>
</div>
Expand Down
13 changes: 13 additions & 0 deletions packages/clay/src/scss/components/_sheets.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,14 @@
margin-bottom: $sheet-subtitle-margin-bottom-mobile;
}

&.autofit-row {
padding-bottom: 0;

.autofit-col {
margin-bottom: $sheet-subtitle-padding-y;
}
}

&.collapse-icon {
padding-left: $sheet-subtitle-collapse-icon-padding-left;
padding-right: $sheet-subtitle-collapse-icon-padding-right;
Expand All @@ -118,6 +126,11 @@
right: $sheet-subtitle-collapse-icon-right;
top: $sheet-subtitle-collapse-icon-top;
}

.heading-text {
margin-bottom: $sheet-subtitle-heading-text-margin-bottom;
margin-top: $sheet-subtitle-heading-text-margin-top;
}
}

a.sheet-subtitle {
Expand Down
2 changes: 2 additions & 0 deletions packages/clay/src/scss/components/_tbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
.tbar-nav {
@extend %autofit-row;

margin-bottom: 0;

> .tbar-item {
justify-content: center;
}
Expand Down
16 changes: 15 additions & 1 deletion packages/clay/src/scss/components/_utilities.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@

@include list-unstyled;

margin-bottom: 0;
width: 100%;
}

Expand Down Expand Up @@ -113,6 +112,21 @@
@extend %autofit-float-sm-down;
}

// Headings (h1-6)

.heading-start {
margin-right: $heading-spacer-x;
}

.heading-end {
margin-left: $heading-spacer-x;
}

.heading-text {
margin-bottom: $heading-text-margin-bottom;
margin-top: $heading-text-margin-top;
}

// Inline Scroller

.inline-scroller {
Expand Down
3 changes: 3 additions & 0 deletions packages/clay/src/scss/variables/_sheets.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ $sheet-subtitle-text-transform: uppercase !default;
$sheet-subtitle-font-size-mobile: null !default;
$sheet-subtitle-margin-bottom-mobile: null !default;

$sheet-subtitle-heading-text-margin-bottom: 0 !default;
$sheet-subtitle-heading-text-margin-top: null !default;

// Sheet Subtitle as Panel Header

$sheet-subtitle-link-color: $sheet-subtitle-color !default;
Expand Down
7 changes: 7 additions & 0 deletions packages/clay/src/scss/variables/_utilities.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ $inline-scroller-max-height: 125px !default;

$autofit-col-expand-min-width: 3.125rem !default; // 50px

// Heading

$heading-spacer-x: 1rem; // 16px

$heading-text-margin-bottom: auto;
$heading-text-margin-top: auto;

// Inline Item

$inline-item-lexicon-icon-margin-top: -0.21429em !default;
Expand Down