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

Updates - Header, create user page, global buttons and fields

Browse Source
This commit is contained in:
Razi KAntorp 2014-02-19 16:34:32 +01:00
parent ad17952031
commit 25cec3e143
6 changed files with 171 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/views/clients/edit.blade.php
View File

@ -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">
<span data-bind="visible: $parent.contacts().length > 1">
{{ link_to('#', 'Remove contact', array('data-bind'=>'click: $parent.removeContact')) }}
<div class="col-lg-8 col-lg-offset-4 bold">
<span class="redlink" data-bind="visible: $parent.contacts().length > 1">
{{ link_to('#', 'Remove contact -', array('data-bind'=>'click: $parent.removeContact')) }}
</span>
<span data-bind="visible: $index() === ($parent.contacts().length - 1)" class="pull-right">
{{ link_to('#', 'Add contact', array('onclick'=>'return addContact()')) }}
<span data-bind="visible: $index() === ($parent.contacts().length - 1)" class="pull-right greenlink bold">
{{ link_to('#', 'Add contact +', array('onclick'=>'return addContact()')) }}
</span>
</div>
</div>
@ -151,11 +150,11 @@
<center style="margin-top:16px">
{{ Button::lg_primary_submit('Save') }} &nbsp;|&nbsp;
{{ link_to('clients/' . ($client ? $client->public_id : ''), 'Cancel') }}
<center class="buttons">
{{ Button::lg_primary_submit('Save')->append_with_icon('floppy-disk') }}
{{ Button::lg_default_link('clients/' . ($client ? $client->public_id : ''), 'Cancel')->append_with_icon('remove-circle'); }}
</center>
{{ Former::close() }}
</div>
@stop

2
app/views/dashboard.blade.php
View File

@ -50,7 +50,7 @@
<div class="row">
<div class="col-md-6">
<div class="panel panel-default" 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>

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

@ -151,7 +151,7 @@
<br/>
<div class="container">
<div class="container">
@if (!isset($showBreadcrumbs) || $showBreadcrumbs)
{{ HTML::breadcrumbs() }}
@ -167,7 +167,6 @@
@yield('content')
</div>
<div class="container">
<div class="footer" style="padding-top: 32px">

3
bower.json
View File

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

22
composer.lock generated
View File

@ -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",

148
public/css/style.css
View File

@ -1,3 +1,110 @@
body { background: #f5f6f7 !important;
font-family: 'Roboto', sans-serif;
font-family: 'Roboto', sans-serif;
}
.bold { font-weight: 700; }
a:hover { text-decoration: none; }
.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: 6px 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;
}
/*buttons*/
.btn { font-weight: bold; }
.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:#2e9e49 !important; border-color:#2e9e49 !important;}
.btn-sm, .btn-group-sm>.btn {
border-radius: 2px;
}
.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: #09334f;
border-color: #09334f;
}
.btn-default {background-color: #9f9f9f;
border-color: #9f9f9f;
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-lg, .btn-group-lg>.btn {
padding: 10px 16px;
font-size: 18px;
line-height: 1.33;
border-radius: 2px;
}
.input-group-addon {
background-color: #f4f4f4;
border: 1px solid #dfe0e1;
border-radius: 2px;
cursor:pointer;
}
.caret {
margin-left: 0px;
}
.btn i.glyphicon { font-size: 16px; margin-left:7px; top: 2px; }
.btn-primary i{
border-color: #0b4d78;
}
/*new*/
div {
word-break: break-word;
}
@ -20,6 +127,11 @@ div.panel {
padding-left: 0px !important;
padding-right: 0px !important;
}
.panel {
border-radius: 2px;
-webkit-box-shadow: 0 1px 1px rgba(0,0,0,.05);
box-shadow: 0 1px 1px rgba(0,0,0,.05);
}
.pointer {
cursor: pointer;
@ -60,7 +172,7 @@ table.dataTable tr.even td.sorting_3 { background-color: white; }
/* Hover nav */
/* navigation */
.sidebar-nav {
padding: 9px 0;
}
@ -68,9 +180,7 @@ table.dataTable tr.even td.sorting_3 { background-color: white; }
.dropdown-menu .sub-menu {
left: 100%;
position: absolute;
top: 0;
visibility: hidden;
margin-top: -1px;
}
.dropdown-menu li:hover .sub-menu {
@ -116,6 +226,19 @@ table.dataTable tr.even td.sorting_3 { background-color: white; }
top: 11px;
left: -6px;
}
.dropdown-menu {
left: 0;
top: 100%
min-width: 160px;
padding: 5px 0;
font-size: 14px;
border: none;
border-top: 1px solid #0b4d78;
border-radius: 2px;
-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;
}
/***********************************************
@ -148,7 +271,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;
@ -214,7 +337,7 @@ body {
.navbar-default {
background-color: #428bff;
border-color: #3276b1;
border-color: transparent;
}
.navbar-default .navbar-brand {
color: #ecf0f1;
@ -267,6 +390,19 @@ body {
.navbar-default .navbar-toggle .icon-bar {
background-color: #ecf0f1;
}
.navbar-form { margin-top: 10px; }
.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;
@ -275,4 +411,4 @@ body {
.navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
color: #ffffff;
}
}
}