Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

Solved issue #313 - Button not visible properly #971

Merged
merged 4 commits into from
Mar 8, 2017
Merged

Solved issue #313 - Button not visible properly #971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0c37c27
changed button style
Mar 4, 2017
1e1f84f
travis error resolved
Mar 5, 2017
1b543b2
button colour fixed for hover state
Mar 8, 2017
2617a80
Merge branch 'master' into button
jkleinsc Mar 8, 2017
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
2 changes: 2 additions & 0 deletions app/styles/_variables_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ $blue_lightest: #eff2f5;
$blue_lightest2: #dee2e7;
$red: #ff6d6f;
$red_light: rgba($red,.3);
$red_lighter: rgba($red,.75);
$red_dark: #c3124e;
$gray_light: #d9d9d9;
$gray: rgba($navy,.65);
Expand All @@ -31,6 +32,7 @@ $sidebar_icon_lighter: $navy_light;
$sidebar_sublink_text: #c2d2e3;
$view_sub_nav: #6784a2;
$content_border: $blue_lightest;
$brown: #711214;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I couldn't see in the screenshots where this color gets applied (and am unable to checkout the branch right now). Can you post a screencap of where this brown is used specifically please?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

screenshot

the $brown colour is used as font-colour of Cancel button on-hover state

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, but the screenshot I was looking for was of the UI showing the color in use. :-)


// from misc

Expand Down
18 changes: 9 additions & 9 deletions app/styles/components/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
.btn {
&.on-white {
background-color: $blue_light;
color: $navy;
background-color: #00c4a2;
color: $white;
}

&.warning {
background-color: $red_light;
color: $red;
background-color: #ff6d6f;
color: $white;

&:hover,
&:focus {
background-color: $red;
color: $white;
background-color: $red_lighter;
color: $brown;
}
}

Expand Down Expand Up @@ -50,7 +50,7 @@

// needs converted to variable
&:hover,
&:focus { background-color: #00c4a2; }
&:focus { background-color: #08987f; }

// needs converted to variable
&:active,
Expand All @@ -64,8 +64,8 @@
&.disabled:active,
&[disabled]:active {
opacity: .7;
background-color: $green;
color: $white;
background-color: #dbebff;
color: $black;
}
}

Expand Down