clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge new into orig

This commit is contained in:
rabuzarus 2016-04-03 14:11:18 +02:00
parent f4c890de8a 9aa8451279
commit 189e34a26d
5 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
css/style.css
View File

@ -160,6 +160,38 @@ iframe, img {
background: $link_hover_color;
}
header #site-location {
display: none;
}
header #banner {
position: fixed;
top: 0px;
/* width: 33%;
margin-left: 33%;
margin-right: 33%;*/
left:49%;
right: 49%;
z-index: 1040;
margin-top: 14px;
text-align: center;
text-shadow: 1px 1px 2px rgba(0,0,0,.5);
font-size: 14px;
font-family: tahoma, "Lucida Sans", sans;
color: #fff;
font-weight: bold;
whitespace: nowrap;
}
header #banner #logo-img {
mask: url('img/friendica-25.png');
-webkit-mask-image: url('img/friendica-25.png');
background-color: $nav_icon_color;
height: 25px;
width: 25px;
margin-left: auto;
margin-right: auto;
}
/* NavBar */
.topbar {
position: fixed;
@ -1090,6 +1122,9 @@ section #jotOpen {
.wall-item-content {
word-break: break-word;
}
.wall-item-content img {
max-height: 480px;
}
.shared-content-wrapper,
.vevent {
margin-left: 50px;
@ -1307,7 +1342,7 @@ ul.tabs li {
/*border-bottom: 0 solid #6fdbe8;*/
border-bottom: 0 solid $link_color;
font-size: 13px;
height: 100%;
height: 102%;
transition: all .15s ease;
}
ul.tabs li a {

BIN
img/friendica-25.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 569 B

BIN
img/friendica-32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 639 B

2
php/modes/default.php
View File

@ -85,7 +85,7 @@ else
</div>
</div><!--/.sidebar-offcanvas-->
<div class=\"col-lg-8 col-md-8 col-sm-12 col-xs-12\" id=\"content\">
<div class=\"col-lg-7 col-md-7 col-sm-12 col-xs-12\" id=\"content\">
<section class=\"sectiontop "; echo $a->argv[0]; echo "-content-wrapper\">";
if(x($page,'content')) echo $page['content']; echo"
<div id=\"pause\"></div> <!-- The pause/resume Ajax indicator -->

14
templates/nav.tpl
View File

@ -1,7 +1,15 @@
{{if $userinfo}}
<header>
{{* {{$langselector}} *}}
<div id="site-location">{{$sitelocation}}</div>
<div id="banner" class="hidden-sm hidden-xs">
<a href="{{$baseurl}}"><div id="logo-img"></div></a>
</div>
</header>
<nav id="topbar-first" class="topbar">
<div class="container">
<div class="col-lg-11 col-md-11 col-sm-12 col-xs-12 no-padding"><!-- div for navbar width-->
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 no-padding"><!-- div for navbar width-->
<!-- Brand and toggle get grouped for better mobile display -->
<div class="topbar-nav">
@ -212,7 +220,7 @@
<div class="container">
<div class="navbar-header">
<a class="navbar-brand" href="#">
<span><img alt="Brand" src="./images/friendica-32.png" width="25" height="25"> Friendica</span>
<span><img alt="Brand" src="./view/theme/frio/img/logo.png" width="25" height="25"> Friendica</span>
</a>
</div>
<div class="hidden-sm hidden-xs">
@ -230,7 +238,7 @@
<div class="container">
<div class="col-lg-3 col-md-3 hidden-sm hidden-xs"></div>
<div class="col-lg-7 col-md-7 col-sm-11 col-xs-10" id="tabmenu"></div>
<div class="col-lg-1 col-md-1 col-sm-1 col-xs-2" id="navbar-button"></div>
<div class="col-lg-2 col-md-2 col-sm-1 col-xs-2" id="navbar-button"></div>
</div>
</div>