Skip to content

Commit

Permalink
Merge pull request #161 from dillonzq/develop
Browse files Browse the repository at this point in the history
Release  v0.1.4
  • Loading branch information
dillonzq authored Mar 15, 2020
2 parents 9928d46 + 7dbe1f8 commit b71f665
Show file tree
Hide file tree
Showing 15 changed files with 68 additions and 36 deletions.
8 changes: 0 additions & 8 deletions assets/css/_core/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,4 @@ a {
}
}

b, strong {
font-weight: bold;

.dark-theme & {
color: #ddd;
}
}

@import "../_partial/dynamic-to-top";
13 changes: 7 additions & 6 deletions assets/css/_page/_home.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
.home {
@if $profile {
.home-profile {
-webkit-transform: translateY(if($posts, 0, 16vh));
-moz-transform: translateY(if($posts, 0, 16vh));
-ms-transform: translateY(if($posts, 0, 16vh));
-o-transform: translateY(if($posts, 0, 16vh));
transform: translateY(if($posts, 0, 16vh));
padding: if($posts, 2rem, 0) 0;
text-align: center;
Expand Down Expand Up @@ -48,14 +52,11 @@

.home-social-links {
padding-top: .6rem;

i {
font-size: 1.45rem;
}
font-size: 1.5rem;
line-height: 1.5rem;

img {
width: 1.5rem;
height: 1.5rem;
max-height: 1.4rem;
}
}
}
Expand Down
12 changes: 10 additions & 2 deletions assets/css/_page/_single.scss
Original file line number Diff line number Diff line change
Expand Up @@ -86,20 +86,28 @@
margin: .5rem 0;
}

b, strong {
font-weight: bold;

.dark-theme & {
color: #ddd;
}
}

a {
word-break: break-all;
word-break: break-word;
color: $single-link-color;

.dark-theme & {
.dark-theme &, .dark-theme & b, .dark-theme & strong {
color: $single-link-color-dark;
}
}

a:hover {
color: $single-link-hover-color;

.dark-theme &:hover {
.dark-theme &, .dark-theme & b, .dark-theme & strong {
color: $single-link-hover-color-dark;
}
}
Expand Down
11 changes: 8 additions & 3 deletions assets/css/_partial/_archive/_tags.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,19 @@
position: relative;
margin: 5px 10px;
overflow-wrap: break-word;
transition-duration: .3s;
transition-property: transform;
transition-timing-function: ease-out;
-webkit-transition: all ease-out .3s;
-moz-transition: all ease-out .3s;
-o-transition: all ease-out .3s;
transition: all ease-out .3s;

&:active,
&:focus,
&:hover {
color: $global-link-hover-color;
-webkit-transform: scale(1.2);
-moz-transform: scale(1.2);
-ms-transform: scale(1.2);
-o-transform: scale(1.2);
transform: scale(1.2);

.dark-theme & {
Expand Down
10 changes: 9 additions & 1 deletion assets/css/_partial/_header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ header {
}

.theme-switch i {
-webkit-transform: rotate(225deg);
-moz-transform: rotate(225deg);
-ms-transform: rotate(225deg);
-o-transform: rotate(225deg);
transform: rotate(225deg);
}
}
Expand Down Expand Up @@ -103,6 +107,7 @@ header {
border-radius: 3px;
-webkit-transition: .1s margin .1s, .1s transform;
-moz-transition: .1s margin .1s, .1s transform;
-o-transition: .1s margin .1s, .1s transform;
transition: .1s margin .1s, .1s transform;

.dark-theme & {
Expand All @@ -122,13 +127,15 @@ header {
span {
-webkit-transition: .1s margin, .1s transform .1s;
-moz-transition: .1s margin, .1s transform .1s;
-o-transition: .1s margin, .1s transform .1s;
transition: .1s margin, .1s transform .1s;
}

span:nth-child(1) {
-webkit-transform: rotate(45deg) translate(.4rem, .5rem);
-moz-transform: rotate(45deg) translate(.4rem, .5rem);
-ms-transform: rotate(45deg) translate(.4rem, .5rem);
-webkit-transform: rotate(45deg) translate(.4rem, .5rem);
-o-transform: rotate(45deg) translate(.4rem, .5rem);
transform: rotate(45deg) translate(.4rem, .5rem);
}

Expand All @@ -140,6 +147,7 @@ header {
-moz-transform: rotate(-45deg) translate(.4rem, -.5rem);
-ms-transform: rotate(-45deg) translate(.4rem, -.5rem);
-webkit-transform: rotate(-45deg) translate(.4rem, -.5rem);
-o-transform: rotate(-45deg) translate(.4rem, -.5rem);
transform: rotate(-45deg) translate(.4rem, -.5rem);
}
}
Expand Down
16 changes: 12 additions & 4 deletions assets/css/_partial/_single/_footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -88,17 +88,21 @@
& a.next {
font-size: 1rem;
font-weight: 600;

transition-duration: .3s;
transition-property: transform;
transition-timing-function: ease-out;
-webkit-transition: all ease-out .3s;
-moz-transition: all ease-out .3s;
-o-transition: all ease-out .3s;
transition: all ease-out .3s;
}

& a.prev {
float: left;
}

& a.prev:hover {
-webkit-transform: translateX(-4px);
-moz-transform: translateX(-4px);
-ms-transform: translateX(-4px);
-o-transform: translateX(-4px);
transform: translateX(-4px);
}

Expand All @@ -107,6 +111,10 @@
}

& a.next:hover {
-webkit-transform: translateX(4px);
-moz-transform: translateX(4px);
-ms-transform: translateX(4px);
-o-transform: translateX(4px);
transform: translateX(4px);
}
}
Expand Down
22 changes: 14 additions & 8 deletions assets/css/_partial/_single/_toc.scss
Original file line number Diff line number Diff line change
Expand Up @@ -80,21 +80,27 @@

details {
summary {
list-style: none;
background: darken($code-background-color, 3%);

.dark-theme & {
background: darken($code-background-color-dark, 3%);
}

.toc-title {
display: block;
display: flex;
justify-content: space-between;
font-weight: bold;
line-height: 2em;
padding: 0 .625rem;
background: $code-background-color;

i.details {
line-height: 2em;
}

.dark-theme & {
background: $code-background-color-dark;
&:hover {
cursor: pointer;
}
}

Expand All @@ -111,14 +117,14 @@
}

.toc-content {
border: 2px solid $code-background-color;
background-color: $code-background-color;

>nav>ul {
margin: .625rem 0;
> nav > ul {
margin: 0;
padding: .4rem .8rem;
}

ul {
padding-left: .625rem;
list-style: none;

ul {
Expand All @@ -127,7 +133,7 @@
}

.dark-theme & {
border: 2px solid $code-background-color-dark;
background-color: $code-background-color-dark;
}
}
}
Expand Down
Binary file modified exampleSite/static/images/Apple-Devices-Preview.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion i18n/fr.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ other = "Partager sur"
other = "Contenu"

[publish]
other = "publié sur"
other = "publié le"

[included]
other = "inclus dans"
Expand Down
Binary file modified images/Apple-Devices-Preview.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/tn.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion layouts/partials/assets.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@

{{- /* iconfont */ -}}
{{- if $scratch.Get "iconfont" -}}
{{- slice "lib/iconfont/iconfont.css" | $scratch.Add "linkLocal" -}}
{{- with $CDN.iconfontCSS -}}
{{- slice . | $scratch.Add "linkCDN" -}}
{{- else -}}
{{- slice "lib/iconfont/iconfont.css" | $scratch.Add "linkLocal" -}}
{{- end -}}
{{- end -}}

{{- /* Smooth Scroll */ -}}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "loveit-src",
"version": "0.1.2",
"version": "0.1.4",
"description": "LoveIt theme source file",
"main": "index.js",
"dependencies": {},
Expand Down

Large diffs are not rendered by default.

0 comments on commit b71f665

Please sign in to comment.