Commit d80f26fe authored by Mark Otto's avatar Mark Otto
Browse files

unaffix sidebar and simplify styles of docs side nav to be more like v3

parent 0156fc1c
main cleanup-floating-forms cssvar-function dependabot/npm_and_yarn/stylelint-and-stylelint-config-twbs-bootstrap-15.3.0 extend-snippets feat/data-target floating-always-visible floating-labels-icons fod-main-banner form-controls-with-icons github/fork/719media/patch-13 github/fork/719media/patch-14 github/fork/719media/patch-9 github/fork/ChellyAhmed/fix-typo-reboot.md github/fork/ChellyAhmed/offcanvas-scroll-back github/fork/CtrlAltLilith/main github/fork/Elysiome/offcanvas-optional-window-resizing github/fork/JanSargsyan/main github/fork/LunicLynx/support-different-line-height-for-buttons github/fork/Psixodelik/main github/fork/Ronid1/ronid1/offcanvas_static_backdrop github/fork/RyanBerliner/tooltip-accessibility github/fork/SantiagoPVazquez/Feature-default-border-bottom-to-dropdown-item github/fork/Sir-Genius/utils github/fork/Sumit-Singh-8/main github/fork/Viktor-VERA2020/offcanvas-slide github/fork/Zivangu9/input-group-for-form-control-plaintext github/fork/alpadev/alpadev/call-dispose-on-component-reinstantiation github/fork/astagi/fix/tree-shake-modules github/fork/compnerd/dark-accordion-icon github/fork/derSascha/dropdown-dont-close-on-input-click github/fork/dev-ph1l/main github/fork/donquixote/issue-33861-utl-mixin github/fork/florianlacreuse/mixin-make-row-gutter-y github/fork/gregorw/main github/fork/iteggmbh/transitionend-dispose-race github/fork/jdelStrother/patch-1 github/fork/jonnysp/form-floating github/fork/jonnysp/independent-offcanvas github/fork/jonnysp/theme-dark-on-card-and-modal-fix github/fork/josefdlange/floating-label-placeholder-opacity github/fork/julien-deramond/enhance-change-version.js github/fork/julien-deramond/main-jd-fix-offset-content github/fork/julien-deramond/main-jd-issue-with-utitlies github/fork/julien-deramond/main-xmr-pa11y-ci-jd-add-hideElements github/fork/kyletsang/fix-tooltip-padding github/fork/lacutah/CheckboxCenteringDocumentation github/fork/lekoala/patch-3 github/fork/louismaximepiton/main-kld-lmp-collapse-proposal github/fork/louismaximepiton/main-lmp-card-inner-border-radius-fix github/fork/louismaximepiton/main-lmp-carousel-multiple-images github/fork/louismaximepiton/main-lmp-css-var-init github/fork/louismaximepiton/main-lmp-disabled-floating-label-fix github/fork/louismaximepiton/main-lmp-input-range-fix github/fork/louismaximepiton/main-lmp-shift-color github/fork/louismaximepiton/main-lmp-table-active-tr-fix github/fork/maciek-szn/switch github/fork/michael-roth/feature/19964-multiple-tab-targets github/fork/mistic100/dom-utils github/fork/nkdas91/accordion github/fork/nstungcom/fix-missing-modal-open-class github/fork/oraliahdz/animation-utilities github/fork/pine3ree/patch-7 github/fork/pouwerkerk/unindent-scss-docs-shortcode github/fork/smares/smares-no-scolling-on-modal-close github/fork/tgm-git/patch-1 gs-forms gs-toasts-with-animated-progress-bar gs/add-history-helper gs/change-version-dir-on-docs gs/data-must-set-onlu-one-instance gs/docs/fix-drop-down-error gs/event-handler-2 gs/make-docs-js-build gs/make-simple-attribute-toggler gs/popover-fix-doc gs/provide-steConfig-method gs/scrollspy-smoothscroll-option-use-browser-history gs/streamline-jqueryInterface gs/support-drop-down-in-navbar gs/test-js-generic-trigger gs/try-web-components gs/tweak-collapse-js-selector gs/use-event-handler-in-cocmponent gs/use-rollup-replace-for-version jo-docs-thanks-page jo-ssr-friendly logical-props-spacing-utils main-fod-disabled-form-check-label main-fod-nested-accordion main-fod-simpler-table-structure main-fod-table-separator main-fod-utilities-contrast main-jd-abbr-title main-jd-add-chips main-jd-add-doc-for-sass-custom-colors main-jd-add-enable-host-to-handle-web-components main-jd-browserstack-fine-tune main-jd-browserstack-updates main-jd-docs-consistent-usage-of-css-sections-step-2 main-jd-fix-docs-headers-in-white main-jd-fix-highlight-docs-border-radius main-jd-fix-placeholder-color-background-params-for-img-markup main-jd-glossary-experiment main-jd-postcss-drop-empty-css-vars main-jd-proto-doc-astro main-jd-skip-navigation-component main-jd-stackblitz-for-examples main-jd-upgrade-browserlistrc main-jd-use-host main-lmp-dark-theme-customization main-lmp-handle-scroll-target main-lmp-tab-fix main-mc-opensearch main-xmr-bundlewatch-action main-xmr-eslint-plugin-compat main-xmr-hugo-docs-vendor main-xmr-hugo-rm-ver main-xmr-linkinator-prod main-xmr-min-mangle main-xmr-pa11y-ci more-darkmode-examples nested-dropdowns patrickhlauke-issue37428 patrickhlauke-use-of-color-tweaks pr/34102 pr/37590 previous-next-docs-links sticky-thead utilities-functions-mixin v4-dev v4-dev-dropdown-hide-method v530-dev v6-postcss-custom-media v6-spinner-dots v6/gs/use-floating-ui-in-place-of-popper xmr/dev xmr/docs-png xmr/docs-svgs xmr/hugo-reorg-files xmr/js-2 xmr/markdownlint xmr/prepare-530-alpha2 xmr/xo v5.3.0-alpha1 v5.2.3 v5.2.2 v5.2.1 v5.2.0 v5.2.0-beta1 v5.1.3 v5.1.2 v5.1.1 v5.1.0 v5.0.2 v5.0.1 v5.0.0 v5.0.0-beta3 v5.0.0-beta2 v5.0.0-beta1 v5.0.0-alpha3 v5.0.0-alpha2 v5.0.0-alpha1 v4.6.2 v4.6.1 v4.6.0 v4.5.3 v4.5.2 v4.5.1 v4.5.0 v4.4.1 v4.4.0 v4.3.1 v4.3.0 v4.2.1 v4.2.0 v4.1.3 v4.1.2 v4.1.1 v4.1.0 v4.0.0 v4.0.0-beta.3 v4.0.0-beta.2 v4.0.0-beta v4.0.0-alpha.6 v4.0.0-alpha.5 v4.0.0-alpha.4 v4.0.0-alpha.3 v4.0.0-alpha.2 v4.0.0-alpha
48 merge requests!28721Hot test,!27561Adds font-weight-medium to font weight classes,!26437merge,!26197V4 dev xmr,!20778V4 dev,!20539Allow multiple modals,!18047#17986,!18988Blockquote border width,!20854Fixes 15534,!19272V4 dev xmr grunt html,!17218Issue 17066,!19581V4 fix popover,!18283Tether docs fix,!17229Include documentation for .navbar-static-top,!20493V4 dev display,!20636Fix docs for heading sizes,!19824blockquote-center,!22547Finished a new translation for bootstrap,!19534Docs 17264,!19533Npm deps,!22143Fix selectable disabled toggle radio buttons,!19084V4 rhythm,!18085Ie9 click comment,!22598test,!18829Add prefix to carousel classes,!18581Check getting started files for broken links - Issue 18568,!18067replace grunt-autoprefixer with gruntpostcss + autoprefixer,!20099V4.0.0 alpha.3,!20438V4 grid classes,!17307Vertical alignment on Bootstrap columns with equal height,!18477add utility color-contrast function,!18864Feature/navbar toggler support color schemes,!19602V4 palettes arun,!18311V4 dev xmr,!19448New pull request for testing,!19358XXL grid size,!19825.blockquote-center,!17508Fix usage of “its” and “it’s” (v4 docs),!25326Adjust examples,!23995Add back cursor: pointer for .btn-link,!23178Spinner,!19754Issue template,!19753Card img overlay padding,!19747Blockquote border width,!19580ExitStars,!18684Docs: change "Button" to "Go somewhere",!18661Docs: accessibility fix-up of collapsible content navbar, change site-wide main navbar,!17021v4
Showing with 4290 additions and 7675 deletions
+4290 -7675
This diff is collapsed.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
This diff is collapsed.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
/*!
* Bootstrap v4.0.0-alpha (http://getbootstrap.com)
* Copyright 2011-2015 Twitter, Inc.
* Licensed under ()
*/
/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
html {
font-family: sans-serif;
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%;
}
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%; }
body {
margin: 0;
}
margin: 0; }
article,
aside,
......@@ -28,367 +20,294 @@ menu,
nav,
section,
summary {
display: block;
}
display: block; }
audio,
canvas,
progress,
video {
display: inline-block;
vertical-align: baseline;
}
vertical-align: baseline; }
audio:not([controls]) {
display: none;
height: 0;
}
height: 0; }
[hidden],
template {
display: none;
}
display: none; }
a {
background-color: transparent;
}
background-color: transparent; }
a:active {
outline: 0;
}
outline: 0; }
a:hover {
outline: 0;
}
outline: 0; }
abbr[title] {
border-bottom: 1px dotted;
}
border-bottom: 1px dotted; }
b,
strong {
font-weight: bold;
}
font-weight: bold; }
dfn {
font-style: italic;
}
font-style: italic; }
h1 {
margin: .67em 0;
font-size: 2em;
}
margin: 0.67em 0; }
mark {
color: #000;
background: #ff0;
}
color: #000; }
small {
font-size: 80%;
}
font-size: 80%; }
sub,
sup {
position: relative;
font-size: 75%;
line-height: 0;
vertical-align: baseline;
}
position: relative;
vertical-align: baseline; }
sup {
top: -.5em;
}
top: -0.5em; }
sub {
bottom: -.25em;
}
bottom: -0.25em; }
img {
border: 0;
}
border: 0; }
svg:not(:root) {
overflow: hidden;
}
overflow: hidden; }
figure {
margin: 1em 40px;
}
margin: 1em 40px; }
hr {
height: 0;
-webkit-box-sizing: content-box;
box-sizing: content-box;
}
box-sizing: content-box;
height: 0; }
pre {
overflow: auto;
}
overflow: auto; }
code,
kbd,
pre,
samp {
font-family: monospace, monospace;
font-size: 1em;
}
font-size: 1em; }
button,
input,
optgroup,
select,
textarea {
margin: 0;
font: inherit;
color: inherit;
}
font: inherit;
margin: 0; }
button {
overflow: visible;
}
overflow: visible; }
button,
select {
text-transform: none;
}
text-transform: none; }
button,
html input[type="button"], input[type="reset"],
input[type="submit"] {
-webkit-appearance: button;
cursor: pointer;
}
cursor: pointer; }
button[disabled],
html input[disabled] {
cursor: default;
}
cursor: default; }
button::-moz-focus-inner,
input::-moz-focus-inner {
padding: 0;
border: 0;
}
padding: 0; }
input {
line-height: normal;
}
line-height: normal; }
input[type="checkbox"],
input[type="radio"] {
-webkit-box-sizing: border-box;
box-sizing: border-box;
padding: 0;
}
box-sizing: border-box;
padding: 0; }
input[type="number"]::-webkit-inner-spin-button,
input[type="number"]::-webkit-outer-spin-button {
height: auto;
}
height: auto; }
input[type="search"] {
-webkit-box-sizing: content-box;
box-sizing: content-box;
-webkit-appearance: textfield;
}
box-sizing: content-box; }
input[type="search"]::-webkit-search-cancel-button,
input[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
}
-webkit-appearance: none; }
fieldset {
padding: .35em .625em .75em;
margin: 0 2px;
border: 1px solid #c0c0c0;
}
margin: 0 2px;
padding: 0.35em 0.625em 0.75em; }
legend {
padding: 0;
border: 0;
}
padding: 0; }
textarea {
overflow: auto;
}
overflow: auto; }
optgroup {
font-weight: bold;
}
font-weight: bold; }
table {
border-spacing: 0;
border-collapse: collapse;
}
border-spacing: 0; }
td,
th {
padding: 0;
}
padding: 0; }
html {
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
box-sizing: border-box; }
*,
*:before,
*:after {
-webkit-box-sizing: inherit;
box-sizing: inherit;
}
box-sizing: inherit; }
@-moz-viewport {
width: device-width;
}
width: device-width; }
@-ms-viewport {
width: device-width;
}
width: device-width; }
@-o-viewport {
width: device-width; }
@-webkit-viewport {
width: device-width;
}
width: device-width; }
@viewport {
width: device-width;
}
width: device-width; }
html {
font-size: 16px;
-webkit-tap-highlight-color: transparent;
}
-webkit-tap-highlight-color: transparent; }
body {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 1rem;
line-height: 1.5;
color: #373a3c;
background-color: #fff;
}
background-color: #fff; }
h1, h2, h3, h4, h5, h6 {
margin-top: 0;
margin-bottom: .5rem;
}
margin-bottom: .5rem; }
p {
margin-top: 0;
margin-bottom: 1rem;
}
margin-bottom: 1rem; }
abbr[title],
abbr[data-original-title] {
cursor: help;
border-bottom: 1px dotted #818a91;
}
border-bottom: 1px dotted #818a91; }
address {
margin-bottom: 1rem;
font-style: normal;
line-height: inherit;
}
line-height: inherit; }
ol,
ul,
dl {
margin-top: 0;
margin-bottom: 1rem;
}
margin-bottom: 1rem; }
ol ol,
ul ul,
ol ul,
ul ol {
margin-bottom: 0;
}
margin-bottom: 0; }
dt {
font-weight: bold;
}
font-weight: bold; }
dd {
margin-bottom: .5rem;
margin-left: 0;
}
margin-left: 0; }
blockquote {
margin: 0 0 1rem;
}
margin: 0 0 1rem; }
a {
color: #0275d8;
text-decoration: none;
}
a:focus,
text-decoration: none; }
a:focus,
a:hover {
color: #014c8c;
text-decoration: underline;
}
a:focus {
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
color: #014c8c;
text-decoration: underline; }
a:focus {
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px; }
pre {
margin-top: 0;
margin-bottom: 1rem;
}
margin-bottom: 1rem; }
figure {
margin: 0 0 1rem;
}
margin: 0 0 1rem; }
img {
vertical-align: middle;
}
vertical-align: middle; }
[role="button"] {
cursor: pointer;
}
cursor: pointer; }
table {
background-color: transparent;
}
background-color: transparent; }
caption {
padding-top: .75rem;
padding-bottom: .75rem;
padding-top: 0.75rem;
padding-bottom: 0.75rem;
color: #818a91;
text-align: left;
caption-side: bottom;
}
caption-side: bottom; }
th {
text-align: left;
}
text-align: left; }
label {
display: inline-block;
margin-bottom: .5rem;
}
margin-bottom: .5rem; }
input,
button,
select,
textarea {
margin: 0;
line-height: inherit;
}
line-height: inherit; }
textarea {
resize: vertical;
}
resize: vertical; }
fieldset {
min-width: 0;
padding: 0;
margin: 0;
border: 0;
}
border: 0; }
legend {
display: block;
......@@ -396,14 +315,12 @@ legend {
padding: 0;
margin-bottom: .5rem;
font-size: 1.5rem;
line-height: inherit;
}
line-height: inherit; }
input[type="search"] {
-webkit-appearance: none;
}
-webkit-appearance: none; }
output {
display: inline-block;
}
/*# sourceMappingURL=bootstrap-reboot.css.map */
display: inline-block; }
/*# sourceMappingURL=bootstrap-reboot.css.map */
\ No newline at end of file
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
This diff is collapsed.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
<header class="navbar navbar-static-top bd-sidebar" id="top" role="banner">
<a href="{{ site.baseurl }}/" class="navbar-brand">
Bootstrap 4 Alpha
</a>
<button class="navbar-toggler hidden-sm-up" type="button" data-toggle="collapse" data-target="#docsNavbarContent">
&#9776;
</button>
<div class="bd-sidebar">
<form class="bd-search hidden-sm-down">
<input type="text" class="form-control" id="search-input" placeholder="Search...">
<ul class="dropdown-menu bd-search-results" id="search-results"></ul>
</form>
<nav class="bd-links collapse navbar-toggleable-xs" id="docsNavbarContent">
<nav class="bd-links" id="docsNavbarContent">
{% for group in site.data.nav %}
{% assign link = group.pages | first %}
{% assign slug = group.title | downcase | replace: ' ', '-' || page.title | downcase | replace: ' ', '-' %}
......@@ -64,4 +57,4 @@
</div>
{% endfor %}
</nav>
</header>
</div>
......@@ -2,10 +2,15 @@
layout: default
---
{% include nav-docs.html %}
<div class="bd-container bd-content">
{% include ads.html %}
<h1 class="bd-title">{{ page.title }}</h1>
{{ content }}
<div class="container">
<div class="row">
<div class="col-sm-3 col-sm-push-9 bd-sidebar">
{% include nav-docs.html %}
</div>
<div class="col-sm-9 col-sm-pull-3 bd-content">
{% include ads.html %}
<h1 class="bd-title">{{ page.title }}</h1>
{{ content }}
</div>
</div>
</div>
......@@ -5,7 +5,7 @@
* details, see http://creativecommons.org/licenses/by/3.0/.
*/
.bd-docs {
padding-top: 3.7rem; }
padding-top: 5rem; }
.bd-container {
position: relative;
......@@ -61,50 +61,6 @@
#markdown-toc > li:first-child {
display: none; }
.bd-sidebar {
padding: 0;
margin-bottom: 0;
background-color: #fafafa; }
.bd-sidebar .navbar-toggler {
position: absolute;
top: 1rem;
right: 0;
z-index: 5; }
.bd-sidebar .navbar-header {
float: none;
margin-right: -15px; }
.bd-sidebar .navbar-collapse {
padding: 0;
border: 0; }
@media (min-width: 992px) {
.bd-docs {
margin-left: 240px; }
.bd-sidebar {
position: fixed;
top: 3.7rem;
bottom: 0;
left: 0;
width: 240px;
overflow-y: auto;
border-right: 1px solid #eee;
-webkit-transform: translated3d(0, 0, 0); } }
.bd-sidebar .navbar-brand {
display: block;
float: none;
height: auto;
padding: 1.55rem 1.25rem;
font-size: 20px;
font-weight: 500;
line-height: 1; }
.bd-sidebar-brand:hover,
.bd-sidebar-brand:focus {
text-decoration: none; }
.bd-search {
position: relative;
margin-right: 1.25rem;
......
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
.bd-docs {
padding-top: 3.7rem;
padding-top: 5rem;
}
// Custom container
......
......@@ -3,59 +3,59 @@
//
.bd-sidebar {
padding: 0;
margin-bottom: 0;
background-color: #fafafa;
.navbar-toggler {
position: absolute;
top: 1rem;
right: 0;
z-index: 5;
}
}
.bd-sidebar .navbar-header {
float: none;
margin-right: -15px;
}
.bd-sidebar .navbar-collapse {
padding: 0;
border: 0;
}
@media (min-width: 992px) {
.bd-docs {
margin-left: 240px;
}
.bd-sidebar {
position: fixed;
top: 3.7rem;
bottom: 0;
left: 0;
width: 240px;
overflow-y: auto;
border-right: 1px solid #eee;
-webkit-transform: translated3d(0,0,0); // Ensure proper scrolling of sidebar
}
}
.bd-sidebar .navbar-brand {
display: block;
float: none;
height: auto;
padding: 1.55rem 1.25rem;
font-size: 20px;
font-weight: 500;
line-height: 1;
// color: #fff;
}
.bd-sidebar-brand:hover,
.bd-sidebar-brand:focus {
// color: #fff;
text-decoration: none;
}
// padding: 0;
// margin-bottom: 0;
// background-color: #fafafa;
// .navbar-toggler {
// position: absolute;
// top: 1rem;
// right: 0;
// z-index: 5;
// }
}
// .bd-sidebar .navbar-header {
// float: none;
// margin-right: -15px;
// }
//
// .bd-sidebar .navbar-collapse {
// padding: 0;
// border: 0;
// }
// @media (min-width: 992px) {
// .bd-docs {
// margin-left: 240px;
// }
// .bd-sidebar {
// position: fixed;
// top: 3.7rem;
// bottom: 0;
// left: 0;
// width: 240px;
// overflow-y: auto;
// border-right: 1px solid #eee;
// -webkit-transform: translated3d(0,0,0); // Ensure proper scrolling of sidebar
// }
// }
//
// .bd-sidebar .navbar-brand {
// display: block;
// float: none;
// height: auto;
// padding: 1.55rem 1.25rem;
// font-size: 20px;
// font-weight: 500;
// line-height: 1;
// // color: #fff;
// }
// .bd-sidebar-brand:hover,
// .bd-sidebar-brand:focus {
// // color: #fff;
// text-decoration: none;
// }
.bd-search {
position: relative;
......
......@@ -53,8 +53,6 @@ $spacer: 1rem !default;
$spacer-x: $spacer !default;
$spacer-y: $spacer !default;
$border-width: (1 / $font-size-root)rem !default;
// Typography
//
......@@ -87,6 +85,8 @@ $headings-font-weight: 500 !default;
$headings-line-height: 1.1 !default;
$headings-color: inherit !default;
$border-width: .0625rem !default;
// Components
//
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment