From a565739ba662165a9d0d8d12158693506621c779 Mon Sep 17 00:00:00 2001
From: "Bc. Petr Pecha" <nejlepsitextovyeditorjevim@gmail.com>
Date: Thu, 15 Oct 2015 19:37:20 +0200
Subject: [PATCH 1/2] flat titulni strana
Pokus o vylepseni titulni stranky tak,
ze pokud mame mensi sirku, tak se novinky
preskupi nad graf a daji na celou sirku,
jen nevim, jak udelat, aby se pro ruzne
sirky aplikovali ruzne styly.
---
mamweb/static/css/mamweb.css | 23 +++++++
seminar/templates/seminar/titulnistrana.html | 71 +++++++++-----------
2 files changed, 55 insertions(+), 39 deletions(-)
diff --git a/mamweb/static/css/mamweb.css b/mamweb/static/css/mamweb.css
index 12036fc5..ace67ef6 100644
--- a/mamweb/static/css/mamweb.css
+++ b/mamweb/static/css/mamweb.css
@@ -299,6 +299,11 @@ div.zadani_azad_termin {
padding: 20px 0px 20px 0px;
float: none;
}
+
+ div.novinky{
+ max-width: 42%;
+ }
+
}
@media (max-width: 767px) {
@@ -407,6 +412,10 @@ div.zadani_azad_termin {
padding: 30px 0px 20px 0px;
float: none;
}
+
+ div.novinky{
+ max-width: 100%;
+ }
}
@@ -462,3 +471,17 @@ div.zadani_azad_termin {
width: 33%;
}
+/* titulni stranka */
+
+.zjistit_vic{
+ text-align: center;
+}
+
+.graf{
+ float: left;
+}
+
+.novinky{
+ float: right;
+ /*max-width: 42%;*/
+}
diff --git a/seminar/templates/seminar/titulnistrana.html b/seminar/templates/seminar/titulnistrana.html
index 66a29393..a28ffa15 100644
--- a/seminar/templates/seminar/titulnistrana.html
+++ b/seminar/templates/seminar/titulnistrana.html
@@ -17,42 +17,7 @@ M&M je korespondeční seminář. Několikrát do roka zdarma vydáváme ča
M&M je taky soutěž. Můžeš vyhrát knížky, deskovky nebo dokonce dort. Můžeš se dostat na matfyz bez přijímaček. A především s námi můžeš jet na skvělé soustředění.
</p>
- <table>
- <tr>
- <td>
-<div class="graf">
-<img class="map" src="{% static 'images/graph.png' %}" width="505.0" height="612.0" usemap="#vuemap">
-
-<map name="vuemap">
- <area href="/" id="mam" shape="rect" coords="148,277,354,364"></area>
- <area href="/soustredeni/" id="sous" shape="rect" coords="180,194,313,236"></area>
- <area href="/archiv/cisla/" id="casopis" shape="rect" coords="206,393,297,432"></area>
- <area href="/media/ilustrace/graf/duvera.jpeg" id="hry" shape="rect" coords="198,87,251,121"></area>
- <area href="/media/ilustrace/graf/prednaska.jpeg" id="prednasky" shape="rect" coords="273,120,390,160"></area>
- <area href="/media/ilustrace/graf/konfera.jpeg" id="konfery" shape="rect" coords="350,168,445,207"></area>
- <area href="/media/ilustrace/graf/vylet.jpeg" id="vylet" shape="rect" coords="366,220,434,256"></area>
- <area href="/media/ilustrace/graf/legenda.jpeg" id="legenda" shape="rect" coords="29,180,129,219"></area>
- <area href="/media/ilustrace/graf/jidlo.jpeg" id="jidlo" shape="rect" coords="125,114,184,149"></area>
- <area href="/media/ilustrace/graf/adrenalin.jpeg" id="adrenalinove" shape="rect" coords="38,30,184,73"></area>
- <area href="/media/ilustrace/graf/beh-p.jpeg" id="behaci" shape="rect" coords="193,20,274,57"></area>
- <area href="/media/ilustrace/graf/strategie.jpeg" id="strategicke" shape="rect" coords="284,16,411,57"></area>
- <area href="/clanky/uvod/" id="clanky" shape="rect" coords="363,428,447,466"></area>
- <area href="/zadani/aktualni/" id="ulohy" shape="rect" coords="246,492,321,529"></area>
- <area href="/zadani/temata/" id="temata" shape="rect" coords="126,473,217,511"></area>
- <area href="/media/ilustrace/graf/knihy.jpg" id="ceny" shape="rect" coords="15,413,188,458"></area>
- <area href="/zadani/aktualni/#zam_M" id="matika" shape="rect" coords="357,514,488,556"></area>
- <area href="/zadani/aktualni/#zam_F" id="fyzika" shape="rect" coords="276,557,354,594"></area>
- <area href="/zadani/aktualni/#zam_I" id="informatika" shape="rect" coords="141,539,269,580"></area>
- <area href="/media/ilustrace/graf/dort.jpg" id="dort" shape="rect" coords="60,519,121,554"></area>
-
-</map>
-</div>
-
- <center>
- <h3><a href="/co-je-MaM/uvod/">Zjistit víc!</a></h3>
- </center></p>
- </td>
- <td valign="top">
+<div class="novinky">
{% if dead %}
<div class="odpocet">
<p><b>Do konce odeslání řešení zbývá:<br>
@@ -79,10 +44,38 @@ M&M je korespondeční seminář. Několikrát do roka zdarma vydáváme ča
{% include 'seminar/novinky.html' %}
<a href='/stare-novinky/'>Archiv novinek</a>
- </td>
- </tr>
- </table>
+</div>
+<div class="graf">
+<img class="map" src="{% static 'images/graph.png' %}" width="505.0" height="612.0" usemap="#vuemap">
+
+<map name="vuemap">
+ <area href="/" id="mam" shape="rect" coords="148,277,354,364"></area>
+ <area href="/soustredeni/" id="sous" shape="rect" coords="180,194,313,236"></area>
+ <area href="/archiv/cisla/" id="casopis" shape="rect" coords="206,393,297,432"></area>
+ <area href="/media/ilustrace/graf/duvera.jpeg" id="hry" shape="rect" coords="198,87,251,121"></area>
+ <area href="/media/ilustrace/graf/prednaska.jpeg" id="prednasky" shape="rect" coords="273,120,390,160"></area>
+ <area href="/media/ilustrace/graf/konfera.jpeg" id="konfery" shape="rect" coords="350,168,445,207"></area>
+ <area href="/media/ilustrace/graf/vylet.jpeg" id="vylet" shape="rect" coords="366,220,434,256"></area>
+ <area href="/media/ilustrace/graf/legenda.jpeg" id="legenda" shape="rect" coords="29,180,129,219"></area>
+ <area href="/media/ilustrace/graf/jidlo.jpeg" id="jidlo" shape="rect" coords="125,114,184,149"></area>
+ <area href="/media/ilustrace/graf/adrenalin.jpeg" id="adrenalinove" shape="rect" coords="38,30,184,73"></area>
+ <area href="/media/ilustrace/graf/beh-p.jpeg" id="behaci" shape="rect" coords="193,20,274,57"></area>
+ <area href="/media/ilustrace/graf/strategie.jpeg" id="strategicke" shape="rect" coords="284,16,411,57"></area>
+ <area href="/clanky/uvod/" id="clanky" shape="rect" coords="363,428,447,466"></area>
+ <area href="/zadani/aktualni/" id="ulohy" shape="rect" coords="246,492,321,529"></area>
+ <area href="/zadani/temata/" id="temata" shape="rect" coords="126,473,217,511"></area>
+ <area href="/media/ilustrace/graf/knihy.jpg" id="ceny" shape="rect" coords="15,413,188,458"></area>
+ <area href="/zadani/aktualni/#zam_M" id="matika" shape="rect" coords="357,514,488,556"></area>
+ <area href="/zadani/aktualni/#zam_F" id="fyzika" shape="rect" coords="276,557,354,594"></area>
+ <area href="/zadani/aktualni/#zam_I" id="informatika" shape="rect" coords="141,539,269,580"></area>
+ <area href="/media/ilustrace/graf/dort.jpg" id="dort" shape="rect" coords="60,519,121,554"></area>
+
+</map>
+ <span class="zjistit_vic">
+ <h3><a href="/co-je-MaM/uvod/">Zjistit víc!</a></h3>
+ </span>
+</div>
From 23456d9f28c299e894f60325ed68bfc2e24aae73 Mon Sep 17 00:00:00 2001
From: "Bc. Petr Pecha" <nejlepsitextovyeditorjevim@gmail.com>
Date: Thu, 15 Oct 2015 20:06:04 +0200
Subject: [PATCH 2/2] dodelani titulni stranky
Uz to funguje podle predstav,
mozna bude potreba trochu poupravit
konstanty
---
mamweb/static/css/mamweb.css | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/mamweb/static/css/mamweb.css b/mamweb/static/css/mamweb.css
index ace67ef6..2fa2644d 100644
--- a/mamweb/static/css/mamweb.css
+++ b/mamweb/static/css/mamweb.css
@@ -301,7 +301,17 @@ div.zadani_azad_termin {
}
div.novinky{
- max-width: 42%;
+ max-width: 70%;
+ margin-left: auto;
+ margin-right: auto;
+ float: none;
+ }
+
+ div.graf{
+ float: none;
+ margin-left: auto;
+ margin-right: auto;
+ width: 70%;
}
}
@@ -415,6 +425,15 @@ div.zadani_azad_termin {
div.novinky{
max-width: 100%;
+ float: none;
+ }
+
+ div.graf{
+ float: none;
+ width: 70%;
+ margin-left: auto;
+ margin-right: auto
+
}
}
@@ -483,5 +502,5 @@ div.zadani_azad_termin {
.novinky{
float: right;
- /*max-width: 42%;*/
+ max-width: 42%;
}