From fd7a7728d7595b8340292d79b59d2cf2579a51f5 Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Wed, 30 Nov 2016 15:24:54 +0100 Subject: [PATCH 1/1] adjust promobox for 3 links --- edumed/static/css/main.css | 13 ++++--------- edumed/static/css/main.scss | 17 +++++++---------- edumed/templates/home.html | 2 -- 3 files changed, 11 insertions(+), 21 deletions(-) diff --git a/edumed/static/css/main.css b/edumed/static/css/main.css index e9c2ac1..98dadef 100644 --- a/edumed/static/css/main.css +++ b/edumed/static/css/main.css @@ -4,27 +4,23 @@ height: 11.6875em; } #main-promobox a { background: #16a487; - padding: 1em 1.25em; + padding: 1em 0.625em; border-radius: 0.9375em; display: block; margin-bottom: 1em; - width: 10em; + width: 11.25em; float: left; } - #main-promobox a:first-of-type { - padding-top: 0; - border-top-right-radius: 0; - border-top-left-radius: 0; } #main-promobox a:last-of-type { margin-bottom: 0; } #main-promobox h1 { background: #16a487; - padding: 1em 1.25em; + padding: 1em 0.625em; border-radius: 0.9375em; color: white; margin: 0; text-transform: uppercase; font-size: .9em; - width: 11.375em; + width: 12.625em; float: left; padding-top: 1.25em; padding-bottom: 1.25em; @@ -69,7 +65,6 @@ #main-sections ul li a { color: white; text-transform: uppercase; - display: block; height: 5em; display: table; padding: 5px; } diff --git a/edumed/static/css/main.scss b/edumed/static/css/main.scss index 7d95145..8d21b1d 100755 --- a/edumed/static/css/main.scss +++ b/edumed/static/css/main.scss @@ -1,15 +1,18 @@ $px: .0625em; +$horiz_padding: 10*$px; +$width_offset: 20*$px; + @mixin main-promobox-shape() { background: #16a487; - padding: 1em 20*$px; + padding: 1em $horiz_padding; border-radius: 15*$px; } #main-promobox { float: right; - width: 220*$px - 20*$px; + width: 220*$px - $width_offset; height: 235*$px - 2 * 1.5em; a { @@ -17,14 +20,9 @@ $px: .0625em; display: block; margin-bottom: 1em; - width: 220*$px - 3 * 20*$px; + width: 220*$px - $width_offset - 2*$horiz_padding; float: left; - &:first-of-type { - padding-top: 0; - border-top-right-radius: 0; - border-top-left-radius: 0; - } &:last-of-type { margin-bottom: 0; } @@ -36,7 +34,7 @@ $px: .0625em; margin: 0; text-transform: uppercase; font-size: .9em; - width: 222*$px - 2 * 20*$px; + width: 222*$px - 2 * $horiz_padding; float: left; padding-top: 1.25em; padding-bottom: 1.25em; @@ -91,7 +89,6 @@ $px: .0625em; a { color: white; text-transform: uppercase; - display: block; height: 80*$px; display: table; padding: 5px; diff --git a/edumed/templates/home.html b/edumed/templates/home.html index 4307ee8..2ea96c6 100755 --- a/edumed/templates/home.html +++ b/edumed/templates/home.html @@ -11,8 +11,6 @@ {% catalogue_carousel %}
-

Co nowego?

- {% chunk "promobox" %}
-- 2.20.1