diff --git a/.gitignore b/.gitignore index 6087707..ce17bd6 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,4 @@ target/ /.nrepl-port config.yaml log/logger1.log* -rsspaper-1.1.3-standalone.jar \ No newline at end of file +*.jar \ No newline at end of file diff --git a/resources/themes/dark/static.zip b/resources/themes/dark/static.zip index 0c2809d..105b796 100644 Binary files a/resources/themes/dark/static.zip and b/resources/themes/dark/static.zip differ diff --git a/resources/themes/dark/static/css/desktop.css b/resources/themes/dark/static/css/desktop.css index 937ad10..868f3b5 100644 --- a/resources/themes/dark/static/css/desktop.css +++ b/resources/themes/dark/static/css/desktop.css @@ -30,7 +30,7 @@ .article__date { font-size: 0.9rem; - color: var(--nord10); + color: var(--color__nord-medium); } .feed__article:nth-child(1) .article__title { diff --git a/resources/themes/dark/static/css/main.css b/resources/themes/dark/static/css/main.css index 6b7c815..4e3f4ab 100644 --- a/resources/themes/dark/static/css/main.css +++ b/resources/themes/dark/static/css/main.css @@ -1,8 +1,8 @@ -/* Global */ -@import "nord.css"; - :root { --height-img: 10rem; + --color__nord-dark: #2e3440; + --color__nord-light: #d8dee9; + --color__nord-medium: #5e81ac; } @font-face { @@ -15,8 +15,8 @@ body { margin: 0; padding: 0; font-family: Newsreader, serif; - color: var(--nord4); - background-color: var(--nord0); + color: var(--color__nord-light); + background-color: var(--color__nord-dark); background-size: 100%; } img { @@ -29,7 +29,7 @@ iframe { width: 100%; } a { - color: var(--nord4); + color: var(--color__nord-light); text-decoration: none; } pre { @@ -66,7 +66,7 @@ pre { } .separator { border: 0; - background: var(--nord4); + background: var(--color__nord-light); height: 1px; } .footer__text { diff --git a/resources/themes/dark/static/css/mobile.css b/resources/themes/dark/static/css/mobile.css index db42972..a45d52d 100644 --- a/resources/themes/dark/static/css/mobile.css +++ b/resources/themes/dark/static/css/mobile.css @@ -1,13 +1,22 @@ +:root { + --height-img-mobile: 18rem; +} + .title { - font-size: 3rem + font-size: 3rem; } .subtitle { - font-size: 1rem; + font-size: 1rem; } .article__header-img > a > img { - height: initial; - object-position: initial; - object-fit: initial; -} \ No newline at end of file + height: var(--height-img-mobile); + object-position: top; + object-fit: cover; +} + +.article__date { + font-size: 0.9rem; + color: var(--color__nord-medium); +} diff --git a/resources/themes/dark/static/css/nord.css b/resources/themes/dark/static/css/nord.css deleted file mode 100644 index 0859c75..0000000 --- a/resources/themes/dark/static/css/nord.css +++ /dev/null @@ -1,233 +0,0 @@ -/* - * Copyright (c) 2016-present Arctic Ice Studio - * Copyright (c) 2016-present Sven Greb - * - * Project: Nord - * Version: 0.2.0 - * Repository: https://github.com/arcticicestudio/nord - * License: MIT - * References: - * https://www.w3.org/TR/css-variables - * https://www.w3.org/TR/selectors/#root-pseudo - * https://drafts.csswg.org/css-variables - * https://developer.mozilla.org/en-US/docs/Web/CSS/Using_CSS_variables - * http://warpspire.com/kss - * https://github.com/kss-node/kss-node - */ - -/* -An arctic, north-bluish color palette. -Created for the clean- and minimal flat design pattern to achieve a optimal focus and readability for code syntax -highlighting and UI. -It consists of a total of sixteen, carefully selected, dimmed pastel colors for a eye-comfortable, but yet colorful -ambiance. - -Styleguide Nord -*/ - -:root { - /* - Base component color of "Polar Night". - - Used for texts, backgrounds, carets and structuring characters like curly- and square brackets. - - Markup: -
- - Styleguide Nord - Polar Night - */ - --nord0: #2e3440; - - /* - Lighter shade color of the base component color. - - Used as a lighter background color for UI elements like status bars. - - Markup: -
- - Styleguide Nord - Polar Night - */ - --nord1: #3b4252; - - /* - Lighter shade color of the base component color. - - Used as line highlighting in the editor. - In the UI scope it may be used as selection- and highlight color. - - Markup: -
- - Styleguide Nord - Polar Night - */ - --nord2: #434c5e; - - /* - Lighter shade color of the base component color. - - Used for comments, invisibles, indent- and wrap guide marker. - In the UI scope used as pseudoclass color for disabled elements. - - Markup: -
- - Styleguide Nord - Polar Night - */ - --nord3: #4c566a; - - /* - Base component color of "Snow Storm". - - Main color for text, variables, constants and attributes. - In the UI scope used as semi-light background depending on the theme shading design. - - Markup: -
- - Styleguide Nord - Snow Storm - */ - --nord4: #d8dee9; - - /* - Lighter shade color of the base component color. - - Used as a lighter background color for UI elements like status bars. - Used as semi-light background depending on the theme shading design. - - Markup: -
- - Styleguide Nord - Snow Storm - */ - --nord5: #e5e9f0; - - /* - Lighter shade color of the base component color. - - Used for punctuations, carets and structuring characters like curly- and square brackets. - In the UI scope used as background, selection- and highlight color depending on the theme shading design. - - Markup: -
- - Styleguide Nord - Snow Storm - */ - --nord6: #eceff4; - - /* - Bluish core color. - - Used for classes, types and documentation tags. - - Markup: -
- - Styleguide Nord - Frost - */ - --nord7: #8fbcbb; - - /* - Bluish core accent color. - - Represents the accent color of the color palette. - Main color for primary UI elements and methods/functions. - - Can be used for - - Markup quotes - - Markup link URLs - - Markup: -
- - Styleguide Nord - Frost - */ - --nord8: #88c0d0; - - /* - Bluish core color. - - Used for language-specific syntactic/reserved support characters and keywords, operators, tags, units and - punctuations like (semi)colons,commas and braces. - - Markup: -
- - Styleguide Nord - Frost - */ - --nord9: #81a1c1; - - /* - Bluish core color. - - Used for markup doctypes, import/include/require statements, pre-processor statements and at-rules (`@`). - - Markup: -
- - Styleguide Nord - Frost - */ - --nord10: #5e81ac; - - /* - Colorful component color. - - Used for errors, git/diff deletion and linter marker. - - Markup: -
- - Styleguide Nord - Aurora - */ - --nord11: #bf616a; - - /* - Colorful component color. - - Used for annotations. - - Markup: -
- - Styleguide Nord - Aurora - */ - --nord12: #d08770; - - /* - Colorful component color. - - Used for escape characters, regular expressions and markup entities. - In the UI scope used for warnings and git/diff renamings. - - Markup: -
- - Styleguide Nord - Aurora - */ - --nord13: #ebcb8b; - - /* - Colorful component color. - - Main color for strings and attribute values. - In the UI scope used for git/diff additions and success visualizations. - - Markup: -
- - Styleguide Nord - Aurora - */ - --nord14: #a3be8c; - - /* - Colorful component color. - - Used for numbers. - - Markup: -
- - Styleguide Nord - Aurora - */ - --nord15: #b48ead; -} diff --git a/resources/themes/light/static.zip b/resources/themes/light/static.zip index 0cb8dc6..ce21778 100644 Binary files a/resources/themes/light/static.zip and b/resources/themes/light/static.zip differ diff --git a/resources/themes/light/static/css/mobile.css b/resources/themes/light/static/css/mobile.css index db42972..5696c46 100644 --- a/resources/themes/light/static/css/mobile.css +++ b/resources/themes/light/static/css/mobile.css @@ -1,13 +1,17 @@ +:root { + --height-img-mobile: 18rem; +} + .title { - font-size: 3rem + font-size: 3rem; } .subtitle { - font-size: 1rem; + font-size: 1rem; } .article__header-img > a > img { - height: initial; - object-position: initial; - object-fit: initial; -} \ No newline at end of file + height: var(--height-img-mobile); + object-position: top; + object-fit: cover; +}