Browse Source

Merge remote-tracking branch 'origin' into prod

root 1 year ago
parent
commit
820efe0aaf

+ 0
- 1
.gitignore View File

@@ -4,6 +4,5 @@ __pycache__
4 4
 app/uploads/*
5 5
 venv/*
6 6
 doc/_build/
7
-app/static/podcasts
8 7
 .sass-cache
9 8
 alchemydumps/*

+ 1
- 1
app/static/css/style.css View File

@@ -184,7 +184,7 @@ section {
184 184
 .more {
185 185
   margin-left: calc(100% - 5em);
186 186
   text-align: center;
187
-  margin-top: 3em;
187
+  margin-top: 2em;
188 188
   width: 5em;
189 189
   border: 1px solid black;
190 190
   padding: 0em 0em; }

+ 1
- 1
app/static/css/style.css.map View File

@@ -1,6 +1,6 @@
1 1
 {
2 2
 "version": 3,
3
-"mappings": "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",
3
+"mappings": "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",
4 4
 "sources": ["../scss/_rules.scss","../scss/style.scss","../scss/_mixins.scss","../scss/_sections.scss","../scss/_svgs.scss","../scss/_fonts.scss"],
5 5
 "names": [],
6 6
 "file": "style.css"

+ 1
- 1
app/static/scss/_sections.scss View File

@@ -139,7 +139,7 @@ section {
139 139
 .more {
140 140
     margin-left: calc(100% - 5em);
141 141
     text-align: center;
142
-    margin-top: 3em;
142
+    margin-top: 2em;
143 143
     width: 5em;
144 144
     border: 1px solid $black;
145 145
     padding: 0em 0em;

+ 0
- 16
app/static/scss/style.scss View File

@@ -66,22 +66,6 @@ nav {
66 66
 main {
67 67
     @include flexbox();
68 68
     width: 100%;
69
-
70
-    a {
71
-
72
-        // font-family: pixelpath;
73
-        // font-size: $font-title-size;
74
-        // text-decoration: none;
75
-
76
-        // background-color: $white;
77
-        // position: sticky;
78
-        // top: 0;
79
-
80
-        // &:hover {
81
-        //     background-color: $main-color;
82
-        //     border-bottom: none;
83
-        // }
84
-    }
85 69
 }
86 70
 ::-moz-selection {
87 71
     background-color: $black;

+ 11
- 1
app/templates/index.html View File

@@ -44,7 +44,7 @@
44 44
     </div>
45 45
 
46 46
     {% for elem in blog_posts %}
47
-    <article>
47
+    <article class="widgetBis">
48 48
         <h3>{{ elem.name }}</h3>
49 49
         <span class="license">{{ elem.timestamp|format_date }}</span>
50 50
 
@@ -57,6 +57,16 @@
57 57
             </a>
58 58
             {%- if not loop.last %}, {% endif %}
59 59
         {% endfor %}
60
+        {% if elem.contributors|length > 0 %}
61
+        @
62
+        {% for collective in elem.collectives %}
63
+            <a class="content-link"
64
+                href="{{ url_for('main.collective', id=collective.id) }}">
65
+            {{ collective.name -}}
66
+            </a>
67
+            {%- if not loop.last %}, {% endif %}
68
+        {% endfor %}
69
+        {% endif %}
60 70
         </p>
61 71
         {% endif %}
62 72
 

+ 1
- 1
app/templates/main_pages/podcasts.html View File

@@ -7,7 +7,7 @@
7 7
 
8 8
 
9 9
 {% for elem in podcasts %}
10
-<article>
10
+<article class="widgetBis">
11 11
     <div class="flex">
12 12
         <a class="picto content-link" href="{{ url_for('main.play', id=elem.id) }}">
13 13
             {% include 'svg/small_play.svg' -%}

Loading…
Cancel
Save