Merge branch 'dev' into oauth2

2 files changed, 5 insertions, 20 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 75992468e..dfd03707f 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -604,14 +604,6 @@ footer {
 	padding: .15rem .5rem;
 }
 
-#nav-search-text::-webkit-input-placeholder {
-	font-family: FontAwesome, sans-serif;
-}
-
-#nav-search-text::-moz-placeholder {
-	font-family: FontAwesome, sans-serif;
-}
-
 nav .acpopup {
 	top: 46px !important;
 	margin-left: -35px;
@@ -842,21 +834,12 @@ div.jGrowl div.jGrowl-notification {
 
 #acl-search::-webkit-input-placeholder {
 	/* non-fontawesome fonts set a fallback for text parts of the placeholder*/
-	font-family: FontAwesome, sans-serif, arial, freesans;
+	font-family: ForkAwesome, sans-serif, arial, freesans;
 }
 
 #acl-search::-moz-placeholder {
 	/* non-fontawesome fonts set a fallback for text parts of the placeholder*/
-	font-family: FontAwesome, sans-serif, arial, freesans;
-}
-
-.acl-list-item {
-	width: 100%;
-	padding: 0.5rem;
-	margin-bottom: 0.5rem;
-	border: 1px solid #ccc;
-	float: left;
-	border-radius: $radius;
+	font-family: ForkAwesome, sans-serif, arial, freesans;
 }
 
 .acl-item-header {
@@ -865,10 +848,12 @@ div.jGrowl div.jGrowl-notification {
 
 .acl-list-item.grouphide {
 	border: 1px solid red;
+	z-index: 2;
 }
 
 .acl-list-item.groupshow {
 	border: 1px solid green;
+	z-index: 2;
 }
 
 .acl-list-item.taggable {
diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php
index 73ae8f6d2..d9750de42 100644
--- a/view/theme/redbasic/php/theme_init.php
+++ b/view/theme/redbasic/php/theme_init.php
@@ -1,6 +1,6 @@
 <?php
 
-head_add_css('/library/font_awesome/css/font-awesome.min.css');
+head_add_css('/library/fork-awesome/css/fork-awesome.min.css');
 head_add_css('/library/bootstrap/css/bootstrap.min.css');
 head_add_css('/library/bootstrap-tagsinput/bootstrap-tagsinput.css');
 head_add_css('/view/css/bootstrap-red.css');