From d34fbcf72609a435399eaa960940f8247a1ec657 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 14 Oct 2015 20:18:19 +0300 Subject: [PATCH] Styling forms --- app/Http/Middleware/StartupCheck.php | 6 +-- app/Services/AuthService.php | 2 +- public/css/built.css | 45 ++++++++++++++----- public/css/style.css | 44 +++++++++++++----- .../views/accounts/account_gateway.blade.php | 2 +- resources/views/accounts/details.blade.php | 4 +- .../views/accounts/invoice_settings.blade.php | 6 +-- .../views/accounts/localization.blade.php | 2 +- resources/views/accounts/product.blade.php | 2 +- resources/views/accounts/token.blade.php | 2 +- .../views/accounts/user_details.blade.php | 2 +- resources/views/users/edit.blade.php | 2 +- 12 files changed, 82 insertions(+), 37 deletions(-) diff --git a/app/Http/Middleware/StartupCheck.php b/app/Http/Middleware/StartupCheck.php index 164bb38da5..3d10c1cb81 100644 --- a/app/Http/Middleware/StartupCheck.php +++ b/app/Http/Middleware/StartupCheck.php @@ -27,11 +27,11 @@ class StartupCheck { // Set up trusted X-Forwarded-Proto proxies // TRUSTED_PROXIES accepts a comma delimited list of subnets - // - // TRUSTED_PROXIES='10.0.0.0/8,172.16.0.0/12,192.168.0.0/16' + // ie, TRUSTED_PROXIES='10.0.0.0/8,172.16.0.0/12,192.168.0.0/16' if (isset($_ENV['TRUSTED_PROXIES'])) { - Request::setTrustedProxies(array_map('trim',explode(",",env('TRUSTED_PROXIES')))); + Request::setTrustedProxies(array_map('trim', explode(',', env('TRUSTED_PROXIES')))); } + // Ensure all request are over HTTPS in production if (App::environment() == ENV_PRODUCTION && !Request::secure()) { return Redirect::secure(Request::getRequestUri()); diff --git a/app/Services/AuthService.php b/app/Services/AuthService.php index 0ba31710b6..b882bef18e 100644 --- a/app/Services/AuthService.php +++ b/app/Services/AuthService.php @@ -46,7 +46,7 @@ class AuthService if ($result === true) { if (!$isRegistered) { event(new UserSignedUp()); - Session::flash('warning', trans('texts.success_message')); + Session::flash('message', trans('texts.success_message')); } else { Session::flash('message', trans('texts.updated_settings')); return redirect()->to('/settings/' . ACCOUNT_COMPANY_DETAILS); diff --git a/public/css/built.css b/public/css/built.css index 6bcc82930e..869fab71b8 100644 --- a/public/css/built.css +++ b/public/css/built.css @@ -3105,8 +3105,39 @@ box-shadow: 0px 0px 15px 0px rgba(0, 5, 5, 0.2); text-decoration: line-through; } -@media screen and (min-width: 992px) { - .hide-desktop {display: none;} + +/* Custom, iPhone Retina */ +@media only screen and (min-width : 320px) { + +} + +/* Extra Small Devices, Phones */ +@media only screen and (min-width : 480px) { + +} + +/* Small Devices, Tablets */ +@media only screen and (min-width : 768px) { + .form-padding-right { + padding-right: 40px; + } +} + +/* Medium Devices, Desktops */ +@media only screen and (min-width : 992px) { + .form-padding-right { + padding-right: 100px; + } + .medium-dialog { + width: 760px; + } + .large-dialog { + width: 960px; + } + .hide-desktop + { + display: none; + } } @media (max-width: 992px) { @@ -3115,15 +3146,6 @@ box-shadow: 0px 0px 15px 0px rgba(0, 5, 5, 0.2); } } -@media screen and (min-width: 992px) { - .medium-dialog { - width: 760px; - } - .large-dialog { - width: 960px; - } -} - @media (max-width: 767px) { .test-class{color:black;} @@ -3342,6 +3364,7 @@ ul.user-accounts a:hover div.remove { width: 350px; } +/* Show selected section in settings nav */ .list-group-item.selected:before { position: absolute; top: 0; diff --git a/public/css/style.css b/public/css/style.css index fee73f7666..3e6e3d01fa 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -755,8 +755,39 @@ box-shadow: 0px 0px 15px 0px rgba(0, 5, 5, 0.2); text-decoration: line-through; } -@media screen and (min-width: 992px) { - .hide-desktop {display: none;} + +/* Custom, iPhone Retina */ +@media only screen and (min-width : 320px) { + +} + +/* Extra Small Devices, Phones */ +@media only screen and (min-width : 480px) { + +} + +/* Small Devices, Tablets */ +@media only screen and (min-width : 768px) { + .form-padding-right { + padding-right: 40px; + } +} + +/* Medium Devices, Desktops */ +@media only screen and (min-width : 992px) { + .form-padding-right { + padding-right: 100px; + } + .medium-dialog { + width: 760px; + } + .large-dialog { + width: 960px; + } + .hide-desktop + { + display: none; + } } @media (max-width: 992px) { @@ -765,15 +796,6 @@ box-shadow: 0px 0px 15px 0px rgba(0, 5, 5, 0.2); } } -@media screen and (min-width: 992px) { - .medium-dialog { - width: 760px; - } - .large-dialog { - width: 960px; - } -} - @media (max-width: 767px) { .test-class{color:black;} diff --git a/resources/views/accounts/account_gateway.blade.php b/resources/views/accounts/account_gateway.blade.php index 0e0580871e..dfb47aaf96 100644 --- a/resources/views/accounts/account_gateway.blade.php +++ b/resources/views/accounts/account_gateway.blade.php @@ -13,7 +13,7 @@

{!! trans($title) !!}

-
+
@if ($accountGateway) {!! Former::populateField('gateway_id', $accountGateway->gateway_id) !!} diff --git a/resources/views/accounts/details.blade.php b/resources/views/accounts/details.blade.php index 3abd38e870..a6dc72b4a8 100644 --- a/resources/views/accounts/details.blade.php +++ b/resources/views/accounts/details.blade.php @@ -26,7 +26,7 @@

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

-
+
{!! Former::text('name') !!} {!! Former::text('id_number') !!} @@ -51,7 +51,7 @@

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

-
+
{!! Former::text('address1') !!} {!! Former::text('address2') !!} diff --git a/resources/views/accounts/invoice_settings.blade.php b/resources/views/accounts/invoice_settings.blade.php index e9608af33d..f5e8bb9062 100644 --- a/resources/views/accounts/invoice_settings.blade.php +++ b/resources/views/accounts/invoice_settings.blade.php @@ -32,7 +32,7 @@

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

-
+
{!! Former::checkbox('pdf_email_attachment')->text(trans('texts.enable')) !!} @if (Utils::isNinja()) {!! Former::inline_radios('custom_invoice_link') @@ -60,7 +60,7 @@

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

-
+
    @@ -90,7 +90,7 @@

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

    -
    +
      diff --git a/resources/views/accounts/localization.blade.php b/resources/views/accounts/localization.blade.php index 0e768b65ef..b11e2dfffd 100644 --- a/resources/views/accounts/localization.blade.php +++ b/resources/views/accounts/localization.blade.php @@ -14,7 +14,7 @@

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

      -
      +
      {!! Former::select('currency_id')->addOption('','') ->fromQuery($currencies, 'name', 'id') !!} diff --git a/resources/views/accounts/product.blade.php b/resources/views/accounts/product.blade.php index aee96fc211..3f2b7f4b27 100644 --- a/resources/views/accounts/product.blade.php +++ b/resources/views/accounts/product.blade.php @@ -14,7 +14,7 @@

      {!! $title !!}

      -
      +
      @if ($product) {{ Former::populate($product) }} diff --git a/resources/views/accounts/token.blade.php b/resources/views/accounts/token.blade.php index f033622a5d..6fd73ec2f1 100644 --- a/resources/views/accounts/token.blade.php +++ b/resources/views/accounts/token.blade.php @@ -12,7 +12,7 @@

      {!! trans($title) !!}

      -
      +
      @if ($token) {!! Former::populate($token) !!} diff --git a/resources/views/accounts/user_details.blade.php b/resources/views/accounts/user_details.blade.php index 96142562a6..1f154d3aca 100644 --- a/resources/views/accounts/user_details.blade.php +++ b/resources/views/accounts/user_details.blade.php @@ -26,7 +26,7 @@

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

      -
      +
      {!! Former::text('first_name') !!} {!! Former::text('last_name') !!} {!! Former::text('email') !!} diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index 2b7af0cbff..71efd2fee6 100644 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -18,7 +18,7 @@

      {!! $title !!}

      -
      +
      {!! Former::text('first_name') !!} {!! Former::text('last_name') !!}