Merge branch 'master' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into marijn-settings

2017-01-12 11:36:26 +01:00
parent 319a406d6f f377491dde
commit 06c24ec096
6 changed files with 91 additions and 2 deletions
--- a/website/styles/main.css
+++ b/website/styles/main.css
@@ -41,6 +41,13 @@ body {
    min-height: 100%;
 }

+.platform {
+    padding: 20px;
+    border-radius: 10px;
+    background-color: #FFFFFF;
+    box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
+}
+
 ::selection {
    background: #845663;
    color: white;
--- a/website/styles/settings.css
+++ b/website/styles/settings.css
@@ -0,0 +1,18 @@
+.settings {
+
+}
+
+.settings input {
+    padding: 10px;
+    margin: 5px;
+    border-radius: 10px;
+    width: 200px;
+}
+
+.settings-password {
+
+}
+
+.settings-profile {
+
+}