Skip to content

Commit

Permalink
fix(style): fix the issue mentioned in VickScarlet#127
Browse files Browse the repository at this point in the history
  • Loading branch information
liby authored and VickScarlet committed Sep 5, 2021
1 parent 7e808e1 commit f730eaa
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 7 deletions.
2 changes: 1 addition & 1 deletion public/bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ class App{
const themeLink = $(document).find('#themeLink');

if(theme == 'light') {
themeLink.attr('href', 'style.css');
themeLink.attr('href', 'light.css');
} else {
themeLink.attr('href', 'dark.css');
}
Expand Down
23 changes: 22 additions & 1 deletion view/dark.css
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@ body {
border-radius: 0.2rem;
cursor: pointer;
color: #EEEEEE;
user-select: none;
}

.grade1b,
Expand All @@ -181,19 +180,41 @@ body {
background-color: rgb(70, 70, 70);
border: #f8f8f8 2px solid !important;
}

.grade1,
.grade1b::before {
background-color: rgb(116, 191, 255) !important;
}
.grade1b {
background-color: rgb(116, 191, 255);
border: #f8f8f8 2px solid !important;
}

.grade2,
.grade2b::before {
background-color: rgb(226, 167, 255) !important;
}
.grade2b {
background-color: rgb(226, 167, 255);
border: #f8f8f8 2px solid !important;
}

.grade3,
.grade3b::before {
background-color: #ffa07a !important;
}
.grade3b {
background-color: #ffa07a;
border: #f8f8f8 2px solid !important;
}

.grade1b,
.grade2b,
.grade3b {
padding-left: 1.5rem;
box-sizing: border-box;
}

.grade0b:hover {
background-color: rgb(202, 202, 202);
color: #3b3b3b;
Expand Down
2 changes: 1 addition & 1 deletion view/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="やり直すんだ。そして、次はうまくやる。"/>
<meta name="keywords" content="人生重开模拟器 liferestart life restart remake 人生重来"/>
<link id="themeLink" rel="stylesheet" href="style.css">
<link id="themeLink" rel="stylesheet" href="light.css">
<link rel="manifest" href="./manifest.json">
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.min.js"></script>
<script src="../public/bundle.js"></script>
Expand Down
18 changes: 16 additions & 2 deletions view/style.css → view/light.css
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ body {
text-align: center;
border-radius: 0.2rem;
cursor: pointer;
user-select: none;
}

.grade1b,
Expand All @@ -176,14 +175,29 @@ body {
background-color: rgb(237, 237, 237);
border: #c5c5c5 2px solid !important;
}

.grade1,
.grade1b::before {
background-color: rgb(116, 191, 255) !important;
}
.grade1b {
background-color: rgb(116, 191, 255);
border: #c5c5c5 2px solid !important;
}

.grade2,
.grade2b::before {
background-color: rgb(226, 167, 255) !important;
}
.grade2b {
background-color: rgb(226, 167, 255);
border: #c5c5c5 2px solid !important;
}

.grade3,
.grade3b::before {
background-color: #ffa07a !important;
}
.grade3b {
background-color: #ffa07a;
border: #c5c5c5 2px solid !important;
Expand Down Expand Up @@ -436,7 +450,7 @@ i {
* Copyright Akveo. All Rights Reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*/
.eva-animation {
.eva-animation {
animation-duration: 1s;
animation-fill-mode: both; }

Expand Down
2 changes: 1 addition & 1 deletion view/test.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="やり直すんだ。そして、次はうまくやる。"/>
<meta name="keywords" content="人生重开模拟器 liferestart life restart remake 人生重来"/>
<link id="themeLink" rel="stylesheet" href="style.css">
<link id="themeLink" rel="stylesheet" href="light.css">
<script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-9857163863537600" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.min.js"></script>
<script type="module" src="../src/index.js"></script>
Expand Down

0 comments on commit f730eaa

Please sign in to comment.