Merge branch 'lars-algemeen' into 'master'

Lars algemeen

See merge request !26
This commit was merged in pull request #30.
This commit is contained in:
Marijn Jansen
2017-01-12 15:02:51 +01:00
8 changed files with 112 additions and 27 deletions

View File

@@ -19,9 +19,7 @@
}
.chat-recent, .chat-history {
border-radius: 20px;
width: 100%;
background-color: white;
}
/* List of chats. */
@@ -47,7 +45,7 @@
.chat-history {
overflow-y: auto;
height: 100%;
padding-bottom: 10px;
padding: 0 0 10px 0;
}
.chat-message {
@@ -80,20 +78,35 @@
/* Chat reply field */
.chat-field {
padding: 15px;
width: 100%;
padding: 15px 0;
display: table;
}
.chat-field input {
border-radius: 8px;
.chat-field form {
width: 100%;
overflow: hidden;
}
.chat-field span {
display: block;
overflow: hidden;
}
.chat-field input[type="text"] {
width: calc(100% - 80px);
width: 100%;
border-top-left-radius: 10px;
border-bottom-left-radius: 10px;
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
}
.chat-field input[type="submit"] {
width: auto;
float: right;
background-color: #845663;
color: white;
padding: 5px 10px;
border-top-right-radius: 10px;
border-bottom-right-radius: 10px;
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
}

View File

@@ -26,16 +26,13 @@ header {
}
#header-search input[type="text"] {
padding: 5px 10px;
height: 19px;
border-top-left-radius: 3px;
border-bottom-left-radius: 3px;
}
#header-search input[type="submit"] {
margin: 0 0 0 -4px;
padding: 5px;
#header-search input[type="submit"] {
background: none;
color: white;
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
}

View File

@@ -43,6 +43,7 @@ body {
.platform {
padding: 20px;
margin-bottom: 10px;
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);
@@ -65,11 +66,6 @@ body {
border: 0;
}
input[type="text"] {
padding: 5px;
}
/* Move element down (clear), below floating elements */
.clear {
clear: both;
@@ -106,6 +102,10 @@ h5 {
font-size: 1.4em;
}
ul {
list-style-type: none;
}
p {
font-size: 1.2em;
}
@@ -115,6 +115,21 @@ a, a:link, a:visited, a:hover, a:active {
text-decoration: none;
}
button, input, select {
width: auto;
height: 32px;
padding: 0 5px;
background: white;
color: #3333333;
cursor: pointer;
border: none;
font-family: Arial;
font-size: 16px;
}
/* Tables */
table {
border-spacing: 0;

View File

@@ -0,0 +1,3 @@
.search-form input {
border-bottom: #845663 solid 1px;
}