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

Added line-height to button properties #86

Merged
merged 6 commits into from
Feb 22, 2024
Merged

Added line-height to button properties #86

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0c426e5
Merged main into develop
github-actions[bot] Jul 17, 2023
614a07a
Merged main into develop
github-actions[bot] Oct 11, 2023
80a4410
Merged main into develop
github-actions[bot] Oct 13, 2023
72f471c
Merged main into develop
github-actions[bot] Feb 12, 2024
d7acd3e
Added default line-height for a button
aletail Feb 21, 2024
e6db2d6
Updated default button line height to 'inherit'
aletail Feb 22, 2024
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: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "werkbot-framewerk",
"version": "2.1.12",
"version": "2.1.13",
"description": "A framework of css and javascript that Werkbot uses as a foundation to build our websites.",
"main": "js/form.js",
"directories": {
Expand Down
2 changes: 2 additions & 0 deletions sass/components/button/_button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ $default-component-button-properties:(
textAlign: center,
disabledColor: #dddddd,
disabledTextColor: getThemeProperty(textColorLight),
lineHeight: 1,
Copy link
Member

Choose a reason for hiding this comment

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

Maybe the default should be "inherit". This doesn't cause issues with previous sites (I tested with fairview evergreen).

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, I think this makes sense

variants: (
white-btn: (
background-color: getThemeProperty(backgroundColorLight),
Expand Down Expand Up @@ -53,6 +54,7 @@ $component-button-properties: $default-component-button-properties !default;
font-weight: getThemeProperty(fontWeight, $component-button-properties);
font-family: getThemeProperty(fontFamily, $component-button-properties);
font-size: getThemeProperty(fontSize, $component-button-properties);
line-height: getThemeProperty(lineHeight, $component-button-properties);
text-align: getThemeProperty(textAlign, $component-button-properties);
-webkit-appearance: none;
-webkit-transition: background-color 0.25s ease-out;
Expand Down
Loading