Skip to content
This repository was archived by the owner on Feb 17, 2025. It is now read-only.

Seedlet & Spearhead Custom Link Color #3325

Merged
scruffian merged 11 commits into from
Mar 8, 2021
Merged

Seedlet & Spearhead Custom Link Color #3325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ad86b2f
Add experimental theme.json to seedlet
pbking Feb 15, 2021
b570475
Refactored theme.json
pbking Feb 15, 2021
214c6d1
Update shame of theme.json file
pbking Jan 28, 2021
19a2fb6
Spaces to tabs.
jffng Feb 22, 2021
4195fa0
added specified link color to very specific anchor color assignment
pbking Feb 23, 2021
4d3697a
Fix link colors
scruffian Feb 25, 2021
926da9c
fix colors in the editor
scruffian Mar 3, 2021
5569e20
Remove color overrides for background colors
scruffian Mar 4, 2021
6f48cf0
Remove color overrides for background colors
scruffian Mar 4, 2021
4620a21
Remove color overrides for background colors
scruffian Mar 4, 2021
f545ed8
rebuild and update version numbers
scruffian Mar 8, 2021
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
21 changes: 2 additions & 19 deletions seedlet/assets/css/style-editor.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 3 additions & 8 deletions seedlet/assets/sass/base/_base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,9 @@ a {
border-bottom-color: transparent;
}
}
}
// Enforce the custom link color even if a custom background color has been set.
// The extra specificity here is required to override the background color styles.
.has-background:not(.has-background-background-color) {
// Target both current level and nested block.
.has-link-color a,
&.has-link-color a {
color: var( --wp--style--color--link, var(--global--color-primary) );

.has-primary-background-color &:not(.has-link-color):not(.has-text-color) {
color: var(--global--color-background);
}
}

Expand Down
3 changes: 0 additions & 3 deletions seedlet/assets/sass/blocks/cover/_editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
.block-editor-block-list__block:not(.wp-social-link) {
color: currentColor; // uses text color specified with background-color options in /blocks/utilities/_style.scss

a:not(.has-text-color):not(.wp-block-button__link) {
color: currentColor;
}
.has-link-color a {
color: var( --wp--style--color--link, var(--global--color-primary) );
}
Expand Down
3 changes: 0 additions & 3 deletions seedlet/assets/sass/blocks/cover/_style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@
margin-top: var(--global--spacing-vertical);
margin-bottom: var(--global--spacing-vertical);

a:not(.has-text-color):not(.wp-block-button__link) {
color: currentColor;
}
.has-link-color a {
color: var( --wp--style--color--link, var(--global--color-primary) );
}
Expand Down
8 changes: 0 additions & 8 deletions seedlet/assets/sass/blocks/utilities/_editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,6 @@
color: var(--global--color-background);
}

// Gutenberg background-color options
.has-background {
&:not(.has-background-background-color) a,
p, h1, h2, h3, h4, h5, h6 {
color: currentColor;
}
}

.has-primary-background-color[class] {
background-color: var(--global--color-primary);
color: var(--global--color-background);
Expand Down
8 changes: 0 additions & 8 deletions seedlet/assets/sass/blocks/utilities/_style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,14 +178,6 @@
color: var(--global--color-black);
}

// Gutenberg background-color options
.has-background {
&:not(.has-background-background-color) a:not(.has-text-color):not(.wp-block-button__link),
p, h1, h2, h3, h4, h5, h6 {
color: currentColor;
}
}

.has-primary-background-color[class] {
background-color: var(--global--color-primary);

Expand Down
2 changes: 1 addition & 1 deletion seedlet/assets/sass/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Description: Seedlet is a free WordPress theme. A two-column layout and classica
Requires at least: 5.5
Tested up to: 5.5
Requires PHP: 5.6.2
Version: 1.1.13-wpcom
Version: 1.1.14-wpcom
License: GNU General Public License v2 or later
License URI: LICENSE
Text Domain: seedlet
Expand Down
9 changes: 9 additions & 0 deletions seedlet/experimental-theme.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"styles": {
"root": {
"color": {
"link": "var( --global--color-primary )"
}
}
}
}
2 changes: 1 addition & 1 deletion seedlet/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion seedlet/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "seedlet",
"version": "1.1.13-wpcom",
"version": "1.1.14-wpcom",
"description": "Seedlet",
"bugs": {
"url": "https://github.com/Automattic/seedlet/issues"
Expand Down
21 changes: 3 additions & 18 deletions seedlet/style-rtl.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Description: Seedlet is a free WordPress theme. A two-column layout and classica
Requires at least: 5.5
Tested up to: 5.5
Requires PHP: 5.6.2
Version: 1.1.13-wpcom
Version: 1.1.14-wpcom
License: GNU General Public License v2 or later
License URI: LICENSE
Text Domain: seedlet
Expand Down Expand Up @@ -949,9 +949,8 @@ a:active {
border-bottom-color: transparent;
}

.has-background:not(.has-background-background-color) .has-link-color a,
.has-background:not(.has-background-background-color).has-link-color a {
color: var(--wp--style--color--link, var(--global--color-primary));
.has-primary-background-color a:not(.has-link-color):not(.has-text-color) {
color: var(--global--color-background);
}

button,
Expand Down Expand Up @@ -1412,15 +1411,6 @@ object {
margin-bottom: var(--global--spacing-vertical);
}

.wp-block-cover .wp-block-cover__inner-container a:not(.has-text-color):not(.wp-block-button__link),
.wp-block-cover .wp-block-cover-image-text a:not(.has-text-color):not(.wp-block-button__link),
.wp-block-cover .wp-block-cover-text a:not(.has-text-color):not(.wp-block-button__link),
.wp-block-cover-image .wp-block-cover__inner-container a:not(.has-text-color):not(.wp-block-button__link),
.wp-block-cover-image .wp-block-cover-image-text a:not(.has-text-color):not(.wp-block-button__link),
.wp-block-cover-image .wp-block-cover-text a:not(.has-text-color):not(.wp-block-button__link) {
color: currentColor;
}

.wp-block-cover .wp-block-cover__inner-container .has-link-color a,
.wp-block-cover .wp-block-cover-image-text .has-link-color a,
.wp-block-cover .wp-block-cover-text .has-link-color a,
Expand Down Expand Up @@ -2653,11 +2643,6 @@ pre.wp-block-verse {
color: var(--global--color-black);
}

.has-background:not(.has-background-background-color) a:not(.has-text-color):not(.wp-block-button__link),
.has-background p, .has-background h1, .has-background h2, .has-background h3, .has-background h4, .has-background h5, .has-background h6 {
color: currentColor;
}

.has-primary-background-color[class] {
background-color: var(--global--color-primary);
}
Expand Down
21 changes: 3 additions & 18 deletions seedlet/style.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion spearhead/assets/sass/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Description: Share your podcast with the world using Spearhead.
Requires at least: 5.5
Tested up to: 5.5
Requires PHP: 5.6.2
Version: 1.3.2
Version: 1.3.3
License: GNU General Public License v2 or later
License URI: LICENSE
Template: seedlet
Expand Down
19 changes: 10 additions & 9 deletions spearhead/experimental-theme.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@

{
"global": {
"styles": {
"color": {
"link": "var( --global--color-primary )"
}
},
"settings": {
"styles": {
"root": {
"color": {
"link": "var( --global--color-primary )"
}
}
},
"settings": {
"defaults": {
"border": {
"customRadius": true
"customRadius": true
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion spearhead/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "spearhead",
"version": "1.3.2",
"version": "1.3.3",
"description": "a podcast theme",
"keywords": [
"gutenberg",
Expand Down
2 changes: 1 addition & 1 deletion spearhead/style-rtl.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Description: Share your podcast with the world using Spearhead.
Requires at least: 5.5
Tested up to: 5.5
Requires PHP: 5.6.2
Version: 1.3.2
Version: 1.3.3
License: GNU General Public License v2 or later
License URI: LICENSE
Template: seedlet
Expand Down
2 changes: 1 addition & 1 deletion spearhead/style.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.