diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..0ed16b5 --- /dev/null +++ b/Makefile @@ -0,0 +1,17 @@ +.DEFAULT_GOAL := build + +build: ## Check style with black + build.templates + lein uberjar + make rm.statics + +build.templates: + make rm.statics + zip -r resources/themes/dark/static.zip resources/themes/dark/static/ + zip -r resources/themes/sepia/static.zip resources/themes/sepia/static/ + zip -r resources/themes/light/static.zip resources/themes/light/static/ + +rm.statics: + rm -rf resources/themes/dark/static.zip + rm -rf resources/themes/sepia/static.zip + rm -rf resources/themes/light/static.zip diff --git a/project.clj b/project.clj index 8d67d6c..69f7b94 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject rsspaper "1.1.4" +(defproject rsspaper "1.1.5" :description "RSSpaper" :url "https://github.com/tanrax/RSSpaper" :license {:name "EPL-2.0 OR GPL-2.0-or-later WITH Classpath-exception-2.0" diff --git a/resources/themes/dark/static.zip b/resources/themes/dark/static.zip index 105b796..e62a633 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/main.css b/resources/themes/dark/static/css/main.css index 4e3f4ab..b08db33 100644 --- a/resources/themes/dark/static/css/main.css +++ b/resources/themes/dark/static/css/main.css @@ -1,5 +1,6 @@ :root { --height-img: 10rem; + --height-img-mobile: 12rem; --color__nord-dark: #2e3440; --color__nord-light: #d8dee9; --color__nord-medium: #5e81ac; diff --git a/resources/themes/dark/static/css/mobile.css b/resources/themes/dark/static/css/mobile.css index a45d52d..51fdf33 100644 --- a/resources/themes/dark/static/css/mobile.css +++ b/resources/themes/dark/static/css/mobile.css @@ -1,7 +1,3 @@ -:root { - --height-img-mobile: 18rem; -} - .title { font-size: 3rem; } diff --git a/resources/themes/light/static.zip b/resources/themes/light/static.zip index ce21778..d8e5b2f 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/main.css b/resources/themes/light/static/css/main.css index 82dbb4d..9172342 100644 --- a/resources/themes/light/static/css/main.css +++ b/resources/themes/light/static/css/main.css @@ -4,6 +4,7 @@ --color-gray: gray; --color-background: #f9f7f1; --height-img: 10rem; + --height-img-mobile: 12rem; } @font-face { @@ -91,4 +92,4 @@ pre { .article__random-background { height: 100%; width: 100%; -} \ No newline at end of file +} diff --git a/resources/themes/light/static/css/mobile.css b/resources/themes/light/static/css/mobile.css index 5696c46..b29aedf 100644 --- a/resources/themes/light/static/css/mobile.css +++ b/resources/themes/light/static/css/mobile.css @@ -1,7 +1,3 @@ -:root { - --height-img-mobile: 18rem; -} - .title { font-size: 3rem; } diff --git a/resources/themes/sepia/static.zip b/resources/themes/sepia/static.zip index aabf44c..b6db25f 100644 Binary files a/resources/themes/sepia/static.zip and b/resources/themes/sepia/static.zip differ diff --git a/resources/themes/sepia/static/css/main.css b/resources/themes/sepia/static/css/main.css index 035fa00..383df8a 100644 --- a/resources/themes/sepia/static/css/main.css +++ b/resources/themes/sepia/static/css/main.css @@ -5,6 +5,7 @@ --color-white: #fcead5; --color-background: #e5d5c2; --height-img: 10rem; + --height-img-mobile: 12rem; } @font-face { @@ -95,4 +96,4 @@ pre { .article__random-background { height: 100%; width: 100%; -} \ No newline at end of file +} diff --git a/resources/themes/sepia/static/css/mobile.css b/resources/themes/sepia/static/css/mobile.css index db42972..2ae2004 100644 --- a/resources/themes/sepia/static/css/mobile.css +++ b/resources/themes/sepia/static/css/mobile.css @@ -7,7 +7,7 @@ } .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; +}