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.

Sign up for GitHub

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

Feature/622: Overview background #637

Merged
merged 3 commits into from
Dec 7, 2023
Merged

Feature/622: Overview background #637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
614a09d
Add new shadows and overview white background color
lkleisa Nov 29, 2023
51e1f54
Remove border
lkleisa Nov 30, 2023
5e60814
Finish shadow
lkleisa Dec 6, 2023
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
17 changes: 11 additions & 6 deletions frontend/src/app/objective/objective.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,19 @@

.objective {
max-width: 750px;
box-shadow:
0px 2px 4px 0px rgba(0, 0, 0, 0.1),
0px 7px 7px 0px rgba(0, 0, 0, 0.09),
0px 15px 9px 0px rgba(0, 0, 0, 0.05),
0px 27px 11px 0px rgba(0, 0, 0, 0.01),
0px 42px 12px 0px rgba(0, 0, 0, 0);
&:hover {
box-shadow:
0 0 0 0 rgba(0, 0, 0, 0.06),
1px 1px 2px 0 rgba(0, 0, 0, 0.06),
3px 3px 4px 0 rgba(0, 0, 0, 0.05),
8px 6px 6px 0 rgba(0, 0, 0, 0.03),
14px 11px 7px 0 rgba(0, 0, 0, 0.01),
21px 18px 8px 0 rgba(0, 0, 0, 0);
2px 8px 19px 0px rgba(0, 0, 0, 0.1),
10px 33px 34px 0px rgba(0, 0, 0, 0.09),
22px 73px 46px 0px rgba(0, 0, 0, 0.05),
40px 130px 54px 0px rgba(0, 0, 0, 0.01),
62px 203px 59px 0px rgba(0, 0, 0, 0);
}
}

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/overview/overview.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<app-application-top-bar [hasAdminAccess]="hasAdminAccess"></app-application-top-bar>
<app-application-banner id="bannerComponent"></app-application-banner>
<div class="overviewContainer px-sm-4" [ngStyle]="{ 'padding-top.px': overviewPadding | async }">
<div id="overview" class="overviewContainer px-sm-4" [ngStyle]="{ 'padding-top.px': overviewPadding | async }">
<app-team
[hasAdminAccess]="hasAdminAccess"
*ngFor="let overviewEntity of overviewEntities$ | async; trackBy: trackByFn"
Expand Down
4 changes: 4 additions & 0 deletions frontend/src/app/overview/overview.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,7 @@
background-color: $overview-bg;
transition: 0.5s;
}

.bottom-shadow-space {
padding-bottom: 4rem;
}
5 changes: 4 additions & 1 deletion frontend/src/app/overview/overview.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { catchError, combineLatest, EMPTY, ReplaySubject, Subject, take, takeUnt
import { OverviewService } from '../shared/services/overview.service';
import { ActivatedRoute } from '@angular/router';
import { RefreshDataService } from '../shared/services/refresh-data.service';
import { getQueryString, getValueFromQuery, trackByFn } from '../shared/common';
import { getQueryString, getValueFromQuery, isMobileDevice, trackByFn } from '../shared/common';

@Component({
selector: 'app-overview',
Expand Down Expand Up @@ -46,6 +46,9 @@ export class OverviewComponent implements OnInit, OnDestroy {
this.overviewPadding.next(e);
this.changeDetector.detectChanges();
});
if (!isMobileDevice()) {
document.getElementById('overview')?.classList.add('bottom-shadow-space');
}
}

loadOverviewWithParams() {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/style/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ $keyResult-bg: #e5e8eb;

$top-bar-height: 48px;

$overview-bg: #d9d9d9;
$overview-bg: #ffffff;

$keyResult-attribute-bg: #ffffff;
$keyResult-attribute-edit-border: #ddddddff;
Expand Down
Loading