From b273d5aed22fbd521eca771de255e54505c413b4 Mon Sep 17 00:00:00 2001 From: horus Date: Mon, 12 Feb 2018 22:50:00 +0100 Subject: Improves the layout. --- site/app/Http/Controllers/OfferController.php | 6 +++ site/config/app.php | 2 +- site/public/css/colors.css | 39 +++++++++++++++++ site/public/css/custom.css | 49 ++++++++++++++++++++++ site/resources/views/offer.blade.php | 28 ++++++++++--- site/resources/views/snippets/footer.blade.php | 2 +- site/resources/views/snippets/navbar.blade.php | 4 +- .../resources/views/snippets/sortbuttons.blade.php | 20 +++++---- 8 files changed, 131 insertions(+), 19 deletions(-) create mode 100644 site/public/css/colors.css (limited to 'site') diff --git a/site/app/Http/Controllers/OfferController.php b/site/app/Http/Controllers/OfferController.php index 563708f..392fb68 100644 --- a/site/app/Http/Controllers/OfferController.php +++ b/site/app/Http/Controllers/OfferController.php @@ -7,6 +7,7 @@ use Illuminate\Support\Facades\DB; use App\Http\Controllers\Controller; use Cookie; +use Carbon; use Illuminate\Support\Facades\Input; class OfferController extends Controller { @@ -70,6 +71,11 @@ class OfferController extends Controller { if ( "misc" == $view_name ) { $view_name = "Andere Angebote"; } + + /* + * For strftime() in view. + */ + setlocale(LC_TIME, 'de_DE.utf8'); return view('offer', ['data' => $data, 'spirit_type' => $view_name]); } diff --git a/site/config/app.php b/site/config/app.php index 138a41a..59d20f6 100644 --- a/site/config/app.php +++ b/site/config/app.php @@ -65,7 +65,7 @@ return [ | */ - 'timezone' => 'UTC', + 'timezone' => 'Europe/Berlin', /* |-------------------------------------------------------------------------- diff --git a/site/public/css/colors.css b/site/public/css/colors.css new file mode 100644 index 0000000..be2d738 --- /dev/null +++ b/site/public/css/colors.css @@ -0,0 +1,39 @@ +.bg-primary, .bg-dark { + background-color: #1289A7 !important; + background-color: #0652DD !important; + background-color: #142639 !important; +} +a, .page-link { + color: #142639; + color: #406485; + color: #142639; + color: #12CBC4; + color: #0fb9b1; + color: #1289A7 ; +} +a:hover, .page-link:hover { + color: #0fb9b1; + color: #12CBC4; +} +a.u:hover, .page-link:hover { + text-decoration-style: dotted; +} +.navbar-light { + color: #424242 !important; +} + +.btn-secondary { + background-color: #406485 !important; + background-color: #778ca3 !important; + background-color: #d1d8e0 !important; + color: #142639 !important; +} +.btn-outline-success { + color: #1289A7 !important; + border: 1px solid #1289A7 !important; +} + +.text-primary { + color: #142639 !important; +} + diff --git a/site/public/css/custom.css b/site/public/css/custom.css index b718b50..742b363 100644 --- a/site/public/css/custom.css +++ b/site/public/css/custom.css @@ -58,3 +58,52 @@ opacity: 0.7; filter: grayscale(100%); } +.u { + text-decoration: underline; +} +.card { + /* + background-color: #d1d8e0; + box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05); + box-shadow: 0 .25rem .75rem #d1d8e0; + border: 0.5px solid #d1d8e0 !important; + box-shadow: 1rem 1rem 1rem #d1d8e0 !important; + */ + box-shadow: 0rem 0rem .5rem .15rem #d1d8e0, 1rem 1rem 1rem #d1d8e0 !important; +} + +footer { + /* + background-color: #d1d8e0 !important; + box-shadow: -0.5rem 0 .1rem .15rem #d1d8e0; + box-shadow: 0 -0.5rem .1rem .05rem #d1d8e0; + */ + box-shadow: 0 -0.2rem .1rem .05rem #d1d8e0; +} +.jumbotron.box-shadow { + box-shadow: 0rem 0rem .5rem .15rem #d1d8e0, 1rem 1rem 1rem #d1d8e0 !important; +} +.text-fade-out { + position: absolute; + bottom: 45%; + left: 0; + width: 100%; + text-align: center; + margin: 0; padding: 8px 0; + background-image: linear-gradient(to bottom, transparent, white); +} +/* + * Not used. + */ +.created_at { + bottom: 5px; + /* + margin-top: 200%; + */ + position: absolute; + background-color: #d1d8e0 !important; + color: #142639 !important; + padding-left:5px; + padding-right: 5px; + opacity: 0.9; +} diff --git a/site/resources/views/offer.blade.php b/site/resources/views/offer.blade.php index 7ff92d3..82b109c 100644 --- a/site/resources/views/offer.blade.php +++ b/site/resources/views/offer.blade.php @@ -2,7 +2,7 @@ @section('content')
-
+

{{ ucfirst($spirit_type) }}

@@ -32,6 +32,14 @@ foreach( $data as $offer) {

{{ $offer->procent}}%

+ + +
@@ -41,21 +49,27 @@ foreach( $data as $offer) {

{{ $offer->name }} +

-

{{ TF::fF($offer->original_price) . "€" }} {{ TF::fF($offer->discounted_price) . "€" }} +

{{ TF::fF($offer->original_price) . "€" }} {{ TF::fF($offer->discounted_price) . "€" }}* {{ TF::fF($offer->base_price ) }}€/L

{{ TF::fF($offer->volume) . " Liter" }}{{ TF::fF($offer->abv) . "%" }} Alk.
- Jetzt bestellen -

+ Jetzt bestellen +

Versand: {{ TF::fF($offer->shipping_costs) }}€ Gratis ab {{ $offer->free_shipping }} +
+ + * Preis vom {{ strftime("%d. %B", $offer->created_at) }}

- {{ $offer->name }} + {{ $offer->name }} -
diff --git a/site/resources/views/snippets/sortbuttons.blade.php b/site/resources/views/snippets/sortbuttons.blade.php index fd568fa..bf99649 100644 --- a/site/resources/views/snippets/sortbuttons.blade.php +++ b/site/resources/views/snippets/sortbuttons.blade.php @@ -1,9 +1,9 @@
-