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

Add support for fab-button border properties #16656

Merged
merged 5 commits into from
Dec 10, 2018
Merged

Add support for fab-button border properties #16656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2245530
fix(fab-button): allow styling border with css custom properties
Maistho Dec 10, 2018
7261c34
test(fab-button): add tests for border custom properties
Maistho Dec 10, 2018
fc26969
Update core/src/components/fab-button/fab-button.scss
manucorporat Dec 10, 2018
564a9cf
Merge branch 'master' into fab-button-border
manucorporat Dec 10, 2018
9c0d595
Merge branch 'master' into fab-button-border
manucorporat Dec 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions core/src/components/fab-button/fab-button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@
--margin-bottom: calc((#{$fab-size} - var(--height)) / 2);
--transition: background-color, opacity 100ms linear;
--ripple-color: currentColor;

--border-radius: #{$fab-border-radius};
--border-width: 0;
--border-style: none;
--border-color: initial;
display: block;

font-size: 14px;
Expand Down Expand Up @@ -76,7 +79,7 @@
}

.button-native {
@include border-radius(50%);
@include border-radius(var(--border-radius));
@include padding(var(--padding-top), var(--padding-end), var(--padding-bottom), var(--padding-start));
@include margin(var(--margin-top), var(--margin-end), var(--margin-bottom), var(--margin-start));
@include text-inherit();
Expand All @@ -91,7 +94,9 @@

transition: var(--transition);

border: 0;
border-width: var(--border-width);
border-style: var(--border-style);
border-color: var(--border-color);

outline: none;

Expand Down
3 changes: 3 additions & 0 deletions core/src/components/fab-button/fab-button.vars.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ $fab-size: 56px !default;

/// @prop - Width and height of the mini FAB button
$fab-mini-size: 40px !default;

/// @prop - Border radius of the FAB button
$fab-border-radius: 50% !default;
11 changes: 11 additions & 0 deletions core/src/components/fab-button/test/standalone/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ <h3>Custom</h3>
<ion-fab-button class="fab-button-in-list custom-white activated"><ion-icon name="heart"></ion-icon></ion-fab-button>
<ion-fab-button class="fab-button-in-list custom-blue"><ion-icon name="star"></ion-icon></ion-fab-button>
<ion-fab-button class="fab-button-in-list custom-blue activated"><ion-icon name="star"></ion-icon></ion-fab-button>
<ion-fab-button class="fab-button-in-list custom-border">Border</ion-fab-button>
<ion-fab-button class="fab-button-in-list custom-border activated">Border</ion-fab-button>
<ion-fab-button class="fab-button-in-list custom-border"><ion-icon name="star"></ion-icon></ion-fab-button>
<ion-fab-button class="fab-button-in-list custom-border activated"><ion-icon name="star"></ion-icon></ion-fab-button>

<style>
ion-fab-button {
Expand Down Expand Up @@ -92,6 +96,13 @@ <h3>Custom</h3>
--background: #add8e6;
--background-activated: #7cb2c4;
}

.custom-border {
--border-radius: 10px;
--border-width: 2px;
--border-style: dashed;
--border-color: red;
}
</style>
</body>
</html>