diff options
| -rw-r--r-- | _scss/base/_fonts.scss | 9 | ||||
| -rw-r--r-- | _scss/base/_highlight.scss | 20 | ||||
| -rw-r--r-- | _scss/base/_sakura.scss | 14 | ||||
| -rw-r--r-- | _scss/highlight/_main.scss | 207 | ||||
| -rw-r--r-- | _scss/sakura/_main.scss | 22 | ||||
| -rw-r--r-- | assets/css/styles.scss | 1 | ||||
| -rw-r--r-- | assets/fonts/open-sans/license.txt | 201 | ||||
| -rw-r--r-- | assets/fonts/open-sans/open-sans-regular.ttf | bin | 0 -> 27156 bytes | |||
| -rw-r--r-- | assets/fonts/open-sans/open-sans-regular.woff | bin | 0 -> 17248 bytes | |||
| -rw-r--r-- | assets/fonts/open-sans/open-sans-regular.woff2 | bin | 0 -> 13608 bytes |
10 files changed, 245 insertions, 229 deletions
diff --git a/_scss/base/_fonts.scss b/_scss/base/_fonts.scss new file mode 100644 index 0000000..ad6d38e --- /dev/null +++ b/_scss/base/_fonts.scss @@ -0,0 +1,9 @@ +@font-face { + font-display: swap; + font-family: 'Open Sans'; + font-style: normal; + font-weight: normal; + src: url('/assets/fonts/open-sans/open-sans-regular.ttf') format('truetype'), + url('/assets/fonts/open-sans/open-sans-regular.woff') format('woff'), + url('/assets/fonts/open-sans/open-sans-regular.woff2') format('woff2'); +} diff --git a/_scss/base/_highlight.scss b/_scss/base/_highlight.scss index d7754cf..c3cf783 100644 --- a/_scss/base/_highlight.scss +++ b/_scss/base/_highlight.scss @@ -1,20 +1,4 @@ -$color00: #000; -$color01: #000080; -$color02: #0000cf; -$color03: #00a000; -$color04: #204a87; -$color05: #3465a4; -$color06: #4e9a06; -$color07: #5c35cc; -$color08: #800080; -$color09: #8f5902; -$color10: #a40000; -$color11: #c4a000; -$color12: #c00; -$color13: #ce5c00; -$color14: #ef2929; -$color15: #f57900; -$color16: #f8f8f8; -$color17: #ffc; +$color00: rgb(255, 0, 0); +$color01: rgb(255, 255, 204); @import 'highlight/main'; diff --git a/_scss/base/_sakura.scss b/_scss/base/_sakura.scss index 0bcce6e..58b95fe 100644 --- a/_scss/base/_sakura.scss +++ b/_scss/base/_sakura.scss @@ -1,11 +1,11 @@ $color-bg-alt: rgba(0, 0, 0, .09); -$color-bg: rgb(255, 255, 255); -$color-blossom: rgb(0, 51, 153); -$color-fade: rgb(51, 102, 204); -$color-html: rgb(255, 255, 255); -$color-text: rgb(0, 0, 0); +$color-bg: rgb(250, 250, 250); +$color-blossom: rgb(0, 108, 160); +$color-fade: rgb(13, 78, 120); +$color-html: rgb(250, 250, 250); +$color-text: rgb(85, 85, 85); -$font-family-sans-serif: '-apple-system', BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', 'Arial', sans-serif; -$font-size-base: 1.6rem; +$font-family-sans-serif: 'Open Sans', sans-serif; +$font-size-base: 1.6em; @import 'sakura/main'; diff --git a/_scss/highlight/_main.scss b/_scss/highlight/_main.scss index f5cdc72..5e999b9 100644 --- a/_scss/highlight/_main.scss +++ b/_scss/highlight/_main.scss @@ -1,310 +1,139 @@ .highlight { - .bp { - color: $color05; - } - .c { - color: $color09; font-style: italic; } .c1 { - color: $color09; font-style: italic; } .cm { - color: $color09; - font-style: italic; - } - - .cp { - color: $color09; font-style: italic; } .cs { - color: $color09; font-style: italic; } .err { - border: 1px solid $color14; - color: $color10; - } - - .g { - color: $color00; - } - - .gd { - color: $color10; + border: 1px solid $color00; } .ge { - color: $color00; font-style: italic; } .gh { - color: $color01; font-weight: bold; } - .gi { - color: $color03; - } - - .go { - color: $color00; - font-style: italic; - } - .gp { - color: $color09; - } - - .gr { - color: $color14; - } - - .gs { - color: $color00; font-weight: bold; } - .gt { - color: $color10; + .gs { font-weight: bold; } .gu { - color: $color08; font-weight: bold; } .hll { - background-color: $color17; - } - - .il { - color: $color02; - font-weight: bold; + background-color: $color01; } .k { - color: $color04; font-weight: bold; } .kc { - color: $color04; font-weight: bold; } .kd { - color: $color04; font-weight: bold; } .kn { - color: $color04; - font-weight: bold; - } - - .kp { - color: $color04; font-weight: bold; } .kr { - color: $color04; - font-weight: bold; - } - - .kt { - color: $color04; font-weight: bold; } - .l { - color: $color00; - } - - .ld { - color: $color00; - } - - .m { - color: $color02; - font-weight: bold; - } - - .mf { - color: $color02; - font-weight: bold; - } - - .mh { - color: $color02; - font-weight: bold; - } - - .mi { - color: $color02; - font-weight: bold; - } - - .mo { - color: $color02; - font-weight: bold; - } - - .n { - color: $color00; - } - - .na { - color: $color11; - } - - .nb { - color: $color04; - } - .nc { - color: $color00; - } - - .nd { - color: $color07; font-weight: bold; } .ne { - color: $color12; font-weight: bold; } - .nf { - color: $color00; - } - .ni { - color: $color13; - } - - .nl { - color: $color15; + font-weight: bold; } .nn { - color: $color00; - } - - .no { - color: $color00; - } - - .nt { - color: $color04; font-weight: bold; } - .nv { - color: $color00; - } - - .nx { - color: $color00; - } - - .o { - color: $color13; + .nt { font-weight: bold; } .ow { - color: $color04; - font-weight: bold; - } - - .p { - color: $color00; font-weight: bold; } - .py { - color: $color00; - } - .s { - color: $color06; + font-style: italic; } .s1 { - color: $color06; + font-style: italic; } .s2 { - color: $color06; + font-style: italic; } .sb { - color: $color06; + font-style: italic; } .sc { - color: $color06; + font-style: italic; } .sd { - color: $color09; font-style: italic; } .se { - color: $color06; + font-style: italic; + font-weight: bold; } .sh { - color: $color06; + font-style: italic; } .si { - color: $color06; + font-style: italic; + font-weight: bold; } .sr { - color: $color06; + font-style: italic; } .ss { - color: $color06; + font-style: italic; } .sx { - color: $color06; - } - - .vc { - color: $color00; - } - - .vg { - color: $color00; - } - - .vi { - color: $color00; - } - - .w { - color: $color16; - text-decoration: underline; - } - - .x { - color: $color00; + font-style: italic; } } diff --git a/_scss/sakura/_main.scss b/_scss/sakura/_main.scss index 2f22dbc..3f1b756 100644 --- a/_scss/sakura/_main.scss +++ b/_scss/sakura/_main.scss @@ -7,22 +7,16 @@ body { background-color: $color-bg; color: $color-text; font-size: $font-size-base; - line-height: 1.6em; + line-height: 1.4em; margin: auto; - max-width: 72em; - padding: 32px; + max-width: 64em; + padding: 4em; } @media (max-width: 684px) { body { font-size: $font-size-base * .85; - padding: 8px; - } -} - -@media (max-width: 382px) { - body { - font-size: $font-size-base * .75; + padding: 2em; } } @@ -81,13 +75,11 @@ hr { a { color: $color-blossom; - text-decoration: none; &:active, &:focus, &:hover { color: $color-fade; - text-decoration: none; } } @@ -170,7 +162,7 @@ input[type='button'] { color: $color-bg; cursor: pointer; display: inline-block; - padding: 5px 10px; + padding: 1em; text-align: center; text-decoration: none; white-space: nowrap; @@ -198,8 +190,8 @@ input[type] { box-shadow: none; box-sizing: border-box; color: $color-text; - margin-bottom: 10px; - padding: 6px 10px; + margin: .5em; + padding: 1em; &:focus { border: 1px solid $color-blossom; diff --git a/assets/css/styles.scss b/assets/css/styles.scss index 5de4ff2..8bba8f6 100644 --- a/assets/css/styles.scss +++ b/assets/css/styles.scss @@ -6,3 +6,4 @@ @import 'base/highlight'; @import 'base/sakura'; @import 'base/main'; +@import 'base/fonts'; diff --git a/assets/fonts/open-sans/license.txt b/assets/fonts/open-sans/license.txt new file mode 100644 index 0000000..989e2c5 --- /dev/null +++ b/assets/fonts/open-sans/license.txt @@ -0,0 +1,201 @@ +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.
\ No newline at end of file diff --git a/assets/fonts/open-sans/open-sans-regular.ttf b/assets/fonts/open-sans/open-sans-regular.ttf Binary files differnew file mode 100644 index 0000000..5ca8393 --- /dev/null +++ b/assets/fonts/open-sans/open-sans-regular.ttf diff --git a/assets/fonts/open-sans/open-sans-regular.woff b/assets/fonts/open-sans/open-sans-regular.woff Binary files differnew file mode 100644 index 0000000..699e5ad --- /dev/null +++ b/assets/fonts/open-sans/open-sans-regular.woff diff --git a/assets/fonts/open-sans/open-sans-regular.woff2 b/assets/fonts/open-sans/open-sans-regular.woff2 Binary files differnew file mode 100644 index 0000000..4359426 --- /dev/null +++ b/assets/fonts/open-sans/open-sans-regular.woff2 |