From 0f6c87e39eed226cb8dd87d789a0b69df9361d52 Mon Sep 17 00:00:00 2001 From: Razi KAntorp Date: Tue, 18 Mar 2014 16:17:49 +0100 Subject: [PATCH 1/2] modal styling updates --- app/views/clients/edit.blade.php | 2 +- app/views/invoices/edit.blade.php | 8 ++++---- public/css/style.css | 27 +++++++++++++++++++++------ 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/app/views/clients/edit.blade.php b/app/views/clients/edit.blade.php index 84fab15a0758..2da0e44a076e 100755 --- a/app/views/clients/edit.blade.php +++ b/app/views/clients/edit.blade.php @@ -52,7 +52,7 @@
- + {{ link_to('#', 'Remove contact -', array('data-bind'=>'click: $parent.removeContact')) }} diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php index e299045883b2..b0ad1214d23b 100755 --- a/app/views/invoices/edit.blade.php +++ b/app/views/invoices/edit.blade.php @@ -319,11 +319,11 @@
- - {{ link_to('#', 'Remove contact', array('data-bind'=>'click: $parent.removeContact')) }} + + {{ link_to('#', 'Remove contact -', array('data-bind'=>'click: $parent.removeContact')) }} - - {{ link_to('#', 'Add contact', array('data-bind'=>'click: $parent.addContact')) }} + + {{ link_to('#', 'Add contact +', array('data-bind'=>'click: $parent.addContact')) }}
diff --git a/public/css/style.css b/public/css/style.css index 6a44343b9dca..ea818d06ea78 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -1,5 +1,4 @@ -body { background: #fff !important; - font-family: 'Roboto', sans-serif; +body { background: #f8f8f8 !important; font-family: 'Roboto', sans-serif; } .bold { font-weight: 700; } @@ -130,14 +129,18 @@ color: #333; } /*modals*/ - +.modal .container { +padding: 20px; +} .modal-header { -border-bottom: 1px solid #dfe0e1; -background-color: #f8f8f8; +border-bottom: none; +background-color: #0b4d78; + padding: 20px; + color: #fff; } .modal-footer { background-color: #f8f8f8; -border-top: 1px solid #dfe0e1; +border-top: none; } .modal thead { background: #fff; @@ -145,10 +148,22 @@ color: #333; } .modal .table>thead>tr>th { border-bottom: 1px solid #dfe0e1 !important; padding-top: 30px; + background: #fff !important; + color: #333 !important; } .modal .table>thead>tr>th:first-child, .modal .table>thead>tr>th:last-child { border-bottom: none !important; } +.modal .close { +color: #fff; +text-shadow: none; +opacity: .8; +filter: alpha(opacity=80); +} +.modal .close:hover { +opacity: 1; +filter: alpha(opacity=100); +} /*buttons*/ .btn { font-weight: bold; border-radius: 3px; From 723b45f3a791d8b8a1bf2abd2b0386b7b511284c Mon Sep 17 00:00:00 2001 From: Razi KAntorp Date: Tue, 18 Mar 2014 17:08:30 +0100 Subject: [PATCH 2/2] Fixed field jumping issue in Manage Rate Modal, changed to red color of the remove icon in Manage Rate Modal and Create invoice --- app/views/invoices/edit.blade.php | 8 +- composer.lock | 519 +++++++++++++++++++++++------- public/css/style.css | 2 + 3 files changed, 409 insertions(+), 120 deletions(-) diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php index b0ad1214d23b..9d6cde00eb62 100755 --- a/app/views/invoices/edit.blade.php +++ b/app/views/invoices/edit.blade.php @@ -147,7 +147,7 @@
-