clones/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-09-22 11:07:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev

Browse Source
This commit is contained in:
Mark Otto 2017-11-06 13:52:04 -08:00
commit 807adbb48a
7 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/4.0/getting-started/introduction.md
View File

@ -4,9 +4,10 @@ title: Introduction
description: Get started with Bootstrap, the world's most popular framework for building responsive, mobile-first sites, with the Bootstrap CDN and a template starter page.
group: getting-started
redirect_from:
- /docs/4.0/getting-started/
- /docs/4.0/
- /docs/
- /docs/4.0/
- /docs/4.0/getting-started/
- /docs/getting-started/
toc: true
---

2
scss/_buttons.scss
View File

@ -28,7 +28,7 @@
// Disabled comes first so active can properly restyle
&.disabled,
&:disabled {
opacity: .65;
opacity: $btn-disabled-opacity;
@include box-shadow(none);
}

4
scss/_nav.scss
View File

@ -41,7 +41,7 @@
@include border-top-radius($nav-tabs-border-radius);
@include hover-focus {
border-color: $nav-tabs-link-hover-border-color $nav-tabs-link-hover-border-color $nav-tabs-border-color;
border-color: $nav-tabs-link-hover-border-color;
}
&.disabled {
@ -55,7 +55,7 @@
.nav-item.show .nav-link {
color: $nav-tabs-link-active-color;
background-color: $nav-tabs-link-active-bg;
border-color: $nav-tabs-link-active-border-color $nav-tabs-link-active-border-color $nav-tabs-link-active-bg;
border-color: $nav-tabs-link-active-border-color;
}
.dropdown-menu {

4
scss/_progress.scss
View File

@ -14,10 +14,12 @@
.progress-bar {
display: flex;
align-items: center;
flex-direction: column;
justify-content: center;
color: $progress-bar-color;
text-align: center;
background-color: $progress-bar-bg;
@include transition($progress-bar-transition);
}
.progress-bar-striped {

8
scss/_tooltip.scss
View File

@ -34,7 +34,7 @@
}
.arrow::before {
margin-left: -($tooltip-arrow-width - 2);
margin-left: -$tooltip-arrow-width;
content: "";
border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
border-top-color: $tooltip-arrow-color;
@ -47,7 +47,7 @@
}
.arrow::before {
margin-top: -($tooltip-arrow-width - 2);
margin-top: -$tooltip-arrow-width;
content: "";
border-width: $tooltip-arrow-width $tooltip-arrow-width $tooltip-arrow-width 0;
border-right-color: $tooltip-arrow-color;
@ -60,7 +60,7 @@
}
.arrow::before {
margin-left: -($tooltip-arrow-width - 2);
margin-left: -$tooltip-arrow-width;
content: "";
border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
border-bottom-color: $tooltip-arrow-color;
@ -74,7 +74,7 @@
.arrow::before {
right: 0;
margin-top: -($tooltip-arrow-width - 2);
margin-top: -($tooltip-arrow-width);
content: "";
border-width: $tooltip-arrow-width 0 $tooltip-arrow-width $tooltip-arrow-width;
border-left-color: $tooltip-arrow-color;

28
scss/_variables.scss
View File

@ -280,7 +280,7 @@ $dt-font-weight: $font-weight-bold !default;
$kbd-box-shadow: inset 0 -.1rem 0 rgba($black, .25) !default;
$nested-kbd-font-weight: $font-weight-bold !default;
$list-inline-padding: 5px !default;
$list-inline-padding: .5rem !default;
$mark-bg: #fcf8e3 !default;
@ -357,6 +357,7 @@ $btn-font-weight: $font-weight-normal !default;
$btn-box-shadow: inset 0 1px 0 rgba($white, .15), 0 1px 1px rgba($black, .075) !default;
$btn-focus-width: $input-btn-focus-width !default;
$btn-focus-box-shadow: $input-btn-focus-box-shadow !default;
$btn-disabled-opacity: .65 !default;
$btn-active-box-shadow: inset 0 3px 5px rgba($black, .125) !default;
$btn-link-disabled-color: $gray-600 !default;
@ -569,10 +570,10 @@ $nav-link-disabled-color: $gray-600 !default;
$nav-tabs-border-color: $gray-300 !default;
$nav-tabs-border-width: $border-width !default;
$nav-tabs-border-radius: $border-radius !default;
$nav-tabs-link-hover-border-color: $gray-200 !default;
$nav-tabs-link-hover-border-color: $gray-200 $gray-200 $nav-tabs-border-color !default;
$nav-tabs-link-active-color: $gray-700 !default;
$nav-tabs-link-active-bg: $body-bg !default;
$nav-tabs-link-active-border-color: $gray-300 !default;
$nav-tabs-link-active-border-color: $gray-300 $gray-300 $nav-tabs-link-active-bg !default;
$nav-pills-border-radius: $border-radius !default;
$nav-pills-link-active-color: $component-active-color !default;
@ -665,18 +666,17 @@ $card-columns-margin: $card-spacer-y !default;
// Tooltips
$tooltip-max-width: 200px !default;
$tooltip-color: $white !default;
$tooltip-bg: $black !default;
$tooltip-opacity: .9 !default;
$tooltip-padding-y: 3px !default;
$tooltip-padding-x: 8px !default;
$tooltip-margin: 0 !default;
$tooltip-max-width: 200px !default;
$tooltip-color: $white !default;
$tooltip-bg: $black !default;
$tooltip-opacity: .9 !default;
$tooltip-padding-y: .25rem !default;
$tooltip-padding-x: .5rem !default;
$tooltip-margin: 0 !default;
$tooltip-arrow-width: 5px !default;
$tooltip-arrow-height: 5px !default;
$tooltip-arrow-color: $tooltip-bg !default;
$tooltip-arrow-width: .4rem !default;
$tooltip-arrow-height: $tooltip-arrow-width !default;
$tooltip-arrow-color: $tooltip-bg !default;
// Popovers

1
scss/mixins/_forms.scss
View File

@ -57,6 +57,7 @@
border-color: $color;
&:focus {
border-color: $color;
box-shadow: 0 0 0 $input-focus-width rgba($color, .25);
}