Merge branch '3.2RC'3.2

5 files changed, 44 insertions, 45 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index b0a109c92..dfd03707f 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -381,14 +381,9 @@ footer {
 	margin: 15px 0px;
 }
 
-#cropimage-wrapper, #cropimage-preview-wrapper {
-	float: left;
-	padding: 30px;
-}
-
-#crop-image-form {
-	margin-top: 30px;
-	clear: both;
+#cropimage-wrapper,
+#cropimage-preview-wrapper {
+	margin-bottom: 10px;
 }
 
 .fn {
@@ -609,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;
@@ -847,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 {
@@ -870,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 {
@@ -1805,3 +1785,8 @@ dl.bb-dl > dd > li {
 .caption-visible {
 	max-height: 75%;
 }
+
+.oneway-overlay {
+    position: absolute;
+    text-shadow: -2px 0 1px #fff, 0 2px 1px#fff, 2px 0 1px #fff, 0 -2px 1px #fff;
+}
diff --git a/view/theme/redbasic/img/screenshot.jpg b/view/theme/redbasic/img/screenshot.jpg
deleted file mode 100644
index ac9258bd6..000000000
--- a/view/theme/redbasic/img/screenshot.jpg
+++ /dev/null
diff --git a/view/theme/redbasic/img/screenshot.png b/view/theme/redbasic/img/screenshot.png
new file mode 100644
index 000000000..60d7e23f6
--- /dev/null
+++ b/view/theme/redbasic/img/screenshot.png
diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php
index b12d80ea5..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');
@@ -8,8 +8,7 @@ head_add_css('/library/datetimepicker/jquery.datetimepicker.css');
 head_add_css('/library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css');
 require_once('view/php/theme_init.php');
 
-head_add_js('/library/popper/popper.min.js');
-head_add_js('/library/bootstrap/js/bootstrap.min.js');
+head_add_js('/library/bootstrap/js/bootstrap.bundle.min.js');
 head_add_js('/library/bootbox/bootbox.min.js');
 head_add_js('/library/bootstrap-tagsinput/bootstrap-tagsinput.js');
 head_add_js('/library/datetimepicker/jquery.datetimepicker.js');
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index 0a142a07f..d0154bfb1 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -15,13 +15,26 @@ textarea, input, select
 	padding: 10px 0;
 }
 
+#jot-title {
+	border-radius: 3px;
+}
+
 #jot-title-wrap {
 	border-bottom: none;
 	margin-bottom: 5px;
 }
 
+#jot-category-wrap {
+	border-bottom: none;
+	margin-bottom: 5px;
+}
+
+.bootstrap-tagsinput {
+	background: #333;
+}
+
 optgroup {
-	color: #CCC !important; 
+	color: #CCC !important;
 }
 
 option {
@@ -132,7 +145,7 @@ option {
 .abook-self {
 	border: 1px solid #222;
 	color: #555;
-	background-color:#111;	
+	background-color:#111;
 }
 
 .modal-content {
@@ -208,7 +221,7 @@ a.btn, aside a {
 }
 .btn-danger:hover, .btn-danger:focus, form#chat-destroy > input:hover, form#chat-destroy > input:focus {
 	color: #FFF !important;
-    background-color: #C9302C !important;		
+    background-color: #C9302C !important;
     border-color: #AC2925 !important;
 }
 
@@ -278,7 +291,7 @@ nav .dropdown-menu {
 	border-bottom:1px solid #333;
 }
 
-.nav-tabs .nav-link.active { 
+.nav-tabs .nav-link.active {
 	color: #fff;
 	background-color: #111;
 	border-color: #333;
@@ -297,7 +310,7 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
 	background-color: #222;
 }
 
-a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { 
+a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link {
 	font-weight: bold;
 }
 
@@ -343,6 +356,10 @@ pre {
 	border:1px solid #090909;
 }
 
+#wiki-content-container code {
+	background: #000;
+}
+
 .notif-item a {
 	color: #ccc;
 }
@@ -352,23 +369,23 @@ pre {
 }
 
 .dropdown-menu {
-	background-color: #222; 
+	background-color: #222;
 }
 
 .dropdown-menu >li > a {
-	color: #ccc; 
+	color: #ccc;
 }
 
 .dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
-    	color: #ddd; 
-    	background-color: #333; 
+    	color: #ddd;
+    	background-color: #333;
 	background-image: none;
 }
 
 .open .dropdown-toggle.btn-default, .open .dropdown-toggle.btn-default:focus {
-    color: #ccc; 
-    background-color: #222; 
-    border-color: #222; 
+    color: #ccc;
+    background-color: #222;
+    border-color: #222;
 }
 
 .pmenu-item:hover a {
@@ -444,7 +461,7 @@ pre {
 
 
 .profile-match-wrapper {
-	width: 150px;	
+	width: 150px;
 	height: 120px;
 	border: none;
 }
@@ -462,5 +479,3 @@ pre {
 .widget-nav-pills-checkbox:hover + a {
 	background-color: #222;
 }
-
-