From c731af9ccd7d414fa66cd85e06461fbebd960ab0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= <jonas.havelka@volny.cz>
Date: Wed, 14 Feb 2024 08:28:30 +0100
Subject: [PATCH] =?UTF-8?q?P=C5=99esun=20css=20galerie=20do=20galerie?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 {mamweb => galerie}/static/css/galerie.css   | 19 +++++++++++++++++++
 galerie/templates/galerie/Galerie.html       |  2 +-
 galerie/templates/galerie/GalerieNahled.html |  2 +-
 galerie/templates/galerie/GalerieNew.html    |  2 +-
 galerie/templates/galerie/base.html          |  6 ++++++
 mamweb/static/css/modules.css                | 18 ------------------
 mamweb/templates/base.html                   |  1 -
 vue_frontend/src/components/TreeNodeRoot.vue |  1 -
 8 files changed, 28 insertions(+), 23 deletions(-)
 rename {mamweb => galerie}/static/css/galerie.css (89%)
 create mode 100644 galerie/templates/galerie/base.html

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 %}
+  <link href="{% static 'css/galerie.css' %}?version=1" rel="stylesheet">
+{% 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 @@
     <link href="{% static 'css/base.css' %}?version=1" rel="stylesheet">
     <link href="{% static 'css/layout.css' %}?version=1" rel="stylesheet">
     <link href="{% static 'css/modules.css' %}?version=1" rel="stylesheet">
-    <link href="{% static 'css/galerie.css' %}?version=1" rel="stylesheet">
     <link href="{% static 'prettyPhoto/css/prettyPhoto.css' %}" rel="stylesheet" type="text/css" media="screen" charset="utf-8" />
     <script src="{% static 'js/jquery-1.11.1.js' %}"></script>
     <script src="{% static 'js/jquery-3.4.1.js' %}"></script>
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 {
 <style>
 @import '../../../mamweb/static/css/base.css';
 @import '../../../mamweb/static/css/constants.css';
-@import '../../../mamweb/static/css/galerie.css';
 @import '../../../mamweb/static/css/layout.css';
 @import '../../../mamweb/static/css/modules.css';
 </style>