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

Jump to bottom

v5: Updated About and Brand pages #31248

Merged
merged 10 commits into from
Sep 10, 2020
Merged

v5: Updated About and Brand pages #31248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
af57750
First pass at cleaning up About pages and brand assets
mdo Jul 6, 2020
988790c
Remove the unused PNG files.
XhmikosR Jul 8, 2020
d098690
Remove `loading=lazy` from the image in viewport
XhmikosR Jul 8, 2020
54335d5
Update the new SVGs with the svgo config we use
XhmikosR Jul 8, 2020
90db7fe
Fix the remaining instances using the old logos.
XhmikosR Jul 8, 2020
209868c
docs-navbar.html: add missing width
XhmikosR Jul 8, 2020
3275e24
Remove `loading=lazy` from navbar snippets
XhmikosR Jul 8, 2020
0171cb0
Update _brand.scss
XhmikosR Jul 8, 2020
3adb2da
Remove sibling projects and fix image dimensions
mdo Sep 10, 2020
c7fa2bb
Update team
mdo Sep 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/zip-examples.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ sh.cp('-Rf', `_gh_pages/docs/${versionShort}/examples/*`, folderName)
sh.cp('-Rf', `_gh_pages/docs/${versionShort}/dist/`, `${folderName}/assets/`)
// also copy the two brand images we use in the examples
sh.cp('-f', [
`_gh_pages/docs/${versionShort}/assets/brand/bootstrap-outline.svg`,
`_gh_pages/docs/${versionShort}/assets/brand/bootstrap-solid.svg`
`_gh_pages/docs/${versionShort}/assets/brand/bootstrap-logo.svg`,
`_gh_pages/docs/${versionShort}/assets/brand/bootstrap-logo-white.svg`
], `${folderName}/assets/brand/`)
sh.rm(`${folderName}/index.html`)

Expand Down
6 changes: 2 additions & 4 deletions site/assets/scss/_brand.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,16 @@

// Logo series wrapper
.bd-brand-logos {
color: $bd-purple;
color: $bd-purple-bright;

.inverse {
color: $white;
background-color: $bd-purple;
background-color: $bd-purple-bright;
}
}

// Individual items
.bd-brand-item {
padding: 4rem 1rem;

+ .bd-brand-item {
border-top: 1px solid $white;
}
Expand Down
77 changes: 24 additions & 53 deletions site/content/docs/5.0/about/brand.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,71 +6,42 @@ group: about
toc: true
---

Have a need for Bootstrap's brand resources? Great! We have only a few guidelines we follow, and in turn ask you to follow as well. These guidelines were inspired by MailChimp's [Brand Assets](https://mailchimp.com/about/brand-assets/).
Have a need for Bootstrap's brand resources? Great! We have only a few guidelines we follow, and in turn ask you to follow as well.

## Mark and logo
## Logo

Use either the Bootstrap mark (a capital **B**) or the standard logo (just **Bootstrap**). It should always appear in San Francisco Display Semibold. **Do not use the Twitter bird** in association with Bootstrap.
When referencing Bootstrap, use our logo mark. Do not modify our logos in any way. Do not use Bootstrap's branding for your own open or closed source projects. **Do not use the Twitter name or logo** in association with Bootstrap.

<div class="bd-brand-logos d-sm-flex text-center bg-light rounded overflow-hidden w-100 mb-3">
<div class="bd-brand-item w-100">
<img src="/docs/{{< param docs_version >}}/assets/brand/bootstrap-solid.svg" alt="Bootstrap" width="144" height="144" loading="lazy">
</div>
<div class="bd-brand-item w-100 inverse">
<img src="/docs/{{< param docs_version >}}/assets/brand/bootstrap-outline.svg" alt="Bootstrap" width="144" height="144" loading="lazy">
</div>
</div>
<div class="bd-brand-logos d-sm-flex text-center bg-light rounded overflow-hidden w-100 mb-3">
<div class="bd-brand-item w-100">
<span class="h1">Bootstrap</span>
</div>
<div class="bd-brand-item w-100 inverse">
<span class="h1">Bootstrap</span>
</div>
<div class="bd-brand-item px-2 py-5 mb-3 bg-light rounded-lg">
<img class="d-block img-fluid mx-auto" src="/docs/{{< param docs_version >}}/assets/brand/bootstrap-logo.svg" alt="Bootstrap" width="256" height="204">
</div>

## Download mark

Download the Bootstrap mark in one of three styles, each available as an SVG file. **Click to download the logos**.
Our logo mark is also available in black and white. All rules for our primary logo apply to these as well.

<div class="bd-brand-logos d-sm-flex text-center bg-light rounded overflow-hidden w-100 mb-3">
<a href="/docs/{{< param docs_version >}}/assets/brand/bootstrap-solid.svg" download class="bd-brand-item w-100" title="Download solid logo">
<img src="/docs/{{< param docs_version >}}/assets/brand/bootstrap-solid.svg" alt="Bootstrap" width="144" height="144" loading="lazy">
</a>
<a href="/docs/{{< param docs_version >}}/assets/brand/bootstrap-outline.svg" download class="bd-brand-item w-100 inverse" title="Download outlined logo">
<img src="/docs/{{< param docs_version >}}/assets/brand/bootstrap-outline.svg" alt="Bootstrap" width="144" height="144" loading="lazy">
</a>
<a href="/docs/{{< param docs_version >}}/assets/brand/bootstrap-punchout.svg" download class="bd-brand-item w-100 inverse" title="Download inverted logo">
<img src="/docs/{{< param docs_version >}}/assets/brand/bootstrap-punchout.svg" alt="Bootstrap" width="144" height="144" loading="lazy">
</a>
<div class="bd-brand-logos d-sm-flex text-center bg-light rounded-lg overflow-hidden w-100 mb-3">
<div class="bd-brand-item w-100 px-2 py-5">
<img src="/docs/{{< param docs_version >}}/assets/brand/bootstrap-logo-black.svg" alt="Bootstrap" width="128" height="102" loading="lazy">
</div>
<div class="bd-brand-item w-100 px-2 py-5 inverse">
<img src="/docs/{{< param docs_version >}}/assets/brand/bootstrap-logo-white.svg" alt="Bootstrap" width="128" height="102" loading="lazy">
</div>
</div>

## Name

The project and framework should always be referred to as **Bootstrap**. No Twitter before it, no capital _s_, and no abbreviations except for one, a capital **B**.
Bootstrap should always be referred to as just **Bootstrap**. No Twitter before it and no capital _s_.

<div class="bd-brand-logos d-sm-flex text-center bg-light rounded overflow-hidden w-100 mb-3">
<div class="bd-brand-item w-100">
<span class="h3">Bootstrap</span>
<strong class="text-success">Right</strong>
<div class="bd-brand-logos d-sm-flex text-center bg-light rounded-lg overflow-hidden w-100 mb-3">
<div class="bd-brand-item w-100 p-3">
<div class="h3">Bootstrap</div>
<strong class="text-success">Correct</strong>
</div>
<div class="bd-brand-item w-100">
<span class="h3 text-muted">BootStrap</span>
<strong class="text-warning">Wrong</strong>
<div class="bd-brand-item w-100 p-3">
<div class="h3 text-muted">BootStrap</div>
<strong class="text-danger">Incorrect</strong>
</div>
<div class="bd-brand-item w-100">
<span class="h3 text-muted">Twitter Bootstrap</span>
<strong class="text-warning">Wrong</strong>
<div class="bd-brand-item w-100 p-3">
<div class="h3 text-muted">Twitter Bootstrap</div>
<strong class="text-danger">Incorrect</strong>
</div>
</div>

## Colors

Our docs and branding use a handful of primary colors to differentiate what *is* Bootstrap from what *is in* Bootstrap. In other words, if it's purple, it's representative of Bootstrap.

<div class="color-swatches d-flex">
<div class="color-swatch bd-purple rounded mx-1"></div>
<div class="color-swatch bd-purple-light rounded mx-1"></div>
<div class="color-swatch bd-purple-lighter rounded mx-1"></div>
<div class="color-swatch bd-gray rounded mx-1"></div>
</div>
2 changes: 2 additions & 0 deletions site/content/docs/5.0/about/overview.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ Originally [released](https://blog.twitter.com/developer/en_us/a/2011/bootstrap-

With Bootstrap 4, we once again rewrote the project to account for two key architectural changes: a migration to Sass and the move to CSS's flexbox. Our intention is to help in a small way to move the web development community forward by pushing for newer CSS properties, fewer dependencies, and new technologies across more modern browsers.

Our latest release, Bootstrap 5 (currently in development), focuses on improving v4's codebase with as few major breaking chanages as possible. We improved existing features and components, removed support for older browsers, dropped jQuery for regular JavaScript, and embraced more future-friendly technologies like CSS custom properties as part of our tooling.

## Get involved

Get involved with Bootstrap development by [opening an issue]({{< param repo >}}/issues/new) or submitting a pull request. Read our [contributing guidelines]({{< param repo >}}/blob/v{{< param current_version >}}/.github/CONTRIBUTING.md) for information on how we develop.
4 changes: 2 additions & 2 deletions site/content/docs/5.0/components/navbar.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ Adding images to the `.navbar-brand` will likely always require custom styles or
<nav class="navbar navbar-light bg-light">
<div class="container">
<a class="navbar-brand" href="#">
<img src="/docs/{{< param docs_version >}}/assets/brand/bootstrap-solid.svg" width="30" height="30" alt="" loading="lazy">
<img src="/docs/{{< param docs_version >}}/assets/brand/bootstrap-logo.svg" alt="" width="30" height="24">
</a>
</div>
</nav>
Expand All @@ -115,7 +115,7 @@ Adding images to the `.navbar-brand` will likely always require custom styles or
<nav class="navbar navbar-light bg-light">
<div class="container-fluid">
<a class="navbar-brand" href="#">
<img src="/docs/{{< param docs_version >}}/assets/brand/bootstrap-solid.svg" width="30" height="30" class="d-inline-block align-top" alt="" loading="lazy">
<img src="/docs/{{< param docs_version >}}/assets/brand/bootstrap-logo.svg" alt="" width="30" height="24" class="d-inline-block align-top">
Bootstrap
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/5.0/examples/checkout/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<div class="container">
<div class="py-5 text-center">
<img class="d-block mx-auto mb-4" src="/docs/{{< param docs_version >}}/assets/brand/bootstrap-solid.svg" alt="" width="72" height="72">
<img class="d-block mx-auto mb-4" src="/docs/{{< param docs_version >}}/assets/brand/bootstrap-logo.svg" alt="" width="72" height="57">
<h2>Checkout form</h2>
<p class="lead">Below is an example form built entirely with Bootstrap’s form controls. Each required form group has a validation state that can be triggered by attempting to submit the form without completing it.</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/5.0/examples/floating-labels/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<form class="form-signin">
<div class="text-center mb-4">
<img class="mb-4" src="/docs/{{< param docs_version >}}/assets/brand/bootstrap-solid.svg" alt="" width="72" height="72">
<img class="mb-4" src="/docs/{{< param docs_version >}}/assets/brand/bootstrap-logo.svg" alt="" width="72" height="57">
<h1 class="h3 mb-3 font-weight-normal">Floating labels</h1>
<p>Build form controls with floating labels via the <code>:placeholder-shown</code> pseudo-element. <a href="https://caniuse.com/#feat=css-placeholder-shown">Works in latest Chrome, Safari, and Firefox.</a></p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/5.0/examples/offcanvas/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@

<main class="container">
<div class="d-flex align-items-center p-3 my-3 text-white-50 bg-purple rounded shadow-sm">
<img class="mr-3" src="/docs/{{< param docs_version >}}/assets/brand/bootstrap-outline.svg" alt="" width="48" height="48">
<img class="mr-3" src="/docs/{{< param docs_version >}}/assets/brand/bootstrap-logo-white.svg" alt="" width="48" height="38">
<div class="lh-1">
<h6 class="mb-0 text-white lh-1">Bootstrap</h6>
<small>Since 2011</small>
Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/5.0/examples/pricing/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ <h1 class="card-title pricing-card-title">$29 <small class="text-muted">/ mo</sm
<footer class="pt-4 my-md-5 pt-md-5 border-top">
<div class="row">
<div class="col-12 col-md">
<img class="mb-2" src="/docs/{{< param docs_version >}}/assets/brand/bootstrap-solid.svg" alt="" width="24" height="24">
<img class="mb-2" src="/docs/{{< param docs_version >}}/assets/brand/bootstrap-logo.svg" alt="" width="24" height="19">
<small class="d-block mb-3 text-muted">&copy; 2017-{{< year >}}</small>
</div>
<div class="col-6 col-md">
Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/5.0/examples/sign-in/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
---

<form class="form-signin">
<img class="mb-4" src="/docs/{{< param docs_version >}}/assets/brand/bootstrap-solid.svg" alt="" width="72" height="72">
<img class="mb-4" src="/docs/{{< param docs_version >}}/assets/brand/bootstrap-logo.svg" alt="" width="72" height="57">
<h1 class="h3 mb-3 font-weight-normal">Please sign in</h1>
<label for="inputEmail" class="visually-hidden">Email address</label>
<input type="email" id="inputEmail" class="form-control" placeholder="Email address" required autofocus>
Expand Down
6 changes: 0 additions & 6 deletions site/data/core-team.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
- name: Jacob Thornton
user: fat

- name: Chris Rebert
user: cvrebert

- name: XhmikosR
user: xhmikosr

Expand All @@ -19,9 +16,6 @@
- name: Johann-S
user: johann-s

- name: Andres Galante
user: andresgalante

- name: Martijn Cuppens
user: martijncuppens

Expand Down
2 changes: 1 addition & 1 deletion site/layouts/partials/docs-navbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<header class="navbar navbar-expand navbar-dark bd-navbar">
<nav class="container-xxl flex-wrap flex-md-nowrap" aria-label="Main navigation">
<a class="navbar-brand p-0 mr-2" href="/" aria-label="Bootstrap">
{{ partial "icons/bootstrap-white-fill.svg" (dict "class" "d-block" "height" "32") }}
{{ partial "icons/bootstrap-white-fill.svg" (dict "class" "d-block" "width" "40" "height" "32") }}
</a>

<div class="navbar-nav-scroll order-3 order-md-0 d-flex justify-content-center justify-content-md-start mt-1 mt-md-0">
Expand Down
1 change: 1 addition & 0 deletions site/static/docs/5.0/assets/brand/bootstrap-logo-black.svg
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions site/static/docs/5.0/assets/brand/bootstrap-logo-white.svg
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions site/static/docs/5.0/assets/brand/bootstrap-logo.svg
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 0 additions & 5 deletions site/static/docs/5.0/assets/brand/bootstrap-outline.svg
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions site/static/docs/5.0/assets/brand/bootstrap-punchout.svg
View file
Open in desktop

This file was deleted.