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

This commit is contained in:
zotlabs
2017-07-02 18:58:43 -07:00
27 changed files with 2429 additions and 4407 deletions

View File

@@ -1344,13 +1344,17 @@ main.fullscreen .section-content-wrapper-np {
/* bootstrap overrides */
.btn,
.rounded-top,
.form-control,
.nav-pills .nav-link,
.nav-tabs .nav-link {
border-radius: $radius;
}
.rounded-top {
border-top-left-radius: $radius !important;
border-top-right-radius: $radius !important;
}
blockquote {
font-size: 1rem;
font-style: italic;
@@ -1380,17 +1384,17 @@ blockquote {
background-color: $item_colour;
}
.bg-inverse {
.bg-dark {
background-color: $nav_bg !important;
}
.navbar-inverse .navbar-nav .nav-link,
.navbar-dark .navbar-nav .nav-link,
.usermenu i {
color: $nav_icon_colour;
}
.navbar-inverse .navbar-nav .nav-link:focus,
.navbar-inverse .navbar-nav .nav-link:hover,
.navbar-dark .navbar-nav .nav-link:focus,
.navbar-dark .navbar-nav .nav-link:hover,
.usermenu:focus i,
.usermenu:hover i {
color: $nav_active_icon_colour;