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.

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

DP-32068: Log in button style improvement #1892

Merged
merged 25 commits into from
Mar 19, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
b4f829d
DP-32068: Log in button style improvement
arthurbaghdas Mar 10, 2024
d2251ae
DP-32068: Log in button style improvement
arthurbaghdas Mar 10, 2024
4627548
DP-32068: Log in button style improvement
arthurbaghdas Mar 10, 2024
e076e75
DP-32068: Log in button style improvement
arthurbaghdas Mar 10, 2024
c30204e
Merge branch 'develop' into patternlab/DP-32068_login_button_style
clairesunstudio Mar 11, 2024
e3f25bc
Mayflower
arthurbaghdas Mar 12, 2024
7caea6d
Merge branch 'patternlab/DP-32068_login_button_style' of github.com:m…
arthurbaghdas Mar 12, 2024
b244788
Mayflower
arthurbaghdas Mar 12, 2024
3b6502c
Merge branch 'develop' into patternlab/DP-32068_login_button_style
clairesunstudio Mar 13, 2024
e70fa62
resolve conflicts
clairesunstudio Mar 13, 2024
bcae256
approve backstop
clairesunstudio Mar 13, 2024
aed130b
DP-32068: Log in button style improvement
arthurbaghdas Mar 18, 2024
b1f5bd9
DP-32068: Log in button style improvement
arthurbaghdas Mar 18, 2024
a57335f
Update packages/patternlab/styleguide/source/_patterns/03-organisms/f…
clairesunstudio Mar 18, 2024
c5e06eb
fix react visual regression
clairesunstudio Mar 19, 2024
d5e72e9
Merge branch 'patternlab/DP-32068_login_button_style' of github.com:m…
clairesunstudio Mar 19, 2024
4043228
remove duplicate
clairesunstudio Mar 19, 2024
a3ae353
remove xsmall size
clairesunstudio Mar 19, 2024
1a77699
Revert "remove xsmall size"
clairesunstudio Mar 19, 2024
2cc6ab4
Revert "Revert "remove xsmall size""
clairesunstudio Mar 19, 2024
ff98ee9
remove button xsmall
clairesunstudio Mar 19, 2024
8c544af
approve react backstop
clairesunstudio Mar 19, 2024
311a34c
approve patternlab backstop
clairesunstudio Mar 19, 2024
d736f59
cleanup
clairesunstudio Mar 19, 2024
155f6a0
approve patternlab backstop
clairesunstudio Mar 19, 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
6 changes: 6 additions & 0 deletions changelogs/DP-32068.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Changed:
- project: Patternlab
arthurbaghdas marked this conversation as resolved.
Show resolved Hide resolved
component: PageHeader
description: Log in button style improvement for mobile devices. (#1892)
issue: DP-32068
impact: Patch
16 changes: 14 additions & 2 deletions packages/assets/scss/00-base/mixins/_ma-button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,9 @@
height: $fonts-small;
}
}
// small
// xsmall

@if ($size == "small") {
@if ($size == "xsmall") {
clairesunstudio marked this conversation as resolved.
Show resolved Hide resolved
font-size: $fonts-xsmall;
line-height: 1.2;

Expand All @@ -119,6 +119,18 @@
height: $fonts-xsmall;
}
}
// small

@if ($size == "small") {
font-size: $fonts-smaller;
line-height: 1.2;

svg {
width: $fonts-smaller;
height: $fonts-smaller;
}
}

// large

@if ($size == "large") {
Expand Down
2 changes: 1 addition & 1 deletion packages/assets/scss/02-molecules/_back-button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

a:not(.ma__button) {

@include ma-button-size("small");
@include ma-button-size("xsmall");

@include ma-chevron("left");

Expand Down
4 changes: 2 additions & 2 deletions packages/assets/scss/02-molecules/_event-filters.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

.ma__event-filters {
padding-top: 30px;

form {

@include ma-container;
Expand Down Expand Up @@ -33,7 +33,7 @@

&__submit {

@include ma-button-size('small');
@include ma-button-size('xsmall');
clairesunstudio marked this conversation as resolved.
Show resolved Hide resolved
}
}

Expand Down
6 changes: 3 additions & 3 deletions packages/assets/scss/02-molecules/_location-filters.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

.ma__location-filters {
padding-top: 30px;

form {

@include ma-container;
Expand Down Expand Up @@ -51,7 +51,7 @@
}

&__by-activity + &__by-keyword {

@media ($bp-medium-min) {

@include span-columns(4 of 8);
Expand Down Expand Up @@ -118,7 +118,7 @@

&__submit {

@include ma-button-size('small');
@include ma-button-size('xsmall');
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/assets/scss/03-organisms/_footer-with-columns.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

&__back2top {

@include ma-button-size("small");
@include ma-button-size("xsmall");
font-size: $fonts-xsmall;
clairesunstudio marked this conversation as resolved.
Show resolved Hide resolved
letter-spacing: $letter-spacing-large;
opacity: 1;
Expand Down Expand Up @@ -62,7 +62,7 @@
@media ($bp-large-max) {
display: flex;
flex-direction: column;
}
}
}

&__nav {
Expand Down
8 changes: 6 additions & 2 deletions packages/assets/scss/03-organisms/_page-header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ $page-header-widget-width: 350px;
}
}
}

&--has-optional-content &__content {
padding-bottom: 0
}
Expand Down Expand Up @@ -192,7 +192,7 @@ $page-header-widget-width: 350px;
display: flex;
width: 100%;
margin-top: 1.5rem;

@media ($bp-medium-max) {
flex-direction: column;
align-items: flex-start;
Expand All @@ -214,6 +214,10 @@ $page-header-widget-width: 350px;
text-shadow: none;
margin-top: 0.5rem;
margin-right: 0.5rem;

a.ma__button {
clairesunstudio marked this conversation as resolved.
Show resolved Hide resolved
text-transform: none;
}
}

// links
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.