Merge branch 'lars-search' into 'master'

Lars search See merge request !36
2017-01-13 11:20:20 +01:00
parent e9a41becf0 057275d513
commit 621fb2868d
4 changed files with 40 additions and 15 deletions
--- a/website/styles/header.css
+++ b/website/styles/header.css
@@ -25,19 +25,11 @@ header {
    padding-left: 48px;
 }

-#header-search input[type="text"] {
-    border-top-left-radius: 3px;
-    border-bottom-left-radius: 3px;
-}

-#header-search input[type="submit"] {
-    background: none;
-    color: white;
-    border-top-right-radius: 3px;
-    border-bottom-right-radius: 3px;
+#header-search input {
+    border: none;
 }

-
 header div {
    display: inline-block;
 }
--- a/website/styles/search.css
+++ b/website/styles/search.css
@@ -1,3 +1,12 @@
-.search-form input {
-    border-bottom: #845663 solid 1px;
+.search-output {
+    width: calc(50% - 48px);
+    display: inline-flex;
+}
+
+.search-output:nth-child(n) {
+    display: inline-block;
+}
+
+#search-friends-output {
+    margin-right: 10px;
 }