-
Notifications
You must be signed in to change notification settings - Fork 56
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.
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
chore/merge-main@195440f #1214
Closed
Closed
chore/merge-main@195440f #1214
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
julien-deramond
force-pushed
the
chore/merge-main@195440f
branch
3 times, most recently
from
April 22, 2022 11:20
59b6874
to
72e2266
Compare
julien-deramond
force-pushed
the
chore/merge-main@195440f
branch
from
May 3, 2022 08:47
d048890
to
b394fa0
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR only contains the merge of twbs/bootstrap@195440f which contains the v5.2.0 design refresh, plus responsive offcanvas classes. I'll do my best in this description to help the reviewers do their job.
Tracking
🔴
.bundlewatch.config.json
TODO at the end of the PR.
🟢
js/src/offcanvas.js
Copied as it is from Bootstrap (it just adds an event handler when the window is resized).
🟢
js/tests/unit/offcanvas.spec.js
Copied as it is from Bootstrap (corresponding tests after the slight modification of
js/src/offcanvas.js
).🟢
scss/_navbar.scss
Nothing to do in Boosted for this file since we don't allow offcanvas in our navbars.
🟢
scss/_offcanvas.scss
Copied almost as it is from BS; just modified the
.btn-close
rule to have the same aspect for Boosted as before.🟢
scss/_spinners.scss
Nothing to do here, the change was already in Boosted.
🟢
site/assets/js/application.js
Copied as it is in Bootstrap.
🟢
site/assets/js/code-examples.js
Copied as it is from Bootstrap.
🟢
site/assets/js/search.js
Copied as it is from Bootstrap: user can access the search input with Ctrl + K as well.
🟢
site/assets/scss/_ads.scss
Nothing to do, we don't have ads in Boosted.
🟡
site/assets/scss/_algolia.scss
Copied the modification as it is in Bootstrap
🟢
site/assets/scss/_buttons.scss
Nothing to do, we don't have special buttons in Boosted, we reuse ours.
🟡
site/assets/scss/_callouts.scss
For this one I've used exactly the same SCSS code coming from Bootstrap. I've just changed the border color as it was already done in Boosted.
Here are the different renderings:
I chose to remove the
.highlight
rule from Bootstrap to avoid having the following rendering in this special case:🟡
site/assets/scss/_clipboard-js.scss
Copied as it is in Bootstrap
🟡
site/assets/scss/_component-examples.scss
Added and modified
.bd-example-snippet
to have a gray border and a light gray background..text-uppercase
#1216🟡
site/assets/scss/_content.scss
🟡
site/assets/scss/_layout.scss
🟡
site/assets/scss/_masthead.scss
.bd-masthead
.masthead-followup-icon
) to be black.masthead-notice
since we are rather using tags for that🟡
site/assets/scss/_navbar.scss
🟡
site/assets/scss/_search.scss
_subnav.scss
; need to merge with the new content:jaune_circle:
site/assets/scss/_sidebar.scss
🟢
site/assets/scss/_subnav.scss
Is replaced by
_search.css
. All the content has been migrated to this file except.bd-subnavbar
not used anymore.🟢
site/assets/scss/_syntax.scss
Let's keep our rules!
🟡
site/assets/scss/_toc.scss
Kept the same structure than Bootstrap but reajusting some colors
margin-bottom: 0
rule as it is.bd-toc-toggle
uses some other colors.bd-toc-collapse
was imported as it is🟡
site/assets/scss/_variables.scss
$dropdown-active-icon
is temporary commented for compilation$bd-{info|warning|danger}
are replaced by$bd-callout-variants
as in Bootstrap.🟢
site/assets/scss/docs.scss
Copied as it is in Bootstrap
🟢
site/content/docs/5.1/components/offcanvas.md
Copied as it is in Bootstrap
🟢
site/content/docs/5.1/examples/_index.md
Copied as it from Bootstrap (just added a
.mt-1
because of our callout)🟡
site/content/docs/5.1/examples/navbars-offcanvas/index.html
+site/content/docs/5.1/examples/navbars-offcanvas/navbar.css
Copied as it is from BS because they won't be displayed.
🟢
site/content/docs/5.1/utilities/api.md
Copied as it is from Bootstrap
🟢
site/content/docs/5.1/utilities/spacing.md
Copied as it is from Bootstrap
🟢
site/data/examples.yml
Added the new "Navbars offcanvas" example but commented. Note: after this PR we should remove all the examples instead of comment them (and the corresponding resources as well).
🟢
site/data/plugins.yml
Included the same list than Bootstrap to facilitate the graphical integration.
🟢
site/data/sidebar.yml
Included the same icon names and modified the color to always be black.
🟢
site/layouts/_default/baseof.html
🟡
site/layouts/_default/docs.html
.Page.Params.toc true
was imported as it is in Bootstrap (just removed the `.text-muted).bd-sidebar
as it is🟡
site/layouts/_default/single.html
.bd-gutter
is useful here (this is the last step for this file)🟡
site/layouts/partials/docs-navbar.html
🟡
site/layouts/partials/docs-sidebar.html
🟡
site/layouts/partials/docs-subnav.html
partial "docs-versions"
now in the header🟡
site/layouts/partials/docs-versions.html
🟢
site/layouts/partials/favicons.html
Nothing done here. The color changes are linked to the main color changes of BS.
🟢
site/layouts/partials/footer.html
Nothing done here. I haven't changed the padding values since we're gonna use the Orange footer from #970
🟡
site/layouts/partials/home/masthead-followup.html
.display-5
classes that don't apply a big size in Boosted.fw-semibold
because bold is preferred in Boostedchore/merge-main@195440f #1214/commits/56afb10011180a52b0470a8254475064a19a066c.
🟡
site/layouts/partials/home/masthead.html
A first quick & very dirty adaptation has been pushed.
🟡
site/layouts/partials/icons.html
🟢
site/layouts/partials/scripts.html
Imported as it is from Bootstrap
🟢
site/layouts/shortcodes/example.html
Almost imported the file as it is in Bootstrap.
.bg-light
in order to handle the color insite/assets/scss/_component-examples.scss
🟢
site/static/docs/5.1/assets/img/examples/navbars-offcanvas.png
Same file than in Bootstrap because won't be displayed.
🟢
site/static/docs/5.1/assets/img/examples/navbars-offcanvas@2x.png
Same file than in Bootstrap because won't be displayed.