Merge branch 'develop' into matthew/scalar

2016-06-06 10:24:39 +01:00
parent a288c5b85d c672919d1e
commit a2e73cceee
6 changed files with 51 additions and 6 deletions
--- a/src/skins/vector/css/common.css
+++ b/src/skins/vector/css/common.css
@@ -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;
+}
--- a/src/skins/vector/css/vector-web/structures/RoomDirectory.css
+++ b/src/skins/vector/css/vector-web/structures/RoomDirectory.css
@@ -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;