From: cain-ish Date: Tue, 22 Mar 2016 13:30:05 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/filmowa' into filmowa X-Git-Url: https://git.mdrn.pl/edumed.git/commitdiff_plain/37b7e864c44294c543e4af7ab374625197f5e539?hp=8045f792684345fa3d82331c7d39696b6e2016f4 Merge remote-tracking branch 'origin/filmowa' into filmowa --- diff --git a/edumed/static/css/base.scss b/edumed/static/css/base.scss index 1f6d195..b68b892 100644 --- a/edumed/static/css/base.scss +++ b/edumed/static/css/base.scss @@ -21,9 +21,10 @@ body { clear: both; } -#ads { +#banners { display: inline-block; - width: 100%; + margin: 0 auto 1.4375em; + width: 58.75em; > a { display: block; @@ -33,6 +34,7 @@ body { img { display: block; margin: 0 auto; + width: 100%; } } #header-wrapper { diff --git a/edumed/static/img/ads/960x150_edukacjaMedialna.jpg b/edumed/static/img/ads/960x150_edukacjaMedialna.jpg deleted file mode 100644 index c3a9819..0000000 Binary files a/edumed/static/img/ads/960x150_edukacjaMedialna.jpg and /dev/null differ diff --git a/edumed/static/img/banners/960x150_edukacjaMedialna.jpg b/edumed/static/img/banners/960x150_edukacjaMedialna.jpg new file mode 100644 index 0000000..c3a9819 Binary files /dev/null and b/edumed/static/img/banners/960x150_edukacjaMedialna.jpg differ diff --git a/edumed/templates/base_super.html b/edumed/templates/base_super.html index 5705721..156cff7 100644 --- a/edumed/templates/base_super.html +++ b/edumed/templates/base_super.html @@ -26,7 +26,7 @@ {% load fnp_annoy %}{% annoy %} -