diff --git a/src/app/reusable-components/forum/forum.component.html b/src/app/reusable-components/forum/forum.component.html index fdba733..93a5d6f 100644 --- a/src/app/reusable-components/forum/forum.component.html +++ b/src/app/reusable-components/forum/forum.component.html @@ -1,23 +1,28 @@
-
- -
- - -
-
- - -
-
- - +
+
+ +
+ + +
+
+ + +
+
+ + +
+
+ + +
-
- - +
+ +
-
    diff --git a/src/app/reusable-components/forum/forum.component.scss b/src/app/reusable-components/forum/forum.component.scss index ddad44d..748c9af 100644 --- a/src/app/reusable-components/forum/forum.component.scss +++ b/src/app/reusable-components/forum/forum.component.scss @@ -1,7 +1,7 @@ .forum-details { .add-post { width: 90%; - margin: 10px auto; + margin: 10px auto 20px; textarea { border: 0px; height: 70px; @@ -49,17 +49,34 @@ } } - .add-post-button { + .action-buttons { + display: flex; + width: 100%; margin-top: 20px; + justify-content: space-between; + } + + .add-post-button { display: block; - width: 100px; - margin-left: auto; + flex-grow: 1; height: 40px; font-size: 14px; background-color: var(--teal-green); color: white; border: 0px; - border-radius: 7px; + border-radius: 5px; + } + + .cancel-post-button { + display: block; + width: 100px; + height: 40px; + font-size: 14px; + background-color: var(--dark-grey); + color: white; + border: 0px; + border-radius: 5px; + margin-right: 20px; } .more-options-slideup { @@ -153,7 +170,7 @@ .forum-post-list { list-style: none; width: 100%; - margin: 20px auto 0; + margin: 0 auto; overflow: hidden; .post { diff --git a/src/app/reusable-components/forum/forum.component.ts b/src/app/reusable-components/forum/forum.component.ts index c4f0d71..5bfd49c 100644 --- a/src/app/reusable-components/forum/forum.component.ts +++ b/src/app/reusable-components/forum/forum.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, Input } from '@angular/core'; @Component({ selector: 'app-forum', @@ -10,9 +10,14 @@ export class ForumComponent implements OnInit { selectedPost: number; showAddCommentToPost: boolean = false; + showAddPostInputs: boolean = false; + + @Input() isSubSegment: boolean = false; + constructor() { } ngOnInit(): void { + } } diff --git a/src/app/tabs/courses/details/details.component.html b/src/app/tabs/courses/details/details.component.html index 89b4c39..35d36bd 100644 --- a/src/app/tabs/courses/details/details.component.html +++ b/src/app/tabs/courses/details/details.component.html @@ -206,7 +206,7 @@
    - +
diff --git a/src/app/tabs/courses/details/details.component.ts b/src/app/tabs/courses/details/details.component.ts index ceb6b85..3f16dd7 100644 --- a/src/app/tabs/courses/details/details.component.ts +++ b/src/app/tabs/courses/details/details.component.ts @@ -14,6 +14,7 @@ export class DetailsComponent implements OnInit { routeSubscription: Subscription; selectedChapter: number = 1; showDeletePopup: boolean = false; + isSubSegment: boolean = true; constructor( private route: ActivatedRoute, @@ -36,7 +37,7 @@ export class DetailsComponent implements OnInit { getPopupDecision(e : boolean) { if (e) { - this.showDeletePopup = false; + this.showDeletePopup = false; } }