From d900edfcda94feb8dca538d8209c8d73faa43fa1 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 12 Jan 2017 15:20:47 +0100 Subject: [PATCH 1/2] Updated buttons --- website/styles/settings.css | 7 ++++++- website/views/settings-view.php | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/website/styles/settings.css b/website/styles/settings.css index 933f8b0..e5b629e 100644 --- a/website/styles/settings.css +++ b/website/styles/settings.css @@ -16,11 +16,16 @@ text-align: right; } +.settings input[type="submit"] { + background-color: #845663; + color: white; +} + .settings input[type="password"], .settings input[type="text"], .settings input[type="date"], .settings input[type="email"], -.settings textarea{ +.settings textarea { border: 1px solid black; } diff --git a/website/views/settings-view.php b/website/views/settings-view.php index 12415b4..7caf36c 100644 --- a/website/views/settings-view.php +++ b/website/views/settings-view.php @@ -44,6 +44,7 @@ From f481c1c611c7732a7323f3fb3fdedf63e6bf4bf4 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 12 Jan 2017 15:41:13 +0100 Subject: [PATCH 2/2] More uniform main css file. --- website/styles/main.css | 31 +++++++++++++++++++++++-------- website/styles/settings.css | 23 ++--------------------- 2 files changed, 25 insertions(+), 29 deletions(-) diff --git a/website/styles/main.css b/website/styles/main.css index 1346635..cbf9477 100644 --- a/website/styles/main.css +++ b/website/styles/main.css @@ -118,16 +118,31 @@ a, a:link, a:visited, a:hover, a:active { button, input, select { width: auto; height: 32px; - padding: 0 5px; - - background: white; - color: #3333333; cursor: pointer; border: none; - font-family: Arial; + font-family: Arial, sans-serif; font-size: 16px; + border-radius: 7px; +} + +textarea, input, select { + padding: 0 5px; + background: white; + color: #333333; + border: 1px solid #845663; + border-radius: 7px; + font-size: 16px; + + +} + +button, input[type="submit"], input[type="reset"] { + background-color: #845663; + color: white; + padding: 0 10px; + border: none; } /* Tables */ @@ -159,9 +174,9 @@ div[data-title]:hover:after{ -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; - -moz-box-shadow: 0px 0px 4px #222; - -webkit-box-shadow: 0px 0px 4px #222; - box-shadow: 0px 0px 4px #222; + -moz-box-shadow: 0 0 4px #222; + -webkit-box-shadow: 0 0 4px #222; + box-shadow: 0 0 4px #222; background-color: #333; font-size: 15px; line-height: normal; diff --git a/website/styles/settings.css b/website/styles/settings.css index e5b629e..751d0dc 100644 --- a/website/styles/settings.css +++ b/website/styles/settings.css @@ -1,13 +1,6 @@ -.settings { - -} - .settings input, .settings textarea{ - padding: 10px; margin: 5px; - border-radius: 10px; - width: 200px; } .settings label { @@ -16,23 +9,11 @@ text-align: right; } -.settings input[type="submit"] { - background-color: #845663; - color: white; -} - +/* All the fields for typing things. */ .settings input[type="password"], .settings input[type="text"], .settings input[type="date"], .settings input[type="email"], .settings textarea { - border: 1px solid black; -} - -.settings-password { - -} - -.settings-profile { - + width: 200px; } \ No newline at end of file