mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00
Code Activity

Merge branch 'v4-dev' into v4-docs-streamlined

Browse Source
This commit is contained in:
Mark Otto
2016-10-24 14:27:52 -07:00
parent 11d52ba949 cf5d94f6d5
commit f7f3e62c66
236 changed files with 28875 additions and 10822 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/brand/bootstrap-social-logo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 45 KiB

docs/assets/brand/bootstrap-social.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 330 KiB

docs/assets/css/docs-flexbox.min.css
Vendored
+73 -33
View File
@@ -54,7 +54,7 @@
justify-content: space-between;
}
@media (min-width: 544px) {
@media (min-width: 576px) {
.flex-sm-first {
order: -1;
}
@@ -66,7 +66,7 @@
}
}
@media (min-width: 544px) {
@media (min-width: 576px) {
.flex-items-sm-top {
align-items: flex-start;
}
@@ -78,7 +78,7 @@
}
}
@media (min-width: 544px) {
@media (min-width: 576px) {
.flex-sm-top {
align-self: flex-start;
}
@@ -90,7 +90,7 @@
}
}
@media (min-width: 544px) {
@media (min-width: 576px) {
.flex-items-sm-left {
justify-content: flex-start;
}
@@ -277,27 +277,31 @@
padding-right: 15px;
}
@media (min-width: 544px) {
@media (min-width: 576px) {
.container {
max-width: 576px;
width: 540px;
max-width: 100%;
}
}
@media (min-width: 768px) {
.container {
max-width: 720px;
width: 720px;
max-width: 100%;
}
}
@media (min-width: 992px) {
.container {
max-width: 940px;
width: 960px;
max-width: 100%;
}
}
@media (min-width: 1200px) {
.container {
max-width: 1140px;
width: 1140px;
max-width: 100%;
}
}
@@ -311,26 +315,78 @@
.row {
display: flex;
flex-wrap: wrap;
margin-left: -15px;
margin-right: -15px;
margin-left: -15px;
}
.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12 {
@media (min-width: 576px) {
.row {
margin-right: -15px;
margin-left: -15px;
}
}
@media (min-width: 768px) {
.row {
margin-right: -15px;
margin-left: -15px;
}
}
@media (min-width: 992px) {
.row {
margin-right: -15px;
margin-left: -15px;
}
}
@media (min-width: 1200px) {
.row {
margin-right: -15px;
margin-left: -15px;
}
}
.col-xs, .col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12, .col-sm, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-md, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-lg, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-xl, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12 {
position: relative;
min-height: 1px;
width: 100%;
padding-right: 15px;
padding-left: 15px;
width: 100%;
}
@media (min-width: 576px) {
.col-xs, .col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12, .col-sm, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-md, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-lg, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-xl, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12 {
padding-right: 15px;
padding-left: 15px;
}
}
@media (min-width: 768px) {
.col-xs, .col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12, .col-sm, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-md, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-lg, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-xl, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12 {
padding-right: 15px;
padding-left: 15px;
}
}
@media (min-width: 992px) {
.col-xs, .col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12, .col-sm, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-md, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-lg, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-xl, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12 {
padding-right: 15px;
padding-left: 15px;
}
}
@media (min-width: 1200px) {
.col-xs, .col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12, .col-sm, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-md, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-lg, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-xl, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12 {
padding-right: 15px;
padding-left: 15px;
}
}
.col-xs {
position: relative;
flex-basis: 0;
flex-grow: 1;
max-width: 100%;
min-height: 1px;
padding-right: 15px;
padding-left: 15px;
}
.col-xs-1 {
@@ -541,15 +597,11 @@
margin-left: 91.666667%;
}
@media (min-width: 544px) {
@media (min-width: 576px) {
.col-sm {
position: relative;
flex-basis: 0;
flex-grow: 1;
max-width: 100%;
min-height: 1px;
padding-right: 15px;
padding-left: 15px;
}
.col-sm-1 {
flex: 0 0 8.333333%;
@@ -717,13 +769,9 @@
@media (min-width: 768px) {
.col-md {
position: relative;
flex-basis: 0;
flex-grow: 1;
max-width: 100%;
min-height: 1px;
padding-right: 15px;
padding-left: 15px;
}
.col-md-1 {
flex: 0 0 8.333333%;
@@ -891,13 +939,9 @@
@media (min-width: 992px) {
.col-lg {
position: relative;
flex-basis: 0;
flex-grow: 1;
max-width: 100%;
min-height: 1px;
padding-right: 15px;
padding-left: 15px;
}
.col-lg-1 {
flex: 0 0 8.333333%;
@@ -1065,13 +1109,9 @@
@media (min-width: 1200px) {
.col-xl {
position: relative;
flex-basis: 0;
flex-grow: 1;
max-width: 100%;
min-height: 1px;
padding-right: 15px;
padding-left: 15px;
}
.col-xl-1 {
flex: 0 0 8.333333%;
docs/assets/css/docs-flexbox.min.css.map
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/assets/css/docs.min.css
Vendored
+13 -13
View File
@@ -1,5 +1,5 @@
/*!
* Bootstrap Docs (http://getbootstrap.com)
* Bootstrap Docs (https://getbootstrap.com)
* Copyright 2011-2016 The Bootstrap Authors
* Copyright 2011-2016 Twitter, Inc.
* Licensed under the Creative Commons Attribution 3.0 Unported License. For
@@ -113,7 +113,7 @@
margin-bottom: -2rem !important;
}
@media (min-width: 544px) {
@media (min-width: 576px) {
.bd-masthead {
padding-top: 8rem;
padding-bottom: 2rem;
@@ -174,7 +174,7 @@
text-align: center;
}
@media (min-width: 544px) {
@media (min-width: 576px) {
.bd-featurette {
text-align: left;
}
@@ -202,7 +202,7 @@
margin: 2.5rem auto;
}
@media (min-width: 544px) {
@media (min-width: 576px) {
.half-rule {
margin-right: 0;
margin-left: 0;
@@ -298,7 +298,7 @@
text-decoration: none;
}
@media (min-width: 544px) {
@media (min-width: 576px) {
#carbonads {
max-width: 330px;
margin: 50px auto 0;
@@ -374,7 +374,7 @@
margin-bottom: .25rem;
}
@media (min-width: 544px) {
@media (min-width: 576px) {
.bd-title {
font-size: 3rem;
}
@@ -418,7 +418,7 @@
font-weight: 300;
}
@media (min-width: 544px) {
@media (min-width: 576px) {
.bd-pageheader {
padding-top: 4rem;
padding-bottom: 4rem;
@@ -600,7 +600,7 @@
margin-bottom: 0;
}
@media (min-width: 544px) {
@media (min-width: 576px) {
.bd-footer {
text-align: left;
}
@@ -690,7 +690,7 @@
clear: both;
}
@media (min-width: 544px) {
@media (min-width: 576px) {
.bd-example {
padding: 1.5rem;
margin-right: 0;
@@ -809,7 +809,7 @@
margin: 1rem -1rem -1rem;
}
@media (min-width: 544px) {
@media (min-width: 576px) {
.bd-example .navbar-fixed-top {
margin: -1.5rem -1.5rem 1rem;
}
@@ -915,7 +915,7 @@
background-color: #f7f7f9;
}
@media (min-width: 544px) {
@media (min-width: 576px) {
.highlight {
padding: 1.5rem;
margin-right: 0;
@@ -997,13 +997,13 @@
border: 1px solid #d6e9c6;
}
@media (max-width: 543px) {
@media (max-width: 575px) {
.hidden-xs-only {
display: none !important;
}
}
@media (min-width: 544px) and (max-width: 767px) {
@media (min-width: 576px) and (max-width: 767px) {
.hidden-sm-only {
display: none !important;
}
docs/assets/css/docs.min.css.map
+2 -2
View File
File diff suppressed because one or more lines are too long
docs/assets/js/docs.min.js
Vendored
+7 -7
View File
File diff suppressed because one or more lines are too long
docs/assets/js/ie10-viewport-bug-workaround.js
+1 -1
View File
@@ -6,7 +6,7 @@
*/
// See the Getting Started docs for more information:
// http://getbootstrap.com/getting-started/#support-ie10-width
// https://getbootstrap.com/getting-started/#support-ie10-width
(function () {
'use strict';
docs/assets/js/src/application.js
+1 -1
View File
@@ -3,7 +3,7 @@
// ++++++++++++++++++++++++++++++++++++++++++
/*!
* JavaScript for Bootstrap's docs (http://getbootstrap.com)
* JavaScript for Bootstrap's docs (https://getbootstrap.com)
* Copyright 2011-2016 The Bootstrap Authors
* Copyright 2011-2016 Twitter, Inc.
* Licensed under the Creative Commons Attribution 3.0 Unported License. For
docs/assets/js/vendor/anchor.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
docs/assets/js/vendor/clipboard.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
docs/assets/js/vendor/holder.min.js
Vendored
+3 -3
View File
File diff suppressed because one or more lines are too long
docs/assets/js/vendor/jekyll-search.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/assets/js/vendor/jquery.min.js
Vendored
+4 -4
View File
File diff suppressed because one or more lines are too long
docs/assets/js/vendor/tether.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/assets/scss/_component-examples.scss
+1 -1
View File
@@ -324,7 +324,7 @@
.highlight {
padding: 1rem;
margin: 1rem (-$grid-gutter-width / 2);
margin: 1rem (-$grid-gutter-width-base / 2);
background-color: #f7f7f9;
@include media-breakpoint-up(sm) {
docs/assets/scss/_featurettes.scss
+2 -2
View File
@@ -26,10 +26,10 @@
@include media-breakpoint-up(md) {
.col-sm-6:first-child {
padding-right: ($grid-gutter-width * 1.5);
padding-right: ($grid-gutter-width-base * 1.5);
};
.col-sm-6:last-child {
padding-left: ($grid-gutter-width * 1.5);
padding-left: ($grid-gutter-width-base * 1.5);
}
}
}
docs/assets/scss/_masthead.scss
+1 -1
View File
@@ -2,7 +2,7 @@
.bd-masthead {
position: relative;
padding: 3rem ($grid-gutter-width / 2) 2rem;
padding: 3rem ($grid-gutter-width-base / 2) 2rem;
color: $bd-purple-light;
text-align: center;
background-image: linear-gradient(135deg, darken($bd-purple, 20%), $bd-purple, lighten(saturate($bd-purple, 5%), 15%));
docs/assets/scss/_page-header.scss
+1 -1
View File
@@ -1,7 +1,7 @@
// scss-lint:disable ImportantRule
.bd-pageheader {
padding: 2rem ($grid-gutter-width / 2);
padding: 2rem ($grid-gutter-width-base / 2);
margin-bottom: 1.5rem;
color: $bd-purple-light;
text-align: center;
docs/assets/scss/_syntax.scss
+3
View File
@@ -61,3 +61,6 @@
.css .o,
.css .o + .nt,
.css .nt + .nt { color: #999; }
.language-bash::before { color: #009; content: "$ "; user-select: none; }
.language-powershell::before { color: #009; content: "PM> "; user-select: none; }
docs/assets/scss/docs.scss
+1 -1
View File
@@ -1,5 +1,5 @@
/*!
* Bootstrap Docs (http://getbootstrap.com)
* Bootstrap Docs (https://getbootstrap.com)
* Copyright 2011-2016 The Bootstrap Authors
* Copyright 2011-2016 Twitter, Inc.
* Licensed under the Creative Commons Attribution 3.0 Unported License. For