Merge pull request #10 from raziraz/master

Razi app-updates

app/views/accounts/details.blade.php

@@ -75,7 +75,7 @@
 	</div>
 	
 	<center>
-		{{ Button::lg_primary_submit('Save') }}
+		{{ Button::lg_primary_submit('Save')->append_with_icon('floppy-disk') }}
 	</center>
 
 	{{ Former::close() }}

app/views/accounts/import_export.blade.php

@@ -6,12 +6,12 @@
 	{{ Former::open_for_files('company/import_map')->addClass('col-md-9 col-md-offset-1') }}
 	{{ Former::legend('Import Client Data') }}
 	{{ Former::file('file')->label('Select CSV file') }}
-	{{ Former::actions( Button::lg_primary_submit('Upload') ) }}
+	{{ Former::actions( Button::lg_info_submit('Upload')->append_with_icon('open') ) }}
 	{{ Former::close() }}
 
   {{ Former::open('company/export')->addClass('col-md-9 col-md-offset-1') }}
   {{ Former::legend('Export Client Data') }}
-  {{ Former::actions( Button::lg_primary_submit('Download') ) }}
+  {{ Former::actions( Button::lg_primary_submit('Download')->append_with_icon('download-alt') ) }}
   {{ Former::close() }}
 
 @stop

app/views/accounts/notifications.blade.php

@@ -18,7 +18,7 @@
 	{{ Former::textarea('invoice_terms')->label('Set default invoice terms') }}
 	{{ Former::textarea('email_footer')->label('Set default email signature') }}
 
-	{{ Former::actions( Button::lg_primary_submit('Save') ) }}
+	{{ Former::actions( Button::lg_primary_submit('Save')->append_with_icon('floppy-disk') ) }}
 	{{ Former::close() }}
 
 @stop

app/views/accounts/payments.blade.php

@@ -45,7 +45,7 @@
 		
 	@endforeach
 
-	{{ Former::actions( Button::lg_primary_submit('Save') ) }}
+	{{ Former::actions( Button::lg_primary_submit('Save')->append_with_icon('floppy-disk') ) }}
 	{{ Former::close() }}
 
 

app/views/clients/edit.blade.php

@@ -6,10 +6,10 @@
 @stop
 
 @section('content')
-
+<div class="row">
 	<!--<h3>{{ $title }} Client</h3>-->
 	
-	{{ Former::open($url)->addClass('col-md-10 col-md-offset-1 main_form')->method($method)->rules(array(
+	{{ Former::open($url)->addClass('col-md-12 main_form')->method($method)->rules(array(
   		'email' => 'email|required'  		
 	)); }}
 
@@ -17,7 +17,6 @@
 		{{ Former::populate($client) }}
 	@endif
 
-
 	<div class="row">
 		<div class="col-md-6">
 
@@ -52,12 +51,12 @@
 				{{ Former::text('phone')->data_bind("value: phone, valueUpdate: 'afterkeydown'") }}	
 
 				<div class="form-group">
-					<div class="col-lg-8 col-lg-offset-4">
+					<div class="col-lg-8 col-lg-offset-4 bold">
-						<span data-bind="visible: $parent.contacts().length > 1">
+						<span class="redlink" data-bind="visible: $parent.contacts().length > 1">
-							{{ link_to('#', 'Remove contact', array('data-bind'=>'click: $parent.removeContact')) }}
+							{{ link_to('#', 'Remove contact -', array('data-bind'=>'click: $parent.removeContact')) }}
 						</span>					
-						<span data-bind="visible: $index() === ($parent.contacts().length - 1)" class="pull-right">
+						<span data-bind="visible: $index() === ($parent.contacts().length - 1)" class="pull-right greenlink bold">
-							{{ link_to('#', 'Add contact', array('onclick'=>'return addContact()')) }}
+							{{ link_to('#', 'Add contact +', array('onclick'=>'return addContact()')) }}
 						</span>
 					</div>
 				</div>
@@ -151,11 +150,11 @@
 
 
 
-	<center style="margin-top:16px">
+	<center class="buttons">
-		{{ Button::lg_primary_submit('Save') }} &nbsp;|&nbsp;
+		{{ Button::lg_primary_submit('Save')->append_with_icon('floppy-disk') }}
-		{{ link_to('clients/' . ($client ? $client->public_id : ''), 'Cancel') }}	
+        {{ Button::lg_default_link('clients/' . ($client ? $client->public_id : ''), 'Cancel')->append_with_icon('remove-circle'); }}
 	</center>
 
 	{{ Former::close() }}
-
+</div>
 @stop

app/views/dashboard.blade.php

@@ -49,8 +49,8 @@
 
 <div class="row">
   <div class="col-md-6">  
-    <div class="panel panel-default" style="min-height:320px">
+    <div class="panel panel-default dashboard" style="min-height:320px">
-      <div class="panel-heading" style="background-color:#2299c0">
+      <div class="panel-heading" style="background-color:#0b4d78">
         <h3 class="panel-title in-bold-white">
           <i class="glyphicon glyphicon-exclamation-sign"></i> Notifications
         </h3>
@@ -66,14 +66,14 @@
     </div>  
   </div>
   <div class="col-md-6">  
-    <div class="panel panel-default" style="min-height:320px">
+    <div class="panel panel-default dashboard" style="min-height:320px">
       <div class="panel-heading" style="background-color:#e37329">
         <h3 class="panel-title in-bold-white">
           <i class="glyphicon glyphicon-time"></i> Invoices Past Due
         </h3>
       </div>
       <div class="panel-body">
-        <table class="table">
+        <table class="table table-striped">
           <thead>
             <th>Invoice #</th>
             <th>Client</th>
@@ -98,14 +98,14 @@
 
 <div class="row">
   <div class="col-md-6">  
-    <div class="panel panel-default" style="min-height:320px">
+    <div class="panel panel-default dashboard" style="min-height:320px">
       <div class="panel-heading">
         <h3 class="panel-title">
           <i class="glyphicon glyphicon-time"></i> Upcoming invoices
         </h3>
       </div>
       <div class="panel-body">
-        <table class="table">
+        <table class="table table-striped">
           <thead>
             <th>Invoice #</th>
             <th>Client</th>
@@ -126,15 +126,18 @@
       </div>
     </div>
   </div>
-  <div class="col-md-6">
+  <div class="col-md-3">
-    <div class="col-md-6 active-clients">      
+    <div class="active-clients">      
       <div class="in-bold in-white" style="font-size:42px">{{ $activeClients }}</div>
       <div class="in-thin in-white">{{ Utils::pluralize('active client', $activeClients) }}</div>
     </div>
-    <div class="col-md-6 average-invoice">  
+      </div>
+    <div class="col-md-3">
+    <div class="average-invoice">  
       <div><b>Average invoice</b></div>
       <div class="in-bold in-white" style="font-size:42px">{{ $invoiceAvg }}</div>
     </div>
+      
   </div> 
 </div>
 

app/views/header.blade.php

@@ -167,7 +167,6 @@
 
 	@yield('content')		
 
-
 		</div>
 		<div class="container">
 		<div class="footer" style="padding-top: 32px">
@@ -211,7 +210,7 @@
 	        <h4 class="modal-title" id="myModalLabel">Sign up</h4>
 	      </div>
 
-	      <div style="background-color: #EEEEEE; padding-right:20px" id="signUpDiv" onkeyup="validateSignUp()" onkeydown="checkForEnter(event)">
+	      <div style="background-color: #fff; padding-right:20px" id="signUpDiv" onkeyup="validateSignUp()" onkeydown="checkForEnter(event)">
 	    	<br/>
 	    	
 	    	{{ Former::open('signup/submit')->addClass('signUpForm') }}
@@ -240,7 +239,7 @@
   			</div>
       </div>
 
-      <div style="background-color: #EEEEEE; padding-right:20px;padding-left:20px; display:none" id="signUpSuccessDiv">
+      <div style="background-color: #fff; padding-right:20px;padding-left:20px; display:none" id="signUpSuccessDiv">
       <br/>
       <h3>Success</h3>
       You have succesfully registered. Please visit the link in the account confirmation email to verify your email address.
@@ -249,8 +248,8 @@
 
 
 	      <div class="modal-footer" id="signUpFooter" style="margin-top: 0px">	      	
-	      	<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+	      	<button type="button" class="btn btn-default" data-dismiss="modal">Close <i class="glyphicon glyphicon-remove-circle"></i></button>
-	        <button type="button" class="btn btn-primary" id="saveSignUpButton" onclick="validateServerSignUp()">Save</button>	      	
+	        <button type="button" class="btn btn-primary" id="saveSignUpButton" onclick="validateServerSignUp()">Save <i class="glyphicon glyphicon-floppy-disk"></i></button>	      	
 	      </div>
 	    </div>
 	  </div>

app/views/invoices/edit.blade.php

@@ -212,14 +212,14 @@
 					->fromQuery($invoiceDesigns, 'name', 'id')->data_bind("value: invoice_design_id") }}
 
 				
-		{{ Button::normal('Download PDF', array('onclick' => 'onDownloadClick()')) }}	
+		{{ Button::primary('Download PDF', array('onclick' => 'onDownloadClick()'))->append_with_icon('download-alt'); }}	
         
 		@if (!$invoice || (!$invoice->trashed() && !$invoice->client->trashed()))						
 			@if ($invoice)		
 
 				<div id="primaryActions" style="text-align:left" data-bind="css: $root.enable.save" class="btn-group">
-					<button class="btn-primary btn" type="button" data-bind="css: $root.enable.save">Save Invoice</button>
+					<button class="btn-success btn" type="button" data-bind="css: $root.enable.save">Save Invoice</button>
-					<button class="btn-primary btn dropdown-toggle" type="button" data-toggle="dropdown" data-bind="css: $root.enable.save"> 
+					<button class="btn-success btn dropdown-toggle" type="button" data-toggle="dropdown" data-bind="css: $root.enable.save"> 
 						<span class="caret"></span>
 					</button>
 					<ul class="dropdown-menu">
@@ -255,13 +255,13 @@
 					  )
 					, array('id'=>'primaryActions', 'style'=>'text-align:left', 'data-bind'=>'css: $root.enable.save'))->split(); --}}				
 			@else
-				{{ Button::primary_submit('Save Invoice', array('data-bind'=>'css: $root.enable.save', 'id' => 'saveButton')) }}			
+				{{ Button::success_submit('Save Invoice', array('data-bind'=>'css: $root.enable.save', 'id' => 'saveButton')) }}			
 			@endif
 
-			{{ Button::primary('Email Invoice', array('id' => 'email_button', 'onclick' => 'onEmailClick()', 'data-bind' => 'css: $root.enable.email')) }}		
+			{{ Button::normal('Email Invoice', array('id' => 'email_button', 'onclick' => 'onEmailClick()', 'data-bind' => 'css: $root.enable.email'))->append_with_icon('send'); }}		
 
 			@if ($invoice)		
-				{{ Button::success('Enter Payment', array('onclick' => 'onPaymentClick()')) }}		
+				{{ Button::info('Enter Payment', array('onclick' => 'onPaymentClick()'))->append_with_icon('usd'); }}		
 			@endif
 		@endif
 
@@ -283,7 +283,7 @@
 	      </div>
 
 	      <div class="container" style="width: 100%">
-		<div style="background-color: #EEEEEE" class="row" data-bind="with: client" onkeypress="clientModalEnterClick(event)">
+		<div style="background-color: #fff" class="row" data-bind="with: client" onkeypress="clientModalEnterClick(event)">
 			<div class="col-md-6" style="margin-left:0px;margin-right:0px" >
 
 				{{ Former::legend('Organization') }}
@@ -361,7 +361,7 @@
 	        <h4 class="modal-title" id="taxModalLabel">Tax Rates</h4>
 	      </div>
 
-	      <div style="background-color: #EEEEEE" onkeypress="taxModalEnterClick(event)">
+	      <div style="background-color: #fff" onkeypress="taxModalEnterClick(event)">
 			<table class="table invoice-table sides-padded" style="margin-bottom: 0px !important">
 			    <thead>
 			        <tr>
@@ -414,7 +414,7 @@
 	        <h4 class="modal-title" id="recurringModalLabel">Recurring Invoices</h4>
 	      </div>
 
-	    <div style="background-color: #EEEEEE; padding-left: 16px; padding-right: 16px">
+	    <div style="background-color: #fff; padding-left: 16px; padding-right: 16px">
 	    	&nbsp;
 	    	<p>Recurring invoices are automatically sent.</p>
 	    	<p>Use :MONTH, :QUARTER or :YEAR for dynamic dates. </p>

app/views/list.blade.php

@@ -17,14 +17,15 @@
 		  )
 		, array('id'=>'archive'))->split(); }}
 	
-	&nbsp;<label for="trashed" style="font-weight:normal">
+	&nbsp;<label for="trashed" style="font-weight:normal; margin-left: 10px;">
 		<input id="trashed" type="checkbox" onclick="setTrashVisible()" 
 			{{ Session::get('show_trash') ? 'checked' : ''}}/> Show archived/deleted {{ $entityType }}s
 	</label>
 
 	<div id="top_right_buttons" class="pull-right">
-		<input id="tableFilter" type="text" style="width:140px;margin-right:4px" class="form-control pull-left" placeholder="Filter"/> 
+		<input id="tableFilter" type="text" style="width:140px;margin-right:17px" class="form-control pull-left" placeholder="Filter"/> 
-		{{ Button::primary_link(URL::to($entityType . 's/create'), 'New ' . Utils::getEntityName($entityType), array('class' => 'pull-right')) }}	
+		{{ Button::success_link(URL::to($entityType . 's/create'), 'New ' . Utils::getEntityName($entityType), array('class' => 'pull-right'))->append_with_icon('plus-sign'); }}	
+        
 	</div>
 
     @if (isset($secEntityType))

bower.json

@@ -17,8 +17,5 @@
     "typeahead.js": "~0.9.3",
     "accounting": "~0.*",
     "pdfjs": "*"
-  },
-  "resolutions": {
-    "jquery": "~1.*"
   }
 }

composer.lock

@@ -1280,7 +1280,7 @@
                     "name": "Max Ehsan",
                     "email": "contact@laravelbook.com",
                     "homepage": "http://laravelbook.com/",
-                    "role": "Developer"
+                    "role": "Maintainer"
                 },
                 {
                     "name": "Igor Santos",
@@ -3902,7 +3902,9 @@
             "authors": [
                 {
                     "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
+                    "email": "fabien@symfony.com",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
                 },
                 {
                     "name": "Chris Corbyn"
@@ -3960,7 +3962,9 @@
             "authors": [
                 {
                     "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
+                    "email": "fabien@symfony.com",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
                 },
                 {
                     "name": "Symfony Community",
@@ -4285,7 +4289,9 @@
             "authors": [
                 {
                     "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
+                    "email": "fabien@symfony.com",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
                 },
                 {
                     "name": "Symfony Community",
@@ -4332,7 +4338,9 @@
             "authors": [
                 {
                     "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
+                    "email": "fabien@symfony.com",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
                 },
                 {
                     "name": "Symfony Community",
@@ -4678,7 +4686,9 @@
             "authors": [
                 {
                     "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
+                    "email": "fabien@symfony.com",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
                 },
                 {
                     "name": "Symfony Community",

public/css/style.css

@@ -1,3 +1,225 @@
+body { background: #f8f8f8 !important;
+    font-family: 'Roboto', sans-serif;
+    font-family: 'Roboto', sans-serif;
+}
+.bold { font-weight: 700; }
+a {color:#0b4d78;}
+a:hover { text-decoration: none; color: #0a3857;}
+.breadcrumb {
+padding: 8px 0!important;
+}
+legend {
+padding-bottom: 10px;
+margin-bottom: 20px;
+font-size: 20px;
+font-weight: 700;
+line-height: inherit;
+color: #333;
+border-bottom: 1px solid #dfe0e1;
+}
+
+.greenlink a { color:#36c157; }
+.greenlink a:hover { color:#2e9e49; }
+.redlink a { color:#da4830; }
+.redlink a:hover { color:#c13b25; }
+
+.buttons { margin: 25px 0;  }
+.buttons .btn { margin: 0 6px;  }
+
+/*forms*/
+.form-group {
+margin-bottom: 17px;
+}
+.form-control {
+display: block;
+width: 100%;
+height: 40px;
+padding: 9px 12px;
+font-size: 14px;
+line-height: 1.42857143;
+color: #555;
+background-color: #fff;
+background-image: none;
+border: 1px solid #dfe0e1;
+border-radius: 2px;
+-webkit-box-shadow: none;
+box-shadow: none;
+-webkit-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
+transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
+}
+.form-horizontal .control-label, .form-horizontal .radio, .form-horizontal .checkbox, .form-horizontal .radio-inline, .form-horizontal .checkbox-inline {
+margin-top: 0;
+margin-bottom: 0;
+padding-top: 10px;
+}
+textarea.form-control {
+height: auto !important;
+}
+/*tables*/
+table.dataTable { border-radius: 3px; color:#fff; border-collapse: collapse;
+    /*border-spacing: 0;*/}
+.dataTable thead, .invoice-table thead {
+    background: #e37329;
+    color:#fff;
+}
+th:first-child {
+    border-radius: 3px 0 0 0;
+}
+th:last-child {
+    border-radius: 0 3px 0 0;
+}
+
+tr {border: none;}
+th {border-left: 1px solid #d26b26; }
+.table>thead>tr>th, .table>tbody>tr>th, .table>tfoot>tr>th, .table>thead>tr>td, .table>tbody>tr>td, .table>tfoot>tr>td {
+vertical-align: middle;
+border-top: none;
+border-bottom: 1px solid #dfe0e1;
+}
+table.dataTable.no-footer {
+border-bottom: none;
+}
+.table-striped>tbody>tr:nth-child(odd)>td, .table-striped>tbody>tr:nth-child(odd)>th {
+background-color: #fff;
+}
+table.table thead .sorting_asc {
+background: url('../images/sort_asc.png') no-repeat 90% 50%;
+}
+table.table thead .sorting_desc {
+background: url('../images/sort_desc.png') no-repeat 90% 50%;
+}
+table.dataTable thead th, table.dataTable thead td, table.invoice-table thead th, table.invoice-table thead td {
+padding: 12px 10px;
+}
+table.dataTable tbody th, table.dataTable tbody td {
+padding: 10px;
+}
+
+.datepicker {
+padding: 4px !important;
+margin-top: 1px;
+-webkit-border-radius: 3px;
+-moz-border-radius: 3px;
+border-radius: 3px;
+}
+.datepicker.dropdown-menu {
+border: 1px solid #dfe0e1;
+-webkit-border-radius: 5px;
+-moz-border-radius: 5px;
+border-radius: 5px;
+-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.05);
+-moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.05);
+box-shadow: 0 5px 10px rgba(0, 0, 0, 0.05);
+color: #333333;
+font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+font-size: 13px;
+line-height: 20px;
+}
+.datepicker table {font-size: 12px; border-spacing:2px;}
+.datepicker td, .datepicker th { width:30px; }
+.datepicker table tr td.active.active, .datepicker table tr td.active:hover.active {
+background-color: #0b4d78;
+    background-image:none;
+}
+.datepicker table tr td.today { color: #333; background-color: #edd71e !important; background-image:none; text-shadow:none;}
+.datepicker table tr td.today:hover { color: #333; background-color: #edd71e !important; background-image:none; text-shadow:none;}
+.datepicker table tr td.today.active:hover {
+color: #333;
+}
+
+/*modals*/
+
+.modal-header {
+border-bottom: 1px solid #dfe0e1;
+background-color: #f8f8f8;
+}
+.modal-footer {
+background-color: #f8f8f8;
+border-top: 1px solid #dfe0e1;
+}
+.modal thead {
+background: #fff;
+color: #333;
+}
+.modal .table>thead>tr>th {
+border-bottom: 1px solid #dfe0e1 !important; padding-top: 30px;
+}
+.modal .table>thead>tr>th:first-child, .modal .table>thead>tr>th:last-child {
+border-bottom: none !important;
+}
+/*buttons*/
+.btn { font-weight: bold; 
+    border-radius: 3px;
+    padding: 9px 12px;
+}
+.btn-success {
+background-color: #36c157 !important;
+border-color: #36c157 !important;
+}
+.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{background-color:#33b753 !important; border-color:#33b753 !important;}
+.btn-sm, .btn-group-sm>.btn {
+padding: 5px 10px;
+}
+.btn-group.open .dropdown-toggle {
+-webkit-box-shadow: none;
+box-shadow: none;
+}
+.btn-primary {
+background-color: #0b4d78;
+border-color: #0b4d78;
+}
+.btn-primary:hover, .btn-primary:focus, .btn-primary:active, .btn-primary.active, .open .dropdown-toggle.btn-primary {
+background-color: #0a456c;
+border-color: #0a456c;
+}
+.btn-default {background-color: #808080;
+border-color: #808080;
+    color: #fff;
+}
+.btn-default:hover, .btn-default:focus, .btn-default:active, .btn-default.active, .open .dropdown-toggle.btn-default {
+color: #fff;
+background-color: #737373;
+border-color: #737373;
+}
+.btn-info {background-color: #e27329;
+border-color: #e27329;
+    color: #fff;
+}
+.btn-info:hover, .btn-info:focus, .btn-info:active, .btn-info.active, .open .dropdown-toggle.btn-info {
+color: #fff;
+background-color: #d66d27;
+border-color: #d66d27;
+}
+.btn-lg, .btn-group-lg>.btn {
+padding: 10px 16px;
+font-size: 18px;
+    height: auto;
+}
+.btn-default.disabled, .btn-default[disabled], fieldset[disabled] .btn-default, .btn-default.disabled:hover, .btn-default[disabled]:hover, fieldset[disabled] .btn-default:hover, .btn-default.disabled:focus, .btn-default[disabled]:focus, fieldset[disabled] .btn-default:focus, .btn-default.disabled:active, .btn-default[disabled]:active, fieldset[disabled] .btn-default:active, .btn-default.disabled.active, .btn-default[disabled].active, fieldset[disabled] .btn-default.active {
+background-color: #b5b5b5;
+border-color: #b5b5b5;
+}
+.input-group-addon {
+background-color: #f4f4f4;
+border: 1px solid #dfe0e1;
+border-radius: 3px;
+    cursor:pointer;
+}
+.caret {
+margin-left: 0px;
+}
+.btn i.glyphicon {  font-size: 16px; margin-left:7px; top: 2px; }
+.btn-primary i{
+border-color: #0b4d78;
+}
+.form-actions .btn { margin-left: 10px; }
+
+.form-actions .btn.btn-success:first-child {
+margin-left: 10px !important;
+}
+
+/*new*/
+
 div {
     word-break: break-word;
 }
@@ -20,6 +242,11 @@ div.panel {
     padding-left: 0px !important;
     padding-right: 0px !important;
 }
+.panel {
+border-radius: 3px;
+-webkit-box-shadow: 0 1px 1px rgba(0,0,0,.05);
+box-shadow: 0 1px 1px rgba(0,0,0,.05);
+}
 
 .pointer {
     cursor: pointer;
@@ -48,6 +275,14 @@ table.table thead > tr > th {
 table td {
     max-width: 250px;
 }
+.pagination>.active>a, .pagination>.active>span, .pagination>.active>a:hover, .pagination>.active>span:hover, .pagination>.active>a:focus, .pagination>.active>span:focus {
+background-color: #0b4d78;
+border-color: #0b4d78;
+}
+.pagination>li:first-child>a, .pagination>li:first-child>span {
+border-bottom-left-radius: 3px;
+border-top-left-radius: 3px;
+}
 
 /* hide table sorting indicators */
 table.table thead .sorting { background: url('') no-repeat center right; }
@@ -60,17 +295,14 @@ table.dataTable tr.even td.sorting_3 { background-color: white; }
 
 
 
-/* Hover nav */
+/* navigation */
 .sidebar-nav {
     padding: 9px 0;
 }
-
 .dropdown-menu .sub-menu {
     left: 100%;
     position: absolute;
-    top: 0;
     visibility: hidden;
-    margin-top: -1px;
 }
 
 .dropdown-menu li:hover .sub-menu {
@@ -81,6 +313,10 @@ table.dataTable tr.even td.sorting_3 { background-color: white; }
     display: block;
 }
 
+.navbar-nav>li>a {
+padding-top: 20px;
+padding-bottom: 20px;
+}
 .nav-tabs .dropdown-menu, .nav-pills .dropdown-menu, .navbar .dropdown-menu {
     margin-top: 0;
 }
@@ -116,6 +352,24 @@ table.dataTable tr.even td.sorting_3 { background-color: white; }
     top: 11px;
     left: -6px;
 }
+.navbar .dropdown-menu {
+    border-top: 1px solid #0b4d78;
+}
+.navbar-brand {
+padding-top:20px;
+}
+.dropdown-menu {
+left: 0;
+top: 100%;
+min-width: 160px;
+padding: 5px 0;
+font-size: 14px;
+border: none;
+border-radius: 3px;
+-webkit-box-shadow: 0 6px 12px rgba(0,0,0,.05);
+box-shadow: 0 6px 12px rgba(0,0,0,.05);
+background-clip: padding-box;
+}
 
 
 /***********************************************
@@ -130,7 +384,7 @@ table.dataTable tr.even td.sorting_3 { background-color: white; }
 
 .in-thin {
     font-size: 26px;
-    color: #888;
+    font-weight: 100;
 }
 
 .in-bold-white {
@@ -139,7 +393,7 @@ table.dataTable tr.even td.sorting_3 { background-color: white; }
 }
 
 .in-image {
-    float:left;padding-right:16px;
+    float:left;padding-right:25px;
 }
 
 .in-white {
@@ -148,7 +402,7 @@ table.dataTable tr.even td.sorting_3 { background-color: white; }
 
 
 .active-clients {
-    background-color: #2299c0;
+    background-color: #0b4d78;
     background-image:url('../images/activeclients.png');
     background-position:center;
     background-repeat: no-repeat;
@@ -167,11 +421,39 @@ table.dataTable tr.even td.sorting_3 { background-color: white; }
 .invoice-table tbody {
     border-style: none !important;
 }
+.panel-body {padding: 25px;}
+
+.dashboard .panel-body {padding: 0;}
+
+.dashboard .table-striped>tbody>tr>td, .table-striped>tbody>tr>th { background-color: #fbfbfb;}
+.dashboard .table-striped>tbody>tr:nth-child(odd)>td, .table-striped>tbody>tr:nth-child(odd)>th {
+background-color: #fff;
+} 
+.dashboard th {
+border-left: none;
+    background-color: #fbfbfb;
+    border-bottom: 1px solid #dfe0e1;
+}
+.dashboard table.table thead > tr > th {
+border-bottom-width: 1px;
+}
+
+.dashboard .table-striped>tbody>tr>td:first-child { padding-left: 15px;  }
+.dashboard .table-striped>thead>tr>th:first-child { padding-left: 15px;  }
 
 /***********************************************
    New/edit invoice page
 ************************************************/
 
+table.invoice-table { color:#333; }
+
+table.invoice-table th:first-child {
+    border-radius: 3px 0 0 3px;
+}
+table.invoice-table th:last-child {
+    border-radius: 0 3px 3px 0;
+}
+
 .invoice-table td.hide-border,
 .invoice-table th.hide-border {
     border-style: none !important;
@@ -181,9 +463,6 @@ table.dataTable tr.even td.sorting_3 { background-color: white; }
     padding-top: 6px;
 }
 
-.invoice-table th {
-    border-top: 1px solid #ddd !important;      
-}
 
 .invoice-table td.td-icon {
     vertical-align: middle !important;
@@ -214,7 +493,7 @@ body {
 
 .navbar-default {
     background-color: #428bff;
-    border-color: #3276b1;
+    border-color: transparent;
 }
 .navbar-default .navbar-brand {
     color: #ecf0f1;
@@ -267,6 +546,19 @@ body {
 .navbar-default .navbar-toggle .icon-bar {
     background-color: #ecf0f1;
 }
+.navbar-form { margin-top: 15px; }
+.navbar-form .form-control { height: 30px; }
+.navbar-form .btn-default {
+color: #fff;
+background-color: #09334f;
+border-color: #09334f;
+}
+.navbar-form .dropdown-toggle.btn-default {
+color: #fff;
+background-color: #08273c;
+border-color: #08273c;
+}
+
 @media (max-width: 767px) {
     .navbar-default .navbar-nav .open .dropdown-menu > li > a {
         color: #ecf0f1;