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

Jump to bottom

Muscat: don't use fg and bg in palette #6894

Draft
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Draft

Muscat: don't use fg and bg in palette #6894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions muscat/parts/header-landing-page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<!-- wp:group {"align":"full","backgroundColor":"primary","layout":{"type":"default"}} -->
<div class="wp-block-group alignfull has-primary-background-color has-background"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"var:preset|spacing|60","right":"var:preset|spacing|60","bottom":"var:preset|spacing|60","left":"var:preset|spacing|60"},"blockGap":"0"},"elements":{"link":{"color":{"text":"var:preset|color|background"}}}},"backgroundColor":"primary","textColor":"background","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between","verticalAlignment":"center"}} -->
<div class="wp-block-group alignwide has-background-color has-primary-background-color has-text-color has-background has-link-color" style="padding-top:var(--wp--preset--spacing--60);padding-right:var(--wp--preset--spacing--60);padding-bottom:var(--wp--preset--spacing--60);padding-left:var(--wp--preset--spacing--60)"><!-- wp:site-title {"textAlign":"left","style":{"typography":{"fontStyle":"normal","fontWeight":"700","textTransform":"uppercase"}},"fontSize":"medium"} /-->
<div class="wp-block-group alignfull has-primary-background-color has-background"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"var:preset|spacing|60","right":"var:preset|spacing|60","bottom":"var:preset|spacing|60","left":"var:preset|spacing|60"},"blockGap":"0"},"elements":{"link":{"color":{"text":"var:preset|color|secondary"}}}},"backgroundColor":"primary","textColor":"secondary","className":"has-background-color","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between","verticalAlignment":"center"}} -->
<div class="wp-block-group alignwide has-background-color has-secondary-color has-primary-background-color has-text-color has-background has-link-color" style="padding-top:var(--wp--preset--spacing--60);padding-right:var(--wp--preset--spacing--60);padding-bottom:var(--wp--preset--spacing--60);padding-left:var(--wp--preset--spacing--60)"><!-- wp:site-title {"textAlign":"left","style":{"typography":{"fontStyle":"normal","fontWeight":"700","textTransform":"uppercase"}},"fontSize":"medium"} /-->

<!-- wp:navigation {"overlayMenu":"never","layout":{"type":"flex","justifyContent":"space-between"},"style":{"spacing":{"blockGap":"30px"}},"fontSize":"medium"} /--></div>
<!-- /wp:group -->

<!-- wp:group {"align":"full","layout":{"type":"constrained"}} -->
<div class="wp-block-group alignfull"><!-- wp:heading {"align":"wide","style":{"typography":{"fontSize":"17rem","lineHeight":1,"letterSpacing":"-11px","fontStyle":"normal","fontWeight":"500"},"spacing":{"padding":{"top":"24rem","right":"0","bottom":"var:preset|spacing|60","left":"0"}}},"textColor":"background"} -->
<h2 class="alignwide has-background-color has-text-color" style="padding-top:24rem;padding-right:0;padding-bottom:var(--wp--preset--spacing--60);padding-left:0;font-size:17rem;font-style:normal;font-weight:500;letter-spacing:-11px;line-height:1">Is this nice?</h2>
<div class="wp-block-group alignfull"><!-- wp:heading {"align":"wide","style":{"typography":{"fontSize":"17rem","lineHeight":1,"letterSpacing":"-11px","fontStyle":"normal","fontWeight":"500"},"spacing":{"padding":{"top":"24rem","right":"0","bottom":"var:preset|spacing|60","left":"0"}}},"textColor":"secondary","className":"has-background-color"} -->
<h2 class="wp-block-heading alignwide has-background-color has-secondary-color has-text-color" style="padding-top:24rem;padding-right:0;padding-bottom:var(--wp--preset--spacing--60);padding-left:0;font-size:17rem;font-style:normal;font-weight:500;letter-spacing:-11px;line-height:1">Is this nice?</h2>
<!-- /wp:heading --></div>
<!-- /wp:group --></div>
<!-- /wp:group -->
14 changes: 7 additions & 7 deletions muscat/patterns/hidden-404.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@
?>

<!-- wp:group {"align":"full","backgroundColor":"primary","layout":{"type":"constrained"}} -->
<div class="wp-block-group alignfull has-primary-background-color has-background"><!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|60","right":"0","bottom":"var:preset|spacing|60","left":"0"},"blockGap":"0"},"elements":{"link":{"color":{"text":"var:preset|color|background"}}}},"backgroundColor":"primary","textColor":"background","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
<div class="wp-block-group alignfull has-background-color has-primary-background-color has-text-color has-background has-link-color" style="padding-top:var(--wp--preset--spacing--60);padding-right:0;padding-bottom:var(--wp--preset--spacing--60);padding-left:0"><!-- wp:site-title {"textAlign":"left","style":{"typography":{"fontStyle":"normal","fontWeight":"700","textTransform":"uppercase"}},"fontSize":"medium"} /-->
<div class="wp-block-group alignfull has-primary-background-color has-background"><!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|60","right":"0","bottom":"var:preset|spacing|60","left":"0"},"blockGap":"0"},"elements":{"link":{"color":{"text":"var:preset|color|secondary"}}}},"backgroundColor":"primary","textColor":"secondary","className":"has-background-color","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
<div class="wp-block-group alignfull has-background-color has-secondary-color has-primary-background-color has-text-color has-background has-link-color" style="padding-top:var(--wp--preset--spacing--60);padding-right:0;padding-bottom:var(--wp--preset--spacing--60);padding-left:0"><!-- wp:site-title {"textAlign":"left","style":{"typography":{"fontStyle":"normal","fontWeight":"700","textTransform":"uppercase"}},"fontSize":"medium"} /-->

<!-- wp:navigation {"overlayMenu":"never","layout":{"type":"flex","justifyContent":"space-between"},"style":{"spacing":{"blockGap":"30px"}},"fontSize":"medium"} /--></div>
<!-- /wp:group -->

<!-- wp:heading {"level":1,"align":"wide","style":{"typography":{"fontSize":"17rem","lineHeight":1,"letterSpacing":"-11px","fontStyle":"normal","fontWeight":"500"},"spacing":{"padding":{"top":"8rem","right":"0","bottom":"var:preset|spacing|60","left":"0"}}},"textColor":"background"} -->
<h1 class="alignwide has-background-color has-text-color" style="padding-top:8rem;padding-right:0;padding-bottom:var(--wp--preset--spacing--60);padding-left:0;font-size:17rem;font-style:normal;font-weight:500;letter-spacing:-11px;line-height:1"><?php echo esc_html__( 'Well, this isn’t nice.', 'muscat' ); ?></h1>
<!-- wp:heading {"level":1,"align":"wide","style":{"typography":{"fontSize":"17rem","lineHeight":1,"letterSpacing":"-11px","fontStyle":"normal","fontWeight":"500"},"spacing":{"padding":{"top":"8rem","right":"0","bottom":"var:preset|spacing|60","left":"0"}}},"textColor":"secondary"} -->
<h1 class="wp-block-heading alignwide has-secondary-color has-text-color" style="padding-top:8rem;padding-right:0;padding-bottom:var(--wp--preset--spacing--60);padding-left:0;font-size:17rem;font-style:normal;font-weight:500;letter-spacing:-11px;line-height:1"><?php echo esc_html__( 'Well, this isn’t nice.', 'muscat' ); ?></h1>
<!-- /wp:heading -->

<!-- wp:group {"align":"wide","layout":{"type":"default"}} -->
<div class="wp-block-group alignwide"><!-- wp:paragraph {"textColor":"background"} -->
<p class="has-background-color has-text-color"><?php echo esc_html__( 'The page you’re looking doesn’t seem to exist. Maybe try a search?', 'muscat' ); ?></p>
<div class="wp-block-group alignwide"><!-- wp:paragraph {"textColor":"secondary"} -->
<p class="has-secondary-color has-text-color"><?php echo esc_html__( 'The page you’re looking doesn’t seem to exist. Maybe try a search?', 'muscat' ); ?></p>
<!-- /wp:paragraph -->

<!-- wp:search {"label":"","showLabel":false,"width":75,"widthUnit":"%","style":{"border":{"width":"0px","style":"none"}},"backgroundColor":"background","textColor":"foreground"} /--></div>
<!-- wp:search {"label":"","showLabel":false,"width":75,"widthUnit":"%","buttonText":"Search","style":{"border":{"width":"0px","style":"none"}},"backgroundColor":"secondary","textColor":"white"} /--></div>
<!-- /wp:group -->

<!-- wp:spacer -->
Expand Down
4 changes: 2 additions & 2 deletions muscat/patterns/home-posts.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
<div style="height:80px" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer -->

<!-- wp:separator {"align":"full","backgroundColor":"secondary","className":"is-style-wide"} -->
<hr class="wp-block-separator alignfull has-text-color has-secondary-color has-alpha-channel-opacity has-secondary-background-color has-background is-style-wide"/>
<!-- wp:separator {"backgroundColor":"tertiary","className":"is-style-default"} -->
<hr class="wp-block-separator has-text-color has-tertiary-color has-alpha-channel-opacity has-tertiary-background-color has-background is-style-default"/>
<!-- /wp:separator -->

<!-- wp:group {"align":"wide","layout":{"type":"constrained"}} -->
Expand Down
2 changes: 1 addition & 1 deletion muscat/templates/archive.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<!-- wp:group -->
<div class="wp-block-group"><!-- wp:post-featured-image {"isLink":true,"height":"340px"} /-->

<!-- wp:post-title {"isLink":true,"style":{"elements":{"link":{"color":{"text":"var:preset|color|foreground"}}},"typography":{"fontSize":"2.5rem"}}} /-->
<!-- wp:post-title {"isLink":true,"style":{"elements":{"link":{"color":{"text":"var:preset|color|white"}}},"typography":{"fontSize":"2.5rem"}}} /-->

<!-- wp:post-date /-->

Expand Down
2 changes: 1 addition & 1 deletion muscat/templates/search.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<!-- wp:group -->
<div class="wp-block-group"><!-- wp:post-featured-image {"isLink":true,"height":"340px"} /-->

<!-- wp:post-title {"isLink":true,"style":{"elements":{"link":{"color":{"text":"var:preset|color|foreground"}}},"typography":{"fontSize":"2.5rem"}}} /-->
<!-- wp:post-title {"isLink":true,"style":{"elements":{"link":{"color":{"text":"var:preset|color|white"}}},"typography":{"fontSize":"2.5rem"}}} /-->

<!-- wp:post-date /-->

Expand Down
63 changes: 19 additions & 44 deletions muscat/theme.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,12 @@
"slug": "primary"
},
{
"color": "#636363",
"color": "#181818",
"name": "Secondary",
"slug": "secondary"
},
{
"color": "#ffffff",
"name": "Foreground",
"slug": "foreground"
},
{
"color": "#181818",
"name": "Background",
"slug": "background"
},
{
"color": "#2c2c2c",
"color": "#636363",
"name": "Tertiary",
"slug": "tertiary"
}
Expand All @@ -37,14 +27,7 @@
"wideSize": "1800px"
},
"spacing": {
"units": [
"%",
"px",
"em",
"rem",
"vh",
"vw"
]
"units": ["%", "px", "em", "rem", "vh", "vw"]
},
"typography": {
"customFontSize": true,
Expand All @@ -61,33 +44,25 @@
"fontFamily": "Albert Sans",
"fontStyle": "normal",
"fontWeight": "300",
"src": [
"file:./assets/fonts/albert-sans_300.ttf"
]
"src": ["file:./assets/fonts/albert-sans_300.ttf"]
},
{
"fontFamily": "Albert Sans",
"fontStyle": "normal",
"fontWeight": "500",
"src": [
"file:./assets/fonts/albert-sans_500.ttf"
]
"src": ["file:./assets/fonts/albert-sans_500.ttf"]
},
{
"fontFamily": "Albert Sans",
"fontStyle": "normal",
"fontWeight": "600",
"src": [
"file:./assets/fonts/albert-sans_600.ttf"
]
"src": ["file:./assets/fonts/albert-sans_600.ttf"]
},
{
"fontFamily": "Albert Sans",
"fontStyle": "normal",
"fontWeight": "700",
"src": [
"file:./assets/fonts/albert-sans_700.ttf"
]
"src": ["file:./assets/fonts/albert-sans_700.ttf"]
},
{
"fontFamily": "Albert Sans",
Expand Down Expand Up @@ -206,7 +181,7 @@
},
"core/code": {
"border": {
"color": "var(--wp--preset--color--foreground)",
"color": "var(--wp--preset--color--white)",
"radius": "0.25rem",
"style": "solid",
"width": "2px"
Expand Down Expand Up @@ -303,7 +278,7 @@
},
"core/post-date": {
"color": {
"text": "var(--wp--preset--color--foreground)"
"text": "var(--wp--preset--color--white)"
},
"elements": {
"link": {
Expand Down Expand Up @@ -347,7 +322,7 @@
},
"core/pullquote": {
"border": {
"color": "var(--wp--preset--color--foreground)",
"color": "var(--wp--preset--color--white)",
"style": "solid",
"width": "1px 0"
},
Expand Down Expand Up @@ -413,7 +388,7 @@
"width": "0 0 1px 0"
},
"color": {
"text": "var(--wp--preset--color--foreground)"
"text": "var(--wp--preset--color--white)"
}
},
"core/site-tagline": {
Expand Down Expand Up @@ -441,21 +416,21 @@
}
},
"color": {
"background": "var(--wp--preset--color--background)",
"text": "var(--wp--preset--color--foreground)"
"background": "var(--wp--preset--color--secondary)",
"text": "var(--wp--preset--color--white)"
},
"elements": {
"button": {
":active": {
"color": {
"background": "var(--wp--preset--color--primary)",
"text": "var(--wp--preset--color--background)"
"text": "var(--wp--preset--color--secondary)"
}
},
":focus": {
"color": {
"background": "var(--wp--preset--color--primary)",
"text": "var(--wp--preset--color--background)"
"text": "var(--wp--preset--color--secondary)"
},
"outline": {
"color": "var(--wp--preset--color--primary)",
Expand All @@ -466,16 +441,16 @@
},
":hover": {
"color": {
"background": "var(--wp--preset--color--secondary)",
"text": "var(--wp--preset--color--background)"
"background": "var(--wp--preset--color--tertiary)",
"text": "var(--wp--preset--color--secondary)"
}
},
"border": {
"radius": "0.25rem"
},
"color": {
"background": "var(--wp--preset--color--primary)",
"text": "var(--wp--preset--color--background)"
"text": "var(--wp--preset--color--secondary)"
},
"typography": {
"fontFamily": "Albert Sans"
Expand Down Expand Up @@ -569,4 +544,4 @@
],
"version": 2,
"$schema": "https://schemas.wp.org/trunk/theme.json"
}
}