Sianglife · Sianglife · Nov 13, 2022
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+node_modules
diff --git a/WebPageTools.bsdesign → UI/WebPageTools.bsdesign b/WebPageTools.bsdesign → UI/WebPageTools.bsdesign
diff --git a/...t/assets/css/Navbar-Right-Links-icons.css → UI/assets/css/Navbar-Right-Links-icons.css b/...t/assets/css/Navbar-Right-Links-icons.css → UI/assets/css/Navbar-Right-Links-icons.css
diff --git a/UIout/assets/css/styles.min.css → UI/assets/css/styles.min.css b/UIout/assets/css/styles.min.css → UI/assets/css/styles.min.css
diff --git a/...at/v25/JTUSjIg1_i6t8kCHKm459W1hyzbi.woff2 → ...at/v25/JTUSjIg1_i6t8kCHKm459W1hyzbi.woff2 b/...at/v25/JTUSjIg1_i6t8kCHKm459W1hyzbi.woff2 → ...at/v25/JTUSjIg1_i6t8kCHKm459W1hyzbi.woff2
diff --git a/...at/v25/JTUSjIg1_i6t8kCHKm459WRhyzbi.woff2 → ...at/v25/JTUSjIg1_i6t8kCHKm459WRhyzbi.woff2 b/...at/v25/JTUSjIg1_i6t8kCHKm459WRhyzbi.woff2 → ...at/v25/JTUSjIg1_i6t8kCHKm459WRhyzbi.woff2
diff --git a/...at/v25/JTUSjIg1_i6t8kCHKm459WZhyzbi.woff2 → ...at/v25/JTUSjIg1_i6t8kCHKm459WZhyzbi.woff2 b/...at/v25/JTUSjIg1_i6t8kCHKm459WZhyzbi.woff2 → ...at/v25/JTUSjIg1_i6t8kCHKm459WZhyzbi.woff2
diff --git a/...at/v25/JTUSjIg1_i6t8kCHKm459Wdhyzbi.woff2 → ...at/v25/JTUSjIg1_i6t8kCHKm459Wdhyzbi.woff2 b/...at/v25/JTUSjIg1_i6t8kCHKm459Wdhyzbi.woff2 → ...at/v25/JTUSjIg1_i6t8kCHKm459Wdhyzbi.woff2
diff --git a/...rrat/v25/JTUSjIg1_i6t8kCHKm459Wlhyw.woff2 → ...rrat/v25/JTUSjIg1_i6t8kCHKm459Wlhyw.woff2 b/...rrat/v25/JTUSjIg1_i6t8kCHKm459Wlhyw.woff2 → ...rrat/v25/JTUSjIg1_i6t8kCHKm459Wlhyw.woff2
diff --git a/UIout/assets/img/logo.png → UI/assets/img/logo.png b/UIout/assets/img/logo.png → UI/assets/img/logo.png
diff --git a/UIout/assets/js/jquery.min.js → UI/assets/js/jquery.min.js b/UIout/assets/js/jquery.min.js → UI/assets/js/jquery.min.js
diff --git a/UIout/index.html → UI/index.html b/UIout/index.html → UI/index.html
diff --git a/index.html b/index.html
@@ -0,0 +1,60 @@
+<<<<<<< HEAD
+<html>
+ <head>
+ <title></title>
+ <script src="lib/jquery.js"></script>
+ <script src="lib/vue.js"></script>
+ <script src="lib/bootstrap/js/bootstrap.min.js"></script>
+ <link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css">
+ <link rel="stylesheet" href="lib/bootstrap/css/Navbar-Right-Links-icons.css">
+ <link rel="stylesheet" href="lib/bootstrap/css/styles.min.css">
+ </head>
+
+ <body id="app">
+ <h1>{{text}}</h1>
+ </body>
+ <script src="src/main.js"></script>
+</html>
+=======
+<!DOCTYPE html>
+<html lang="zh-Hant-TW">
+<meta name="viewport" content="width=device-width, initial-scale=1.0" content="text/html; charset=utf-8">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<head>
+ <title>飛翔小工具</title>
+ <link rel="stylesheet" href="style.css"></link>
+ <link rel="icon" href="/icon.png" type="image/icon type">
+ <!-- Global site tag (gtag.js) - Google Analytics -->
+ <script async src="https://www.googletagmanager.com/gtag/js?id=G-N2ZW9GEK33"></script>
+ <script>
+ window.dataLayer = window.dataLayer || [];
+ function gtag(){dataLayer.push(arguments);}
+ gtag('js', new Date());
+
+ gtag('config', 'G-N2ZW9GEK33');
+ </script>
+</head>
+<body>
+ <div id="title">
+ <strong>飛翔小工具</strong>
+ </div>
+ <table>
+ <tr style="border-collapse: collapse;">
+ <td id="math" style="width: 48%;">
+ <strong class="subtitle">數學</strong><br>
+ <a href="/WebPageTools/math/Factor.html" class="word">質數與因數</a><br>
+ <a href="/WebPageTools/math/CommorFactor.html" class="word">公因數</a><br>
+ <a href="/WebPageTools/math/Random.html" class="word">抽籤!!!</a>
+ </td>
+ <td id="chemistry" style="width: 48%;">
+ <strong class="subtitle">化學</strong><br>
+ <a href="/WebPageTools/chemistry/DensityCounter.html" class="word">密度、質量、體積換算</a><br>
+ <a href="/WebPageTools/chemistry/MoleCalculator.html" class="word">莫耳計算機</a><br>
+ <a href="/WebPageTools/chemistry/MoleCularCounter.html" class="word">分子量計算器</a><br>
+ <!--
+ <a href="/WebPageTools/chemistry/ElectronSorting.html" class="word">電子殼層排列</a>-->
+ </td>
+ </tr>
+ </table>
+</body>
+>>>>>>> 5c8b0e3d501b28e74afee9c4c8e16825bf6c850e
diff --git a/v2/src/assets/js/jquery.min.js → jquery.js b/v2/src/assets/js/jquery.min.js → jquery.js
diff --git a/...c/assets/css/Navbar-Right-Links-icons.css → ...ootstrap/css/Navbar-Right-Links-icons.css b/...c/assets/css/Navbar-Right-Links-icons.css → ...ootstrap/css/Navbar-Right-Links-icons.css
diff --git a/UIout/assets/bootstrap/css/bootstrap.min.css → lib/bootstrap/css/bootstrap.min.css b/UIout/assets/bootstrap/css/bootstrap.min.css → lib/bootstrap/css/bootstrap.min.css
diff --git a/v2/src/assets/css/styles.min.css → lib/bootstrap/css/styles.min.css b/v2/src/assets/css/styles.min.css → lib/bootstrap/css/styles.min.css
diff --git a/...at/v25/JTUSjIg1_i6t8kCHKm459W1hyzbi.woff2 → ...at/v25/JTUSjIg1_i6t8kCHKm459W1hyzbi.woff2 b/...at/v25/JTUSjIg1_i6t8kCHKm459W1hyzbi.woff2 → ...at/v25/JTUSjIg1_i6t8kCHKm459W1hyzbi.woff2
diff --git a/...at/v25/JTUSjIg1_i6t8kCHKm459WRhyzbi.woff2 → ...at/v25/JTUSjIg1_i6t8kCHKm459WRhyzbi.woff2 b/...at/v25/JTUSjIg1_i6t8kCHKm459WRhyzbi.woff2 → ...at/v25/JTUSjIg1_i6t8kCHKm459WRhyzbi.woff2
diff --git a/...at/v25/JTUSjIg1_i6t8kCHKm459WZhyzbi.woff2 → ...at/v25/JTUSjIg1_i6t8kCHKm459WZhyzbi.woff2 b/...at/v25/JTUSjIg1_i6t8kCHKm459WZhyzbi.woff2 → ...at/v25/JTUSjIg1_i6t8kCHKm459WZhyzbi.woff2
diff --git a/...at/v25/JTUSjIg1_i6t8kCHKm459Wdhyzbi.woff2 → ...at/v25/JTUSjIg1_i6t8kCHKm459Wdhyzbi.woff2 b/...at/v25/JTUSjIg1_i6t8kCHKm459Wdhyzbi.woff2 → ...at/v25/JTUSjIg1_i6t8kCHKm459Wdhyzbi.woff2
diff --git a/...rrat/v25/JTUSjIg1_i6t8kCHKm459Wlhyw.woff2 → ...rrat/v25/JTUSjIg1_i6t8kCHKm459Wlhyw.woff2 b/...rrat/v25/JTUSjIg1_i6t8kCHKm459Wlhyw.woff2 → ...rrat/v25/JTUSjIg1_i6t8kCHKm459Wlhyw.woff2
diff --git a/UIout/assets/bootstrap/js/bootstrap.min.js → lib/bootstrap/js/bootstrap.min.js b/UIout/assets/bootstrap/js/bootstrap.min.js → lib/bootstrap/js/bootstrap.min.js
diff --git a/lib/jquery.js b/lib/jquery.js