Browse Source

Assembler: Fonts, text balance, field styling (#7617)

* Add Fahkwang and Roboto

* Organize stylesheet + add progressive text wrap

* Tweak small

* Create screenshot.png

* Add jetpack form styles
Rich Tabor 1 year ago
parent
commit
1564632ec8

BIN
assembler/assets/fonts/fahkwang/Fahkwang-Bold.ttf


BIN
assembler/assets/fonts/fahkwang/Fahkwang-BoldItalic.ttf


BIN
assembler/assets/fonts/fahkwang/Fahkwang-Italic.ttf


BIN
assembler/assets/fonts/fahkwang/Fahkwang-Regular.ttf


+ 93 - 0
assembler/assets/fonts/fahkwang/OFL.txt

@@ -0,0 +1,93 @@
+Copyright 2018 The Fahkwang Project Authors (https://github.com/cadsondemak/Fah-Kwang)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

+ 202 - 0
assembler/assets/fonts/roboto/LICENSE.txt

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

BIN
assembler/assets/fonts/roboto/Roboto-Bold.ttf


BIN
assembler/assets/fonts/roboto/Roboto-BoldItalic.ttf


BIN
assembler/assets/fonts/roboto/Roboto-Italic.ttf


BIN
assembler/assets/fonts/roboto/Roboto-Light.ttf


BIN
assembler/assets/fonts/roboto/Roboto-LightItalic.ttf


BIN
assembler/assets/fonts/roboto/Roboto-Regular.ttf


BIN
assembler/screenshot.png


+ 93 - 11
assembler/style.css

@@ -14,11 +14,44 @@ Text Domain: assembler
 Tags: blog, one-column, three-columns, wide-blocks, block-patterns, custom-colors, custom-logo, custom-menu, editor-style, featured-images, full-site-editing, rtl-language-support, style-variations, template-editing, theme-options, threaded-comments, translation-ready
 */
 
+/* Progresive enhancement to reduce widows and orphans. */
+h1, h2, h3, h4, h5, h6, blockquote {
+    text-wrap: balance;
+}
+
+p {
+    text-wrap: pretty;
+}
+
 /* Tiny tweak to make sure footers are properly spaced. */
 footer {
     margin-top: 0 !important;
 }
 
+/* Provide better default color for social links */
+.wp-block-social-links.is-style-logos-only li.wp-social-link {
+    color: currentColor;
+}
+
+.wp-block-social-links.is-style-logos-only .wp-social-link svg {
+    height: 1em;
+    width: 1em;
+}
+
+.wp-block-social-links.has-small-icon-size {
+    font-size: 20px;
+}
+
+/* Set default line height for font size presets. */
+.has-xx-large-font-size {
+   line-height: 1;
+}
+
+/* Add space between the header and first element, if its a paragraph. */
+.entry-content > p:first-child {
+    margin-top: var(--wp--style--root--padding-left); 
+}
+
 /* Move header core/navigation to the right on mobile. */
 .order-0 {
     order: 0;
@@ -55,23 +88,72 @@ footer {
 
 }
 
-.wp-block-social-links.is-style-logos-only li.wp-social-link {
-    color: currentColor;
+/* Style Jetpack forms */
+.wp-block-jetpack-contact-form-container {
+    --jetpack--contact-form--input-padding-left: 16px !important;
 }
 
-.wp-block-social-links.is-style-logos-only .wp-social-link svg {
-    height: 1em;
-    width: 1em;
+.wp-block-jetpack-contact-form input,
+.wp-block-jetpack-contact-form textarea {
+    backdrop-filter: saturate(1.1);
+    background-color: transparent;
+    border-color: var(--wp--custom--input--border--color);
+    border-radius: var(--wp--custom--input--border--radius) !important; /* Requires !important to override local variables with theme variables. */
+    border-width: var(--wp--custom--input--border--width) !important;  /* Requires !important to override local variables with theme variables. */
+    filter: brightness(0.975);
+    font-size: inherit;
+    color: inherit;
+    transition: border-color 0.15s cubic-bezier(.4,0,.2,1);
 }
 
-.wp-block-social-links.has-small-icon-size {
-    font-size: 20px;
+.jetpack-contact-form .jetpack-field .jetpack-field__input, 
+.jetpack-contact-form .jetpack-field .jetpack-field__textarea {
+    border-color: var(--wp--custom--input--border--color);
 }
 
-.has-xx-large-font-size {
-   line-height: 1;
+.wp-block-jetpack-contact-form input:not(:placeholder-shown),
+.wp-block-jetpack-contact-form textarea:not(:placeholder-shown),
+.wp-block-jetpack-contact-form input:focus,
+.wp-block-jetpack-contact-form textarea:focus {
+    filter: brightness(1);
+    backdrop-filter: saturate(1);
 }
 
-.entry-content > p:first-child {
-    margin-top: var(--wp--style--root--padding-left); 
+.wp-block-jetpack-contact-form input:focus,
+.wp-block-jetpack-contact-form textarea:focus {
+    border-color: var(--wp--custom--input--focus--border--color);
+}
+
+.contact-form .is-style-animated .grunion-field-wrap:not(.no-label) select, 
+.contact-form .is-style-animated .grunion-field-wrap:not(.no-label)>input, 
+.contact-form .is-style-animated .grunion-field-wrap:not(.no-label)>textarea {
+    padding-top: var(--field-padding); /* Remove unnecessary padding adjustment from Jetpack. */
+}
+
+.contact-form .is-style-animated .grunion-field-wrap .animated-label__label {
+    font-size: inherit;
+}
+
+.contact-form .is-style-animated .grunion-field-wrap .animated-label__label {
+    width: auto;
+    padding: 0 4px;
+    transition: transform 0.15s cubic-bezier(.4,0,.2,1), top 0.15s cubic-bezier(.4,0,.2,1), font-size 0.15s cubic-bezier(.4,0,.2,1);
+}
+
+.contact-form .is-style-animated .grunion-field-wrap .grunion-field.has-placeholder~.animated-label__label, 
+.contact-form .is-style-animated .grunion-field-wrap .grunion-field:focus~.animated-label__label, 
+.contact-form .is-style-animated .grunion-field-wrap .grunion-field:not(:placeholder-shown)~.animated-label__label, 
+.contact-form .is-style-animated .grunion-field-wrap.grunion-field-select-wrap .animated-label__label {
+    background-color: var(--wp--custom--input--color--background) !important;
+    transform: translateY(-11px) translateX(-4px); /* Moves the label out of the field. */
+}
+
+.contact-form label,
+.wp-block-jetpack-contact-form label,
+.jetpack-field-label .rich-text.jetpack-field-label__input {
+    font-weight: 500;
+}
+
+.contact-form__input-error {
+    font-size: var(--wp--preset--font-size--small);
 }

+ 109 - 5
assembler/theme.json

@@ -41,7 +41,17 @@
         },
         "custom": {
             "spacing-increment": "2",
-            "spacing-unit": "10"
+            "spacing-unit": "10",
+            "input": {
+                "color": {
+                    "background": "var(--wp--preset--color--theme-1)"
+                },
+                "border": {
+                    "color": "var(--wp--preset--color--theme-3)",
+                    "width": "1px",
+                    "radius": "3px"
+                }
+            }
         },
         "layout": {
             "contentSize": "620px",
@@ -92,6 +102,100 @@
         "typography": {
             "fluid": true,
             "fontFamilies": [
+                {
+                    "fontFace": [
+                        {
+                            "fontFamily": "Fahkwang",
+                            "fontStyle": "normal",
+                            "fontWeight": "400",
+                            "src": [
+                                "file:./assets/fonts/fahkwang/Fahkwang-Regular.ttf"
+                            ]
+                        },
+                        {
+                            "fontFamily": "Fahkwang",
+                            "fontStyle": "italic",
+                            "fontWeight": "400",
+                            "src": [
+                                "file:./assets/fonts/fahkwang/Fahkwang-Italic.ttf"
+                            ]
+                        },
+                        {
+                            "fontFamily": "Fahkwang",
+                            "fontStyle": "normal",
+                            "fontWeight": "600",
+                            "src": [
+                                "file:./assets/fonts/fahkwang/Fahkwang-Bold.ttf"
+                            ]
+                        },
+                        {
+                            "fontFamily": "Fahkwang",
+                            "fontStyle": "italic",
+                            "fontWeight": "600",
+                            "src": [
+                                "file:./assets/fonts/fahkwang/Fahkwang-BoldItalic.ttf"
+                            ]
+                        }
+                    ],
+                    "fontFamily": "\"Fahkwang\", sans-serif",
+                    "name": "Fahkwang",
+                    "slug": "fahkwang"
+                },
+                {
+                    "fontFace": [
+                        {
+                            "fontFamily": "Roboto",
+                            "fontStyle": "normal",
+                            "fontWeight": "300",
+                            "src": [
+                                "file:./assets/fonts/roboto/Roboto-Light.ttf"
+                            ]
+                        },
+                        {
+                            "fontFamily": "Roboto",
+                            "fontStyle": "italic",
+                            "fontWeight": "300",
+                            "src": [
+                                "file:./assets/fonts/roboto/Roboto-LightItalic.ttf"
+                            ]
+                        },
+                        {
+                            "fontFamily": "Roboto",
+                            "fontStyle": "normal",
+                            "fontWeight": "400",
+                            "src": [
+                                "file:./assets/fonts/roboto/Roboto-Regular.ttf"
+                            ]
+                        },
+                        {
+                            "fontFamily": "Roboto",
+                            "fontStyle": "italic",
+                            "fontWeight": "400",
+                            "src": [
+                                "file:./assets/fonts/roboto/Roboto-Regular.ttf"
+                            ]
+                        },
+                        {
+                            "fontFamily": "Roboto",
+                            "fontStyle": "normal",
+                            "fontWeight": "600",
+                            "src": [
+                                "file:./assets/fonts/roboto/Roboto-Bold.ttf"
+                            ]
+                        },
+                        {
+                            "fontFamily": "Roboto",
+                            "fontStyle": "italic",
+                            "fontWeight": "600",
+                            "src": [
+                                "file:./assets/fonts/roboto/Roboto-BoldItalic.ttf"
+                            ]
+                        }
+                    ],
+                    "fontFamily": "\"Roboto\", sans-serif",
+                    "name": "Roboto",
+                    "slug": "roboto"
+                },
                 {
                     "fontFace": [
                         {
@@ -556,7 +660,7 @@
             "fontSizes": [
                 {
                     "name": "Small",
-                    "size": "15px",
+                    "size": "16px",
                     "slug": "small"
                 },
                 {
@@ -633,13 +737,13 @@
                 "elements": {
                     "link": {
                         "typography": {
-                            "textDecoration": "none",
-                            "fontWeight": "550"
+                            "textDecoration": "none"
                         }
                     }
                 },
                 "typography": {
-                    "fontSize": "var(--wp--preset--font-size--medium)"
+                    "fontSize": "var(--wp--preset--font-size--medium)",
+                    "fontWeight": "550"
                 }
             }
         },