Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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');
|
||||
|
||||
Reference in New Issue
Block a user