Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript

assets/gui/css/alas-mobile.css

@@ -35,6 +35,7 @@
     grid-template-columns: 1fr auto;
     grid-template-rows: 1fr auto;
 }
+<<<<<<< HEAD
 #pywebio-scope-dashboard {
     font-weight: 400;
     width: 100%;
@@ -43,6 +44,8 @@
     grid-template-columns: repeat(auto-fit,minmax(6rem,1fr));
     overflow: hidden;
 }
+=======
+>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
 
 #pywebio-scope-_groups {
     grid-template-columns: 0fr 1fr;
@@ -67,6 +70,7 @@
 #pywebio-scope-waiting,
 #pywebio-scope-log {
     overflow-y: auto;
+<<<<<<< HEAD
 }
 
 #output-container .status-point {
@@ -89,4 +93,6 @@
 }
 *[style*="--dashboard-help--"] {
     font-size: .6rem;
+=======
+>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
 }

assets/gui/css/alas-pc.css

@@ -44,4 +44,8 @@
     display: grid;
     grid-auto-flow: column;
     grid-template-columns: auto auto;
+<<<<<<< HEAD
 }
+=======
+}
+>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0

assets/gui/css/alas.css

@@ -117,6 +117,7 @@ footer {
     margin-bottom: .25rem !important;
 }
 
+<<<<<<< HEAD
 .status-point {
     margin: 37% 50% 63% 50%;
     width: .75rem;
@@ -124,6 +125,8 @@ footer {
     border-radius: 50%;
 }
 
+=======
+>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
 .hr-task-group-box {
     display: flex;
     align-items: center;
@@ -295,7 +298,11 @@ pre.rich-traceback-code {
 }
 
 *[style*="--header-text--"] {
+<<<<<<< HEAD
     font-size: 1rem;
+=======
+    font-size: 1.5rem;
+>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
     font-weight: bold;
     margin: auto !important;
 }
@@ -396,15 +403,19 @@ pre.rich-traceback-code {
     justify-content: space-between;
 }
 
+<<<<<<< HEAD
 #pywebio-scope-log-bar {
     flex-wrap: wrap;
 }
 
+=======
+>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
 #pywebio-scope-log-bar-btns {
     display: grid;
     grid-auto-flow: column;
 }
 
+<<<<<<< HEAD
 #pywebio-scope-log-bar .hr-group {
     width: 100%;
 }
@@ -421,6 +432,8 @@ pre.rich-traceback-code {
     padding: 0 0 0;
     }
 
+=======
+>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
 #pywebio-scope-log {
     line-height: 1.2;
     font-size: 0.85rem;
@@ -540,6 +553,7 @@ pre.rich-traceback-code {
     width: 1.5rem;
     height: 1.5rem;
     border: .2em solid currentColor;
+<<<<<<< HEAD
 }
 
 /**[style*="--dashboard-value--"] {*/
@@ -587,3 +601,6 @@ pre.rich-traceback-code {
              "Arial",
              serif;
 }
+=======
+}
+>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0

assets/gui/css/dark-alas.css

@@ -149,6 +149,7 @@ pre.rich-traceback-code {
     border-bottom: 1px solid #36393f;
 }
 
+<<<<<<< HEAD
 #pywebio-scope-dashboard input {
     background-color: #2f3136 !important;
 }
@@ -165,3 +166,9 @@ pre.rich-traceback-code {
 *[style*="--dashboard-limit--"]{
     color: #adb5bd;
 }
+=======
+*[style*="--arg-help--"],
+[id^="pywebio-scope-group_"] > p + p {
+    color: #adb5bd;
+}
+>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0

assets/gui/css/light-alas.css

@@ -56,10 +56,13 @@
     box-shadow: 0 0.06rem 0 #4e4c97;
 }
 
+<<<<<<< HEAD
 #pywebio-scope-dashboard input {
     background-color: white !important;
 }
 
+=======
+>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
 input[type="checkbox"] {
     accent-color: #7a77bb;
 }
@@ -155,6 +158,7 @@ pre.rich-traceback-code {
 *[style*="--arg-help--"],
 [id^="pywebio-scope-group_"] > p + p {
     color: #777777;
+<<<<<<< HEAD
 }
 
 *[style*="--dashboard-help--"]{
@@ -163,4 +167,6 @@ pre.rich-traceback-code {
 
 *[style*="--dashboard-limit--"]{
     color: #777777;
+=======
+>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
 }