Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-18 09:04:35 +01:00
Code Issues Releases Activity

Merge pull request #12 from raziraz/master

Browse Source 
table color fix, search field fix, account pages update.
This commit is contained in:
Hillel Coren 2014-02-26 06:44:50 +02:00
commit 7a896bd307
2 changed files with 51 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/views/header.blade.php
View File

@ -91,8 +91,7 @@
{{ HTML::menu_link('credit') }} {{ HTML::menu_link('credit') }}
{{-- HTML::nav_link('reports', 'Reports') --}} {{-- HTML::nav_link('reports', 'Reports') --}}
</ul> </ul>
<div class="navbar-form navbar-right">
<div class="navbar-form navbar-right">
@if (Auth::check() && !Auth::user()->registered) @if (Auth::check() && !Auth::user()->registered)
{{ Button::sm_success_primary('Sign up', array('id' => 'signUpButton', 'data-toggle'=>'modal', 'data-target'=>'#signUpModal')) }} &nbsp; {{ Button::sm_success_primary('Sign up', array('id' => 'signUpButton', 'data-toggle'=>'modal', 'data-target'=>'#signUpModal')) }} &nbsp;
@endif @endif
@ -122,7 +121,14 @@
@endif @endif
</div> </div>
<ul class="nav navbar-nav navbar-right">
<form class="navbar-form navbar-right" role="search">
<div class="form-group">
<input type="text" id="search" class="form-control" placeholder="Search">
</div>
</form>
<ul class="nav navbar-nav navbar-right">
<li class="dropdown"> <li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">History <b class="caret"></b></a> <a href="#" class="dropdown-toggle" data-toggle="dropdown">History <b class="caret"></b></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
@ -135,12 +141,13 @@
@endif @endif
</ul> </ul>
</li> </li>
<form class="navbar-form navbar-left" role="search"> </ul>
<div class="form-group">
<input type="text" id="search" class="form-control" placeholder="Search">
</div>
</form>
</ul>

38
public/css/style.css
View File

@ -56,14 +56,15 @@ textarea.form-control {
height: auto !important; height: auto !important;
} }
/*tables*/ /*tables*/
table.dataTable { border-radius: 3px; color:#fff; border-collapse: collapse; table.dataTable { border-radius: 3px; border-collapse: collapse;
/*border-spacing: 0;*/} /*border-spacing: 0;*/}
.dataTable thead, .invoice-table thead { table.dataTable thead > tr > th, table.invoice-table thead > tr > th {
background: #e37329; background: #e37329 !important;
color:#fff; color:#fff;
} }
th:first-child { th:first-child {
border-radius: 3px 0 0 0; border-radius: 3px 0 0 0;
border-left: none;
} }
th:last-child { th:last-child {
border-radius: 0 3px 0 0; border-radius: 0 3px 0 0;
@ -321,6 +322,30 @@ padding-bottom: 20px;
margin-top: 0; margin-top: 0;
} }
.nav-tabs { color:#fff; }
.nav-tabs.nav-justified>li>a {
border: none;
border-radius: 0;
color: #fff;
background-color: #9b9b9b;
}
.nav-tabs.nav-justified>li:first-child>a {
border-radius: 3px 0 0 3px;
border-left: none;
}
.nav-tabs.nav-justified>li:last-child>a {
border-radius: 0 3px 3px 0;
}
.nav-tabs.nav-justified>li>a:hover {
background-color:#8a8a8a;
}
.nav-tabs.nav-justified>.active>a, .nav-tabs.nav-justified>.active>a:hover, .nav-tabs.nav-justified>.active>a:focus {
border: none;
background-color: #808080;
font-weight: bold;
color: #fff;
}
.navbar { .navbar {
background-color: #0b4d78 !important; background-color: #0b4d78 !important;
background-image: none; background-image: none;
@ -546,8 +571,13 @@ body {
.navbar-default .navbar-toggle .icon-bar { .navbar-default .navbar-toggle .icon-bar {
background-color: #ecf0f1; background-color: #ecf0f1;
} }
.navbar-form { margin-top: 15px; } .navbar-form { margin-top: 15px; padding-right:0; }
.navbar-form:first-child { padding-right: 0; }
.navbar-form .form-control { height: 30px; } .navbar-form .form-control { height: 30px; }
.twitter-typeahead .tt-hint {
height: 30px;
border-radius: 3px;
}
.navbar-form .btn-default { .navbar-form .btn-default {
color: #fff; color: #fff;
background-color: #09334f; background-color: #09334f;