Merge remote-tracking branch 'origin/main' into main

# Conflicts: # description.html
agenda-scout2030 · Apr 1, 2021 · c999d81 · c999d81
2 parents 87ffdb0 + 5f24c8a
commit c999d81
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/description.html b/description.html
@@ -6,7 +6,7 @@
 </head>
 
 <body>
-<div style="background-image:url('assets/background2.png') ; background-blend-mode:lighten;height:1000px; background-repeat: no-repeat ">
+<div style="background-image:url('assets/background2.png') ; background-blend-mode:lighten;height:10000px; top:-1000px ">
 
 <p style = "text-align: center; font-size:30px;";> <b>CHI SIAMO </b></p>
 

diff --git a/final_page.html b/final_page.html
@@ -7,6 +7,7 @@
 </head>
 <body>
 
+<!-- scale view for mobile-->
 <meta content="width=device-width, initial-scale=1" name="viewport" />
 
 <!-- load jquery library -->

diff --git a/form.html b/form.html
@@ -7,6 +7,9 @@
 </head>
 <body>
 
+<!-- scale view for mobile-->
+<meta content="width=device-width, initial-scale=1" name="viewport" />
+
 <!-- load jquery library -->
 <script src="lib/jquery-1.11.0.min.js"></script>
 

diff --git a/index.html b/index.html
@@ -7,6 +7,9 @@
 </head>
 <body>
 
+<!-- scale view for mobile-->
+<meta content="width=device-width, initial-scale=1" name="viewport" />
+
 <!-- load jquery library -->
 <script src="lib/jquery-1.11.0.min.js"></script>
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ @@
     </head>
     <body>
-    <div style="background-image:url('assets/background2.png') ; background-blend-mode:lighten;height:1000px; background-repeat: no-repeat ">
+    <div style="background-image:url('assets/background2.png') ; background-blend-mode:lighten;height:10000px; top:-1000px ">
     <p style = "text-align: center; font-size:30px;";> <b>CHI SIAMO </b></p>
@@ Expand Down @@