Merge new into orig

diff --git a/css/style.css b/css/style.css
index 5a3347de67f0fcd1f16c2d6c16cfc4ce8a1320df..6d5366a45b74ac433900cd7ec6c1b112579dc24c 100644 (file)
--- a/css/style.css
+++ b/css/style.css
@@ -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 {

diff --git a/img/friendica-25.png b/img/friendica-25.png
new file mode 100644 (file)
index 0000000..f642eeb
Binary files /dev/null and b/img/friendica-25.png differ

diff --git a/img/friendica-32.png b/img/friendica-32.png
new file mode 100644 (file)
index 0000000..5bd3962
Binary files /dev/null and b/img/friendica-32.png differ

diff --git a/php/modes/default.php b/php/modes/default.php
index 1edbfbb26232c03d07ed41dc0d06b73d11e5cc29..73874d6611c0eff3e30178bd56c67b2528ceb386 100644 (file)
--- a/php/modes/default.php
+++ b/php/modes/default.php
@@ -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 -->

diff --git a/templates/nav.tpl b/templates/nav.tpl
index a110669588ab5740671b565e9691209057920895..96c94e43a7cc9aba53a2ebc4e384c84cfccb5b32 100644 (file)
--- a/templates/nav.tpl
+++ b/templates/nav.tpl
@@ -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>