Merge branch 'dev' into 'main'

Dev See merge request !2

Merge branch 'dev' into 'main'
e029b1c6 · Jakob Severin Steffensen Hjelseth · 3ac11f69 · 8e7e914c · e029b1c6 · e029b1c6
Commit e029b1c6 authored 1 year ago by Jakob Severin Steffensen Hjelseth
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,3 +9,4 @@ pages:
    - public
  only:
  - main
+  
\ No newline at end of file
--- a/ProgGIS.html
+++ b/ProgGIS.html
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>ProgGIS</title>
+        <style>
+            .h1 {
+                text-align: center;
+                font-weight: bold;
+                font-family: monospace;
+            }
+            .button {
+                font-family: monospace;
+                background-color: greenyellow;
+                color: white;
+                border-width: 0;
+                cursor: pointer;
+            }
+            #box1 {
+                font-family: monospace;
+                height: 6vh;
+                display: flex;
+                flex-grow: 4;
+                flex-direction: row;
+                text-align: center;
+            }
+        </style>
+    </head>
+    <body>
+        <div style="height: 20vh; width: 100vw; background-color: greenyellow;">
+            <h1 style="height: 14vh; color: white;">ProgGIS</h1>
+            <div id="box1">
+                <button>Buffer</button>
+                <button>Union</button>
+                <button>Intersection</button>
+                <button>Difference</button>
+            </div>
+        </div>
+    </body>
+</html>
--- a/index.html
+++ b/index.html
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>Hello world!</title>
-    </head>
-    <body>
-        <p>This is a GitLab page :)</p>
-    </body>
-</html>