From 9ede06e7a3576d80714bf2c9c41c3e722955da7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20=C4=BDach?= Date: Mon, 16 Dec 2019 22:28:48 +0100 Subject: [PATCH] Make the comment syntax consistent across all CSS (#707) * Update _article.scss * Update _dark_variables.scss * Update _forms.scss * Update _global.scss * Update _header.scss * Update _variables.scss --- assets/themes/default/_article.scss | 22 +++++++++++----------- assets/themes/default/_dark_variables.scss | 2 +- assets/themes/default/_forms.scss | 4 ++-- assets/themes/default/_global.scss | 18 +++++++++--------- assets/themes/default/_header.scss | 2 +- assets/themes/default/_variables.scss | 6 +++--- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/assets/themes/default/_article.scss b/assets/themes/default/_article.scss index 71719e12..f44e7faf 100644 --- a/assets/themes/default/_article.scss +++ b/assets/themes/default/_article.scss @@ -1,4 +1,4 @@ -// Heading +/* Heading */ main header.article { overflow: hidden; background: $background; @@ -73,7 +73,7 @@ main .article-info { } } -// The article itself +/* The article itself */ main article { max-width: $article-width; margin: 2.5em auto; @@ -104,7 +104,7 @@ main article { } } -// Metadata under the article +/* Metadata under the article */ main .article-meta, main .article-meta button { padding: 0; font-size: 1.1em; @@ -129,7 +129,7 @@ main .article-meta { font-size: 0.9em; } - // Article Tags + /* Article Tags */ .tags { list-style: none; padding: 0px; @@ -154,7 +154,7 @@ main .article-meta { } } - // Likes & Boosts + /* Likes & Boosts */ .actions { display: flex; flex-direction: row; @@ -257,7 +257,7 @@ main .article-meta { } } - // Comments + /* Comments */ .comments { margin: 0 $horizontal-margin; @@ -271,7 +271,7 @@ main .article-meta { cursor: pointer; } - // New comment form + /* New comment form */ > form input[type="submit"] { font-size: 1em; -webkit-appearance: none; @@ -421,7 +421,7 @@ main .article-meta { } -// content warning +/* Content warning */ .cw-container { position: relative; display: inline-block; @@ -459,7 +459,7 @@ input:checked ~ .cw-container > .cw-text { transform: translateY(-50%); } -// Bottom action bar +/* Bottom action bar */ .bottom-bar { z-index: 10; @@ -482,11 +482,11 @@ input:checked ~ .cw-container > .cw-text { } } -// Footnote related styles +/* Footnote related styles */ .footnote-definition { p { font-size: smaller; - // Make sur the definition is inline with the label-definition + /* Make sure the definition is inline with the label-definition */ display: inline; } } diff --git a/assets/themes/default/_dark_variables.scss b/assets/themes/default/_dark_variables.scss index 2d1b9fd4..f24df140 100644 --- a/assets/themes/default/_dark_variables.scss +++ b/assets/themes/default/_dark_variables.scss @@ -1,6 +1,6 @@ @import '_variables'; -// Color Scheme +/* Color Scheme */ $gray: #1a3854; $black: #102e4a; $white: #F8F8F8; diff --git a/assets/themes/default/_forms.scss b/assets/themes/default/_forms.scss index 5ab0293c..da8cda8e 100644 --- a/assets/themes/default/_forms.scss +++ b/assets/themes/default/_forms.scss @@ -44,7 +44,7 @@ input[type="checkbox"] { -webkit-appearance: checkbox; } -/** Inline forms (containing only CSRF token and a , for protected links) **/ +/* Inline forms (containing only CSRF token and a , for protected links) */ form.inline { display: inline; @@ -111,7 +111,7 @@ input[type="submit"] { -webkit-appearance: none; } -// Writing page +/* The writing page */ form.new-post { max-width: 60em; .title { diff --git a/assets/themes/default/_global.scss b/assets/themes/default/_global.scss index 0552cbc8..b8d3469e 100644 --- a/assets/themes/default/_global.scss +++ b/assets/themes/default/_global.scss @@ -68,7 +68,7 @@ small { appearance: none; } -/// Main +/* Main */ body > main > *, .h-feed > * { margin: 1em $horizontal-margin; } @@ -137,13 +137,13 @@ main { } } -/// Errors +/* Errors */ p.error { color: $red; font-weight: bold; } -/// User page +/* User page */ .user h1 { display: flex; flex-direction: row; @@ -170,7 +170,7 @@ p.error { margin: 2em 0px; } -/// Cards +/* Cards */ .cards { display: flex; flex-direction: row; @@ -249,7 +249,7 @@ p.error { } } -/// Instance presentation +/* Instance presentation */ .presentation { max-width: none; @@ -263,7 +263,7 @@ p.error { } } -// Stats +/* Stats */ .stats { display: flex; justify-content: space-around; @@ -287,7 +287,7 @@ p.error { } } -/// Pagination +/* Pagination */ .pagination { display: flex; justify-content: space-evenly; @@ -297,7 +297,7 @@ p.error { } } -/// Flex boxes +/* Flex boxes */ .flex { display: flex; flex-direction: row; @@ -332,7 +332,7 @@ p.error { margin-right: 2em; } -/// Footer +/* Footer */ body > footer { display: flex; align-content: center; diff --git a/assets/themes/default/_header.scss b/assets/themes/default/_header.scss index 369be572..2ec54847 100644 --- a/assets/themes/default/_header.scss +++ b/assets/themes/default/_header.scss @@ -101,7 +101,7 @@ body > header { } } -// Only enable label animations on normal screens +/* Only enable label animations on large screens */ @media screen and (min-width: 600px) { header nav a { i { diff --git a/assets/themes/default/_variables.scss b/assets/themes/default/_variables.scss index d6bbf1d0..79e0791d 100644 --- a/assets/themes/default/_variables.scss +++ b/assets/themes/default/_variables.scss @@ -1,4 +1,4 @@ -// Color Scheme +/* Color Scheme */ $gray: #F3F3F3; $black: #242424; $white: #F8F8F8; @@ -16,13 +16,13 @@ $primary: $purple; $primary-text-color: $white; // text color on primary background (buttons for instance) $success-color: $green; -// Dimensions +/* Dimensions */ $article-width: 70ch; $horizontal-margin: 20%; $margin: 0 $horizontal-margin; -// Fonts +/* Fonts */ $route159: "Route159", serif; $playfair: "Playfair Display", serif;