Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

community: improve news (fixes #7295) #7307

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Remove the configuration toolbar
  • Loading branch information
Mutugiii committed Nov 1, 2023
commit 74860f036ff3f9a935e34c1a7ed1a7c53c75072b
7 changes: 2 additions & 5 deletions src/app/community/community.component.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
<div class="space-container">
<div class="view-container view-full-height community-view">
<mat-toolbar class="action-buttons">
<span>{{configuration?.name}}</span>
</mat-toolbar>
<div class="community-news">
<mat-tab-group class="tabs-padding" (selectedTabChange)="tabChanged($event)">
<mat-tab i18n-label label="News">
Expand Down Expand Up @@ -58,11 +55,11 @@ <h3>
<mat-tab i18n-label label="Reports">
<planet-teams-reports [reports]="reports" [editable]="isCommunityLeader && !planetCode" [team]="team" (reportsChanged)="dataChanged()"></planet-teams-reports>
</mat-tab>
<mat-tab i18n-label label="Calendar" *ngIf="deviceType === deviceTypes.MOBILE">
<mat-tab i18n-label label="Calendar" *ngIf="deviceType !== deviceTypes.DESKTOP">
<planet-calendar [resizeCalendar]="resizeCalendar" [link]="{ teams: teamId }" [sync]="{ type: 'sync', planetCode: planetCode || configuration.code }"></planet-calendar>
</mat-tab>
</mat-tab-group>
</div>
<planet-calendar *ngIf="deviceType != deviceTypes.MOBILE" [link]="{ teams: teamId }" [sync]="{ type: 'sync', planetCode: planetCode || configuration.code }"></planet-calendar>
<planet-calendar *ngIf="deviceType === deviceTypes.DESKTOP" [link]="{ teams: teamId }" [sync]="{ type: 'sync', planetCode: planetCode || configuration.code }"></planet-calendar>
</div>
</div>
20 changes: 3 additions & 17 deletions src/app/community/community.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,12 @@

display: grid;
grid-template-columns: 2fr 1fr;
grid-template-rows: 64px calc(100% - 64px - 0.5rem);
grid-template-areas:
"links calendar"
"news calendar";
grid-template-areas: "news calendar";
gap: 0.5rem;

@media only screen and (max-width: #{$screen-sm}) {
@media only screen and (max-width: #{$screen-md}) {
grid-template-columns: 1fr;
grid-template-areas:
"links"
"news";
grid-template-areas: "news";
}
}

Expand All @@ -28,26 +23,17 @@
align-items: center;
}

.view-container mat-toolbar {
grid-area: links;
overflow: hidden;
}

.community-news {

grid-area: news;
overflow-y: auto;

h3 {

margin: 0;

*:not(:last-child) {
margin-right: 0.25rem;
}

}

}

planet-calendar {
Expand Down