switch from bootstrap to water.css + cleanup

limenet · Jul 9, 2023 · b5c9537 · b5c9537
1 parent 2253c15
commit b5c9537
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 205 deletions.
diff --git a/configs/limenet.json b/configs/limenet.json
diff --git a/configs/pikapp.json b/configs/pikapp.json
diff --git a/configs/under-construction.json b/configs/under-construction.json
@@ -0,0 +1,4 @@
+{
+  "template": "under-construction",
+  "title": "Work in progress"
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,6 @@
 {
   "name": "droplet-placeholder",
   "dependencies": {
-    "bootstrap": "^4.6.2",
     "cedar": "^0.3.4",
     "chokidar": "^3.5.3",
     "css": "^3.0.0",
@@ -12,7 +11,8 @@
     "mime-types": "^2.1.35",
     "mustache": "^4.2.0",
     "snyk": "^1.1187.0",
-    "sync-request": "^6.0.0"
+    "sync-request": "^6.0.0",
+    "water.css": "^2.1.1"
   },
   "devDependencies": {
     "eslint": "^8.44.0",

diff --git a/public/corporate.html b/public/corporate.html
diff --git a/public/limenet.html b/public/limenet.html
diff --git a/public/personal.html b/public/personal.html
diff --git a/public/pikapp.html b/public/pikapp.html
diff --git a/public/under-construction.html b/public/under-construction.html
diff --git a/src/build.js b/src/build.js
@@ -39,13 +39,6 @@ function parseConfig(file) {
       limenetch: helpers.image(
         'https://s3.amazonaws.com/limenet-logo-img/v2/full-transparent-height20.png'
       ),
-      digitalocean: helpers.image(
-        'https://s3.amazonaws.com/multisite-misc-assets/DO_Powered_by_Badge_black.svg'
-      ),
-      faCode: helpers.image(
-        'https://raw.githubusercontent.com/encharm/Font-Awesome-SVG-PNG/master/black/svg/code.svg',
-        'image/svg+xml'
-      ),
     };
 
     const config = c;

diff --git a/src/helpers.js b/src/helpers.js
@@ -57,7 +57,7 @@ module.exports = {
 
   css() {
     const cssFile = fs.readFileSync(
-      'node_modules/bootstrap/dist/css/bootstrap.min.css',
+      'node_modules/water.css/out/water.min.css',
       'utf8'
     );
     return cssFile;

diff --git a/templates/business-card.html b/templates/business-card.html
diff --git a/templates/gravatar.html b/templates/gravatar.html
@@ -7,31 +7,11 @@
         <style></style>
     </head>
     <body>
-        <div class="container">
-            <div class="row m-3">
-                <div class="col text-center">
-                    <h1>
-                        {{#images}}<img src="{{faCode}}" height="72">{{/images}}
-                        <br><br>
-                        <span class="text-muted">{{title}}</span>
-                        <br><br>
-                        <a href="https://limenet.ch">
-                            <img src="{{gravatar}}" alt="{{title}}" class="rounded-circle" height="256" width="256">
-                        </a>
-                    </h1>
-                </div>
-            </div>
-        </div>
-        {{#google_analytics}}
-            <script>
-                /* eslint-disable */
-                ! function(a, b, c, d, e, f, g) {
-                    a.GoogleAnalyticsObject = e, a[e] = a[e] || function() {
-                        (a[e].q = a[e].q || []).push(arguments)
-                    }, a[e].l = 1 * new Date, f = b.createElement(c), g = b.getElementsByTagName(c)[0], f.async = 1, f.src = d, g.parentNode.insertBefore(f, g)
-                }(window, document, "script", "https://www.google-analytics.com/analytics.js", "ga"), ga("create", '{{google_analytics}}', "auto"), ga("send", "pageview");
-            </script>
-        {{/google_analytics}}
+        <h1><code>&lt;/&gt;</code>&nbsp;{{title}}</h1>
+        <br><br>
+        <a href="https://limenet.ch" style="display: block; text-align: center;">
+            <img src="{{gravatar}}" alt="{{title}}" class="rounded-circle" height="256" width="256">
+        </a>
     </body>
 </html>
 
diff --git a/templates/under-construction.html b/templates/under-construction.html
@@ -7,26 +7,10 @@
         <style></style>
     </head>
     <body>
-        <div class="container">
-            <div class="row">
-                <div class="col-md-12 text-center">
-                    <h1>{{title}}</h1>
-                    <p class="lead">Diese Seite befindet sich im Aufbau.</p>
-                    <br>
-                    {{#images}}<a href="https://limenet.ch"><img src="{{limenetch}}" alt="limenet.ch"></a>{{/images}}
-                </div>
-            </div>
-        </div>
-        {{#google_analytics}}
-            <script>
-                /* eslint-disable */
-                ! function(a, b, c, d, e, f, g) {
-                    a.GoogleAnalyticsObject = e, a[e] = a[e] || function() {
-                        (a[e].q = a[e].q || []).push(arguments)
-                    }, a[e].l = 1 * new Date, f = b.createElement(c), g = b.getElementsByTagName(c)[0], f.async = 1, f.src = d, g.parentNode.insertBefore(f, g)
-                }(window, document, "script", "https://www.google-analytics.com/analytics.js", "ga"), ga("create", "{{google_analytics}}", "auto"), ga("send", "pageview");
-            </script>
-        {{/google_analytics}}
+        <h1>{{title}}</h1>
+        <p class="lead">Diese Seite befindet sich im Aufbau.</p>
+        <br>
+        {{#images}}<a href="https://limenet.ch"><img src="{{limenetch}}" alt="limenet.ch"></a>{{/images}}
     </body>
 </html>