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

Update Bootstrap to 572d00a (v4.0.0) #437

Merged
merged 6 commits into from
Jan 22, 2018
Merged

Update Bootstrap to 572d00a (v4.0.0) #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
af41b4e
Breaking: Update Bootstrap 4 to 572d00a (v4-stable)
pat270 Jan 22, 2018
0a6dc6e
Update: Buttons update comment about `$btn-active-box-shadow`
pat270 Jan 22, 2018
d8def98
Update: Cursor selectors to match BS4 selectors
pat270 Jan 22, 2018
ee1d37a
Update: Navbar use variable `$navbar-nav-link-padding-x` added by BS4
pat270 Jan 22, 2018
8349c4c
Site: (#425) Navbar forgot to change `div` to `ul`
pat270 Jan 22, 2018
481aed9
Update: Buttons fixed typo in comment
pat270 Jan 22, 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
4 changes: 2 additions & 2 deletions packages/clay/src/content/navbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,7 @@ <h3>Alternate Navbar Toggler Style</h3>
<use xlink:href="{{rootPath}}/images/icons/icons.svg#caret-bottom" />
</svg>
</a>
<div aria-labelledby="dropdownMenu" class="dropdown-menu">
<ul aria-labelledby="dropdownMenu" class="dropdown-menu">
<li class="dropdown-header">Dropdown Header</li>
<li><a class="dropdown-item" href="#1">Actions</a></li>
<li><a class="dropdown-item" href="#1">Edit</a></li>
Expand All @@ -703,7 +703,7 @@ <h3>Alternate Navbar Toggler Style</h3>
<li><a class="disabled dropdown-item" href="#1">Disabled</a></li>
<li class="dropdown-divider"></li>
<li><a class="dropdown-item" href="#1">Scope</a></li>
</div>
</ul>
</li>
<li class="nav-item">
<a class="nav-link" href="#1">
Expand Down
44 changes: 22 additions & 22 deletions packages/clay/src/js/bootstrap.js
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion packages/clay/src/scss/atlas/variables/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ $btn-disabled-opacity: 0.26 !default;

$btn-link-disabled-color: $link-color !default;

// Will need to be revisited if https://github.com/twbs/bootstrap/pull/24821 is merged
// Will need to be revisited if https://github.com/twbs/bootstrap/pull/24821 merge error is fixed
$btn-active-box-shadow: inset 0 0 rgba(#000, 0) !default;

$btn-inline-item-font-size: 1rem !default; // 16px
Expand Down
14 changes: 5 additions & 9 deletions packages/clay/src/scss/bootstrap/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@
}

// Opinionated: add "hand" cursor to non-disabled .btn elements
&:not([disabled]):not(.disabled) {
&:not(:disabled):not(.disabled) {
cursor: pointer;
}

&:not([disabled]):not(.disabled):active,
&:not([disabled]):not(.disabled).active {
&:not(:disabled):not(.disabled):active,
&:not(:disabled):not(.disabled).active {
background-image: none;
@include box-shadow($btn-active-box-shadow);

Expand All @@ -51,7 +51,7 @@

// Future-proof disabling of clicks on `<a>` elements
a.btn.disabled,
fieldset[disabled] a.btn {
fieldset:disabled a.btn {
pointer-events: none;
}

Expand All @@ -68,11 +68,7 @@ fieldset[disabled] a.btn {

@each $color, $value in $theme-colors {
.btn-outline-#{$color} {
@if $color == "light" {
@include button-outline-variant($value, $gray-900);
} @else {
@include button-outline-variant($value, $white);
}
@include button-outline-variant($value);
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/clay/src/scss/bootstrap/_close.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}

// Opinionated: add "hand" cursor to non-disabled .close elements
&:not([disabled]):not(.disabled) {
&:not(:disabled):not(.disabled) {
cursor: pointer;
}
}
Expand Down
17 changes: 16 additions & 1 deletion packages/clay/src/scss/bootstrap/_custom-forms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,15 @@
background-image: $custom-checkbox-indicator-icon-indeterminate;
}
}

.custom-control-input:disabled {
&:checked ~ .custom-control-label::before {
background-color: $custom-control-indicator-checked-disabled-bg;
}
&:indeterminate ~ .custom-control-label::before {
background-color: $custom-control-indicator-checked-disabled-bg;
}
}
}

// Radios
Expand All @@ -136,6 +145,12 @@
background-image: $custom-radio-indicator-icon-checked;
}
}

.custom-control-input:disabled {
&:checked ~ .custom-control-label::before {
background-color: $custom-control-indicator-checked-disabled-bg;
}
}
}


Expand All @@ -148,7 +163,7 @@
.custom-select {
display: inline-block;
width: 100%;
height: $input-height;
height: $custom-select-height;
padding: $custom-select-padding-y ($custom-select-padding-x + $custom-select-indicator-padding) $custom-select-padding-y $custom-select-padding-x;
line-height: $custom-select-line-height;
color: $custom-select-color;
Expand Down
12 changes: 6 additions & 6 deletions packages/clay/src/scss/bootstrap/_input-group.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
align-items: stretch;
width: 100%;

.form-control,
.custom-select,
.custom-file {
> .form-control,
> .custom-select,
> .custom-file {
position: relative; // For focus state's z-index
flex: 1 1 auto;
// Add width 1% and flex-basis auto to ensure that button will not wrap out
Expand All @@ -33,15 +33,15 @@
}
}

.form-control,
.custom-select {
> .form-control,
> .custom-select {
&:not(:last-child) { @include border-right-radius(0); }
&:not(:first-child) { @include border-left-radius(0); }
}

// Custom file inputs have more complex markup, thus requiring different
// border-radius overrides.
.custom-file {
> .custom-file {
display: flex;
align-items: center;

Expand Down
2 changes: 1 addition & 1 deletion packages/clay/src/scss/bootstrap/_navbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
}

// Opinionated: add "hand" cursor to non-disabled .navbar-toggler elements
&:not([disabled]):not(.disabled) {
&:not(:disabled):not(.disabled) {
cursor: pointer;
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/clay/src/scss/bootstrap/_pagination.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
}

// Opinionated: add "hand" cursor to non-disabled .page-link elements
&:not([disabled]):not(.disabled) {
&:not(:disabled):not(.disabled) {
cursor: pointer;
}
}
Expand Down
Loading