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

Add new rounded sizes classes #28011

Merged
merged 12 commits into from
Jan 13, 2019
Merged

Add new rounded sizes classes #28011

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3df656f
update border-radius mixins
jt143 Jan 9, 2019
9db8dd9
Update rounded classes
jt143 Jan 9, 2019
b0ea667
update borders docs
jt143 Jan 9, 2019
55383f7
Revert touch of dist files
jt143 Jan 9, 2019
5d17a1f
Revert change of border-radius mixins
jt143 Jan 9, 2019
34ee61e
use !important in border-radius utilies classes
jt143 Jan 9, 2019
ef35cd2
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into add-n…
jt143 Jan 10, 2019
82f32c2
update border radius classes keep only rounded-lg and rounded-sm
jt143 Jan 10, 2019
c172d70
Merge branch 'v4-dev' into add-new-rounded-classes
jt143 Jan 10, 2019
fa7e959
Merge branch 'v4-dev' into add-new-rounded-classes
jt143 Jan 11, 2019
76ca7ad
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into add-n…
jt143 Jan 12, 2019
bdabe43
Merge branch 'add-new-rounded-classes' of https://github.com/jt143/bo…
jt143 Jan 12, 2019
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
66 changes: 57 additions & 9 deletions dist/css/bootstrap.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/bootstrap.css.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/bootstrap.min.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/bootstrap.min.css.map
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions scss/mixins/_border-radius.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// stylelint-disable property-blacklist
// Single side border-radius

@mixin border-radius($radius: $border-radius, $fallback-border-radius: false) {
@mixin border-radius($radius: $border-radius, $fallback-border-radius: false, $enable-rounded: $enable-rounded) {
@if $enable-rounded {
border-radius: $radius;
}
Expand All @@ -10,41 +10,41 @@
}
}

@mixin border-top-radius($radius) {
@mixin border-top-radius($radius, $enable-rounded: $enable-rounded) {
@if $enable-rounded {
border-top-left-radius: $radius;
border-top-right-radius: $radius;
}
}

@mixin border-right-radius($radius) {
@mixin border-right-radius($radius, $enable-rounded: $enable-rounded) {
@if $enable-rounded {
border-top-right-radius: $radius;
border-bottom-right-radius: $radius;
}
}

@mixin border-bottom-radius($radius) {
@mixin border-bottom-radius($radius, $enable-rounded: $enable-rounded) {
@if $enable-rounded {
border-bottom-right-radius: $radius;
border-bottom-left-radius: $radius;
}
}

@mixin border-left-radius($radius) {
@mixin border-left-radius($radius, $enable-rounded: $enable-rounded) {
@if $enable-rounded {
border-top-left-radius: $radius;
border-bottom-left-radius: $radius;
}
}

@mixin border-top-right-radius($radius) {
@mixin border-top-right-radius($radius, $enable-rounded: $enable-rounded) {
@if $enable-rounded {
border-top-right-radius: $radius;
}
}

@mixin border-bottom-left-radius($radius) {
@mixin border-bottom-left-radius($radius, $enable-rounded: $enable-rounded) {
@if $enable-rounded {
border-bottom-left-radius: $radius;
}
Expand Down
45 changes: 36 additions & 9 deletions scss/utilities/_borders.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,50 @@
//

.rounded {
border-radius: $border-radius !important;
$enable-rounded: true;
@include border-radius($border-radius, $enable-rounded: true);
&.rounded-sm {
@include border-radius($border-radius-sm, $enable-rounded: true);
}
&.rounded-lg {
@include border-radius($border-radius-lg, $enable-rounded: true);
}
}
.rounded-top {
border-top-left-radius: $border-radius !important;
border-top-right-radius: $border-radius !important;
@include border-top-radius($border-radius, true);
&.rounded-sm {
@include border-top-radius($border-radius-sm, true);
}
&.rounded-lg {
@include border-top-radius($border-radius-lg, true);
}
}
.rounded-right {
border-top-right-radius: $border-radius !important;
border-bottom-right-radius: $border-radius !important;
@include border-right-radius($border-radius, true);
&.rounded-sm {
@include border-right-radius($border-radius-sm, true);
}
&.rounded-lg {
@include border-right-radius($border-radius-lg, true);
}
}
.rounded-bottom {
border-bottom-right-radius: $border-radius !important;
border-bottom-left-radius: $border-radius !important;
@include border-bottom-radius($border-radius, true);
&.rounded-sm {
@include border-bottom-radius($border-radius-sm, true);
}
&.rounded-lg {
@include border-bottom-radius($border-radius-lg, true);
}
}
.rounded-left {
border-top-left-radius: $border-radius !important;
border-bottom-left-radius: $border-radius !important;
@include border-left-radius($border-radius, true);
&.rounded-sm {
@include border-left-radius($border-radius-sm, true);
}
&.rounded-lg {
@include border-left-radius($border-radius-lg, true);
}
}

.rounded-circle {
Expand Down
2 changes: 1 addition & 1 deletion site/docs/4.2/assets/css/docs.min.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion site/docs/4.2/assets/css/docs.min.css.map
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions site/docs/4.2/utilities/borders.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,17 @@ Add classes to an element to easily round its corners.
<img src="..." alt="..." class="rounded-pill">
<img src="..." alt="..." class="rounded-0">
{% endhighlight %}

## Sizes

Larger or smaller border-radius? Add `.rounded-lg` or `.rounded-sm` for additional sizes.

<div class="bd-example bd-example-images">
{%- include icons/placeholder.svg width="75" height="75" class="rounded rounded-sm" title="Example rounded image" -%}
{%- include icons/placeholder.svg width="75" height="75" class="rounded rounded-lg" title="Example rounded image" -%}
</div>

{% highlight html %}
<img src="..." alt="..." class="rounded rounded-sm">
<img src="..." alt="..." class="rounded rounded-lg">
{% endhighlight %}