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

This commit is contained in:
zotlabs 2017-03-28 14:58:48 -07:00
commit d12b360e92
17 changed files with 238 additions and 169 deletions

View File

@ -630,7 +630,6 @@ pre code {
} }
.container { .container {
position: relative;
margin-right: auto; margin-right: auto;
margin-left: auto; margin-left: auto;
padding-right: 15px; padding-right: 15px;
@ -694,7 +693,6 @@ pre code {
} }
.container-fluid { .container-fluid {
position: relative;
margin-right: auto; margin-right: auto;
margin-left: auto; margin-left: auto;
padding-right: 15px; padding-right: 15px;
@ -780,7 +778,12 @@ pre code {
padding-left: 0; padding-left: 0;
} }
.col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, .col, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-md, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12, .col-xl { .col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, .col,
.col-auto, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm,
.col-sm-auto, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-md,
.col-md-auto, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg,
.col-lg-auto, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12, .col-xl,
.col-xl-auto {
position: relative; position: relative;
width: 100%; width: 100%;
min-height: 1px; min-height: 1px;
@ -789,28 +792,48 @@ pre code {
} }
@media (min-width: 576px) { @media (min-width: 576px) {
.col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, .col, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-md, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12, .col-xl { .col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, .col,
.col-auto, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm,
.col-sm-auto, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-md,
.col-md-auto, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg,
.col-lg-auto, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12, .col-xl,
.col-xl-auto {
padding-right: 15px; padding-right: 15px;
padding-left: 15px; padding-left: 15px;
} }
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, .col, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-md, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12, .col-xl { .col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, .col,
.col-auto, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm,
.col-sm-auto, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-md,
.col-md-auto, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg,
.col-lg-auto, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12, .col-xl,
.col-xl-auto {
padding-right: 15px; padding-right: 15px;
padding-left: 15px; padding-left: 15px;
} }
} }
@media (min-width: 992px) { @media (min-width: 992px) {
.col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, .col, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-md, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12, .col-xl { .col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, .col,
.col-auto, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm,
.col-sm-auto, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-md,
.col-md-auto, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg,
.col-lg-auto, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12, .col-xl,
.col-xl-auto {
padding-right: 15px; padding-right: 15px;
padding-left: 15px; padding-left: 15px;
} }
} }
@media (min-width: 1200px) { @media (min-width: 1200px) {
.col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, .col, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-md, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12, .col-xl { .col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, .col,
.col-auto, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm,
.col-sm-auto, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-md,
.col-md-auto, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg,
.col-lg-auto, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12, .col-xl,
.col-xl-auto {
padding-right: 15px; padding-right: 15px;
padding-left: 15px; padding-left: 15px;
} }
@ -3070,10 +3093,10 @@ tbody.collapse.show {
} }
.dropdown-divider { .dropdown-divider {
height: 1px; height: 0;
margin: 0.5rem 0; margin: 0.5rem 0;
overflow: hidden; overflow: hidden;
background-color: #eceeef; border-top: 1px solid #eceeef;
} }
.dropdown-item { .dropdown-item {
@ -3713,7 +3736,7 @@ tbody.collapse.show {
.nav-link { .nav-link {
display: block; display: block;
padding: 0.5em 1em; padding: 0.5rem 1rem;
} }
.nav-link:focus, .nav-link:hover { .nav-link:focus, .nav-link:hover {
@ -3805,16 +3828,35 @@ tbody.collapse.show {
display: -webkit-flex; display: -webkit-flex;
display: -ms-flexbox; display: -ms-flexbox;
display: flex; display: flex;
-webkit-box-orient: vertical; -webkit-flex-wrap: wrap;
-webkit-box-direction: normal; -ms-flex-wrap: wrap;
-webkit-flex-direction: column; flex-wrap: wrap;
-ms-flex-direction: column; -webkit-box-pack: justify;
flex-direction: column; -webkit-justify-content: space-between;
-ms-flex-pack: justify;
justify-content: space-between;
padding: 0.5rem 1rem; padding: 0.5rem 1rem;
} }
.navbar > .container,
.navbar > .container-fluid {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-wrap: wrap;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
-ms-flex-pack: justify;
justify-content: space-between;
}
@media (max-width: 575px) { @media (max-width: 575px) {
.navbar > .container { .navbar > .container,
.navbar > .container-fluid {
width: 100%;
margin-right: 0; margin-right: 0;
margin-left: 0; margin-left: 0;
} }
@ -3825,8 +3867,8 @@ tbody.collapse.show {
-webkit-align-self: flex-start; -webkit-align-self: flex-start;
-ms-flex-item-align: start; -ms-flex-item-align: start;
align-self: flex-start; align-self: flex-start;
padding-top: .25rem; padding-top: 0.3125rem;
padding-bottom: .25rem; padding-bottom: 0.3125rem;
margin-right: 1rem; margin-right: 1rem;
font-size: 1.25rem; font-size: 1.25rem;
line-height: inherit; line-height: inherit;
@ -3859,8 +3901,14 @@ tbody.collapse.show {
.navbar-text { .navbar-text {
display: inline-block; display: inline-block;
padding-top: .425rem; padding-top: 0.5rem;
padding-bottom: .425rem; padding-bottom: 0.5rem;
}
.navbar-collapse {
-webkit-flex-basis: 100%;
-ms-flex-preferred-size: 100%;
flex-basis: 100%;
} }
.navbar-toggler { .navbar-toggler {
@ -3890,29 +3938,20 @@ tbody.collapse.show {
background-size: 100% 100%; background-size: 100% 100%;
} }
.navbar-toggler-left {
position: absolute;
left: 1rem;
}
.navbar-toggler-right {
position: absolute;
right: 1rem;
}
@media (max-width: 575px) { @media (max-width: 575px) {
.navbar-toggleable .navbar-nav .dropdown-menu { .navbar-expand-sm .navbar-nav .dropdown-menu {
position: static; position: static;
float: none; float: none;
} }
.navbar-toggleable > .container { .navbar-expand-sm > .container,
.navbar-expand-sm > .container-fluid {
padding-right: 0; padding-right: 0;
padding-left: 0; padding-left: 0;
} }
} }
@media (min-width: 576px) { @media (min-width: 576px) {
.navbar-toggleable { .navbar-expand-sm {
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: row; -webkit-flex-direction: row;
@ -3925,23 +3964,24 @@ tbody.collapse.show {
-webkit-align-items: center; -webkit-align-items: center;
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
-webkit-box-pack: start;
-webkit-justify-content: flex-start;
-ms-flex-pack: start;
justify-content: flex-start;
} }
.navbar-toggleable .navbar-nav { .navbar-expand-sm .navbar-nav {
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: row; -webkit-flex-direction: row;
-ms-flex-direction: row; -ms-flex-direction: row;
flex-direction: row; flex-direction: row;
} }
.navbar-toggleable .navbar-nav .nav-link { .navbar-expand-sm .navbar-nav .nav-link {
padding-right: .5rem; padding-right: .5rem;
padding-left: .5rem; padding-left: .5rem;
} }
.navbar-toggleable > .container { .navbar-expand-sm > .container,
display: -webkit-box; .navbar-expand-sm > .container-fluid {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-wrap: nowrap; -webkit-flex-wrap: nowrap;
-ms-flex-wrap: nowrap; -ms-flex-wrap: nowrap;
flex-wrap: nowrap; flex-wrap: nowrap;
@ -3950,31 +3990,31 @@ tbody.collapse.show {
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
} }
.navbar-toggleable .navbar-collapse { .navbar-expand-sm .navbar-collapse {
display: -webkit-box !important; display: -webkit-box !important;
display: -webkit-flex !important; display: -webkit-flex !important;
display: -ms-flexbox !important; display: -ms-flexbox !important;
display: flex !important; display: flex !important;
width: 100%;
} }
.navbar-toggleable .navbar-toggler { .navbar-expand-sm .navbar-toggler {
display: none; display: none;
} }
} }
@media (max-width: 767px) { @media (max-width: 767px) {
.navbar-toggleable-sm .navbar-nav .dropdown-menu { .navbar-expand-md .navbar-nav .dropdown-menu {
position: static; position: static;
float: none; float: none;
} }
.navbar-toggleable-sm > .container { .navbar-expand-md > .container,
.navbar-expand-md > .container-fluid {
padding-right: 0; padding-right: 0;
padding-left: 0; padding-left: 0;
} }
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.navbar-toggleable-sm { .navbar-expand-md {
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: row; -webkit-flex-direction: row;
@ -3987,23 +4027,24 @@ tbody.collapse.show {
-webkit-align-items: center; -webkit-align-items: center;
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
-webkit-box-pack: start;
-webkit-justify-content: flex-start;
-ms-flex-pack: start;
justify-content: flex-start;
} }
.navbar-toggleable-sm .navbar-nav { .navbar-expand-md .navbar-nav {
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: row; -webkit-flex-direction: row;
-ms-flex-direction: row; -ms-flex-direction: row;
flex-direction: row; flex-direction: row;
} }
.navbar-toggleable-sm .navbar-nav .nav-link { .navbar-expand-md .navbar-nav .nav-link {
padding-right: .5rem; padding-right: .5rem;
padding-left: .5rem; padding-left: .5rem;
} }
.navbar-toggleable-sm > .container { .navbar-expand-md > .container,
display: -webkit-box; .navbar-expand-md > .container-fluid {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-wrap: nowrap; -webkit-flex-wrap: nowrap;
-ms-flex-wrap: nowrap; -ms-flex-wrap: nowrap;
flex-wrap: nowrap; flex-wrap: nowrap;
@ -4012,31 +4053,31 @@ tbody.collapse.show {
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
} }
.navbar-toggleable-sm .navbar-collapse { .navbar-expand-md .navbar-collapse {
display: -webkit-box !important; display: -webkit-box !important;
display: -webkit-flex !important; display: -webkit-flex !important;
display: -ms-flexbox !important; display: -ms-flexbox !important;
display: flex !important; display: flex !important;
width: 100%;
} }
.navbar-toggleable-sm .navbar-toggler { .navbar-expand-md .navbar-toggler {
display: none; display: none;
} }
} }
@media (max-width: 991px) { @media (max-width: 991px) {
.navbar-toggleable-md .navbar-nav .dropdown-menu { .navbar-expand-lg .navbar-nav .dropdown-menu {
position: static; position: static;
float: none; float: none;
} }
.navbar-toggleable-md > .container { .navbar-expand-lg > .container,
.navbar-expand-lg > .container-fluid {
padding-right: 0; padding-right: 0;
padding-left: 0; padding-left: 0;
} }
} }
@media (min-width: 992px) { @media (min-width: 992px) {
.navbar-toggleable-md { .navbar-expand-lg {
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: row; -webkit-flex-direction: row;
@ -4049,23 +4090,24 @@ tbody.collapse.show {
-webkit-align-items: center; -webkit-align-items: center;
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
-webkit-box-pack: start;
-webkit-justify-content: flex-start;
-ms-flex-pack: start;
justify-content: flex-start;
} }
.navbar-toggleable-md .navbar-nav { .navbar-expand-lg .navbar-nav {
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: row; -webkit-flex-direction: row;
-ms-flex-direction: row; -ms-flex-direction: row;
flex-direction: row; flex-direction: row;
} }
.navbar-toggleable-md .navbar-nav .nav-link { .navbar-expand-lg .navbar-nav .nav-link {
padding-right: .5rem; padding-right: .5rem;
padding-left: .5rem; padding-left: .5rem;
} }
.navbar-toggleable-md > .container { .navbar-expand-lg > .container,
display: -webkit-box; .navbar-expand-lg > .container-fluid {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-wrap: nowrap; -webkit-flex-wrap: nowrap;
-ms-flex-wrap: nowrap; -ms-flex-wrap: nowrap;
flex-wrap: nowrap; flex-wrap: nowrap;
@ -4074,31 +4116,31 @@ tbody.collapse.show {
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
} }
.navbar-toggleable-md .navbar-collapse { .navbar-expand-lg .navbar-collapse {
display: -webkit-box !important; display: -webkit-box !important;
display: -webkit-flex !important; display: -webkit-flex !important;
display: -ms-flexbox !important; display: -ms-flexbox !important;
display: flex !important; display: flex !important;
width: 100%;
} }
.navbar-toggleable-md .navbar-toggler { .navbar-expand-lg .navbar-toggler {
display: none; display: none;
} }
} }
@media (max-width: 1199px) { @media (max-width: 1199px) {
.navbar-toggleable-lg .navbar-nav .dropdown-menu { .navbar-expand-xl .navbar-nav .dropdown-menu {
position: static; position: static;
float: none; float: none;
} }
.navbar-toggleable-lg > .container { .navbar-expand-xl > .container,
.navbar-expand-xl > .container-fluid {
padding-right: 0; padding-right: 0;
padding-left: 0; padding-left: 0;
} }
} }
@media (min-width: 1200px) { @media (min-width: 1200px) {
.navbar-toggleable-lg { .navbar-expand-xl {
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: row; -webkit-flex-direction: row;
@ -4111,23 +4153,24 @@ tbody.collapse.show {
-webkit-align-items: center; -webkit-align-items: center;
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
-webkit-box-pack: start;
-webkit-justify-content: flex-start;
-ms-flex-pack: start;
justify-content: flex-start;
} }
.navbar-toggleable-lg .navbar-nav { .navbar-expand-xl .navbar-nav {
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: row; -webkit-flex-direction: row;
-ms-flex-direction: row; -ms-flex-direction: row;
flex-direction: row; flex-direction: row;
} }
.navbar-toggleable-lg .navbar-nav .nav-link { .navbar-expand-xl .navbar-nav .nav-link {
padding-right: .5rem; padding-right: .5rem;
padding-left: .5rem; padding-left: .5rem;
} }
.navbar-toggleable-lg > .container { .navbar-expand-xl > .container,
display: -webkit-box; .navbar-expand-xl > .container-fluid {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-wrap: nowrap; -webkit-flex-wrap: nowrap;
-ms-flex-wrap: nowrap; -ms-flex-wrap: nowrap;
flex-wrap: nowrap; flex-wrap: nowrap;
@ -4136,19 +4179,18 @@ tbody.collapse.show {
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
} }
.navbar-toggleable-lg .navbar-collapse { .navbar-expand-xl .navbar-collapse {
display: -webkit-box !important; display: -webkit-box !important;
display: -webkit-flex !important; display: -webkit-flex !important;
display: -ms-flexbox !important; display: -ms-flexbox !important;
display: flex !important; display: flex !important;
width: 100%;
} }
.navbar-toggleable-lg .navbar-toggler { .navbar-expand-xl .navbar-toggler {
display: none; display: none;
} }
} }
.navbar-toggleable-xl { .navbar-expand {
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: row; -webkit-flex-direction: row;
@ -4161,19 +4203,24 @@ tbody.collapse.show {
-webkit-align-items: center; -webkit-align-items: center;
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
-webkit-box-pack: start;
-webkit-justify-content: flex-start;
-ms-flex-pack: start;
justify-content: flex-start;
} }
.navbar-toggleable-xl .navbar-nav .dropdown-menu { .navbar-expand .navbar-nav .dropdown-menu {
position: static; position: static;
float: none; float: none;
} }
.navbar-toggleable-xl > .container { .navbar-expand > .container,
.navbar-expand > .container-fluid {
padding-right: 0; padding-right: 0;
padding-left: 0; padding-left: 0;
} }
.navbar-toggleable-xl .navbar-nav { .navbar-expand .navbar-nav {
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: row; -webkit-flex-direction: row;
@ -4181,16 +4228,13 @@ tbody.collapse.show {
flex-direction: row; flex-direction: row;
} }
.navbar-toggleable-xl .navbar-nav .nav-link { .navbar-expand .navbar-nav .nav-link {
padding-right: .5rem; padding-right: .5rem;
padding-left: .5rem; padding-left: .5rem;
} }
.navbar-toggleable-xl > .container { .navbar-expand > .container,
display: -webkit-box; .navbar-expand > .container-fluid {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-wrap: nowrap; -webkit-flex-wrap: nowrap;
-ms-flex-wrap: nowrap; -ms-flex-wrap: nowrap;
flex-wrap: nowrap; flex-wrap: nowrap;
@ -4200,26 +4244,22 @@ tbody.collapse.show {
align-items: center; align-items: center;
} }
.navbar-toggleable-xl .navbar-collapse { .navbar-expand .navbar-collapse {
display: -webkit-box !important; display: -webkit-box !important;
display: -webkit-flex !important; display: -webkit-flex !important;
display: -ms-flexbox !important; display: -ms-flexbox !important;
display: flex !important; display: flex !important;
width: 100%;
} }
.navbar-toggleable-xl .navbar-toggler { .navbar-expand .navbar-toggler {
display: none; display: none;
} }
.navbar-light .navbar-brand, .navbar-light .navbar-brand {
.navbar-light .navbar-toggler {
color: rgba(0, 0, 0, 0.9); color: rgba(0, 0, 0, 0.9);
} }
.navbar-light .navbar-brand:focus, .navbar-light .navbar-brand:hover, .navbar-light .navbar-brand:focus, .navbar-light .navbar-brand:hover {
.navbar-light .navbar-toggler:focus,
.navbar-light .navbar-toggler:hover {
color: rgba(0, 0, 0, 0.9); color: rgba(0, 0, 0, 0.9);
} }
@ -4243,6 +4283,7 @@ tbody.collapse.show {
} }
.navbar-light .navbar-toggler { .navbar-light .navbar-toggler {
color: rgba(0, 0, 0, 0.5);
border-color: rgba(0, 0, 0, 0.1); border-color: rgba(0, 0, 0, 0.1);
} }
@ -4254,14 +4295,11 @@ tbody.collapse.show {
color: rgba(0, 0, 0, 0.5); color: rgba(0, 0, 0, 0.5);
} }
.navbar-inverse .navbar-brand, .navbar-inverse .navbar-brand {
.navbar-inverse .navbar-toggler {
color: white; color: white;
} }
.navbar-inverse .navbar-brand:focus, .navbar-inverse .navbar-brand:hover, .navbar-inverse .navbar-brand:focus, .navbar-inverse .navbar-brand:hover {
.navbar-inverse .navbar-toggler:focus,
.navbar-inverse .navbar-toggler:hover {
color: white; color: white;
} }
@ -4285,6 +4323,7 @@ tbody.collapse.show {
} }
.navbar-inverse .navbar-toggler { .navbar-inverse .navbar-toggler {
color: rgba(255, 255, 255, 0.5);
border-color: rgba(255, 255, 255, 0.1); border-color: rgba(255, 255, 255, 0.1);
} }
@ -4498,10 +4537,6 @@ tbody.collapse.show {
border-left: 0; border-left: 0;
} }
.card-img {
border-radius: calc(0.25rem - 1px);
}
.card-img-overlay { .card-img-overlay {
position: absolute; position: absolute;
top: 0; top: 0;
@ -4511,12 +4546,19 @@ tbody.collapse.show {
padding: 1.25rem; padding: 1.25rem;
} }
.card-img {
width: 100%;
border-radius: calc(0.25rem - 1px);
}
.card-img-top { .card-img-top {
width: 100%;
border-top-left-radius: calc(0.25rem - 1px); border-top-left-radius: calc(0.25rem - 1px);
border-top-right-radius: calc(0.25rem - 1px); border-top-right-radius: calc(0.25rem - 1px);
} }
.card-img-bottom { .card-img-bottom {
width: 100%;
border-bottom-right-radius: calc(0.25rem - 1px); border-bottom-right-radius: calc(0.25rem - 1px);
border-bottom-left-radius: calc(0.25rem - 1px); border-bottom-left-radius: calc(0.25rem - 1px);
} }
@ -4532,6 +4574,8 @@ tbody.collapse.show {
-webkit-flex-flow: row wrap; -webkit-flex-flow: row wrap;
-ms-flex-flow: row wrap; -ms-flex-flow: row wrap;
flex-flow: row wrap; flex-flow: row wrap;
margin-right: -15px;
margin-left: -15px;
} }
.card-deck .card { .card-deck .card {
display: -webkit-box; display: -webkit-box;
@ -4547,12 +4591,8 @@ tbody.collapse.show {
-webkit-flex-direction: column; -webkit-flex-direction: column;
-ms-flex-direction: column; -ms-flex-direction: column;
flex-direction: column; flex-direction: column;
}
.card-deck .card:not(:first-child) {
margin-left: 15px;
}
.card-deck .card:not(:last-child) {
margin-right: 15px; margin-right: 15px;
margin-left: 15px;
} }
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -791,9 +791,13 @@ var Carousel = function ($) {
}; };
Carousel.prototype._triggerSlideEvent = function _triggerSlideEvent(relatedTarget, eventDirectionName) { Carousel.prototype._triggerSlideEvent = function _triggerSlideEvent(relatedTarget, eventDirectionName) {
var targetIndex = this._getItemIndex(relatedTarget);
var fromIndex = this._getItemIndex($(this._element).find(Selector.ACTIVE_ITEM)[0]);
var slideEvent = $.Event(Event.SLIDE, { var slideEvent = $.Event(Event.SLIDE, {
relatedTarget: relatedTarget, relatedTarget: relatedTarget,
direction: eventDirectionName direction: eventDirectionName,
from: fromIndex,
to: targetIndex
}); });
$(this._element).trigger(slideEvent); $(this._element).trigger(slideEvent);
@ -817,8 +821,9 @@ var Carousel = function ($) {
var _this5 = this; var _this5 = this;
var activeElement = $(this._element).find(Selector.ACTIVE_ITEM)[0]; var activeElement = $(this._element).find(Selector.ACTIVE_ITEM)[0];
var activeElementIndex = this._getItemIndex(activeElement);
var nextElement = element || activeElement && this._getItemByDirection(direction, activeElement); var nextElement = element || activeElement && this._getItemByDirection(direction, activeElement);
var nextElementIndex = this._getItemIndex(nextElement);
var isCycling = Boolean(this._interval); var isCycling = Boolean(this._interval);
var directionalClassName = void 0; var directionalClassName = void 0;
@ -860,7 +865,9 @@ var Carousel = function ($) {
var slidEvent = $.Event(Event.SLID, { var slidEvent = $.Event(Event.SLID, {
relatedTarget: nextElement, relatedTarget: nextElement,
direction: eventDirectionName direction: eventDirectionName,
from: activeElementIndex,
to: nextElementIndex
}); });
if (Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.SLIDE)) { if (Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.SLIDE)) {
@ -1337,7 +1344,9 @@ var Collapse = function ($) {
*/ */
$(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) {
event.preventDefault(); if (/input|textarea/i.test(event.target.tagName)) {
event.preventDefault();
}
var target = Collapse._getTargetFromElement(this); var target = Collapse._getTargetFromElement(this);
var data = $(target).data(DATA_KEY); var data = $(target).data(DATA_KEY);
@ -1854,6 +1863,10 @@ var Modal = function ($) {
this._scrollbarWidth = null; this._scrollbarWidth = null;
}; };
Modal.prototype.handleUpdate = function handleUpdate() {
this._adjustDialog();
};
// private // private
Modal.prototype._getConfig = function _getConfig(config) { Modal.prototype._getConfig = function _getConfig(config) {
@ -1935,7 +1948,7 @@ var Modal = function ($) {
if (this._isShown) { if (this._isShown) {
$(window).on(Event.RESIZE, function (event) { $(window).on(Event.RESIZE, function (event) {
return _this14._handleUpdate(event); return _this14.handleUpdate(event);
}); });
} else { } else {
$(window).off(Event.RESIZE); $(window).off(Event.RESIZE);
@ -2036,10 +2049,6 @@ var Modal = function ($) {
// todo (fat): these should probably be refactored out of modal.js // todo (fat): these should probably be refactored out of modal.js
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
Modal.prototype._handleUpdate = function _handleUpdate() {
this._adjustDialog();
};
Modal.prototype._adjustDialog = function _adjustDialog() { Modal.prototype._adjustDialog = function _adjustDialog() {
var isModalOverflowing = this._element.scrollHeight > document.documentElement.clientHeight; var isModalOverflowing = this._element.scrollHeight > document.documentElement.clientHeight;

File diff suppressed because one or more lines are too long

View File

@ -9,8 +9,8 @@ nav .badge {
@media screen and (min-width: 767px) { @media screen and (min-width: 767px) {
nav .badge { nav .badge {
top: -0.25rem; top: 0px;
left: -0.25rem; left: 0px;
} }
} }
@ -29,6 +29,11 @@ nav .badge {
height: 2.3rem; height: 2.3rem;
} }
.navbar-toggler-right {
padding: 0.2rem 0;
}
#navbar-collapse-1 i { #navbar-collapse-1 i {
font-size: 1rem; font-size: 1rem;
} }
@ -42,12 +47,16 @@ nav.navbar {
max-height: 100vh; max-height: 100vh;
} }
#navbar-collapse-2 {
flex-basis: 100%;
}
#navbar-collapse-2.show { #navbar-collapse-2.show {
overflow: auto; overflow: auto;
} }
.navbar-toggler-right { .navbar-inverse .navbar-toggler {
top: 0.5rem; color: rgba(255,255,255,1);
} }
/* nav overrides end */ /* nav overrides end */

View File

@ -128,6 +128,10 @@ a.wall-item-name-link {
word-wrap: break-word; word-wrap: break-word;
} }
.wall-item-title.bg-primary a {
color: #fff;
}
.wall-item-body { .wall-item-body {
word-wrap: break-word; word-wrap: break-word;
} }

View File

@ -8,7 +8,7 @@
<body <?php if($page['direction']) echo 'dir="rtl"' ?> > <body <?php if($page['direction']) echo 'dir="rtl"' ?> >
<?php if(x($page,'banner')) echo $page['banner']; ?> <?php if(x($page,'banner')) echo $page['banner']; ?>
<header><?php if(x($page,'header')) echo $page['header']; ?></header> <header><?php if(x($page,'header')) echo $page['header']; ?></header>
<nav class="navbar fixed-top navbar-toggleable-sm navbar-inverse bg-inverse"><?php if(x($page,'nav')) echo $page['nav']; ?></nav> <nav class="navbar fixed-top navbar-expand-md navbar-inverse bg-inverse"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
<main> <main>
<aside id="region_1"><div id="left_aside_spacer"><div id="left_aside_wrapper"><?php if(x($page,'aside')) echo $page['aside']; ?></div></div></aside> <aside id="region_1"><div id="left_aside_spacer"><div id="left_aside_wrapper"><?php if(x($page,'aside')) echo $page['aside']; ?></div></div></aside>
<section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?> <section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?>

View File

@ -7,7 +7,7 @@
</head> </head>
<body> <body>
<header><?php if(x($page,'header')) echo $page['header']; ?></header> <header><?php if(x($page,'header')) echo $page['header']; ?></header>
<nav class="navbar fixed-top navbar-toggleable-sm navbar-inverse bg-inverse"><?php if(x($page,'nav')) echo $page['nav']; ?></nav> <nav class="navbar fixed-top navbar-expand-md navbar-inverse bg-inverse"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
<section><?php if(x($page,'content')) echo $page['content']; ?> <section><?php if(x($page,'content')) echo $page['content']; ?>
<div id="page-footer"></div> <div id="page-footer"></div>
</section> </section>

View File

@ -11,7 +11,7 @@
} }
.contextual-help-content-open { .contextual-help-content-open {
top: 2.4rem; top: 2.5rem;
} }
aside { aside {

View File

@ -191,7 +191,7 @@ nav {
.contextual-help-content-open { .contextual-help-content-open {
display: block; display: block;
position: fixed; position: fixed;
top: 3.25rem; top: 3.35rem;
left: 0px; left: 0px;
width: 100%; width: 100%;
max-height: 50%; max-height: 50%;
@ -1211,12 +1211,12 @@ a.active:hover .dropdown-sub-text {
} }
.usermenu { .usermenu {
width: 3.5rem; width: 3.75rem;
} }
#avatar { #avatar {
width: 2.2rem; width: 2.35rem;
height: 2.2rem; height: 2.35rem;
border-radius: $radius; border-radius: $radius;
} }

View File

@ -3,6 +3,13 @@
*/ */
$(document).ready(function() { $(document).ready(function() {
//this is a hotfix to make collapsible bs panels work again. this needs fixing in bootstrap.
$('a').on('click', function(e) {
if($(this).data('toggle') == 'collapse') {
e.preventDefault();
}
});
// CSS3 calc() fallback (for unsupported browsers) // CSS3 calc() fallback (for unsupported browsers)
$('body').append('<div id="css3-calc" style="width: 10px; width: calc(10px + 10px); display: none;"></div>'); $('body').append('<div id="css3-calc" style="width: 10px; width: calc(10px + 10px); display: none;"></div>');
if( $('#css3-calc').width() == 10) { if( $('#css3-calc').width() == 10) {

View File

@ -10,24 +10,6 @@
{{/if}} {{/if}}
</div> </div>
{{/if}} {{/if}}
<div class="navbar-toggler-right">
{{if $nav.help.6}}
<button id="context-help-btn" class="navbar-toggler border-0" type="button" onclick="contextualHelp(); return false;">
<i class="fa fa-question-circle"></i>
</button>
{{/if}}
<button id="expand-aside" type="button" class="navbar-toggler border-0" data-toggle="offcanvas" data-target="#region_1">
<i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i>
</button>
{{if $localuser}}
<button id="notifications-btn" type="button" class="navbar-toggler border-0 text-white" data-toggle="collapse" data-target="#navbar-collapse-1">
<i class="fa fa-exclamation-circle"></i>
</button>
{{/if}}
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-collapse-2">
<i class="fa fa-bars"></i>
</button>
</div>
{{if $userinfo}} {{if $userinfo}}
<div class="dropdown usermenu"> <div class="dropdown usermenu">
<div class="fakelink" data-toggle="dropdown"> <div class="fakelink" data-toggle="dropdown">
@ -73,6 +55,24 @@
{{/if}} {{/if}}
</div> </div>
{{/if}} {{/if}}
<div class="navbar-toggler-right">
{{if $nav.help.6}}
<button id="context-help-btn" class="navbar-toggler border-0" type="button" onclick="contextualHelp(); return false;">
<i class="fa fa-question-circle"></i>
</button>
{{/if}}
<button id="expand-aside" type="button" class="navbar-toggler border-0" data-toggle="offcanvas" data-target="#region_1">
<i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i>
</button>
{{if $localuser}}
<button id="notifications-btn" type="button" class="navbar-toggler border-0 text-white" data-toggle="collapse" data-target="#navbar-collapse-1">
<i class="fa fa-exclamation-circle"></i>
</button>
{{/if}}
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-collapse-2">
<i class="fa fa-bars"></i>
</button>
</div>
<div class="collapse navbar-collapse" id="navbar-collapse-1"> <div class="collapse navbar-collapse" id="navbar-collapse-1">
<ul class="navbar-nav mr-auto"> <ul class="navbar-nav mr-auto">
{{if $nav.network}} {{if $nav.network}}
@ -201,7 +201,7 @@
</ul> </ul>
</div> </div>
<div class="collapse d-md-none" id="navbar-collapse-2"> <div class="collapse d-md-none" id="navbar-collapse-2">
<div class="navbar-nav"> <div class="navbar-nav mr-auto">
{{foreach $navapps as $navapp}} {{foreach $navapps as $navapp}}
{{$navapp|replace:'dropdown-item':'nav-link'}} {{$navapp|replace:'dropdown-item':'nav-link'}}
{{/foreach}} {{/foreach}}

View File

@ -11,12 +11,12 @@
<div class="panel"> <div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="basic-settings"> <div class="section-subtitle-wrapper" role="tab" id="basic-settings">
<h3> <h3>
<a data-toggle="collapse" data-parent="#settings" href="#basic-settings-collapse" aria-expanded="true" aria-controls="basic-settings-collapse"> <a data-toggle="collapse" data-parent="#settings" href="#basic-settings-collapse">
{{$h_basic}} {{$h_basic}}
</a> </a>
</h3> </h3>
</div> </div>
<div id="basic-settings-collapse" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="basic-settings"> <div id="basic-settings-collapse" class="collapse show" role="tabpanel" aria-labelledby="basic-settings">
<div class="section-content-tools-wrapper"> <div class="section-content-tools-wrapper">
{{include file="field_input.tpl" field=$username}} {{include file="field_input.tpl" field=$username}}
{{include file="field_select_grouped.tpl" field=$timezone}} {{include file="field_select_grouped.tpl" field=$timezone}}
@ -37,12 +37,12 @@
<div class="panel"> <div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="privacy-settings"> <div class="section-subtitle-wrapper" role="tab" id="privacy-settings">
<h3> <h3>
<a data-toggle="collapse" data-parent="#settings" href="#privacy-settings-collapse" aria-expanded="true" aria-controls="privacy-settings-collapse"> <a data-toggle="collapse" data-parent="#settings" href="#privacy-settings-collapse">
{{$h_prv}} {{$h_prv}}
</a> </a>
</h3> </h3>
</div> </div>
<div id="privacy-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="privacy-settings"> <div id="privacy-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="privacy-settings">
<div class="section-content-tools-wrapper"> <div class="section-content-tools-wrapper">
{{if $server_role != 'basic'}} {{if $server_role != 'basic'}}
{{include file="field_select_grouped.tpl" field=$role}} {{include file="field_select_grouped.tpl" field=$role}}
@ -100,12 +100,12 @@
<div class="panel"> <div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="notification-settings"> <div class="section-subtitle-wrapper" role="tab" id="notification-settings">
<h3> <h3>
<a data-toggle="collapse" data-parent="#settings" href="#notification-settings-collapse" aria-expanded="true" aria-controls="notification-settings-collapse"> <a data-toggle="collapse" data-parent="#settings" href="#notification-settings-collapse">
{{$h_not}} {{$h_not}}
</a> </a>
</h3> </h3>
</div> </div>
<div id="notification-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="notification-settings"> <div id="notification-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="notification-settings">
<div class="section-content-tools-wrapper"> <div class="section-content-tools-wrapper">
<div id="settings-notifications"> <div id="settings-notifications">
<h3>{{$activity_options}}</h3> <h3>{{$activity_options}}</h3>
@ -162,7 +162,7 @@
</a> </a>
</h3> </h3>
</div> </div>
<div id="miscellaneous-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="miscellaneous-settings"> <div id="miscellaneous-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="miscellaneous-settings">
<div class="section-content-tools-wrapper"> <div class="section-content-tools-wrapper">
{{if $menus}} {{if $menus}}
<div class="form-group channel-menu"> <div class="form-group channel-menu">

View File

@ -15,7 +15,7 @@
</a> </a>
</h3> </h3>
</div> </div>
<div id="theme-settings-content" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="theme-settings"> <div id="theme-settings-content" class="collapse show" role="tabpanel" aria-labelledby="theme-settings">
<div class="section-content-tools-wrapper"> <div class="section-content-tools-wrapper">
{{if $theme}} {{if $theme}}
{{include file="field_themeselect.tpl" field=$theme}} {{include file="field_themeselect.tpl" field=$theme}}
@ -41,7 +41,7 @@
</a> </a>
</h3> </h3>
</div> </div>
<div id="custom-settings-content" class="panel-collapse collapse{{if !$theme && !$mobile_theme}} in{{/if}}" role="tabpanel" aria-labelledby="custom-settings"> <div id="custom-settings-content" class="collapse{{if !$theme && !$mobile_theme}} in{{/if}}" role="tabpanel" aria-labelledby="custom-settings">
<div class="section-content-tools-wrapper"> <div class="section-content-tools-wrapper">
{{if $theme_config}} {{if $theme_config}}
{{$theme_config}} {{$theme_config}}
@ -57,7 +57,7 @@
</a> </a>
</h3> </h3>
</div> </div>
<div id="content-settings-content" class="panel-collapse collapse{{if !$theme && !$mobile_theme && !$theme_config}} in{{/if}}" role="tabpanel" aria-labelledby="content-settings"> <div id="content-settings-content" class="collapse{{if !$theme && !$mobile_theme && !$theme_config}} in{{/if}}" role="tabpanel" aria-labelledby="content-settings">
<div class="section-content-wrapper"> <div class="section-content-wrapper">
{{include file="field_input.tpl" field=$ajaxint}} {{include file="field_input.tpl" field=$ajaxint}}
{{include file="field_input.tpl" field=$itemspage}} {{include file="field_input.tpl" field=$itemspage}}

View File

@ -14,7 +14,7 @@
</a> </a>
</h3> </h3>
</div> </div>
<div id="{{$g}}-settings-content" class="panel-collapse collapse{{if $g == 'general'}} in{{/if}}" role="tabpanel" aria-labelledby="{{$g}}-settings-title"> <div id="{{$g}}-settings-content" class="collapse{{if $g == 'general'}} show{{/if}}" role="tabpanel" aria-labelledby="{{$g}}-settings-title">
<div class="section-content-tools-wrapper"> <div class="section-content-tools-wrapper">
{{foreach $f.1 as $fcat}} {{foreach $f.1 as $fcat}}
{{include file="field_checkbox.tpl" field=$fcat}} {{include file="field_checkbox.tpl" field=$fcat}}