Merge branch 'dev' into oauth2

2018-02-26 18:19:08 -05:00
parent 45e0fc6802 fe7fba4789
commit 1035c453ea
813 changed files with 4540 additions and 141025 deletions
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -179,14 +179,14 @@ a.wikilist {
 	overflow: auto;
 }

-.notifications-textinput input {
-	font-family: FontAwesome, sans-serif;
-}
-
 .notifications-textinput {
 	padding: .75rem 0.85rem;
 }

+.notifications-textinput input {
+	padding-left: 1.75rem;
+}
+
 .notifications-textinput-clear {
 	padding: .5rem;
 	line-height: 1;
@@ -196,6 +196,14 @@ a.wikilist {
 	cursor: pointer;
 }

+.notifications-textinput-filter {
+	padding: .5rem;
+	line-height: 1;
+	position: absolute;
+	top: .75rem;
+	left: 0.75rem;
+}
+
 .notification-content.collapsing {
 	overflow: hidden;
 }