Merge branch 'develop' into matthew/scalar

This commit is contained in:
Matthew Hodgson 2016-06-06 10:24:39 +01:00
commit a2e73cceee
6 changed files with 51 additions and 6 deletions

View file

@ -228,3 +228,13 @@ input[type=text]:focus, textarea:focus {
height: 1em;
vertical-align: middle;
}
::-moz-selection {
background-color: #76CFA6;
color: white;
}
::selection {
background-color: #76CFA6;
color: white;
}

View file

@ -22,8 +22,6 @@ limitations under the License.
margin-bottom: 12px;
color: #4a4a4a;
border-top: 1px solid #c5c5c5;
display: -webkit-box;
display: -moz-box;
display: -ms-flexbox;