diff --git a/mamweb/static/css/mamweb.css b/mamweb/static/css/mamweb.css index e1579c5e..e0f410f1 100644 --- a/mamweb/static/css/mamweb.css +++ b/mamweb/static/css/mamweb.css @@ -11,17 +11,59 @@ div.container { margin: auto; } +/* odkazy a nadpisy */ + a { color: #6f2509; + text-shadow: 1px 1px 3px #fdedd5; +} + +a:hover { + color: #6f2509; +} + +h1 { /*todo: odlišit 1 a 2 */ + font-size: 200%; + font-variant: small-caps; + font-weight: bold; + color: #6f2509; } h2 { + font-size: 200%; + font-variant: small-caps; + font-weight: bold; + color: #6f2509; +} + +h3 { font-size: 160%; font-variant: small-caps; font-weight: bold; color: #6f2509; } -/* todo ostatní nadpisy */ + +h4 { + font-size: 140%; + font-variant: small-caps; + font-weight: bold; + color: #6f2509; +} + +h5 { + font-size: 140%; + font-variant: small-caps; + font-weight: bold; + color: black; +} + +h6 { + font-size: 120%; + font-variant: small-caps; + font-weight: bold; + color: black; +} + .org-logged-in .mam-text-plugin { border: dashed 1px #f77; @@ -96,7 +138,12 @@ h1 { font-variant: small-caps; text-align: center; text-decoration: bold; - padding-top: 8px + padding-top: 8px; + text-shadow: none; +} + +#title-mobile { + display: none; } @@ -129,6 +176,10 @@ h1 { filter: drop-shadow(0px 5px 5px rgba(0, 0, 0, 0.4)); } +#header img.logo-mobile { + display: none; +} + /* #header h1 { font-size: 130%; @@ -184,6 +235,7 @@ div.menu a { padding: 8px 10px; color: #6f2509; height: 48px; + text-shadow: none; } div.menu a:hover { color: black; @@ -202,40 +254,45 @@ h1 a:hover { text-decoration: none; } -#submenu { +img.decor { /*todo bug při zmenšování okna */ position: relative; - top: 4px; - background: url("../images/submenu.svg") no-repeat left top; - background-size: 100%; + top: 2px; + width: 100%; filter: drop-shadow(0px 5px 5px rgba(0, 0, 0, 0.4)); +} + + +#submenu { + position: relative; + top: 3px; + background-color: #e84e10; width: 100%; + z-index: 5; } #submenu ul { - padding: 10px 30px; font-size: 120%; font-weight: 400; + margin-bottom: 0px; } #submenu li { - padding: 4px 20px; + padding: 15px 20px 0px 20px; display: inline-block; - height: 60px; } #submenu li>a { color: #f9d59e; text-decoration: none; + text-shadow: none; } #submenu li>a:hover { - color: #3c003c; -} -/* -#submenu li.selected { - background: url("../images/submenu-bg-selected.png") no-repeat center -11px; - background-size: 150% 150%; + color: black; } + #submenu li.selected>a { - color: #3c003c; + color: black; } + +/* #submenu li:first-child { border-top-left-radius: 7px; border-top-right-radius: 7px; @@ -271,12 +328,17 @@ div.zadani_azad_termin { background-position: relative; background-size: 100%; filter: drop-shadow(5px 0px 5px rgba(0, 0, 0, 0.4)); - padding-top: 36px; /*todo lépe*/ + padding-top: 3.5%; } #footer p.license { text-align: center; font-weight: 400; + bottom: 0px; +} + +p.license-mobile { + display: none; } .foto_org { @@ -288,13 +350,31 @@ div.zadani_azad_termin { text-align: center; } -@media (max-width: 991px) { + + + +/********************** + * Zmenšování displeje +***********************/ + + +/* stránka přes celý displej */ +@media (max-width: 971px) { + + div.container { + width: 100%; + } + + #title { + width: 100%; + text-align: center; + } + #header { - height: 196px; - background-size: 100% 100%; + background-size: 100%; } #header img.logo { - height: 140px; + width: 100%; } div.menu li { min-width: 120px; @@ -307,30 +387,7 @@ div.zadani_azad_termin { padding-top: 5px; } #footer { - padding: 20px 40px 0px 40px; - min-height: 270px; - } - #footer-extra { - position: relative; - top: -10px; - height: 39px; - } - - #footer p.organize { - margin-top: 50px; - margin-left: 0px; - max-width: 80%; - min-height: 70px; - } - - #footer img.logo-left { - padding: 50px 20px 0px 13px; - float: left; - } - - #footer img.logo-right { - padding: 20px 0px 20px 0px; - float: none; + width: 100%; } div.novinky{ @@ -349,68 +406,105 @@ div.zadani_azad_termin { } -@media (max-width: 767px) { +/* malý tablet, mobil */ +@media (max-width: 735px) { + + #title { + display: none; + } + #header { width: 100%; - height: 196px; - height: 0px; - background-size: 100%; - padding-bottom: 25%; + top: 0px; + background-image: none; + } + + #header.cojemam, + #header.soustredeni, + #header.zadani, + #header.clanky, + #header.archiv, + #header.NOC, + #header.NOCcojemam, + #header.NOCsoustredeni, + #header.NOCzaani, + #header.NOCclanky, + #header.NOCarchiv { + background-image: none; } + #header img.logo { + display: none; + } + + #header img.logo-mobile { + display: block; top: 0px; left: 0px; - height: 100%; + width: 100%; + filter: drop-shadow(0px 0px 5px rgba(0, 0, 0, 0.4)); } + div.menu { - height: auto; - } - div.menu li { - display: block; - width: 100%; - height: 35px; - font-size: 130%; + display: none; } + #submenu { - background: none; + font-variant: small-caps; + top:-1px; + width: 100%; + background-color: #e84e10; + color: #fdedd5; height: auto; - margin-left: 90px; - margin-top: 15px; + position: relative; } #submenu ul { - font-size: 110%; + font-size: 120%; + padding-bottom: 5px; } #submenu li { - display: inline-block; - margin: 5px 8px; - border-radius: 30px; - background: #ffd546; + display: list-item; height: auto; } #submenu li a:hover, #submenu li.selected { - background: #ffd546; + color: black; } + + img.decor { /*todo bug při zmenšování okna */ + top: -5px; + } + div.menu.mobile { + top: 3px; display: block; - position: absolute; - top: -1px; - background: none; + position: relative; + background: #e84e10; + padding: 10px; + font-variant: small-caps; } div.menu.mobile > div.dropdown > button { - font-size: 20px; + background-color: #fdedd5; + color: #e84e10; + width: 100%; + margin: 0px; + border-color: #f7cb87; + font-size: 160%; } div.menu.mobile > div.dropdown > ul { margin: 0px; padding: 0px; border-radius: 0px; + width: 100%; + background-color: #fdedd5; } div.menu.mobile > div.dropdown > ul > li { margin: 0px; padding: 0px; display: block; - font-size: 20px; + font-size: 160%; background: none; - font-variant: normal; + font-variant: small-caps; + color: #e84e10; height: auto; } div.menu.mobile > div.dropdown > ul > li > a { @@ -419,7 +513,7 @@ div.zadani_azad_termin { height: auto; } div.menu.mobile > div.dropdown > ul > li > a:hover { - background: #ffa500; + color: black; } div.menu.desktop { @@ -427,34 +521,18 @@ div.zadani_azad_termin { } #footer { - padding: 20px 40px 0px 40px; - min-height: 270px; + display: none; } - #footer-extra { + + p.license-mobile { position: relative; - top: -10px; - height: 39px; - } - - #footer p.license { - font-size: 80%; - } - #footer p.organize { - margin: 30px 0px 0px 0px; - min-height: 80px; - width: 300px; + display: block; font-size: 90%; + background-color: #e84e10; + padding: 5%; + text-align: justify; } - - #footer img.logo-left { - padding: 30px 20px 0px 18px; - float: left; - } - - #footer img.logo-right { - padding: 30px 0px 20px 0px; - float: none; - } + div.novinky{ max-width: 100%; diff --git a/mamweb/static/images/MATFYZ_MM_barevne.svg b/mamweb/static/images/MATFYZ_MM_barevne.svg new file mode 100644 index 00000000..a718677f --- /dev/null +++ b/mamweb/static/images/MATFYZ_MM_barevne.svg @@ -0,0 +1,120 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/mamweb/static/images/logo-mobile.svg b/mamweb/static/images/logo-mobile.svg new file mode 100644 index 00000000..48b64297 --- /dev/null +++ b/mamweb/static/images/logo-mobile.svg @@ -0,0 +1,232 @@ + + + +image/svg+xmlM&M + + + \ No newline at end of file diff --git a/mamweb/static/images/logo.svg b/mamweb/static/images/logo.svg new file mode 100644 index 00000000..4e7a225a --- /dev/null +++ b/mamweb/static/images/logo.svg @@ -0,0 +1,208 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/mamweb/static/images/logojcmf.png b/mamweb/static/images/logojcmf.png new file mode 100644 index 00000000..b100d752 Binary files /dev/null and b/mamweb/static/images/logojcmf.png differ diff --git a/mamweb/static/images/matfyz-logo.png b/mamweb/static/images/matfyz-logo.png new file mode 100644 index 00000000..193d24f0 Binary files /dev/null and b/mamweb/static/images/matfyz-logo.png differ diff --git a/mamweb/static/images/mozaika-footer.svg b/mamweb/static/images/mozaika-footer.svg new file mode 100644 index 00000000..f7be05be --- /dev/null +++ b/mamweb/static/images/mozaika-footer.svg @@ -0,0 +1,660 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/mamweb/static/images/noc.jpg b/mamweb/static/images/noc.jpg new file mode 100644 index 00000000..f7a484e4 Binary files /dev/null and b/mamweb/static/images/noc.jpg differ diff --git a/mamweb/static/images/ohen.jpg b/mamweb/static/images/ohen.jpg new file mode 100644 index 00000000..bd92c4fc Binary files /dev/null and b/mamweb/static/images/ohen.jpg differ diff --git a/mamweb/static/images/stiny.jpg b/mamweb/static/images/stiny.jpg new file mode 100644 index 00000000..92d593fc Binary files /dev/null and b/mamweb/static/images/stiny.jpg differ diff --git a/mamweb/static/images/submenu.svg b/mamweb/static/images/submenu.svg new file mode 100644 index 00000000..2bfff9d7 --- /dev/null +++ b/mamweb/static/images/submenu.svg @@ -0,0 +1,69 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/mamweb/static/images/uvod.jpg b/mamweb/static/images/uvod.jpg new file mode 100644 index 00000000..327eb310 Binary files /dev/null and b/mamweb/static/images/uvod.jpg differ diff --git a/mamweb/templates/base.html b/mamweb/templates/base.html index e32baf41..8d060578 100644 --- a/mamweb/templates/base.html +++ b/mamweb/templates/base.html @@ -54,9 +54,10 @@
-
M&M - korepsondenční seminář a časopis MFF UK
+
M&M - korepsondenční seminář a časopis MFF UK
 @@ -98,6 +99,7 @@
{% block submenu %} {% endblock %} +
@@ -111,6 +113,7 @@ +

Korespondenční seminář M&M organizují převážně studenti MFF UK. Organizaci semináře a vydávání časopisu podporuje Jednota českých matematiků a fyziků. S obsahem webu M&M je možné nakládat dle licence Creative Commons Attribution 3.0.