Header updates

This commit is contained in:
Razi KAntorp 2014-06-16 17:56:06 +02:00
parent 5a4f625d31
commit da1db89c75
5 changed files with 27 additions and 26 deletions

View File

@ -117,22 +117,23 @@
<div class="navbar" style="margin-bottom:0px"> <div class="navbar" style="margin-bottom:0px">
<div class="container"> <div class="container">
<div class="navbar-header"> <div class="navbar-header">
<a class="navbar-brand" href="https://www.invoiceninja.com/"><img src="{{ asset('images/invoiceninja-logo.png') }}"></a>
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span> <span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button> </div>
<a class="navbar-brand" href="https://www.invoiceninja.com/"><img src="{{ asset('images/invoiceninja-logo.png') }}"></a>
</div>
<div class="collapse navbar-collapse"> <div class="collapse navbar-collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li class="hidden-desktop">{{ link_to('http://blog.invoiceninja.com', 'Blog' ) }}</li> <li class="hidden-desktop">{{ link_to('http://blog.invoiceninja.com', 'Blog' ) }}</li>
<li class="hidden-desktop">{{ link_to('https://www.invoiceninja.com/about', 'About Us' ) }}</li> <li class="hidden-desktop">{{ link_to('https://www.invoiceninja.com/about', 'About Us' ) }}</li>
<li class="hidden-desktop">{{ link_to('https://www.invoiceninja.com/contact', 'Contact Us' ) }}</li> <li class="hidden-desktop">{{ link_to('https://www.invoiceninja.com/contact', 'Contact Us' ) }}</li>
<li>{{ link_to('https://www.invoiceninja.com/features', 'Features' ) }}</li> <li>{{ link_to('https://www.invoiceninja.com/features', 'Features' ) }}</li>
<li>{{ link_to('https://www.invoiceninja.com/faq', 'FAQ' ) }}</li>
<li>{{ link_to('https://www.invoiceninja.com/plans', 'Plans' ) }}</li> <li>{{ link_to('https://www.invoiceninja.com/plans', 'Plans' ) }}</li>
<li>{{ link_to('https://www.invoiceninja.com/testimonials', 'Testimonials' ) }}</li>
<li>{{ link_to('https://www.invoiceninja.com/faq', 'FAQ' ) }}</li>
<li><span class="glyphicon glyphicon-user"></span> <li><span class="glyphicon glyphicon-user"></span>
{{ link_to('login', Auth::check() ? 'My Account' : 'Login' ) }}</li> {{ link_to('login', Auth::check() ? 'My Account' : 'Login' ) }}</li>
</ul> </ul>

View File

@ -7,8 +7,6 @@
<section class="hero background hero1 center" data-speed="2" data-type="background"> <section class="hero background hero1 center" data-speed="2" data-type="background">
<div class="caption-side"></div> <div class="caption-side"></div>
<div class="container">
<div class="container"> <div class="container">
<div class="row" style="margin:0;"> <div class="row" style="margin:0;">
<div class="caption-wrap"> <div class="caption-wrap">

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,3 @@
body { body {
font-family: Roboto, sans-serif; font-family: Roboto, sans-serif;
line-height: 1.6; line-height: 1.6;
@ -106,6 +105,9 @@ text-align: center;
line-height: 1; line-height: 1;
height: auto; height: auto;
} }
.navbar>.container .navbar-brand {
margin-left: 0 !important;
}
ul.navbar-nav { ul.navbar-nav {
float: right; float: right;
list-style-type: none; list-style-type: none;
@ -156,9 +158,13 @@ ul.navbar-nav li a:hover {
.nav>li>a:hover, .nav>li>a:focus { .nav>li>a:hover, .nav>li>a:focus {
background-color: transparent; background-color: transparent;
} }
.container>.navbar-collapse {
margin-right: -15px;
}
.navbar-top { .navbar-top {
padding: 5px 0 0 0; padding: 5px 0 0 0;
background: #fff; background: #fff;
border-top: 1px solid #211f1f;
} }
.navbar-top ul { .navbar-top ul {
float: right; float: right;
@ -172,14 +178,14 @@ ul.navbar-nav li a:hover {
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
vertical-align: middle; vertical-align: middle;
float: left;
} }
.navbar-top ul li .socicon { .navbar-top ul li .socicon {
text-transform: none; text-transform: none;
margin-top: 1px; margin-top: 1px;
} }
.navbar-top ul li a .socicon { .navbar-top ul li a .socicon {
font-size: 16px; font-size: 13px;
color: #a6a5a5; color: #a6a5a5;
display: inline-block; display: inline-block;
} }
@ -187,10 +193,10 @@ ul.navbar-nav li a:hover {
color: #ebbe09; color: #ebbe09;
} }
.navbar-top ul li a { .navbar-top ul li a {
color: #736b6b; color: #2e2b2b;
} }
.navbar-top ul li a:hover { .navbar-top ul li a:hover {
color: #2e2b2b; color: #ebbe09;
} }

Binary file not shown.