mam/mamweb
13
1
Fork 0
Code Issues Pull requests 12 Projects Wiki Activity Actions

Velká revize stylů (a některých JS) #44

Merged
zelvuska merged 50 commits from static-files-upgrade into master 2024-10-22 20:00:12 +02:00
Conversation 0 Commits 50 Files changed 108 +28 -23
8 changed files with 28 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit c731af9ccd - Show all commits

19
mamweb/static/css/galerie.css → galerie/static/css/galerie.css
View file

@ -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;
}

2
galerie/templates/galerie/Galerie.html
View file

@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "galerie/base.html" %}
{% block nadpis1a %}

2
galerie/templates/galerie/GalerieNahled.html
View file

@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "galerie/base.html" %}
{% block nadpis1a %}
Galerie {{galerie.nazev}}

2
galerie/templates/galerie/GalerieNew.html
View file

@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "galerie/base.html" %}
{% block content %}

6
galerie/templates/galerie/base.html Normal file
View file

@ -0,0 +1,6 @@
{% extends "base.html" %}
{% load static %}
{% block custom_css %}
<link href="{% static 'css/galerie.css' %}?version=1" rel="stylesheet">
{% endblock %}

18
mamweb/static/css/modules.css
View file

@ -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;
}
/**********************************/

1
mamweb/templates/base.html
View file

@ -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>

1
vue_frontend/src/components/TreeNodeRoot.vue
View file

@ -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>