diff --git a/mamweb/static/css/galerie.css b/galerie/static/css/galerie.css similarity index 89% rename from mamweb/static/css/galerie.css rename to galerie/static/css/galerie.css index 6ee1a676..46df8552 100644 --- a/mamweb/static/css/galerie.css +++ b/galerie/static/css/galerie.css @@ -165,3 +165,22 @@ margin-top: -3em; /* #FIXME */ } } + + +/* plus a minus tlacitka */ +.mam-org-only-galerie { + background: var(--orgovska-svetla-fialova); + padding: 10px; + margin: 10px 10px 10px -20px; + border: #333 2px dashed; + float: left; +} + +.mam-org-only-galerie a{ + padding: 3px 5px; + margin: 5px; + border-radius: 20px; + background-color: var(--tmava-oranzova);; + color: var(--barva-pozadi); + float: left; +} diff --git a/galerie/templates/galerie/Galerie.html b/galerie/templates/galerie/Galerie.html index aadc969e..ff8ebfe3 100644 --- a/galerie/templates/galerie/Galerie.html +++ b/galerie/templates/galerie/Galerie.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "galerie/base.html" %} {% block nadpis1a %} diff --git a/galerie/templates/galerie/GalerieNahled.html b/galerie/templates/galerie/GalerieNahled.html index ec0d5f67..87794680 100644 --- a/galerie/templates/galerie/GalerieNahled.html +++ b/galerie/templates/galerie/GalerieNahled.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "galerie/base.html" %} {% block nadpis1a %} Galerie {{galerie.nazev}} diff --git a/galerie/templates/galerie/GalerieNew.html b/galerie/templates/galerie/GalerieNew.html index 1b549232..d974224c 100644 --- a/galerie/templates/galerie/GalerieNew.html +++ b/galerie/templates/galerie/GalerieNew.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "galerie/base.html" %} {% block content %} diff --git a/galerie/templates/galerie/base.html b/galerie/templates/galerie/base.html new file mode 100644 index 00000000..032f16b2 --- /dev/null +++ b/galerie/templates/galerie/base.html @@ -0,0 +1,6 @@ +{% extends "base.html" %} +{% load static %} + +{% block custom_css %} + +{% endblock %} diff --git a/mamweb/static/css/modules.css b/mamweb/static/css/modules.css index 15fb9a5e..5302b673 100644 --- a/mamweb/static/css/modules.css +++ b/mamweb/static/css/modules.css @@ -19,24 +19,6 @@ li.mam-org-only { padding: 3px 0px; margin: -2px 0px; } - -/* plus a minus tlacitka */ -.mam-org-only-galerie { - background: var(--orgovska-svetla-fialova); - padding: 10px; - margin: 10px 10px 10px -20px; - border: #333 2px dashed; - float: left; -} - -.mam-org-only-galerie a{ - padding: 3px 5px; - margin: 5px; - border-radius: 20px; - background-color: var(--tmava-oranzova);; - color: var(--barva-pozadi); - float: left; -} /**********************************/ diff --git a/mamweb/templates/base.html b/mamweb/templates/base.html index 5a0b55c6..027f296f 100644 --- a/mamweb/templates/base.html +++ b/mamweb/templates/base.html @@ -14,7 +14,6 @@ - diff --git a/vue_frontend/src/components/TreeNodeRoot.vue b/vue_frontend/src/components/TreeNodeRoot.vue index 408efce5..7bb107ca 100644 --- a/vue_frontend/src/components/TreeNodeRoot.vue +++ b/vue_frontend/src/components/TreeNodeRoot.vue @@ -75,7 +75,6 @@ export default {