Skip to content

Commit 7eafaed

Browse files
committed
Merge branch 'master' of github.com:citizenos/citizenos-fe
2 parents 0606239 + 6c465b6 commit 7eafaed

File tree

17 files changed

+30
-4
lines changed

17 files changed

+30
-4
lines changed

src/app/ideation/components/add-idea/add-idea.component.html

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@
1515
</div>
1616
<div id="create_idea_footer" [@openSlide]="(app.addIdea | async) ? 'open' : 'closed'">
1717
<div id="post_idea_form_wrap" [class.expanded]="toggleExpand">
18+
<div *ngIf="ideation.allowAnonymous" id="anonymous_info_wrap" class="mobile_show"
19+
translate="COMPONENTS.ADD_IDEA.FOOTER_FORM_ANONYMOUS_INFO">
20+
<div class="tooltip" tooltip>
21+
<div class="content_title" translate="COMPONENTS.ADD_IDEA.TOOLTIP_ANONYMOUS_TITLE"></div>
22+
<div class="content_description" translate="COMPONENTS.ADD_IDEA.TOOLTIP_ANONYMOUS_DESCRIPTION"></div>
23+
</div>
24+
</div>
1825
<div class="form_header">
1926
<div class="form_header_title">
2027
<span translate="COMPONENTS.ADD_IDEA.FOOTER_FORM_TITLE"></span>
@@ -33,14 +40,14 @@
3340
</div>
3441

3542
<div class="form_header_actions">
36-
<div *ngIf="ideation.allowAnonymous" id="anonymous_info_wrap"
43+
<div *ngIf="ideation.allowAnonymous" id="anonymous_info_wrap" class="mobile_hidden"
3744
translate="COMPONENTS.ADD_IDEA.FOOTER_FORM_ANONYMOUS_INFO">
3845
<div class="tooltip" tooltip>
3946
<div class="content_title" translate="COMPONENTS.ADD_IDEA.TOOLTIP_ANONYMOUS_TITLE"></div>
4047
<div class="content_description" translate="COMPONENTS.ADD_IDEA.TOOLTIP_ANONYMOUS_DESCRIPTION"></div>
4148
</div>
4249
</div>
43-
<button class="form_header_expand_button" (click)="toggleExpand = !toggleExpand"
50+
<button class="form_header_expand_button mobile_hidden" (click)="toggleExpand = !toggleExpand"
4451
[attr.aria-expanded]="toggleExpand">
4552
<svg class="form_header_expand_icon" [ngClass]="{ rotated: toggleExpand }" width="24" height="24"
4653
viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
@@ -275,7 +282,7 @@
275282
</ng-container>
276283
</div>
277284

278-
<div>
285+
<div id="idea_description">
279286
<textarea cosmarkdown name="description" formControlName="description"
280287
cosmarkdowntranslatecharacterstatuskey="COMPONENTS.ADD_IDEA.IDEA_TYPE_CHARACTER_LIMIT" id="idea_description"
281288
[(item)]="description" class="gray_borders" (itemChange)="updateText($event)"

src/app/ideation/components/add-idea/add-idea.component.scss

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,10 @@
163163
.form_header_actions {
164164
display: flex;
165165
gap: 8px;
166+
167+
@include mixins.mobile {
168+
flex-direction: column;
169+
}
166170
}
167171

168172
.form_header_expand_button {
@@ -208,7 +212,7 @@
208212
flex: 1 1 auto;
209213
height: calc(100vh - 200px);
210214

211-
> div:not(.form_header) {
215+
#idea_description {
212216
flex: 1 1 auto;
213217
display: flex;
214218
flex-direction: column;

src/assets/i18n/bg.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2666,6 +2666,7 @@
26662666
"LNK_CLEAR": "@:LNK_CLEAR",
26672667
"BTN_LEAVE_GROUP": "Leave group",
26682668
"BTN_VIEW_GROUP": "View group",
2669+
"BTN_JOINED_GROUP": "Joined",
26692670
"ORDER_TITLE_ASC": "Order groups A-Z",
26702671
"ORDER_TITLE_DESC": "Order groups Z-A",
26712672
"HEADING_NO_RESUTS": "@:VIEWS.MY.NO_RESULTS_FOUND_TITLE",

src/assets/i18n/cs.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2666,6 +2666,7 @@
26662666
"LNK_CLEAR": "@:LNK_CLEAR",
26672667
"BTN_LEAVE_GROUP": "Leave group",
26682668
"BTN_VIEW_GROUP": "Zobrazit skupinu",
2669+
"BTN_JOINED_GROUP": "Joined",
26692670
"ORDER_TITLE_ASC": "Seřadit skupiny A-Z",
26702671
"ORDER_TITLE_DESC": "Seřadit skupiny Z-A",
26712672
"HEADING_NO_RESUTS": "@:VIEWS.MY.NO_RESULTS_FOUND_TITLE",

src/assets/i18n/de.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2666,6 +2666,7 @@
26662666
"LNK_CLEAR": "@:LNK_CLEAR",
26672667
"BTN_LEAVE_GROUP": "Gruppe verlassen",
26682668
"BTN_VIEW_GROUP": "Gruppe anzeigen",
2669+
"BTN_JOINED_GROUP": "Joined",
26692670
"ORDER_TITLE_ASC": "Gruppen ordnen (A-Z)",
26702671
"ORDER_TITLE_DESC": "Gruppen ordnen (Z-A)",
26712672
"HEADING_NO_RESUTS": "@:VIEWS.MY.NO_RESULTS_FOUND_TITLE",

src/assets/i18n/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2666,6 +2666,7 @@
26662666
"LNK_CLEAR": "@:LNK_CLEAR",
26672667
"BTN_LEAVE_GROUP": "Leave group",
26682668
"BTN_VIEW_GROUP": "View group",
2669+
"BTN_JOINED_GROUP": "Joined",
26692670
"ORDER_TITLE_ASC": "Order groups A-Z",
26702671
"ORDER_TITLE_DESC": "Order groups Z-A",
26712672
"HEADING_NO_RESUTS": "@:VIEWS.MY.NO_RESULTS_FOUND_TITLE",

src/assets/i18n/es.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2666,6 +2666,7 @@
26662666
"LNK_CLEAR": "@:LNK_CLEAR",
26672667
"BTN_LEAVE_GROUP": "Leave group",
26682668
"BTN_VIEW_GROUP": "Ver grupo",
2669+
"BTN_JOINED_GROUP": "Joined",
26692670
"ORDER_TITLE_ASC": "Ordenar grupos de la A a la Z",
26702671
"ORDER_TITLE_DESC": "Ordenar grupos de la Z a la A",
26712672
"HEADING_NO_RESUTS": "@:VIEWS.MY.NO_RESULTS_FOUND_TITLE",

src/assets/i18n/et.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2666,6 +2666,7 @@
26662666
"LNK_CLEAR": "@:LNK_CLEAR",
26672667
"BTN_LEAVE_GROUP": "Lahku grupist",
26682668
"BTN_VIEW_GROUP": "Vaata gruppi",
2669+
"BTN_JOINED_GROUP": "Joined",
26692670
"ORDER_TITLE_ASC": "Reasta grupid A-Z",
26702671
"ORDER_TITLE_DESC": "Reasta grupid Z-A",
26712672
"HEADING_NO_RESUTS": "@:VIEWS.MY.NO_RESULTS_FOUND_TITLE",

src/assets/i18n/fr.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2666,6 +2666,7 @@
26662666
"LNK_CLEAR": "@:LNK_CLEAR",
26672667
"BTN_LEAVE_GROUP": "Leave group",
26682668
"BTN_VIEW_GROUP": "Voir le groupe",
2669+
"BTN_JOINED_GROUP": "Joined",
26692670
"ORDER_TITLE_ASC": "Tri des groupes A-Z",
26702671
"ORDER_TITLE_DESC": "Tri des groupes Z-A",
26712672
"HEADING_NO_RESUTS": "@:VIEWS.MY.NO_RESULTS_FOUND_TITLE",

src/assets/i18n/id.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2666,6 +2666,7 @@
26662666
"LNK_CLEAR": "@:LNK_CLEAR",
26672667
"BTN_LEAVE_GROUP": "Leave group",
26682668
"BTN_VIEW_GROUP": "Lihat grup",
2669+
"BTN_JOINED_GROUP": "Joined",
26692670
"ORDER_TITLE_ASC": "Urutan grup A-Z",
26702671
"ORDER_TITLE_DESC": "Urutan grup Z-A",
26712672
"HEADING_NO_RESUTS": "@:VIEWS.MY.NO_RESULTS_FOUND_TITLE",

0 commit comments

Comments
 (0)