Browse Source

Fix: bootstrap upravuje .container

pull/44/head
Jonas Havelka 8 months ago
parent
commit
df5ae2c12a
  1. 10
      mamweb/static/css/layout.css
  2. 6
      mamweb/static/css/modules.css
  3. 4
      mamweb/templates/april.html
  4. 6
      mamweb/templates/base.html

10
mamweb/static/css/layout.css

@ -8,7 +8,7 @@
} }
/**** KONTEJNER ****/ /**** KONTEJNER ****/
div.container { div.kontejner {
width: 970px; width: 970px;
margin: auto; margin: auto;
min-height: 100vh; min-height: 100vh;
@ -17,16 +17,16 @@ div.container {
} }
.org-logged-in div.container { .org-logged-in div.kontejner {
margin-top: var(--login-bar-height); margin-top: var(--login-bar-height);
} }
div.content-wrapper { div.kontent-wrapper {
padding-bottom: var(--footer-height); padding-bottom: var(--footer-height);
} }
div.content { div.kontent {
padding: 15px 30px; padding: 15px 30px;
} }
@ -169,7 +169,7 @@ a.login-ref-admin {
/* stránka přes celý displej */ /* stránka přes celý displej */
@media (max-width: 970px) { @media (max-width: 970px) {
div.container { div.kontejner {
width: 100%; width: 100%;
} }

6
mamweb/static/css/modules.css

@ -279,9 +279,9 @@ div.org_email {
.tabulka_s_uchycenym_radkem_a_sloupcem thead, .tabulka_s_uchycenym_radkem_a_sloupcem thead,
.tabulka_s_uchycenym_radkem_a_sloupcem tbody, .tabulka_s_uchycenym_radkem_a_sloupcem tbody,
.tabulka_s_uchycenym_radkem_a_sloupcem tr, .tabulka_s_uchycenym_radkem_a_sloupcem tr,
.container, .kontejner,
.content-wrapper, .kontent-wrapper,
.content .kontent
{ {
background: inherit; background: inherit;
} }

4
mamweb/templates/april.html

@ -36,8 +36,8 @@
return Math.floor(360*Math.random()); return Math.floor(360*Math.random());
} }
$('.container').css('margin', 0); $('.kontejner').css('margin', 0);
rotace_a_posun($('.container'), randomUhel()); rotace_a_posun($('.kontejner'), randomUhel());
</script> </script>
{% endif %} {% endif %}

6
mamweb/templates/base.html

@ -55,8 +55,8 @@
</div> </div>
{% endif %} {% endif %}
<div class="container"> <div class="kontejner">
<div class="content-wrapper"> <div class="kontent-wrapper">
<a href='/'> <a href='/'>
<div id="title" >M&M &ndash; korespondenční seminář a časopis MFF&nbspUK</div> <div id="title" >M&M &ndash; korespondenční seminář a časopis MFF&nbspUK</div>
@ -100,7 +100,7 @@
{# ========= END MENU ========== #} {# ========= END MENU ========== #}
<div class='content'> <div class='kontent'>
{% block content %} {% block content %}
{% endblock content %} {% endblock content %}

Loading…
Cancel
Save