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

BCB + children: added border supports to buttons #3688

Merged
scruffian merged 3 commits into from
Apr 26, 2021
Merged

BCB + children: added border supports to buttons #3688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a8acc7
added border supports to buttons
MaggieCabrera Apr 22, 2021
085deec
Added user border controls to theme.json
pbking Apr 22, 2021
afc29e5
rebuild children
MaggieCabrera Apr 23, 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
6 changes: 0 additions & 6 deletions blank-canvas-blocks/assets/ponyfill.css
View file
Open in desktop

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

16 changes: 14 additions & 2 deletions blank-canvas-blocks/experimental-theme.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,10 @@
"lineHeight": 2
},
"border": {
"radius": "4px"
"radius": "4px",
"width": "0",
"style": "solid",
"color": "var(--wp--custom--button--color--text)"
},
"color": {
"text": "var(--wp--custom--color--background)",
Expand Down Expand Up @@ -283,6 +286,12 @@
"fontWeight": "normal"
}
}
},
"border": {
"customColor": true,
"customRadius": true,
"customStyle": true,
"customWidth": true
}
}
},
Expand Down Expand Up @@ -319,7 +328,10 @@
"lineHeight": "var(--wp--custom--button--typography--line-height)"
},
"border": {
"radius": "var(--wp--custom--button--border--radius)"
"radius": "var(--wp--custom--button--border--radius)",
"style": "var(--wp--custom--button--border--style)",
"width": "var(--wp--custom--button--border--width)",
"color": "var(--wp--custom--button--border--color)"
}
},
"core/heading/h1": {
Expand Down
2 changes: 0 additions & 2 deletions blank-canvas-blocks/sass/blocks/_button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@
font-weight: var(--wp--custom--button--typography--font-weight);
font-family: var(--wp--custom--button--typography--font-family);
font-size: var(--wp--custom--button--typography--font-size);
border-radius: var(--wp--custom--button--border--radius);
line-height: var(--wp--custom--button--typography--line-height);
text-decoration: none; // Needed because link styles inside .entry-content add a text decoration
color: var(--wp--custom--button--color--text);
border-color: var(--wp--custom--button--color--text);
background-color: var(--wp--custom--button--color--background);
padding: calc(.667em + 2px) calc(1.333em + 2px); //The padding found on an unmodified Button Block
svg {
Expand Down
30 changes: 28 additions & 2 deletions mayland-blocks/experimental-theme.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,10 @@
"lineHeight": 2
},
"border": {
"radius": "4px"
"radius": "4px",
"width": "0",
"style": "solid",
"color": "var(--wp--custom--button--color--text)"
},
"color": {
"text": "var(--wp--custom--color--background)",
Expand All @@ -163,6 +166,14 @@
"text": "var(--wp--custom--color--foreground)",
"background": "transparent",
"boxShadow": "none"
},
"label": {
"typography": {
"fontSize": "var(--wp--preset--font-size--tiny)"
}
},
"typography": {
"fontSize": "var(--wp--preset--font-size--normal)"
}
},
"paragraph": {
Expand Down Expand Up @@ -198,7 +209,13 @@
"citation": {
"typography": {
"fontSize": "var(--wp--preset--font-size--tiny)",
"fontFamily": "inherit",
"fontStyle": "italic"
},
"spacing": {
"margin": {
"top": "var(--wp--custom--margin--vertical)"
}
}
}
},
Expand Down Expand Up @@ -295,6 +312,12 @@
"default": "750px",
"wide": "1022px"
}
},
"border": {
"customColor": true,
"customRadius": true,
"customStyle": true,
"customWidth": true
}
}
},
Expand Down Expand Up @@ -331,7 +354,10 @@
"lineHeight": "var(--wp--custom--button--typography--line-height)"
},
"border": {
"radius": "var(--wp--custom--button--border--radius)"
"radius": "var(--wp--custom--button--border--radius)",
"style": "var(--wp--custom--button--border--style)",
"width": "var(--wp--custom--button--border--width)",
"color": "var(--wp--custom--button--border--color)"
}
},
"core/heading/h1": {
Expand Down
16 changes: 14 additions & 2 deletions seedlet-blocks/experimental-theme.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,10 @@
"lineHeight": 2
},
"border": {
"radius": "4px"
"radius": "4px",
"width": "0",
"style": "solid",
"color": "var(--wp--custom--button--color--text)"
},
"color": {
"text": "var(--wp--custom--color--background)",
Expand Down Expand Up @@ -339,6 +342,12 @@
"family=Fira+Sans:ital,wght@0,400;0,500;1,400",
"family=Playfair+Display:ital,wght@0,400;0,700;1,400"
]
},
"border": {
"customColor": true,
"customRadius": true,
"customStyle": true,
"customWidth": true
}
}
},
Expand Down Expand Up @@ -375,7 +384,10 @@
"lineHeight": "var(--wp--custom--button--typography--line-height)"
},
"border": {
"radius": "var(--wp--custom--button--border--radius)"
"radius": "var(--wp--custom--button--border--radius)",
"style": "var(--wp--custom--button--border--style)",
"width": "var(--wp--custom--button--border--width)",
"color": "var(--wp--custom--button--border--color)"
}
},
"core/heading/h1": {
Expand Down