aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-06-20 18:39:27 -0700
committerzotlabs <mike@macgirvin.com>2017-06-20 18:39:27 -0700
commit99ff808b8a7d3e7d4a4e6f04f13dcb18652532a2 (patch)
tree75408410d5e4eb71101924df37b16b8eec864181 /view/theme
parent7e4e2f28dbc52316f4cef7c17a7c9e6ec7f607dc (diff)
parent76e98091690cf5f2726bf7cefea217d49b23a5b4 (diff)
downloadvolse-hubzilla-99ff808b8a7d3e7d4a4e6f04f13dcb18652532a2.tar.gz
volse-hubzilla-99ff808b8a7d3e7d4a4e6f04f13dcb18652532a2.tar.bz2
volse-hubzilla-99ff808b8a7d3e7d4a4e6f04f13dcb18652532a2.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view/theme')
-rw-r--r--view/theme/redbasic/css/style.css14
-rw-r--r--view/theme/redbasic/php/theme_init.php2
2 files changed, 10 insertions, 6 deletions
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');