Merge branch '7.6RC'7.6

3 files changed, 34 insertions, 45 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 3b2370b7f..d282e1a3b 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -145,23 +145,6 @@ input[type=text], textarea {
 	white-space: pre;
 }
 
-pre code {
-	border: none;
-	padding: 1em 1.5em;
-}
-
-code {
-	background: #ccc;
-	color: #000;
-}
-
-pre {
-	background: #F5F5F5;
-	color: #333;
-	border:1px solid #ccc;
-	border-radius: $radius;
-}
-
 .heart {
 	color: #FF0000;
 }
@@ -209,7 +192,7 @@ nav {
 	max-height: 50%;
 	background: $comment_item_colour;
 	padding: 1rem;
-	border-bottom: #ccc 1px solid;
+	border-bottom: #e0e0e0 1px solid;
 	overflow: auto;
 	-moz-box-shadow: 0px 3px 3px rgba(0,0,0,0.2);
 	-webkit-box-shadow: 0px 3px 3px rgba(0,0,0,0.2);
@@ -455,7 +438,7 @@ footer {
 .pager-prev,
 .pager-next,
 .pager_n {
-	border: 1px solid #ccc;
+	border: 1px solid #e0e0e0;
 	background: transparent;
 	padding: 4px;
 }
@@ -706,7 +689,7 @@ nav .acpopup {
  */
 .oauthapp {
 	height: auto; overflow: auto;
-	border-bottom: 2px solid #cccccc;
+	border-bottom: 2px solid #e0e0e0;
 	padding-bottom: 1em;
 	margin-bottom: 1em;
 }
@@ -1086,7 +1069,7 @@ img.mail-conv-sender-photo {
 
 .hide-comments-outer {
 	background-color: $comment_item_colour;
-	border-top-color: #ccc;
+	border-top-color: #e0e0e0;
 	border-style: solid;
 	border-top-style: dashed;
 	border-width: 1px 0px 0px 0px;
@@ -1140,13 +1123,13 @@ img.mail-conv-sender-photo {
 
 
 .comment-edit-text {
-	border: 1px solid #ccc;
+	border: 1px solid #e0e0e0;
 	border-radius: $radius;
 }
 
 .divgrow-showmore {
 	display: block;
-	border-top: 1px dashed #ccc;
+	border-top: 1px dashed #e0e0e0;
 	text-align: center;
 }
 
@@ -1180,7 +1163,7 @@ img.mail-conv-sender-photo {
 }
 
 #datebrowse-sidebar select {
-	border: 1px solid #ccc;
+	border: 1px solid #e0e0e0;
 	border-radius: $radius;
 }
 
@@ -1265,7 +1248,7 @@ img.mail-conv-sender-photo {
 }
 
 .generic-content-wrapper {
-	border: 1px solid rgba(0, 0, 0, .2);
+	border: 1px solid #e0e0e0;
 	border-radius: $radius;
 	margin-bottom: 1.5rem;
 }
@@ -1437,7 +1420,7 @@ main.fullscreen .section-content-wrapper-np {
 blockquote {
 	font-size: 1rem;
 	font-style: italic;
-	border-left: 3px solid #ccc;
+	border-left: 3px solid #e0e0e0;
 	padding: 1em 0px 1em 1.5em;
 	margin: 0px;
 }
@@ -1612,7 +1595,7 @@ dl.bb-dl > dd > li {
 
 .onoffswitch.checkbox > div label {
 	display: block; overflow: hidden; cursor: pointer;
-	border: 1px solid #ccc;
+	border: 1px solid #e0e0e0;
 	border-radius: 12px;
 	margin:0px;
 	-webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
@@ -1651,13 +1634,13 @@ dl.bb-dl > dd > li {
 .onoffswitch-inner:after {
     content: attr(data-off);
     padding-left: 21px;
-    background-color: $item_colour; color: #ccc;
+    background-color: $item_colour; color: #e0e0e0;
     text-align: left;
 }
 
 .onoffswitch-switch {
     display: block; width: 15px; margin:4px;
-    background: #ccc;
+    background: #e0e0e0;
     border-radius: 10px;
     position: absolute; top: 0; bottom: 0; right: 36px;
     -moz-transition: all 0.3s ease-in 0s; -webkit-transition: all 0.3s ease-in 0s;
@@ -1801,3 +1784,7 @@ span.default-highlight {
 .bootstrap-tagsinput {
 	width: 100%;
 }
+
+.jg-entry img {
+	border-radius: $radius;
+}
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 3dbc29a96..fd79b02a9 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -80,13 +80,13 @@ if (! $nav_active_icon_colour)
 if (! $link_colour)
 	$link_colour = '#0d6efd';
 if (! $banner_colour)
-	$banner_colour = '#fff';
+	$banner_colour = '#efefef';
 if (! $bgcolour)
 	$bgcolour = 'rgb(254,254,254)';
 if (! $background_image)
 	$background_image ='';
 if (! $item_colour)
-	$item_colour = 'rgb(238,238,238)';
+	$item_colour = '#f6f6f6';
 if (! $comment_item_colour)
 	$comment_item_colour = 'rgb(255,255,255)';
 if (! $item_opacity)
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index e7049a1c5..751ce25e8 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -40,13 +40,19 @@ option {
 	color: $link_colour !important;
 }
 
-.vcard, #contact-block, .widget {
+.vcard,
+#contact-block,
+.widget {
 	background-color: transparent;
 	border: none;
 	border-bottom: 1px solid #333;
 	border-radius: 0px
 }
 
+.vcard-card {
+	background-color: transparent;
+}
+
 #profile-photo-wrapper {
 	border: none;
 }
@@ -323,10 +329,6 @@ a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link {
 	background-color: #222;
 }
 
-.text-dark {
-	color: #aaa !important;
-}
-
 .group-selected, .fileas-selected, .categories-selected, .search-selected, a.active {
 	color: #fff !important;
 	text-decoration: underline !important;
@@ -484,18 +486,18 @@ pre {
 
 
 /* category badge fix: */
-a.text-dark:focus, a.text-dark:hover {
-	color: #ddd !important;
-}
 
-.badge-warning {
-/*     background-color: #ffc927; */
+.bg-warning {
+    background-color: #e38916;
+}
+.bg-warning:hover, .bg-warning:focus {
+	background-color: #ffc927 !important;
 }
-.badge-warning a.text-dark {
-    color: #333 !important;
+.bg-warning a.text-dark {
+    color: #111 !important;
 }
-.badge-warning a.text-dark:focus, .badge-warning a.text-dark:hover {
-    color: red !important;
+.bg-warning a.text-dark:focus, .bg-warning a.text-dark:hover {
+    color: #bd0000 !important;
     text-decoration: none;
 }