From 87bdf34e4ad08871df3d80df31012383279dde21 Mon Sep 17 00:00:00 2001 From: Segundo Fdez Date: Wed, 19 Jan 2022 11:38:47 +0100 Subject: [PATCH] Delete sass and test css. Added basic css structure --- ...s_5ad6f408b0e3e473c748aac88af0ea18.content | 13 + ....css_5ad6f408b0e3e473c748aac88af0ea18.json | 1 + ...s_5ad6f408b0e3e473c748aac88af0ea18.content | 519 ++++++++++++++++++ ...scss_5ad6f408b0e3e473c748aac88af0ea18.json | 1 + src/themes/oscar/assets/css/common.css | 18 + src/themes/oscar/assets/css/main.css | 20 +- src/themes/oscar/assets/css/normalize.css | 349 ++++++++++++ src/themes/oscar/assets/css/variables.css | 53 ++ src/themes/oscar/assets/scss/tale.scss | 8 - src/themes/oscar/assets/scss/tale/_base.scss | 67 --- .../oscar/assets/scss/tale/_catalogue.scss | 39 -- src/themes/oscar/assets/scss/tale/_code.scss | 47 -- .../oscar/assets/scss/tale/_layout.scss | 92 ---- .../oscar/assets/scss/tale/_pagination.scss | 44 -- src/themes/oscar/assets/scss/tale/_post.scss | 63 --- .../oscar/assets/scss/tale/_syntax.scss | 65 --- .../oscar/assets/scss/tale/_variables.scss | 29 - src/themes/oscar/layouts/partials/metas.html | 2 +- 18 files changed, 972 insertions(+), 458 deletions(-) create mode 100644 src/resources/_gen/assets/css/css/main.css_5ad6f408b0e3e473c748aac88af0ea18.content create mode 100644 src/resources/_gen/assets/css/css/main.css_5ad6f408b0e3e473c748aac88af0ea18.json create mode 100644 src/resources/_gen/assets/scss/scss/tale.scss_5ad6f408b0e3e473c748aac88af0ea18.content create mode 100644 src/resources/_gen/assets/scss/scss/tale.scss_5ad6f408b0e3e473c748aac88af0ea18.json create mode 100644 src/themes/oscar/assets/css/common.css create mode 100644 src/themes/oscar/assets/css/normalize.css create mode 100644 src/themes/oscar/assets/css/variables.css delete mode 100644 src/themes/oscar/assets/scss/tale.scss delete mode 100644 src/themes/oscar/assets/scss/tale/_base.scss delete mode 100644 src/themes/oscar/assets/scss/tale/_catalogue.scss delete mode 100644 src/themes/oscar/assets/scss/tale/_code.scss delete mode 100644 src/themes/oscar/assets/scss/tale/_layout.scss delete mode 100644 src/themes/oscar/assets/scss/tale/_pagination.scss delete mode 100644 src/themes/oscar/assets/scss/tale/_post.scss delete mode 100644 src/themes/oscar/assets/scss/tale/_syntax.scss delete mode 100644 src/themes/oscar/assets/scss/tale/_variables.scss diff --git a/src/resources/_gen/assets/css/css/main.css_5ad6f408b0e3e473c748aac88af0ea18.content b/src/resources/_gen/assets/css/css/main.css_5ad6f408b0e3e473c748aac88af0ea18.content new file mode 100644 index 0000000..deb2c47 --- /dev/null +++ b/src/resources/_gen/assets/css/css/main.css_5ad6f408b0e3e473c748aac88af0ea18.content @@ -0,0 +1,13 @@ +/* Basic */ +@import https://fonts.googleapis.com/css2?family=Overpass+Mono:wght@400;700&display=swap; +@import url(/src/themes/oscar/assets/css/normalize.css); +@import url(/src/themes/oscar/assets/css/variables.css); +@import url(/src/themes/oscar/assets/css/common.css); +/* Layout */ +/* Components */ +/* Modules */ +/* Specific pages */ +/* Utilities */ +/* Vendors */ + +/*# sourceMappingURL=style.css.map */ \ No newline at end of file diff --git a/src/resources/_gen/assets/css/css/main.css_5ad6f408b0e3e473c748aac88af0ea18.json b/src/resources/_gen/assets/css/css/main.css_5ad6f408b0e3e473c748aac88af0ea18.json new file mode 100644 index 0000000..28c014b --- /dev/null +++ b/src/resources/_gen/assets/css/css/main.css_5ad6f408b0e3e473c748aac88af0ea18.json @@ -0,0 +1 @@ +{"Target":"css/style.css","MediaType":"text/css","Data":{}} \ No newline at end of file diff --git a/src/resources/_gen/assets/scss/scss/tale.scss_5ad6f408b0e3e473c748aac88af0ea18.content b/src/resources/_gen/assets/scss/scss/tale.scss_5ad6f408b0e3e473c748aac88af0ea18.content new file mode 100644 index 0000000..0169b95 --- /dev/null +++ b/src/resources/_gen/assets/scss/scss/tale.scss_5ad6f408b0e3e473c748aac88af0ea18.content @@ -0,0 +1,519 @@ +* { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + line-height: 1.5; } + +html, +body { + color: #555; + background-color: blue; + margin: 0; + padding: 0; } + +html { + font-family: "Libre Baskerville", "Times New Roman", Times, serif; + font-size: 14px; + overflow-y: scroll; } + @media (min-width: 600px) { + html { + font-size: 16px; } } +body { + -webkit-text-size-adjust: 100%; } + +h1, +h2, +h3, +h4, +h5, +h6 { + color: #353535; + font-family: "Helvetica Neue", "Segoe UI", Helvetica, Arial, sans-serif; + line-height: normal; } + +a { + color: #4a9ae1; + text-decoration: none; } + +blockquote { + border-left: 0.25rem solid #e5e5e5; + color: #979797; + margin: .8rem 0; + padding: .5rem 1rem; } + blockquote p:last-child { + margin-bottom: 0; } + @media (min-width: 600px) { + blockquote { + padding: 0 5rem 0 1.25rem; } } +img { + display: block; + margin: 0 0 1rem; + max-width: 100%; } + +td { + vertical-align: top; } + +pre, +code { + font-family: Menlo, Monaco, monospace; } + +code { + background-color: #f9f9f9; + border-radius: 3px; + color: #bf616a; + font-size: 85%; + padding: .25em .5em; + white-space: pre-wrap; } + +pre { + margin: 0 0 1rem; } + +pre code { + background-color: transparent; + color: inherit; + font-size: 100%; + padding: 0; } + +.highlight { + background-color: #f9f9f9; + border-radius: 3px; + line-height: 1.4; + margin: 0 0 1rem; + padding: 1rem; } + .highlight pre { + margin-bottom: 0; + overflow-x: auto; } + .highlight .lineno { + color: #aaa; + display: inline-block; + padding: 0 .75rem 0 .25rem; + -webkit-user-select: none; + -moz-user-select: none; + user-select: none; } + +.post { + padding: 3rem 0; } + .post-info { + color: #aaa; + font-family: Palatino, "Palatino LT STD", "Palatino Linotype", "Book Antiqua", "Georgia", serif; + letter-spacing: 0.5px; + text-align: center; } + .post-info span { + font-style: italic; } + .post-title { + color: #353535; + font-family: "Helvetica Neue", "Segoe UI", Helvetica, Arial, sans-serif; + font-size: 4rem; + margin: 1rem 0; + text-align: center; } + .post-line { + border-top: 0.4rem solid #353535; + display: block; + margin: 0 auto 3rem; + width: 4rem; } + .post p { + margin: 0 0 1rem; + text-align: justify; } + .post a:hover { + text-decoration: underline; } + .post img { + margin: 0 auto 0.5rem; } + .post img + em { + color: #aaa; + display: block; + font-family: "Helvetica Neue", "Segoe UI", Helvetica, Arial, sans-serif; + font-size: 0.9rem; + font-style: normal; + text-align: center; } + .post img.emoji { + display: inline-block; + left: 0; + transform: none; + width: 1rem; + height: 1rem; + vertical-align: text-top; + padding: 0; + margin: 0; } + +.highlight .hll { + background-color: #ffc; } + +.highlight .c { + color: #999; } + +/* Comment */ +.highlight .err { + color: #a00; + background-color: #faa; } + +/* Error */ +.highlight .k { + color: #069; } + +/* Keyword */ +.highlight .o { + color: #555; } + +/* Operator */ +.highlight .cm { + color: #09f; + font-style: italic; } + +/* Comment.Multiline */ +.highlight .cp { + color: #099; } + +/* Comment.Preproc */ +.highlight .c1 { + color: #999; } + +/* Comment.Single */ +.highlight .cs { + color: #999; } + +/* Comment.Special */ +.highlight .gd { + background-color: #fcc; + border: 1px solid #c00; } + +/* Generic.Deleted */ +.highlight .ge { + font-style: italic; } + +/* Generic.Emph */ +.highlight .gr { + color: #f00; } + +/* Generic.Error */ +.highlight .gh { + color: #030; } + +/* Generic.Heading */ +.highlight .gi { + background-color: #cfc; + border: 1px solid #0c0; } + +/* Generic.Inserted */ +.highlight .go { + color: #aaa; } + +/* Generic.Output */ +.highlight .gp { + color: #009; } + +/* Generic.Prompt */ +/* Generic.Strong */ +.highlight .gu { + color: #030; } + +/* Generic.Subheading */ +.highlight .gt { + color: #9c6; } + +/* Generic.Traceback */ +.highlight .kc { + color: #069; } + +/* Keyword.Constant */ +.highlight .kd { + color: #069; } + +/* Keyword.Declaration */ +.highlight .kn { + color: #069; } + +/* Keyword.Namespace */ +.highlight .kp { + color: #069; } + +/* Keyword.Pseudo */ +.highlight .kr { + color: #069; } + +/* Keyword.Reserved */ +.highlight .kt { + color: #078; } + +/* Keyword.Type */ +.highlight .m { + color: #f60; } + +/* Literal.Number */ +.highlight .s { + color: #d44950; } + +/* Literal.String */ +.highlight .na { + color: #4f9fcf; } + +/* Name.Attribute */ +.highlight .nb { + color: #366; } + +/* Name.Builtin */ +.highlight .nc { + color: #0a8; } + +/* Name.Class */ +.highlight .no { + color: #360; } + +/* Name.Constant */ +.highlight .nd { + color: #99f; } + +/* Name.Decorator */ +.highlight .ni { + color: #999; } + +/* Name.Entity */ +.highlight .ne { + color: #c00; } + +/* Name.Exception */ +.highlight .nf { + color: #c0f; } + +/* Name.Function */ +.highlight .nl { + color: #99f; } + +/* Name.Label */ +.highlight .nn { + color: #0cf; } + +/* Name.Namespace */ +.highlight .nt { + color: #2f6f9f; } + +/* Name.Tag */ +.highlight .nv { + color: #033; } + +/* Name.Variable */ +.highlight .ow { + color: #000; } + +/* Operator.Word */ +.highlight .w { + color: #bbb; } + +/* Text.Whitespace */ +.highlight .mf { + color: #f60; } + +/* Literal.Number.Float */ +.highlight .mh { + color: #f60; } + +/* Literal.Number.Hex */ +.highlight .mi { + color: #f60; } + +/* Literal.Number.Integer */ +.highlight .mo { + color: #f60; } + +/* Literal.Number.Oct */ +.highlight .sb { + color: #c30; } + +/* Literal.String.Backtick */ +.highlight .sc { + color: #c30; } + +/* Literal.String.Char */ +.highlight .sd { + color: #c30; + font-style: italic; } + +/* Literal.String.Doc */ +.highlight .s2 { + color: #c30; } + +/* Literal.String.Double */ +.highlight .se { + color: #c30; } + +/* Literal.String.Escape */ +.highlight .sh { + color: #c30; } + +/* Literal.String.Heredoc */ +.highlight .si { + color: #a00; } + +/* Literal.String.Interpol */ +.highlight .sx { + color: #c30; } + +/* Literal.String.Other */ +.highlight .sr { + color: #3aa; } + +/* Literal.String.Regex */ +.highlight .s1 { + color: #c30; } + +/* Literal.String.Single */ +.highlight .ss { + color: #fc3; } + +/* Literal.String.Symbol */ +.highlight .bp { + color: #366; } + +/* Name.Builtin.Pseudo */ +.highlight .vc { + color: #033; } + +/* Name.Variable.Class */ +.highlight .vg { + color: #033; } + +/* Name.Variable.Global */ +.highlight .vi { + color: #033; } + +/* Name.Variable.Instance */ +.highlight .il { + color: #f60; } + +/* Literal.Number.Integer.Long */ +.css .o, +.css .o + .nt, +.css .nt + .nt { + color: #999; } + +.container { + margin: 0 auto; + max-width: 800px; + width: 80%; } + +main, +footer, +.nav-container { + display: block; + margin: 0 auto; + max-width: 800px; + width: 80%; } + +.nav { + box-shadow: 0 2px 2px -2px rgba(0, 0, 0, 0.2); + overflow: auto; } + .nav-container { + margin: 1rem auto; + position: relative; + text-align: center; } + .nav-title { + -webkit-transition: all 0.2s ease-out; + -moz-transition: all 0.2s ease-out; + transition: all 0.2s ease-out; + color: #555; + display: inline-block; + margin: 0; + padding-right: .2rem; } + .nav-title:hover, .nav-title:focus { + opacity: .6; } + .nav ul { + list-style-type: none; + margin: 1rem 0 0; + padding: 0; + text-align: center; } + .nav li { + -webkit-transition: all 0.2s ease-out; + -moz-transition: all 0.2s ease-out; + transition: all 0.2s ease-out; + color: #555; + display: inline-block; + opacity: .6; + padding: 0 2rem 0 0; } + .nav li:last-child { + padding-right: 0; } + .nav li:hover, .nav li:focus { + opacity: 1; } + .nav a { + color: #555; + font-family: "Helvetica Neue", "Segoe UI", Helvetica, Arial, sans-serif; } + +@media (min-width: 600px) { + .nav-container { + text-align: left; } + .nav ul { + bottom: 0; + position: absolute; + right: 0; } } + +footer { + font-family: Palatino, "Palatino LT STD", "Palatino Linotype", "Book Antiqua", "Georgia", serif; + padding: 2rem 0; + text-align: center; } + footer span { + color: #555; + font-size: .8rem; } + +.pagination { + border-top: 0.5px solid #e5e5e5; + font-family: Palatino, "Palatino LT STD", "Palatino Linotype", "Book Antiqua", "Georgia", serif; + padding-top: 2rem; + position: relative; + text-align: center; } + .pagination span { + color: #353535; + font-size: 1.1rem; } + .pagination .top { + -webkit-transition: all 0.3s ease-out; + -moz-transition: all 0.3s ease-out; + transition: all 0.3s ease-out; + color: #555; + font-family: "Helvetica Neue", "Segoe UI", Helvetica, Arial, sans-serif; + font-size: 1.1rem; + opacity: .6; } + .pagination .top:hover { + opacity: 1; } + .pagination .arrow { + -webkit-transition: all 0.3s ease-out; + -moz-transition: all 0.3s ease-out; + transition: all 0.3s ease-out; + color: #555; + position: absolute; } + .pagination .arrow:hover, .pagination .arrow:focus { + opacity: .6; + text-decoration: none; } + .pagination .left { + left: 0; } + .pagination .right { + right: 0; } + +.catalogue-item { + border-bottom: 1px solid #e5e5e5; + color: #555; + display: block; + padding: 2rem 0; } + .catalogue-item:hover .catalogue-line, .catalogue-item:focus .catalogue-line { + width: 5rem; } + .catalogue-item:last-child { + border: 0; } + +.catalogue-time { + color: #aaa; + font-family: Palatino, "Palatino LT STD", "Palatino Linotype", "Book Antiqua", "Georgia", serif; + letter-spacing: .5px; } + +.catalogue-title { + color: #353535; + display: block; + font-family: "Helvetica Neue", "Segoe UI", Helvetica, Arial, sans-serif; + font-size: 2rem; + font-weight: 700; + margin: .5rem 0; } + +.catalogue-line { + -webkit-transition: all 0.3s ease-out; + -moz-transition: all 0.3s ease-out; + transition: all 0.3s ease-out; + border-top: 0.2rem solid #353535; + display: block; + width: 2rem; } + +/*# sourceMappingURL=style.css.map */ \ No newline at end of file diff --git a/src/resources/_gen/assets/scss/scss/tale.scss_5ad6f408b0e3e473c748aac88af0ea18.json b/src/resources/_gen/assets/scss/scss/tale.scss_5ad6f408b0e3e473c748aac88af0ea18.json new file mode 100644 index 0000000..28c014b --- /dev/null +++ b/src/resources/_gen/assets/scss/scss/tale.scss_5ad6f408b0e3e473c748aac88af0ea18.json @@ -0,0 +1 @@ +{"Target":"css/style.css","MediaType":"text/css","Data":{}} \ No newline at end of file diff --git a/src/themes/oscar/assets/css/common.css b/src/themes/oscar/assets/css/common.css new file mode 100644 index 0000000..32562ef --- /dev/null +++ b/src/themes/oscar/assets/css/common.css @@ -0,0 +1,18 @@ +*, +*::before, +*::after { + box-sizing: border-box; +} + +body { + font-family: var(--font-brand); + text-rendering: auto; +} +h1, h2, h3, h4, h5, h6, +b, strong { + font-weight: var(--fw-bold); +} + +i, em { + font-style: italic; +} \ No newline at end of file diff --git a/src/themes/oscar/assets/css/main.css b/src/themes/oscar/assets/css/main.css index c1347f8..08b56f2 100644 --- a/src/themes/oscar/assets/css/main.css +++ b/src/themes/oscar/assets/css/main.css @@ -1,3 +1,17 @@ -html { - background-color: red; -} \ No newline at end of file +/* Basic */ +@import 'https://fonts.googleapis.com/css2?family=Overpass+Mono:wght@400;700&display=swap'; +@import 'normalize.css'; +@import 'variables.css'; +@import 'common.css'; + +/* Layout */ + +/* Components */ + +/* Modules */ + +/* Specific pages */ + +/* Utilities */ + +/* Vendors */ diff --git a/src/themes/oscar/assets/css/normalize.css b/src/themes/oscar/assets/css/normalize.css new file mode 100644 index 0000000..1a9fc1b --- /dev/null +++ b/src/themes/oscar/assets/css/normalize.css @@ -0,0 +1,349 @@ +/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */ + +/* Document + ========================================================================== */ + +/** + * 1. Correct the line height in all browsers. + * 2. Prevent adjustments of font size after orientation changes in iOS. + */ + + html { + line-height: 1.15; /* 1 */ + -webkit-text-size-adjust: 100%; /* 2 */ + } + + /* Sections + ========================================================================== */ + + /** + * Remove the margin in all browsers. + */ + + body { + margin: 0; + } + + /** + * Render the `main` element consistently in IE. + */ + + main { + display: block; + } + + /** + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. + */ + + h1 { + font-size: 2em; + margin: 0.67em 0; + } + + /* Grouping content + ========================================================================== */ + + /** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ + + hr { + box-sizing: content-box; /* 1 */ + height: 0; /* 1 */ + overflow: visible; /* 2 */ + } + + /** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + + pre { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ + } + + /* Text-level semantics + ========================================================================== */ + + /** + * Remove the gray background on active links in IE 10. + */ + + a { + background-color: transparent; + } + + /** + * 1. Remove the bottom border in Chrome 57- + * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. + */ + + abbr[title] { + border-bottom: none; /* 1 */ + text-decoration: underline; /* 2 */ + text-decoration: underline dotted; /* 2 */ + } + + /** + * Add the correct font weight in Chrome, Edge, and Safari. + */ + + b, + strong { + font-weight: bolder; + } + + /** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + + code, + kbd, + samp { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ + } + + /** + * Add the correct font size in all browsers. + */ + + small { + font-size: 80%; + } + + /** + * Prevent `sub` and `sup` elements from affecting the line height in + * all browsers. + */ + + sub, + sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; + } + + sub { + bottom: -0.25em; + } + + sup { + top: -0.5em; + } + + /* Embedded content + ========================================================================== */ + + /** + * Remove the border on images inside links in IE 10. + */ + + img { + border-style: none; + } + + /* Forms + ========================================================================== */ + + /** + * 1. Change the font styles in all browsers. + * 2. Remove the margin in Firefox and Safari. + */ + + button, + input, + optgroup, + select, + textarea { + font-family: inherit; /* 1 */ + font-size: 100%; /* 1 */ + line-height: 1.15; /* 1 */ + margin: 0; /* 2 */ + } + + /** + * Show the overflow in IE. + * 1. Show the overflow in Edge. + */ + + button, + input { /* 1 */ + overflow: visible; + } + + /** + * Remove the inheritance of text transform in Edge, Firefox, and IE. + * 1. Remove the inheritance of text transform in Firefox. + */ + + button, + select { /* 1 */ + text-transform: none; + } + + /** + * Correct the inability to style clickable types in iOS and Safari. + */ + + button, + [type="button"], + [type="reset"], + [type="submit"] { + -webkit-appearance: button; + } + + /** + * Remove the inner border and padding in Firefox. + */ + + button::-moz-focus-inner, + [type="button"]::-moz-focus-inner, + [type="reset"]::-moz-focus-inner, + [type="submit"]::-moz-focus-inner { + border-style: none; + padding: 0; + } + + /** + * Restore the focus styles unset by the previous rule. + */ + + button:-moz-focusring, + [type="button"]:-moz-focusring, + [type="reset"]:-moz-focusring, + [type="submit"]:-moz-focusring { + outline: 1px dotted ButtonText; + } + + /** + * Correct the padding in Firefox. + */ + + fieldset { + padding: 0.35em 0.75em 0.625em; + } + + /** + * 1. Correct the text wrapping in Edge and IE. + * 2. Correct the color inheritance from `fieldset` elements in IE. + * 3. Remove the padding so developers are not caught out when they zero out + * `fieldset` elements in all browsers. + */ + + legend { + box-sizing: border-box; /* 1 */ + color: inherit; /* 2 */ + display: table; /* 1 */ + max-width: 100%; /* 1 */ + padding: 0; /* 3 */ + white-space: normal; /* 1 */ + } + + /** + * Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ + + progress { + vertical-align: baseline; + } + + /** + * Remove the default vertical scrollbar in IE 10+. + */ + + textarea { + overflow: auto; + } + + /** + * 1. Add the correct box sizing in IE 10. + * 2. Remove the padding in IE 10. + */ + + [type="checkbox"], + [type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ + } + + /** + * Correct the cursor style of increment and decrement buttons in Chrome. + */ + + [type="number"]::-webkit-inner-spin-button, + [type="number"]::-webkit-outer-spin-button { + height: auto; + } + + /** + * 1. Correct the odd appearance in Chrome and Safari. + * 2. Correct the outline style in Safari. + */ + + [type="search"] { + -webkit-appearance: textfield; /* 1 */ + outline-offset: -2px; /* 2 */ + } + + /** + * Remove the inner padding in Chrome and Safari on macOS. + */ + + [type="search"]::-webkit-search-decoration { + -webkit-appearance: none; + } + + /** + * 1. Correct the inability to style clickable types in iOS and Safari. + * 2. Change font properties to `inherit` in Safari. + */ + + ::-webkit-file-upload-button { + -webkit-appearance: button; /* 1 */ + font: inherit; /* 2 */ + } + + /* Interactive + ========================================================================== */ + + /* + * Add the correct display in Edge, IE 10+, and Firefox. + */ + + details { + display: block; + } + + /* + * Add the correct display in all browsers. + */ + + summary { + display: list-item; + } + + /* Misc + ========================================================================== */ + + /** + * Add the correct display in IE 10+. + */ + + template { + display: none; + } + + /** + * Add the correct display in IE 10. + */ + + [hidden] { + display: none; + } diff --git a/src/themes/oscar/assets/css/variables.css b/src/themes/oscar/assets/css/variables.css new file mode 100644 index 0000000..1e4ce1a --- /dev/null +++ b/src/themes/oscar/assets/css/variables.css @@ -0,0 +1,53 @@ +:root { +/* ========================================================================== + Fonts + ========================================================================== */ + --font-brand: 'Overpass Mono', monospace; + + /* Fonts weights */ + --fw-regular: 400; + --fw-bold: 700; + + + /* ========================================================================== + Colors + ========================================================================== */ + + /* Brand + ========================================================================== */ + --brand: #0249FF; + + +/* ========================================================================== + Font sizes + ========================================================================== */ + + /* Font sizes */ + --font-size-1: 14px; + --font-size-2: 16px; + --font-size-3: 26px; + + /* Font sizes names */ + --font-heading: var(--fw-bold) var(--font-size-3) / 1.25 var(--font-brand); + --font-body: var(--font-size-2) / 1.38 var(--font-brand); + --font-caption: var(--font-size-1) / 1.37 var(--font-brand); + +} + + +/* ========================================================================== + Breakpoints + ========================================================================== */ + @custom-media --screen-xxs (min-width: 320px); + @custom-media --screen-xs (min-width: 480px); + @custom-media --screen-s (min-width: 768px); + @custom-media --screen-m (min-width: 960px); + @custom-media --screen-ml (min-width: 1024px); + @custom-media --screen-l (min-width: 1281px); + @custom-media --screen-xl (min-width: 1441px); + @custom-media --screen-xxl (min-width: 1920px); + + + @custom-media --max-screen-s (max-width: 769px); + @custom-media --max-screen-m (max-width: 960px); + @custom-media --max-screen-ml (max-width: 1024px); \ No newline at end of file diff --git a/src/themes/oscar/assets/scss/tale.scss b/src/themes/oscar/assets/scss/tale.scss deleted file mode 100644 index 3cdfa99..0000000 --- a/src/themes/oscar/assets/scss/tale.scss +++ /dev/null @@ -1,8 +0,0 @@ -@import 'tale/variables'; -@import 'tale/base'; -@import 'tale/code'; -@import 'tale/post'; -@import 'tale/syntax'; -@import 'tale/layout'; -@import 'tale/pagination'; -@import 'tale/catalogue'; diff --git a/src/themes/oscar/assets/scss/tale/_base.scss b/src/themes/oscar/assets/scss/tale/_base.scss deleted file mode 100644 index fec3d29..0000000 --- a/src/themes/oscar/assets/scss/tale/_base.scss +++ /dev/null @@ -1,67 +0,0 @@ -* { - @include box-sizing; - line-height: 1.5; -} - -html, -body { - color: $default-color; - background-color: red; - margin: 0; - padding: 0; -} - -html { - font-family: $serif-primary; - font-size: 14px; - overflow-y: scroll; - - @media (min-width: 600px) { - font-size: 16px; - } -} - -body { - -webkit-text-size-adjust: 100%; -} - -h1, -h2, -h3, -h4, -h5, -h6 { - color: $default-shade; - font-family: $sans-serif; - line-height: normal; -} - -a { - color: $blue; - text-decoration: none; -} - -blockquote { - border-left: .25rem solid $grey-2; - color: $grey-1; - margin: .8rem 0; - padding: .5rem 1rem; - - p:last-child { - margin-bottom: 0; - } - - @media (min-width: 600px) { - padding: 0 5rem 0 1.25rem; - } -} - -img { - display: block; - margin: 0 0 1rem; - max-width: 100%; -} - -td { - vertical-align: top; -} diff --git a/src/themes/oscar/assets/scss/tale/_catalogue.scss b/src/themes/oscar/assets/scss/tale/_catalogue.scss deleted file mode 100644 index 0587bc5..0000000 --- a/src/themes/oscar/assets/scss/tale/_catalogue.scss +++ /dev/null @@ -1,39 +0,0 @@ -.catalogue { - &-item { - border-bottom: 1px solid $grey-2; - color: $default-color; - display: block; - padding: 2rem 0; - - &:hover .catalogue-line, - &:focus .catalogue-line { - width: 5rem; - } - - &:last-child { - border: 0; - } - } - - &-time { - color: $default-tint; - font-family: $serif-secondary; - letter-spacing: .5px; - } - - &-title { - color: $default-shade; - display: block; - font-family: $sans-serif; - font-size: 2rem; - font-weight: 700; - margin: .5rem 0; - } - - &-line { - @include transition(all .3s ease-out); - border-top: .2rem solid $default-shade; - display: block; - width: 2rem; - } -} diff --git a/src/themes/oscar/assets/scss/tale/_code.scss b/src/themes/oscar/assets/scss/tale/_code.scss deleted file mode 100644 index 8d3db57..0000000 --- a/src/themes/oscar/assets/scss/tale/_code.scss +++ /dev/null @@ -1,47 +0,0 @@ -pre, -code { - font-family: $monospaced; -} - -code { - background-color: $grey-3; - border-radius: 3px; - color: $code-color; - font-size: 85%; - padding: .25em .5em; - white-space: pre-wrap; -} - -pre { - margin: 0 0 1rem; -} - -pre code { - background-color: transparent; - color: inherit; - font-size: 100%; - padding: 0; -} - -.highlight { - background-color: $grey-3; - border-radius: 3px; - line-height: 1.4; - margin: 0 0 1rem; - padding: 1rem; - - pre { - margin-bottom: 0; - overflow-x: auto; - } - - .lineno { - color: $default-tint; - display: inline-block; // Ensures the null space also isn't selectable - padding: 0 .75rem 0 .25rem; - // Make sure numbers aren't selectable - -webkit-user-select: none; - -moz-user-select: none; - user-select: none; - } -} diff --git a/src/themes/oscar/assets/scss/tale/_layout.scss b/src/themes/oscar/assets/scss/tale/_layout.scss deleted file mode 100644 index ba4a7b0..0000000 --- a/src/themes/oscar/assets/scss/tale/_layout.scss +++ /dev/null @@ -1,92 +0,0 @@ -.container { - margin: 0 auto; - max-width: 800px; - width: 80%; -} - -main, -footer, -.nav-container { - display: block; - margin: 0 auto; - max-width: 800px; - width: 80%; -} - -.nav { - box-shadow: 0 2px 2px -2px $shadow-color; - overflow: auto; - - &-container { - margin: 1rem auto; - position: relative; - text-align: center; - } - - &-title { - @include transition(all .2s ease-out); - color: $default-color; - display: inline-block; - margin: 0; - padding-right: .2rem; - - &:hover, - &:focus { - opacity: .6; - } - } - - ul { - list-style-type: none; - margin: 1rem 0 0; - padding: 0; - text-align: center; - } - - li { - @include transition(all .2s ease-out); - color: $default-color; - display: inline-block; - opacity: .6; - padding: 0 2rem 0 0; - - &:last-child { - padding-right: 0; - } - - &:hover, - &:focus { - opacity: 1; - } - } - - a { - color: $default-color; - font-family: $sans-serif; - } -} - -@media (min-width: 600px) { - .nav { - &-container { - text-align: left; - } - - ul { - bottom: 0; - position: absolute; - right: 0; - } - } -} - -footer { - font-family: $serif-secondary; - padding: 2rem 0; - text-align: center; - - span { - color: $default-color; - font-size: .8rem; - } -} diff --git a/src/themes/oscar/assets/scss/tale/_pagination.scss b/src/themes/oscar/assets/scss/tale/_pagination.scss deleted file mode 100644 index 3700e15..0000000 --- a/src/themes/oscar/assets/scss/tale/_pagination.scss +++ /dev/null @@ -1,44 +0,0 @@ -.pagination { - border-top: .5px solid $grey-2; - font-family: $serif-secondary; - padding-top: 2rem; - position: relative; - text-align: center; - - span { - color: $default-shade; - font-size: 1.1rem; - } - - .top { - @include transition(all .3s ease-out); - color: $default-color; - font-family: $sans-serif; - font-size: 1.1rem; - opacity: .6; - - &:hover { - opacity: 1; - } - } - - .arrow { - @include transition(all .3s ease-out); - color: $default-color; - position: absolute; - - &:hover, - &:focus { - opacity: .6; - text-decoration: none; - } - } - - .left { - left: 0; - } - - .right { - right: 0; - } -} diff --git a/src/themes/oscar/assets/scss/tale/_post.scss b/src/themes/oscar/assets/scss/tale/_post.scss deleted file mode 100644 index 3680d80..0000000 --- a/src/themes/oscar/assets/scss/tale/_post.scss +++ /dev/null @@ -1,63 +0,0 @@ -.post { - padding: 3rem 0; - - &-info { - color: $default-tint; - font-family: $serif-secondary; - letter-spacing: 0.5px; - text-align: center; - - span { - font-style: italic; - } - } - - &-title { - color: $default-shade; - font-family: $sans-serif; - font-size: 4rem; - margin: 1rem 0; - text-align: center; - } - - &-line { - border-top: 0.4rem solid $default-shade; - display: block; - margin: 0 auto 3rem; - width: 4rem; - } - - p { - margin: 0 0 1rem; - text-align: justify; - } - - a:hover { - text-decoration: underline; - } - - img { - margin: 0 auto 0.5rem; - } - - img + em { - color: $default-tint; - display: block; - font-family: $sans-serif; - font-size: 0.9rem; - font-style: normal; - text-align: center; - } - - // CSS for making emoji inline - img.emoji { - display: inline-block; - left: 0; - transform: none; - width: 1rem; - height: 1rem; - vertical-align: text-top; - padding: 0; - margin: 0; - } -} diff --git a/src/themes/oscar/assets/scss/tale/_syntax.scss b/src/themes/oscar/assets/scss/tale/_syntax.scss deleted file mode 100644 index 15ad797..0000000 --- a/src/themes/oscar/assets/scss/tale/_syntax.scss +++ /dev/null @@ -1,65 +0,0 @@ -.highlight .hll { background-color: #ffc; } -.highlight .c { color: #999; } /* Comment */ -.highlight .err { color: #a00; background-color: #faa } /* Error */ -.highlight .k { color: #069; } /* Keyword */ -.highlight .o { color: #555 } /* Operator */ -.highlight .cm { color: #09f; font-style: italic } /* Comment.Multiline */ -.highlight .cp { color: #099 } /* Comment.Preproc */ -.highlight .c1 { color: #999; } /* Comment.Single */ -.highlight .cs { color: #999; } /* Comment.Special */ -.highlight .gd { background-color: #fcc; border: 1px solid #c00 } /* Generic.Deleted */ -.highlight .ge { font-style: italic } /* Generic.Emph */ -.highlight .gr { color: #f00 } /* Generic.Error */ -.highlight .gh { color: #030; } /* Generic.Heading */ -.highlight .gi { background-color: #cfc; border: 1px solid #0c0 } /* Generic.Inserted */ -.highlight .go { color: #aaa } /* Generic.Output */ -.highlight .gp { color: #009; } /* Generic.Prompt */ -.highlight .gs { } /* Generic.Strong */ -.highlight .gu { color: #030; } /* Generic.Subheading */ -.highlight .gt { color: #9c6 } /* Generic.Traceback */ -.highlight .kc { color: #069; } /* Keyword.Constant */ -.highlight .kd { color: #069; } /* Keyword.Declaration */ -.highlight .kn { color: #069; } /* Keyword.Namespace */ -.highlight .kp { color: #069 } /* Keyword.Pseudo */ -.highlight .kr { color: #069; } /* Keyword.Reserved */ -.highlight .kt { color: #078; } /* Keyword.Type */ -.highlight .m { color: #f60 } /* Literal.Number */ -.highlight .s { color: #d44950 } /* Literal.String */ -.highlight .na { color: #4f9fcf } /* Name.Attribute */ -.highlight .nb { color: #366 } /* Name.Builtin */ -.highlight .nc { color: #0a8; } /* Name.Class */ -.highlight .no { color: #360 } /* Name.Constant */ -.highlight .nd { color: #99f } /* Name.Decorator */ -.highlight .ni { color: #999; } /* Name.Entity */ -.highlight .ne { color: #c00; } /* Name.Exception */ -.highlight .nf { color: #c0f } /* Name.Function */ -.highlight .nl { color: #99f } /* Name.Label */ -.highlight .nn { color: #0cf; } /* Name.Namespace */ -.highlight .nt { color: #2f6f9f; } /* Name.Tag */ -.highlight .nv { color: #033 } /* Name.Variable */ -.highlight .ow { color: #000; } /* Operator.Word */ -.highlight .w { color: #bbb } /* Text.Whitespace */ -.highlight .mf { color: #f60 } /* Literal.Number.Float */ -.highlight .mh { color: #f60 } /* Literal.Number.Hex */ -.highlight .mi { color: #f60 } /* Literal.Number.Integer */ -.highlight .mo { color: #f60 } /* Literal.Number.Oct */ -.highlight .sb { color: #c30 } /* Literal.String.Backtick */ -.highlight .sc { color: #c30 } /* Literal.String.Char */ -.highlight .sd { color: #c30; font-style: italic } /* Literal.String.Doc */ -.highlight .s2 { color: #c30 } /* Literal.String.Double */ -.highlight .se { color: #c30; } /* Literal.String.Escape */ -.highlight .sh { color: #c30 } /* Literal.String.Heredoc */ -.highlight .si { color: #a00 } /* Literal.String.Interpol */ -.highlight .sx { color: #c30 } /* Literal.String.Other */ -.highlight .sr { color: #3aa } /* Literal.String.Regex */ -.highlight .s1 { color: #c30 } /* Literal.String.Single */ -.highlight .ss { color: #fc3 } /* Literal.String.Symbol */ -.highlight .bp { color: #366 } /* Name.Builtin.Pseudo */ -.highlight .vc { color: #033 } /* Name.Variable.Class */ -.highlight .vg { color: #033 } /* Name.Variable.Global */ -.highlight .vi { color: #033 } /* Name.Variable.Instance */ -.highlight .il { color: #f60 } /* Literal.Number.Integer.Long */ - -.css .o, -.css .o + .nt, -.css .nt + .nt { color: #999; } diff --git a/src/themes/oscar/assets/scss/tale/_variables.scss b/src/themes/oscar/assets/scss/tale/_variables.scss deleted file mode 100644 index 8a064f3..0000000 --- a/src/themes/oscar/assets/scss/tale/_variables.scss +++ /dev/null @@ -1,29 +0,0 @@ -// Colors -$default-color: #555; -$default-shade: #353535; -$default-tint: #aaa; -$grey-1: #979797; -$grey-2: #e5e5e5; -$grey-3: #f9f9f9; -$white: #fff; -$blue: #4a9ae1; -$shadow-color: rgba(0, 0, 0, .2); -$code-color: #bf616a; - -// Fonts -$serif-primary: 'Libre Baskerville', 'Times New Roman', Times, serif; -$serif-secondary: Palatino, 'Palatino LT STD', 'Palatino Linotype', 'Book Antiqua', 'Georgia', serif; -$sans-serif: 'Helvetica Neue', 'Segoe UI', Helvetica, Arial, sans-serif; -$monospaced: Menlo, Monaco, monospace; - -@mixin box-sizing($type: border-box) { - -webkit-box-sizing: $type; - -moz-box-sizing: $type; - box-sizing: $type; -} - -@mixin transition($args...) { - -webkit-transition: $args; - -moz-transition: $args; - transition: $args; -} diff --git a/src/themes/oscar/layouts/partials/metas.html b/src/themes/oscar/layouts/partials/metas.html index 014cd6c..d9bee3c 100644 --- a/src/themes/oscar/layouts/partials/metas.html +++ b/src/themes/oscar/layouts/partials/metas.html @@ -13,7 +13,7 @@ {{- $inServerMode := .Site.IsServer }} {{- $cssTarget := "css/style.css" }} {{- $cssOptions := cond ($inServerMode) (dict "targetPath" $cssTarget "enableSourceMap" true) (dict "targetPath" $cssTarget "outputStyle" "compressed") }} - {{- $style := resources.Get "scss/tale.scss" | toCSS $cssOptions }} + {{- $style := resources.Get "css/main.css" | toCSS $cssOptions }} {{ range .Site.Params.css -}}