From dab023d898093c5622905548b818f9b594c5426c Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 22 Mar 2016 12:08:48 +0200 Subject: [PATCH] Minor styling changes --- public/css/built.css | 8 +- public/css/built.public.css | 8 +- public/css/public.style.css | 8 +- public/css/style.css | 8 +- .../views/accounts/client_portal.blade.php | 80 ++++++++++--------- .../views/accounts/localization.blade.php | 37 +++++---- .../views/accounts/system_settings.blade.php | 27 ++++--- 7 files changed, 95 insertions(+), 81 deletions(-) diff --git a/public/css/built.css b/public/css/built.css index ee26ad4b7e93..e98e86aefe90 100644 --- a/public/css/built.css +++ b/public/css/built.css @@ -2530,11 +2530,13 @@ font-weight: bold; } .navbar, +.panel-default, ul.dropdown-menu, +canvas, .twitter-typeahead .tt-menu { - -moz-box-shadow: 0 0 4px rgba(0,0,0,.14),0 4px 8px rgba(0,0,0,.28); - -webkit-box-shadow: 0 0 4px rgba(0,0,0,.14),0 4px 8px rgba(0,0,0,.28); - box-shadow: 0 0 4px rgba(0,0,0,.14),0 4px 8px rgba(0,0,0,.28); + x-moz-box-shadow: 0 0 1px 1px rgba(0,0,0,.05); + x-webkit-box-shadow: 0 0 1px 1px rgba(0,0,0,.05); + box-shadow: 0 0 1px 1px rgba(0,0,0,.05); } .navbar .active > a { diff --git a/public/css/built.public.css b/public/css/built.public.css index 2845cbabd3ab..cd2d7469627e 100644 --- a/public/css/built.public.css +++ b/public/css/built.public.css @@ -799,14 +799,16 @@ html { padding-top: 18px; font-weight: 500; font-size: 15px; + font-weight: bold; + color: #ecf0f1; padding-left: 20px; padding-right: 20px; } .navbar { - -moz-box-shadow: 0 0 4px rgba(0,0,0,.14),0 4px 8px rgba(0,0,0,.28); - -webkit-box-shadow: 0 0 4px rgba(0,0,0,.14),0 4px 8px rgba(0,0,0,.28); - box-shadow: 0 0 4px rgba(0,0,0,.14),0 4px 8px rgba(0,0,0,.28); + x-moz-box-shadow: 0 0 1px 1px rgba(0,0,0,.05); + x-webkit-box-shadow: 0 0 1px 1px rgba(0,0,0,.05); + box-shadow: 0 0 1px 1px rgba(0,0,0,.05); } #footer { diff --git a/public/css/public.style.css b/public/css/public.style.css index b12c175294a0..bdac74f7799b 100644 --- a/public/css/public.style.css +++ b/public/css/public.style.css @@ -16,14 +16,16 @@ html { padding-top: 18px; font-weight: 500; font-size: 15px; + font-weight: bold; + color: #ecf0f1; padding-left: 20px; padding-right: 20px; } .navbar { - -moz-box-shadow: 0 0 4px rgba(0,0,0,.14),0 4px 8px rgba(0,0,0,.28); - -webkit-box-shadow: 0 0 4px rgba(0,0,0,.14),0 4px 8px rgba(0,0,0,.28); - box-shadow: 0 0 4px rgba(0,0,0,.14),0 4px 8px rgba(0,0,0,.28); + x-moz-box-shadow: 0 0 1px 1px rgba(0,0,0,.05); + x-webkit-box-shadow: 0 0 1px 1px rgba(0,0,0,.05); + box-shadow: 0 0 1px 1px rgba(0,0,0,.05); } #footer { diff --git a/public/css/style.css b/public/css/style.css index 204edf2e88f5..7ddea57785a9 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -403,11 +403,13 @@ font-weight: bold; } .navbar, +.panel-default, ul.dropdown-menu, +canvas, .twitter-typeahead .tt-menu { - -moz-box-shadow: 0 0 4px rgba(0,0,0,.14),0 4px 8px rgba(0,0,0,.28); - -webkit-box-shadow: 0 0 4px rgba(0,0,0,.14),0 4px 8px rgba(0,0,0,.28); - box-shadow: 0 0 4px rgba(0,0,0,.14),0 4px 8px rgba(0,0,0,.28); + x-moz-box-shadow: 0 0 1px 1px rgba(0,0,0,.05); + x-webkit-box-shadow: 0 0 1px 1px rgba(0,0,0,.05); + box-shadow: 0 0 1px 1px rgba(0,0,0,.05); } .navbar .active > a { diff --git a/resources/views/accounts/client_portal.blade.php b/resources/views/accounts/client_portal.blade.php index 745574ad7254..8737c015d06e 100644 --- a/resources/views/accounts/client_portal.blade.php +++ b/resources/views/accounts/client_portal.blade.php @@ -28,45 +28,47 @@ @include('accounts.nav', ['selected' => ACCOUNT_CLIENT_PORTAL])
-
-
-

{!! trans('texts.client_portal') !!}

-
-
-
- {!! Former::checkbox('enable_client_portal') - ->text(trans('texts.enable')) - ->help(trans('texts.enable_client_portal_help')) !!} -
-
- {!! Former::checkbox('enable_portal_password') - ->text(trans('texts.enable_portal_password')) - ->help(trans('texts.enable_portal_password_help')) - ->label(' ') !!} -
-
- {!! Former::checkbox('send_portal_password') - ->text(trans('texts.send_portal_password')) - ->help(trans('texts.send_portal_password_help')) - ->label(' ') !!} -
-
-
-
-
-

{!! trans('texts.custom_css') !!}

-
-
-
- {!! Former::textarea('client_view_css') - ->label(trans('texts.custom_css')) - ->rows(10) - ->raw() - ->autofocus() - ->maxlength(60000) - ->style("min-width:100%;max-width:100%;font-family:'Roboto Mono', 'Lucida Console', Monaco, monospace;font-size:14px;'") !!} -
-
+
+
+
+

{!! trans('texts.client_portal') !!}

+
+
+
+ {!! Former::checkbox('enable_client_portal') + ->text(trans('texts.enable')) + ->help(trans('texts.enable_client_portal_help')) !!} +
+
+ {!! Former::checkbox('enable_portal_password') + ->text(trans('texts.enable_portal_password')) + ->help(trans('texts.enable_portal_password_help')) + ->label(' ') !!} +
+
+ {!! Former::checkbox('send_portal_password') + ->text(trans('texts.send_portal_password')) + ->help(trans('texts.send_portal_password_help')) + ->label(' ') !!} +
+
+
+
+
+

{!! trans('texts.custom_css') !!}

+
+
+
+ {!! Former::textarea('client_view_css') + ->label(trans('texts.custom_css')) + ->rows(10) + ->raw() + ->autofocus() + ->maxlength(60000) + ->style("min-width:100%;max-width:100%;font-family:'Roboto Mono', 'Lucida Console', Monaco, monospace;font-size:14px;'") !!} +
+
+
diff --git a/resources/views/accounts/localization.blade.php b/resources/views/accounts/localization.blade.php index f2c28e3684a8..b921c8710567 100644 --- a/resources/views/accounts/localization.blade.php +++ b/resources/views/accounts/localization.blade.php @@ -11,26 +11,29 @@ @include('accounts.nav', ['selected' => ACCOUNT_LOCALIZATION])
+ +
-
-
-

{!! trans('texts.localization') !!}

-
-
+
+
+

{!! trans('texts.localization') !!}

+
+
- {!! Former::select('currency_id')->addOption('','') - ->fromQuery($currencies, 'name', 'id') !!} - {!! Former::select('language_id')->addOption('','') - ->fromQuery($languages, 'name', 'id') !!} - {!! Former::select('timezone_id')->addOption('','') - ->fromQuery($timezones, 'location', 'id') !!} - {!! Former::select('date_format_id')->addOption('','') - ->fromQuery($dateFormats, 'label', 'id') !!} - {!! Former::select('datetime_format_id')->addOption('','') - ->fromQuery($datetimeFormats, 'label', 'id') !!} - {!! Former::checkbox('military_time')->text(trans('texts.enable')) !!} - {{-- Former::checkbox('show_currency_code')->text(trans('texts.enable')) --}} + {!! Former::select('currency_id')->addOption('','') + ->fromQuery($currencies, 'name', 'id') !!} + {!! Former::select('language_id')->addOption('','') + ->fromQuery($languages, 'name', 'id') !!} + {!! Former::select('timezone_id')->addOption('','') + ->fromQuery($timezones, 'location', 'id') !!} + {!! Former::select('date_format_id')->addOption('','') + ->fromQuery($dateFormats, 'label', 'id') !!} + {!! Former::select('datetime_format_id')->addOption('','') + ->fromQuery($datetimeFormats, 'label', 'id') !!} + {!! Former::checkbox('military_time')->text(trans('texts.enable')) !!} + {{-- Former::checkbox('show_currency_code')->text(trans('texts.enable')) --}} +
diff --git a/resources/views/accounts/system_settings.blade.php b/resources/views/accounts/system_settings.blade.php index 31be6a9d0962..ce889364f943 100644 --- a/resources/views/accounts/system_settings.blade.php +++ b/resources/views/accounts/system_settings.blade.php @@ -6,22 +6,23 @@ @include('accounts.nav', ['selected' => ACCOUNT_SYSTEM_SETTINGS])
- - {!! Former::open('/update_setup') - ->addClass('warn-on-exit') - ->autocomplete('off') - ->rules([ - 'app[url]' => 'required', - //'database[default]' => 'required', - 'database[type][host]' => 'required', - 'database[type][database]' => 'required', - 'database[type][username]' => 'required', - 'database[type][password]' => 'required', - ]) !!} +
+ {!! Former::open('/update_setup') + ->addClass('warn-on-exit') + ->autocomplete('off') + ->rules([ + 'app[url]' => 'required', + //'database[default]' => 'required', + 'database[type][host]' => 'required', + 'database[type][database]' => 'required', + 'database[type][username]' => 'required', + 'database[type][password]' => 'required', + ]) !!} - @include('partials.system_settings') + @include('partials.system_settings') +