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

Issues 738 & 733 #740

Merged
merged 5 commits into from
Oct 5, 2022
Merged

Issues 738 & 733 #740

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
bec144f
resolves #738
jamesros161 Sep 30, 2022
dd1e5e5
Resolves #733
jamesros161 Sep 30, 2022
6511a5b
update Buttons in yarn.lock
jamesros161 Oct 3, 2022
eb3fc34
generalize btn selectors
jamesros161 Oct 4, 2022
d8c2a65
update Buttons in yarn.lock
jamesros161 Oct 4, 2022
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
1 change: 1 addition & 0 deletions src/assets/scss/boldgrid/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

@if variable-exists( button-secondary-classes ) {
.button-secondary,
*:not( .menu-item ) > .button-secondary,
.woocommerce .alt.button {
.palette-primary & {
@extend #{$button-secondary-classes};
Expand Down
24 changes: 11 additions & 13 deletions src/assets/scss/boldgrid/_elements.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,19 +74,17 @@ blockquote {
}

/* Support for button wrapping classes. */
.main {
.btn,
.button-primary,
.button-secondary {
white-space: normal;
height: unset !important;
&:not( .btn-small ):not( .btn-tiny ) {
min-height: 40px;
}
&:hover,
&:focus {
text-decoration: none;
}
.btn,
.button-primary,
.button-secondary {
white-space: normal;
height: unset !important;
&:not( .btn-small ):not( .btn-tiny ) {
min-height: 40px;
}
&:hover,
&:focus {
text-decoration: none;
}
}

Expand Down
16 changes: 8 additions & 8 deletions src/assets/scss/custom-color/color-classes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,20 +102,20 @@ $names: background background-color;
@for $each from 1 through length( $colors ) {
$reference: nth($colors, $color);
&.color-#{$each}-link-color {
a {
a:not( .btn ) {
color: #{nth($colors, $each)};
}
a:hover, a:focus, a:active, a.highlighted {
a:not( .btn ):hover, a:not( .btn ):focus, a:not( .btn ):active, a:not( .btn ).highlighted {
color: hover( nth($colors, $color), nth($colors, $each) );
}
}
}
@if variable-exists( palette-primary-neutral-color ) {
&.color-neutral-link-color {
a {
a:not( .btn ) {
color: $palette-primary-neutral-color;
}
a:hover, a:focus, a:active, a.highlighted {
a:not( .btn ):hover, a:not( .btn ):focus, a:not( .btn ):active, a:not( .btn ).highlighted {
color: hover( nth($colors, $color), $palette-primary-neutral-color );
}
}
Expand Down Expand Up @@ -147,19 +147,19 @@ $names: background background-color;
.color#{$color}-#{nth( $names, $i )} {
@for $each from 1 through length( $colors ) {
&.color-#{$each}-link-color {
a {
a:not( .btn ) {
color: #{nth($colors, $each)};
}
a:hover, a:focus, a:active, a.highlighted {
a:not( .btn ):hover, a:not( .btn ):focus, a:not( .btn ):active, a:not( .btn ).highlighted {
color: hover( nth($colors, $color), nth($colors, $each) );
}
}
&.sidebar {
&.color-#{$each}-link-color {
a {
a:not( .btn ) {
color: #{nth($colors, $each)};
}
a:hover, a:focus, a:active, a.highlighted {
a:not( .btn ):hover, a:not( .btn ):focus, a:not( .btn ):active, a:not( .btn ).highlighted {
color: hover( nth($colors, $color), nth($colors, $each) );
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/includes/class-boldgrid-framework-links.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ public function get_styles( $prefix ) {
$footer_lightness = max( $footer_lightness, 0 );
$footer_color_hover = $footer_ari_color->getNew( 'lightness', $footer_lightness )->toCSS( 'hsla' );

$css .= "#colophon .bgtfw-footer.footer-content *:not( .menu-item ) > a { text-decoration: ${decoration};}";
$css .= "#colophon .bgtfw-footer.footer-content *:not( .menu-item ) > a:hover, .bgtfw-footer.footer-content *:not( .menu-item ) > a:focus {color: ${footer_color_hover};text-decoration: ${decoration_hover};}";
$css .= "#colophon .bgtfw-footer.footer-content *:not( .menu-item ) > a:not( .btn ) { text-decoration: ${decoration};}";
$css .= "#colophon .bgtfw-footer.footer-content *:not( .menu-item ) > a:not( .btn ):hover, .bgtfw-footer.footer-content *:not( .menu-item ) > a:not( .btn ):focus {color: ${footer_color_hover};text-decoration: ${decoration_hover};}";
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1346,7 +1346,7 @@

"Buttons@https://github.com/boldgrid/Buttons#crio-buttons":
version "3.0.0"
resolved "https://github.com/boldgrid/Buttons#609475046d4372ec6b8881baadff536dbadce1cd"
resolved "https://github.com/boldgrid/Buttons#0c98eef82d7193b949f2ae6f6584840fe0c8f4e1"
dependencies:
grunt "^0.4.5"
grunt-saucelabs "^8.3.2"
Expand Down