Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

3 files changed, 10 insertions, 12 deletions

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 6f35f5226..321778d39 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -46,12 +46,6 @@ nav .dropdown-menu {
 	overflow: auto;
 }
 
-/* this is a hack and needs fixing in bootstrap */
-nav .dropdown-menu-right {
-	right: 0;
-	left: auto !important;
-}
-
 #navbar-collapse-2 {
 	flex-basis: 100%;
 	max-height: 70vh;
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index faa292fe5..07dfd938d 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1339,6 +1339,14 @@ main.fullscreen .section-content-wrapper-np {
 }
 /* bootstrap overrides */
 
+.btn,
+.rounded-top,
+.form-control,
+.nav-pills .nav-link,
+.nav-tabs .nav-link {
+	border-radius: $radius;
+}
+
 blockquote {
 	font-size: 1rem;
 	font-style: italic;
@@ -1353,10 +1361,6 @@ blockquote {
 	border-radius: $radius;
 }
 
-.dropdown-menu img {
-	border-radius: $radius;
-}
-
 .dropdown-item {
 	color: $font_colour;
 }
@@ -1491,7 +1495,7 @@ dl.bb-dl > dd > li {
 .form-group.checkbox > div label {
     display: block; overflow: hidden; cursor: pointer;
     border: 1px solid #ccc;
-    border-radius: 4px;
+    border-radius: $radius;
     margin:0px;
 	-webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
 	-o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php
index bfeabcb46..b12d80ea5 100644
--- a/view/theme/redbasic/php/theme_init.php
+++ b/view/theme/redbasic/php/theme_init.php
@@ -8,7 +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.js');
+head_add_js('/library/popper/popper.min.js');
 head_add_js('/library/bootstrap/js/bootstrap.min.js');
 head_add_js('/library/bootbox/bootbox.min.js');
 head_add_js('/library/bootstrap-tagsinput/bootstrap-tagsinput.js');