Commit 1502997 1 parent d50e304 commit 1502997 Copy full SHA for 1502997
File tree 7 files changed +21
-9
lines changed
contrib/templates/meinberlin_contrib/components
projects/templates/meinberlin_projects
assets/scss/components_user_facing/adhocracy4
7 files changed +21
-9
lines changed Original file line number Diff line number Diff line change @@ -23,7 +23,7 @@ <h1 class="hero__title">
23
23
{% translate "More information" %}
24
24
</ a >
25
25
{% load react_follows %}
26
- {% react_follows project %}
26
+ {% react_follows project alert_target="follow-alert-wrapper" %}
27
27
</ div >
28
28
{% endif %}
29
29
</ div >
Original file line number Diff line number Diff line change 1
1
{% extends "meinberlin_projects/project_detail.html" %}
2
- {% load i18n rules react_follows thumbnail wagtailcore_tags meinberlin_project_tags offlineevent_tags contrib_tags ckeditor_tags %}
2
+ {% load i18n rules thumbnail wagtailcore_tags meinberlin_project_tags offlineevent_tags contrib_tags ckeditor_tags %}
3
3
4
4
{% block title %}{{ project.name }} — {{ block.super }}{% endblock title %}
5
5
Original file line number Diff line number Diff line change 34
34
< div class ="layout-grid__area--maincontent ">
35
35
{% url 'project-information' slug=project.slug as info_page %}
36
36
{% include 'meinberlin_contrib/components/hero.html' with content=project show_buttons=True hero_link=info_page %}
37
-
37
+ < div id =" follow-alert-wrapper " > </ div >
38
38
{% include 'meinberlin_projects/project_actions.html' %}
39
39
40
40
{% include 'meinberlin_projects/includes/project_details_summary.html' %}
Original file line number Diff line number Diff line change
1
+ /* stylelint-disable no-descending-specificity */
1
2
.a4-btn--follow ,
2
3
.a4-btn--following {
3
4
@extend .button ;
4
5
@extend .button--fullwidth-palm ;
5
6
@extend .button--light ;
6
7
@extend .button--fulltone ;
7
8
color : $text-inverted !important ;
9
+
10
+ & :not (:disabled ):hover {
11
+ background-color : $primary-600 ;
12
+ }
8
13
}
9
14
10
- // we do not display alert in mB
11
- .a4-follow__notification {
12
- display : none ;
15
+ .a4-btn--following {
16
+ background-color : $primary ;
17
+
18
+ & :not (:disabled ):focus {
19
+ background-color : $primary ;
20
+ }
21
+
22
+ & :not (:disabled ):hover {
23
+ background-color : $primary-600 ;
24
+ }
13
25
}
14
26
15
27
.a4-follow__btn--content :after {
Original file line number Diff line number Diff line change 1
1
{% extends "base.html" %}
2
- {% load i18n rules react_follows thumbnail wagtailcore_tags meinberlin_project_tags offlineevent_tags contrib_tags ckeditor_tags static %}
2
+ {% load i18n rules thumbnail wagtailcore_tags meinberlin_project_tags offlineevent_tags contrib_tags ckeditor_tags static %}
3
3
4
4
<!-- Extra blocks to ensure cookie banner for live stream -->
5
5
{% block extra_js %}
Original file line number Diff line number Diff line change 18
18
"@react-leaflet/core" : " ^2.1.0" ,
19
19
"@turf/turf" : " ^6.5.0" ,
20
20
"acorn" : " 8.14.0" ,
21
- "adhocracy4" : " liqd/adhocracy4#cfe044bea1e4ddc633f9deded0cab4c02fcacf2a " ,
21
+ "adhocracy4" : " liqd/adhocracy4#1b17f7f486dcdbd0bcbff05b6e2fccdc8f0efcc7 " ,
22
22
"autoprefixer" : " 10.4.20" ,
23
23
"bootstrap" : " 5.2.3" ,
24
24
"copy-webpack-plugin" : " 12.0.2" ,
Original file line number Diff line number Diff line change 1
1
# A4
2
- git+https://github.com/liqd/adhocracy4.git@cfe044bea1e4ddc633f9deded0cab4c02fcacf2a #egg=adhocracy4
2
+ git+https://github.com/liqd/adhocracy4.git@1b17f7f486dcdbd0bcbff05b6e2fccdc8f0efcc7 #egg=adhocracy4
3
3
4
4
# Additional requirements
5
5
beautifulsoup4==4.12.3
You can’t perform that action at this time.
0 commit comments