Merge branch 'master' into production

smhs-os-project · Jun 6, 2020 · 6d42997 · 6d42997
2 parents f9df8d5 + f66a16e
commit 6d42997
Show file tree

Hide file tree

Showing 3 changed files with 491 additions and 453 deletions.
diff --git a/package.json b/package.json
@@ -33,8 +33,8 @@
     "webpack-dev-server": "^3.10.1"
   },
   "scripts": {
-    "build": "webpack",
-    "build:production": "webpack --mode=production",
-    "serve:dev": "webpack-dev-server"
+    "build": "ytAPIToken=AIzaSyCnsDRA2UFhTEycYS1_4wKvwaTxNmZeb58 webpack",
+    "build:production": "ytAPIToken=AIzaSyCnsDRA2UFhTEycYS1_4wKvwaTxNmZeb58 webpack --mode=production",
+    "serve:dev": "ytAPIToken=AIzaSyCnsDRA2UFhTEycYS1_4wKvwaTxNmZeb58 webpack-dev-server"
   }
 }
diff --git a/src/style/style.scss b/src/style/style.scss
@@ -1,4 +1,17 @@
 @import 'variables.scss';
+@import url(//fonts.googleapis.com/earlyaccess/notosansthaana.css);
+
+/* Web Font*/
+* {
+  font-family: 'Noto Sans TC', sans-serif;
+}
+
+/* 反白顏色 */
+::selection {
+  text-shadow: 2px 2px 8px #FFF;
+  background-color:$highliht-underline-color;
+  color:#000;
+}
 
 /* TopBar 元件區 */
 ::-webkit-scrollbar-thumb, ::selection {