diff --git a/assets/icons/books.svg b/assets/icons/books.svg new file mode 100644 index 0000000..837ecc2 --- /dev/null +++ b/assets/icons/books.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/friends.svg b/assets/icons/friends.svg new file mode 100644 index 0000000..9bc8121 --- /dev/null +++ b/assets/icons/friends.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/scss/custom.scss b/assets/scss/custom.scss index d9932fd..17de5ca 100644 --- a/assets/scss/custom.scss +++ b/assets/scss/custom.scss @@ -139,4 +139,22 @@ img { margin: 0 !important; } - } \ No newline at end of file + } + + .work-list { + position:relative; + overflow: hidden; + text-align: center; + width: 100%; + } + + .work-list-item { + padding: 0px; + border-radius: var(--card-border-radius); + } + + .work-list-item img { + width:100%; + height: 100%; + object-fit: cover; + } \ No newline at end of file diff --git a/assets/scss/partials/article.scss b/assets/scss/partials/article.scss index 2225fb9..eb845ba 100644 --- a/assets/scss/partials/article.scss +++ b/assets/scss/partials/article.scss @@ -59,9 +59,10 @@ margin: 0; color: var(--card-text-color-main); font-size: 2.2rem; + line-height: 1.2; @include respond(xl) { - font-size: 2.4rem; + font-size: 2.2rem; } a { diff --git a/assets/scss/partials/sidebar.scss b/assets/scss/partials/sidebar.scss index 9830646..cfd1ee7 100644 --- a/assets/scss/partials/sidebar.scss +++ b/assets/scss/partials/sidebar.scss @@ -23,7 +23,7 @@ @include respond(md) { width: auto; - padding-top: var(--main-top-padding); + padding-top: calc(var(--main-top-padding)*1.5); padding-bottom: var(--main-top-padding); max-height: 100vh; } diff --git a/assets/scss/variables.scss b/assets/scss/variables.scss index 41d0231..eaa86f4 100644 --- a/assets/scss/variables.scss +++ b/assets/scss/variables.scss @@ -11,12 +11,12 @@ $defaultTagColors: #fff, #fff, #fff, #fff, #fff; --main-top-padding: 50px; } - --body-background: #EAE0DA; + --body-background: #F1F1F1; --accent-color: #352F44; --accent-color-darker: #5C5470; --accent-color-text: #fff; - --body-text-color: #5C5470; + --body-text-color: #737373; --tag-border-radius: 4px; @@ -26,9 +26,9 @@ $defaultTagColors: #fff, #fff, #fff, #fff, #fff; --scrollbar-track: var(--body-background); &[data-scheme="dark"] { - --body-background: #393646; - --accent-color: #F4EEE0; - --accent-color-darker: #F4EEE0; + --body-background: #303030; + --accent-color: #ecf0f1; + --accent-color-darker: #bdc3c7; --accent-color-text: #000; --body-text-color: rgba(255, 255, 255, 0.7); --scrollbar-thumb: hsl(0, 0%, 40%); @@ -51,11 +51,11 @@ $defaultTagColors: #fff, #fff, #fff, #fff, #fff; * Card style */ :root { - --card-background: #f7f5eb; +--card-background: #F7F8F8; --card-background-selected: #eaeaea; - --card-text-color-main: #352F44; - --card-text-color-secondary: #5C5470; + --card-text-color-main: #2c3e50; + --card-text-color-secondary: #737373; --card-text-color-tertiary: #5C5470; --card-separator-color: rgba(218, 218, 218, 0.5); @@ -78,9 +78,9 @@ $defaultTagColors: #fff, #fff, #fff, #fff, #fff; } &[data-scheme="dark"] { - --card-background: #4F4557; - --card-background-selected: #9DB2BF; - --card-text-color-main: #F4EEE0; + --card-background: #424242; + --card-background-selected: rgba(255, 255, 255, 0.16); + --card-text-color-main: rgba(255, 255, 255, 0.9); --card-text-color-secondary: rgba(255, 255, 255, 0.7); --card-text-color-tertiary: rgba(255, 255, 255, 0.5); --card-separator-color: #6D5D6E; @@ -110,7 +110,7 @@ $defaultTagColors: #fff, #fff, #fff, #fff, #fff; --heading-border-size: 3px; - --link-background-color: 189, 195, 199; + --link-background-color: 170,170,170; --link-background-opacity: 0.5; --link-background-opacity-hover: 0.7; @@ -126,7 +126,7 @@ $defaultTagColors: #fff, #fff, #fff, #fff, #fff; --kbd-border-color: #dadada; &[data-scheme="dark"] { - --code-background-color: #272822; + --code-background-color: #5A5A5A; --code-text-color: rgba(255, 255, 255, 0.9); --table-border-color: #717171; diff --git a/layouts/shortcodes/music.html b/layouts/shortcodes/music.html index 13a9f6c..62088f3 100644 --- a/layouts/shortcodes/music.html +++ b/layouts/shortcodes/music.html @@ -1,6 +1,5 @@ - @@ -18,6 +17,8 @@ volume="{{ if .Get "volume" }}{{ .Get "volume" }}{{ else }}0.6{{ end }}" prelosd="{{ if .Get "prelosd" }}{{ .Get "prelosd" }}{{ else }}auto{{ end }}" mutex="{{ if .Get "mutex" }}{{ .Get "mutex" }}{{ else }}true{{ end }}" - list-folded="{{ if .Get "list-folded" }}{{ .Get "list-folded" }}{{ else }}true{{ end }}"> + list-folded="{{ if .Get "list-folded" }}{{ .Get "list-folded" }}{{ else }}false{{ end }}" + listMaxHeight=5 + > {{ end }} \ No newline at end of file diff --git a/layouts/shortcodes/work-list.html b/layouts/shortcodes/work-list.html new file mode 100644 index 0000000..c7e416d --- /dev/null +++ b/layouts/shortcodes/work-list.html @@ -0,0 +1,15 @@ +{{ $file := .Get 0 }} +{{ $num := 4 }} +{{ if .Get 1 }} + {{ $num = .Get 1 }} +{{ end }} +{{ $width := div 90 $num }} +{{$items := getJSON $file }} + +