Skip to content

Commit 1502997

Browse files
committed
fix follow issue
1 parent d50e304 commit 1502997

File tree

7 files changed

+21
-9
lines changed

7 files changed

+21
-9
lines changed

meinberlin/apps/contrib/templates/meinberlin_contrib/components/hero.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ <h1 class="hero__title">
2323
{% translate "More information" %}
2424
</a>
2525
{% load react_follows %}
26-
{% react_follows project %}
26+
{% react_follows project alert_target="follow-alert-wrapper" %}
2727
</div>
2828
{% endif %}
2929
</div>

meinberlin/apps/projects/templates/meinberlin_projects/project_bplan_detail.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% 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 %}
33

44
{% block title %}{{ project.name }} — {{ block.super }}{% endblock title %}
55

meinberlin/apps/projects/templates/meinberlin_projects/project_detail.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<div class="layout-grid__area--maincontent">
3535
{% url 'project-information' slug=project.slug as info_page %}
3636
{% include 'meinberlin_contrib/components/hero.html' with content=project show_buttons=True hero_link=info_page %}
37-
37+
<div id="follow-alert-wrapper"></div>
3838
{% include 'meinberlin_projects/project_actions.html' %}
3939

4040
{% include 'meinberlin_projects/includes/project_details_summary.html' %}

meinberlin/assets/scss/components_user_facing/adhocracy4/_a4-follow.scss

+15-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,27 @@
1+
/* stylelint-disable no-descending-specificity */
12
.a4-btn--follow,
23
.a4-btn--following {
34
@extend .button;
45
@extend .button--fullwidth-palm;
56
@extend .button--light;
67
@extend .button--fulltone;
78
color: $text-inverted !important;
9+
10+
&:not(:disabled):hover {
11+
background-color: $primary-600;
12+
}
813
}
914

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+
}
1325
}
1426

1527
.a4-follow__btn--content:after {

meinberlin/templates/a4modules/module_detail.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% 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 %}
33

44
<!-- Extra blocks to ensure cookie banner for live stream -->
55
{% block extra_js %}

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"@react-leaflet/core": "^2.1.0",
1919
"@turf/turf": "^6.5.0",
2020
"acorn": "8.14.0",
21-
"adhocracy4": "liqd/adhocracy4#cfe044bea1e4ddc633f9deded0cab4c02fcacf2a",
21+
"adhocracy4": "liqd/adhocracy4#1b17f7f486dcdbd0bcbff05b6e2fccdc8f0efcc7",
2222
"autoprefixer": "10.4.20",
2323
"bootstrap": "5.2.3",
2424
"copy-webpack-plugin": "12.0.2",

requirements/base.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# A4
2-
git+https://github.com/liqd/adhocracy4.git@cfe044bea1e4ddc633f9deded0cab4c02fcacf2a#egg=adhocracy4
2+
git+https://github.com/liqd/adhocracy4.git@1b17f7f486dcdbd0bcbff05b6e2fccdc8f0efcc7#egg=adhocracy4
33

44
# Additional requirements
55
beautifulsoup4==4.12.3

0 commit comments

Comments
 (0)