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

Jump to bottom

Embedded examples cleanup #30330

Merged
merged 6 commits into from
Mar 4, 2020
Merged

Embedded examples cleanup #30330

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
41519ef
Thin out embeddeed examples borders, rounded their corners
mdo Mar 3, 2020
36a68b1
Fix busted class
mdo Mar 3, 2020
1a4b418
Adjust nesting of .bd-example styles, tweak padding while I'm at it
mdo Mar 3, 2020
b87ffe0
combine selectors
mdo Mar 4, 2020
cc4f775
cleanup some margins that always cancel each other out
mdo Mar 4, 2020
73c07cf
Remove redundant universal selector
MartijnCuppens Mar 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
79 changes: 37 additions & 42 deletions site/assets/scss/_component-examples.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,20 +82,20 @@
position: relative;
padding: 1rem;
margin: 1rem (-$grid-gutter-width / 2) 0;
border: solid $gray-100;
border-width: .2rem 0 0;
border: solid $gray-300;
border-width: 1px 0 0;
@include clearfix();

@include media-breakpoint-up(sm) {
padding: 1.5rem;
margin-right: 0;
margin-left: 0;
border-width: .2rem;
}
border-width: 1px;
@include border-top-radius(.25rem);

+ .highlight,
+ .clipboard + .highlight {
margin-top: 0;
+ .bd-clipboard + .highlight {
@include border-bottom-radius(.25rem);
}
}

+ p {
Expand All @@ -119,18 +119,18 @@
position: static;
display: block;
}
}

// Images
.bd-example {
> :last-child {
margin-bottom: 0;
}

// Images
> svg + svg,
> img + img {
margin-left: .5rem;
}
}

// Buttons
.bd-example {
// Buttons
> .btn,
> .btn-group {
margin-top: .25rem;
Expand All @@ -139,19 +139,17 @@
> .btn-toolbar + .btn-toolbar {
margin-top: .5rem;
}
}

// List groups
.bd-example > .list-group {
max-width: 400px;
}
// List groups
> .list-group {
max-width: 400px;
}

.bd-example > [class*="list-group-horizontal"] {
max-width: 100%;
}
> [class*="list-group-horizontal"] {
max-width: 100%;
}

// Navbars
.bd-example {
// Navbars
.fixed-top,
.sticky-top {
position: static;
Expand All @@ -172,12 +170,12 @@
margin: 1rem -1.5rem -1.5rem;
}
}
}

// Pagination
.bd-example .pagination {
margin-top: .5rem;
margin-bottom: .5rem;
// Pagination
.pagination {
margin-top: .5rem;
margin-bottom: .5rem;
}
}

.bd-example-modal {
Expand Down Expand Up @@ -236,27 +234,14 @@

.highlight {
padding: 1rem;
margin-top: 1rem;
margin-bottom: 1rem;
background-color: $gray-100;
-ms-overflow-style: -ms-autohiding-scrollbar;

@include media-breakpoint-up(sm) {
padding: 1.5rem;
padding: 1rem 1.5rem;
}
}

.bd-content .highlight {
margin-right: (-$grid-gutter-width / 2);
margin-left: (-$grid-gutter-width / 2);

@include media-breakpoint-up(sm) {
margin-right: 0;
margin-left: 0;
}
}

.highlight {
pre {
padding: 0;
margin-top: 0;
Expand All @@ -270,3 +255,13 @@
color: $gray-900; // Effectively the base text color
}
}

.bd-content .highlight {
margin-right: (-$grid-gutter-width / 2);
margin-left: (-$grid-gutter-width / 2);

@include media-breakpoint-up(sm) {
margin-right: 0;
margin-left: 0;
}
}