Skip to content

Commit

Permalink
fix(back-button): apply the proper color to the back button
Browse files Browse the repository at this point in the history
fixes #14177
  • Loading branch information
brandyscarney committed Mar 16, 2018
1 parent a737323 commit 7d2de18
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 1 deletion.
3 changes: 3 additions & 0 deletions core/src/components/back-button/back-button.ios.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@
border: 0;
font-size: 17px;
line-height: 1;

color: $back-button-ios-color;
background-color: transparent;

transform: translateZ(0);

&.activated {
Expand Down
7 changes: 6 additions & 1 deletion core/src/components/back-button/back-button.ios.vars.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
@import "../../themes/ionic.globals.ios";

// iOS Back Button
// --------------------------------------------------

$back-button-ios-button-z-index: $z-index-toolbar-buttons !default;
/// @prop - Z index of the back button
$back-button-ios-button-z-index: $z-index-toolbar-buttons !default;

/// @prop - Text color of the back button
$back-button-ios-color: $toolbar-ios-text-color !default;
6 changes: 6 additions & 0 deletions core/src/components/back-button/back-button.md.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
@import "./back-button";
@import "./back-button.md.vars";

// MD Back Button
// --------------------------------------------------

.back-button-md .back-button-inner {
@include margin(2px, 6px, 0, 0);
@include padding(0, 5px);
Expand All @@ -12,7 +14,10 @@
font-size: 14px;
font-weight: 500;
text-transform: uppercase;

color: $back-button-md-color;
background-color: transparent;

box-shadow: none;

&.activated {
Expand All @@ -25,6 +30,7 @@
@include margin(0);
@include padding(0, 6px);
@include text-align(start);

font-size: 24px;
font-weight: normal;
line-height: 0.67;
Expand Down
7 changes: 7 additions & 0 deletions core/src/components/back-button/back-button.md.vars.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
@import "../../themes/ionic.globals.md";

// Material Design Back Button
// --------------------------------------------------

/// @prop - Text color of the back button
$back-button-md-color: $toolbar-md-text-color !default;

0 comments on commit 7d2de18

Please sign in to comment.