aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-03-28 14:58:48 -0700
committerzotlabs <mike@macgirvin.com>2017-03-28 14:58:48 -0700
commitd12b360e926c5df8da1639a5935fcd3e9236e4e3 (patch)
treea5eed2bf4fa37183435a39ecbd73a0d75aff0c22 /view
parent3e6088c6142d1dabbfdbb8b5df276ae942bd3554 (diff)
parent5564b47dbc640b30a8090a6138f0c2f841accbe9 (diff)
downloadvolse-hubzilla-d12b360e926c5df8da1639a5935fcd3e9236e4e3.tar.gz
volse-hubzilla-d12b360e926c5df8da1639a5935fcd3e9236e4e3.tar.bz2
volse-hubzilla-d12b360e926c5df8da1639a5935fcd3e9236e4e3.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view')
-rw-r--r--view/css/bootstrap-red.css17
-rw-r--r--view/css/conversation.css4
-rw-r--r--view/php/default.php2
-rw-r--r--view/php/full.php2
-rw-r--r--view/theme/redbasic/css/narrow_navbar.css2
-rw-r--r--view/theme/redbasic/css/style.css8
-rw-r--r--view/theme/redbasic/js/redbasic.js7
-rwxr-xr-xview/tpl/nav.tpl38
-rwxr-xr-xview/tpl/settings.tpl14
-rwxr-xr-xview/tpl/settings_display.tpl6
-rwxr-xr-xview/tpl/settings_features.tpl2
11 files changed, 61 insertions, 41 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index d4f5b2d9b..69886b141 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -9,8 +9,8 @@ nav .badge {
@media screen and (min-width: 767px) {
nav .badge {
- top: -0.25rem;
- left: -0.25rem;
+ top: 0px;
+ left: 0px;
}
}
@@ -29,6 +29,11 @@ nav .badge {
height: 2.3rem;
}
+.navbar-toggler-right {
+ padding: 0.2rem 0;
+}
+
+
#navbar-collapse-1 i {
font-size: 1rem;
}
@@ -42,12 +47,16 @@ nav.navbar {
max-height: 100vh;
}
+#navbar-collapse-2 {
+ flex-basis: 100%;
+}
+
#navbar-collapse-2.show {
overflow: auto;
}
-.navbar-toggler-right {
- top: 0.5rem;
+.navbar-inverse .navbar-toggler {
+ color: rgba(255,255,255,1);
}
/* nav overrides end */
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 27601b453..08f23c4d0 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -128,6 +128,10 @@ a.wall-item-name-link {
word-wrap: break-word;
}
+.wall-item-title.bg-primary a {
+ color: #fff;
+}
+
.wall-item-body {
word-wrap: break-word;
}
diff --git a/view/php/default.php b/view/php/default.php
index 950dfbc99..e4553a17f 100644
--- a/view/php/default.php
+++ b/view/php/default.php
@@ -8,7 +8,7 @@
<body <?php if($page['direction']) echo 'dir="rtl"' ?> >
<?php if(x($page,'banner')) echo $page['banner']; ?>
<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>
<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']; ?>
diff --git a/view/php/full.php b/view/php/full.php
index a528781c0..64e32c5bd 100644
--- a/view/php/full.php
+++ b/view/php/full.php
@@ -7,7 +7,7 @@
</head>
<body>
<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']; ?>
<div id="page-footer"></div>
</section>
diff --git a/view/theme/redbasic/css/narrow_navbar.css b/view/theme/redbasic/css/narrow_navbar.css
index 33db6ce83..99f083638 100644
--- a/view/theme/redbasic/css/narrow_navbar.css
+++ b/view/theme/redbasic/css/narrow_navbar.css
@@ -11,7 +11,7 @@
}
.contextual-help-content-open {
- top: 2.4rem;
+ top: 2.5rem;
}
aside {
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 3265f1c44..156df07ff 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -191,7 +191,7 @@ nav {
.contextual-help-content-open {
display: block;
position: fixed;
- top: 3.25rem;
+ top: 3.35rem;
left: 0px;
width: 100%;
max-height: 50%;
@@ -1211,12 +1211,12 @@ a.active:hover .dropdown-sub-text {
}
.usermenu {
- width: 3.5rem;
+ width: 3.75rem;
}
#avatar {
- width: 2.2rem;
- height: 2.2rem;
+ width: 2.35rem;
+ height: 2.35rem;
border-radius: $radius;
}
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 14b977b80..fb048518e 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -3,6 +3,13 @@
*/
$(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)
$('body').append('<div id="css3-calc" style="width: 10px; width: calc(10px + 10px); display: none;"></div>');
if( $('#css3-calc').width() == 10) {
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 0a9b94758..f7953c5f3 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -10,24 +10,6 @@
{{/if}}
</div>
{{/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}}
<div class="dropdown usermenu">
<div class="fakelink" data-toggle="dropdown">
@@ -73,6 +55,24 @@
{{/if}}
</div>
{{/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">
<ul class="navbar-nav mr-auto">
{{if $nav.network}}
@@ -201,7 +201,7 @@
</ul>
</div>
<div class="collapse d-md-none" id="navbar-collapse-2">
- <div class="navbar-nav">
+ <div class="navbar-nav mr-auto">
{{foreach $navapps as $navapp}}
{{$navapp|replace:'dropdown-item':'nav-link'}}
{{/foreach}}
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 37bd70196..dd5fecb43 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -11,12 +11,12 @@
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="basic-settings">
<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}}
</a>
</h3>
</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">
{{include file="field_input.tpl" field=$username}}
{{include file="field_select_grouped.tpl" field=$timezone}}
@@ -37,12 +37,12 @@
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="privacy-settings">
<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}}
</a>
</h3>
</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">
{{if $server_role != 'basic'}}
{{include file="field_select_grouped.tpl" field=$role}}
@@ -100,12 +100,12 @@
<div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="notification-settings">
<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}}
</a>
</h3>
</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 id="settings-notifications">
<h3>{{$activity_options}}</h3>
@@ -162,7 +162,7 @@
</a>
</h3>
</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">
{{if $menus}}
<div class="form-group channel-menu">
diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl
index 64a3a5778..d8c1ac7aa 100755
--- a/view/tpl/settings_display.tpl
+++ b/view/tpl/settings_display.tpl
@@ -15,7 +15,7 @@
</a>
</h3>
</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">
{{if $theme}}
{{include file="field_themeselect.tpl" field=$theme}}
@@ -41,7 +41,7 @@
</a>
</h3>
</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">
{{if $theme_config}}
{{$theme_config}}
@@ -57,7 +57,7 @@
</a>
</h3>
</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">
{{include file="field_input.tpl" field=$ajaxint}}
{{include file="field_input.tpl" field=$itemspage}}
diff --git a/view/tpl/settings_features.tpl b/view/tpl/settings_features.tpl
index 75eb34fb9..dfe049a7a 100755
--- a/view/tpl/settings_features.tpl
+++ b/view/tpl/settings_features.tpl
@@ -14,7 +14,7 @@
</a>
</h3>
</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">
{{foreach $f.1 as $fcat}}
{{include file="field_checkbox.tpl" field=$fcat}}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 10:55:15 +0000