Merge pull request #29 from privacybydesign/ux3.1

Ux3.1
privacybydesign · Apr 20, 2023 · eaf0049 · eaf0049
2 parents 12b493e + bd08923
commit eaf0049
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 35 deletions.
diff --git a/webapp/en/index.html b/webapp/en/index.html
@@ -4,7 +4,10 @@
   <meta charset="utf-8" />
   <title>Add E-mail</title>
   <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <link rel="stylesheet" href="assets/style.css"/>
+  <meta name="theme-color" content="#ffffff" />
+  <meta name="apple-mobile-web-app-capable" content="yes" />
+  <meta name="apple-mobile-web-app-status-bar-style" content="#ffffff" />
+  <link rel="stylesheet" href="assets/style.css" />
   <script src="assets/config.js" defer></script>
   <script src="assets/jquery.min.js" defer></script>
   <script src="assets/yivi.js" defer></script>

diff --git a/webapp/fonts/alexandria-v1-latin-600.woff b/webapp/fonts/alexandria-v1-latin-600.woff
diff --git a/webapp/fonts/alexandria-v1-latin-600.woff2 b/webapp/fonts/alexandria-v1-latin-600.woff2
diff --git a/webapp/fonts/alexandria-v1-latin-700.woff b/webapp/fonts/alexandria-v1-latin-700.woff
diff --git a/webapp/fonts/alexandria-v1-latin-700.woff2 b/webapp/fonts/alexandria-v1-latin-700.woff2
diff --git a/webapp/nl/index.html b/webapp/nl/index.html
@@ -4,6 +4,9 @@
   <meta charset="utf-8" />
   <title>E-mail toevoegen</title>
   <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <meta name="theme-color" content="#ffffff" />
+  <meta name="apple-mobile-web-app-capable" content="yes" />
+  <meta name="apple-mobile-web-app-status-bar-style" content="#ffffff" />
   <link rel="stylesheet" href="assets/style.css" />
   <script src="assets/config.js" defer></script>
   <script src="assets/jquery.min.js" defer></script>

diff --git a/webapp/package-lock.json b/webapp/package-lock.json
diff --git a/webapp/package.json b/webapp/package.json
@@ -7,7 +7,7 @@
     "build": "./build.sh"
   },
   "dependencies": {
-    "@privacybydesign/yivi-frontend": "^0.1.0",
-    "jquery": "^3.6.3"
+    "@privacybydesign/yivi-frontend": "^0.1.2",
+    "jquery": "^3.6.4"
   }
 }
diff --git a/webapp/style.css b/webapp/style.css
@@ -8,8 +8,8 @@
 
 @font-face {
 	font-family: 'Alexandria';
-	src: url('./fonts/alexandria-v1-latin-700.woff2') format('woff2'),
-		url('./fonts/alexandria-v1-latin-700.woff') format('woff');
+	src: url('./fonts/alexandria-v1-latin-600.woff2') format('woff2'),
+		url('./fonts/alexandria-v1-latin-600.woff') format('woff');
 	font-weight: bold;
 	font-style: normal;
 }
@@ -44,7 +44,7 @@ body {
 	height: 100%;
 	font-size: 16px;
 	line-height: 24px;
-	background-color: #FAFAFA;
+	background-color: #F7F5F3;
 	font-family: 'Open Sans', Verdana, Arial, sans-serif;
 }
 
@@ -57,7 +57,7 @@ form {
 header {
 	background: #FFFFFF;
 	color: #484747;
-	border-bottom: 1px solid #EAE5E2
+	border-bottom: 1px solid #CFE4EF
 }
 
 header h1 {
@@ -160,7 +160,7 @@ label {
 	margin-top: 2rem;
 	margin-bottom: 0.5rem;
 	display: block;
-	font-weight: bold;
+	font-family: 'Alexandria';
 	color: #484747;
 }
 
@@ -178,7 +178,7 @@ input {
 footer {
 	padding: 16px;
 	background: #FFFFFF;
-	border-top: 1px solid #EAE5E2;
+	box-shadow: 0px -4px 12px rgba(0, 0, 0, 0.1);
 }
 
 footer .actions {
@@ -194,20 +194,20 @@ footer button {
 	display: inline-block;
 	text-align: center;
 	font-size: 16px;
-	height: 48px;
 	font-weight: bold;
 	cursor: pointer;
 	border-radius: 6px;
+	box-sizing: border-box;
 	width: 48%;
+	height:48px;
+	line-height: 48px;
 	max-width: 343px;
-
 }
 
 footer a {
 	background-color: #FFFFFF;
 	text-decoration: none;
 	color: #484747;
-	line-height: 48px;
 	border: 1px solid #484747;
 }
 
@@ -231,4 +231,4 @@ footer button {
 	input {
 		font-size: 14px;
 	}
-}
+}
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
@@ -2,12 +2,12 @@
 # yarn lockfile v1
 
 
-"@privacybydesign/yivi-frontend@^0.1.0":
-  "integrity" "sha512-EswUMc6h46Vk04y6YTB9futsDxpw2s55hYM+/V/E29c1KLuDNC2iw6Paz0WfN+uh52Yd7gJ+mFqKqXMFgkzIoA=="
-  "resolved" "https://registry.npmjs.org/@privacybydesign/yivi-frontend/-/yivi-frontend-0.1.0.tgz"
-  "version" "0.1.0"
+"@privacybydesign/yivi-frontend@^0.1.2":
+  version "0.1.2"
+  resolved "https://registry.npmjs.org/@privacybydesign/yivi-frontend/-/yivi-frontend-0.1.2.tgz"
+  integrity sha512-HnF/hlu2qn+eG/gsBYKvbgdv2O8AptqNTHjvc/o7JKLwPI3GJCxPwr8+JQKrcI7q8AqE0aHJusklKiJZLLJc7g==
 
-"jquery@^3.6.3":
-  "integrity" "sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg=="
-  "resolved" "https://registry.npmjs.org/jquery/-/jquery-3.6.3.tgz"
-  "version" "3.6.3"
+jquery@^3.6.4:
+  version "3.6.4"
+  resolved "https://registry.npmjs.org/jquery/-/jquery-3.6.4.tgz"
+  integrity sha512-v28EW9DWDFpzcD9O5iyJXg3R3+q+mET5JhnjJzQUZMHOv67bpSIHq81GEYpPNZHG+XXHsfSme3nxp/hndKEcsQ==