diff options
| author | lucascono <[email protected]> | 2017-10-04 05:33:17 -0300 |
|---|---|---|
| committer | lucascono <[email protected]> | 2017-10-04 05:33:17 -0300 |
| commit | 8c04a74c8c7f0174ea08bc02fa3762f49bf615a3 (patch) | |
| tree | db9d6923c082243d765c57885992db8dd26a70b5 /_layouts | |
| parent | 9aff890efa3798f831b714c41794c9fee0684bae (diff) | |
| parent | b29b1e155880ac953899889c9cbb67f7f7df0529 (diff) | |
| download | bootstrap-8c04a74c8c7f0174ea08bc02fa3762f49bf615a3.tar.xz bootstrap-8c04a74c8c7f0174ea08bc02fa3762f49bf615a3.zip | |
Merge remote-tracking branch 'refs/remotes/twbs/v4-dev' into v4-dev
Diffstat (limited to '_layouts')
| -rw-r--r-- | _layouts/default.html | 10 | ||||
| -rw-r--r-- | _layouts/docs.html | 2 | ||||
| -rw-r--r-- | _layouts/home.html | 2 | ||||
| -rw-r--r-- | _layouts/redirect.html | 37 | ||||
| -rw-r--r-- | _layouts/simple.html | 17 |
5 files changed, 52 insertions, 16 deletions
diff --git a/_layouts/default.html b/_layouts/default.html index 0292da9fd..0c800e2bb 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,4 +1,4 @@ -<!DOCTYPE html> +<!doctype html> <html lang="en"> <head> {% include header.html %} @@ -12,9 +12,13 @@ {% include docs-navbar.html %} - <main id="content" role="main"> + {% if page.layout == "simple" %} {{ content }} - </main> + {% else %} + <main id="content" role="main"> + {{ content }} + </main> + {% endif %} {% include footer.html %} {% include scripts.html %} diff --git a/_layouts/docs.html b/_layouts/docs.html index 2e0e1e85d..558d64d2a 100644 --- a/_layouts/docs.html +++ b/_layouts/docs.html @@ -1,4 +1,4 @@ -<!DOCTYPE html> +<!doctype html> <html lang="en"> <head> {% include header.html %} diff --git a/_layouts/home.html b/_layouts/home.html index 6405134e2..05767fcd5 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -1,4 +1,4 @@ -<!DOCTYPE html> +<!doctype html> <html lang="en"> <head> {% include header.html %} diff --git a/_layouts/redirect.html b/_layouts/redirect.html new file mode 100644 index 000000000..8666c8502 --- /dev/null +++ b/_layouts/redirect.html @@ -0,0 +1,37 @@ +<!doctype html> +<html lang="en"> + <head> + <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> + <title>Bootstrap - Content moved</title> + <link rel="canonical" href="{{ page.redirect.to }}"> + <meta http-equiv="refresh" content="0; url={{ page.redirect.to }}"> + <style> + html { + display: flex; + align-items: center; + justify-content: center; + margin: 0; + width: 100vw; + height: 100vh; + text-align: center; + } + body { + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; + } + h1 { + margin-top: 0; + margin-bottom: .5rem; + } + a { + color: #007bff; + text-decoration: none; + } + </style> + </head> + <body> + <h1>Redirecting…</h1> + <a href="{{ page.redirect.to }}">Click here if you are not redirected</a> + <script>window.location="{{ page.redirect.to }}";</script> + </body> +</html> diff --git a/_layouts/simple.html b/_layouts/simple.html index bb35ec792..8e7fc5e30 100644 --- a/_layouts/simple.html +++ b/_layouts/simple.html @@ -2,16 +2,11 @@ layout: default --- -<div class="bd-pageheader text-center text-sm-left"> - <div class="container"> - <h1>{{ page.title }}</h1> - <p class="lead"> - Quickly get a project started with any of our examples ranging from using parts of the framework to custom components and layouts. - </p> +<div class="container my-5"> + <main class="bd-content" role="main"> + <h1 class="bd-title" id="content">{{ page.title }}</h1> + <p class="bd-lead">{{ page.description }}</p> {% include ads.html %} - </div> -</div> - -<div class="container bd-content"> - {{ content }} + {{ content }} + </main> </div> |