harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #356 from git-marijus/master

Browse Source 
hide aside on navbar collapse and add button to toggle visibility
This commit is contained in:
friendica 2014-03-08 07:37:59 +11:00
commit a06c09cdf3
6 changed files with 51 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
view/css/conversation.css
View File

@ -113,7 +113,7 @@
/* conversation */ /* conversation */
.thread-wrapper.toplevel_item { .thread-wrapper.toplevel_item {
width: 92%; width: 90%;
} }
/* conv_item */ /* conv_item */

21
view/css/default.css
View File

@ -7,24 +7,19 @@ header #banner {
} }
aside#region_1 { aside#region_1 {
display: block; min-width: 210px;
width: 210px; display: table-cell;
position: absolute; vertical-align: top;
top: 65px; padding: 65px 10px 10px 10px;
left: 0;
margin-left: 10px;
} }
aside input[type='text'] { aside input[type='text'] {
width: 174px; width: 174px;
} }
section { section {
position: absolute; width: 100%;
top: 65px; display: table-cell;
left: 250px; vertical-align: top;
display: block; padding: 65px 0px 200px 10px;
right: 15px;
padding-bottom: 350px;
} }

41
view/php/default.php
View File

@ -1,20 +1,21 @@
<!DOCTYPE html > <!DOCTYPE html >
<html> <html>
<head> <head>
<title><?php if(x($page,'title')) echo $page['title'] ?></title> <title><?php if(x($page,'title')) echo $page['title'] ?></title>
<script>var baseurl="<?php echo $a->get_baseurl() ?>";</script> <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?> <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
</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 navbar-inverse navbar-fixed-top" role="navigation"><?php if(x($page,'nav')) echo $page['nav']; ?></nav> <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
<aside id="region_1"><?php if(x($page,'aside')) echo $page['aside']; ?></aside> <main>
<section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?> <aside id="region_1" class="hidden-xs"><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
<div id="page-footer"></div> <section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?>
<div id="pause"></div> <div id="page-footer"></div>
</section> <div id="pause"></div>
<aside id="region_3"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></aside> </section>
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer> <aside id="region_3"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></aside>
</body> </main>
</html> <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
</body>
</html>

14
view/theme/redbasic/css/style.css
View File

@ -2233,7 +2233,7 @@ nav .dropdown-menu {
/* bootstrap overrides */ /* bootstrap overrides */
blockquote { blockquote {
font-size: $body_font_size; font-size: $body_font_size;
} }
.dropdown-menu { .dropdown-menu {
@ -2282,3 +2282,15 @@ blockquote {
background-color: $nav_bd; background-color: $nav_bd;
color: $nav_active_icon_colour; color: $nav_active_icon_colour;
} }
#expand-aside {
color: $nav_active_icon_colour;
padding: 7px 10px;
}
@media screen and (max-width:767px) {
aside#region_1 {
background: rgba(0, 0, 0, .1);
border-right: 1px solid $nav_bd;
}
}

5
view/theme/redbasic/js/redbasic.js
View File

@ -22,6 +22,11 @@ function cmtBbClose(comment, id) {
$(document).ready(function() { $(document).ready(function() {
$('[data-toggle=show_hide]').click(function() {
$('#expand-aside-icon').toggleClass('icon-circle-arrow-right').toggleClass('icon-circle-arrow-left');
$('#region_1').toggleClass('hidden-xs');
});
$('.group-edit-icon').hover( $('.group-edit-icon').hover(
function() { function() {
$(this).css('opacity','1.0');}, $(this).css('opacity','1.0');},

3
view/tpl/nav.tpl
View File

@ -5,6 +5,9 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<button id="expand-aside" type="button" class="navbar-toggle" data-toggle="show_hide" data-target="#region_1">
<i class="icon-circle-arrow-right" id="expand-aside-icon"></i>
</button>
{{if $userinfo}} {{if $userinfo}}
<img class="dropdown-toggle fakelink" data-toggle="dropdown" id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="caret" id="usermenu-caret"></span> <img class="dropdown-toggle fakelink" data-toggle="dropdown" id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="caret" id="usermenu-caret"></span>
{{if $localuser}} {{if $localuser}}