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

page content alignment across all dashboard pages #1493

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion app/components/app-monitoring/details/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@direction='column'
@width='full'
local-class='app-details-container'
class='pl-3 pt-3 pr-3'
class='pt-3'
data-test-app-details-container
>
<AkStack
Expand Down
2 changes: 1 addition & 1 deletion app/components/app-monitoring/index.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.app-monitoring-container {
width: 100%;
padding: 0.714em 4.285em 0;
padding: 0.714em 0;
box-sizing: border-box;
}
1 change: 1 addition & 0 deletions app/components/app-monitoring/settings/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
@width='full'
@justifyContent='space-between'
@alignItems='center'
@spacing='1.5'
local-class='header-app-moitoring-page-title'
>
<AkStack @direction='column' @spacing='0.5'>
Expand Down
1 change: 0 additions & 1 deletion app/components/app-monitoring/version-table/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
@direction='column'
@spacing='2'
@width='full'
class='px-3'
data-test-amVersionTable-container
>
<AkTypography @color='textSecondary' {{style paddingLeft='1.2143em'}}>
Expand Down
2 changes: 0 additions & 2 deletions app/components/file-compare/compare-list/index.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
.file-compare-list-root {
background-color: var(--file-compare-compare-list-wrapper-background-color);
min-height: calc(100vh - 70px);

.file-compare-list-files-wrapper {
margin-top: 1.4286em;
margin-bottom: 5.7143em;
padding: 0em 0.9286em;
}

.file-compare-list-file-overviews {
Expand Down
5 changes: 3 additions & 2 deletions app/components/file-compare/empty/index.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.empty-container {
margin-top: 4.625em;
margin-bottom: 4.625em;
background-color: var(--file-compare-background-light);
padding-top: 4.625em;
padding-bottom: 4.625em;

.empty-state-vector {
margin-bottom: 1.5625em;
Expand Down
1 change: 1 addition & 0 deletions app/components/file-compare/header/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
>
<div
local-class='file-compare-header-breadcrumbs'
class='pt-2 pb-3'
data-test-fileCompare-headerBreadcrumbs
>
{{yield to='breadcrumbs'}}
Expand Down
9 changes: 3 additions & 6 deletions app/components/file-compare/header/index.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
.file-compare-header-container {
background-color: var(--file-compare-header-white-background-color);
padding: 0em 0.7143em;
position: sticky;
top: -0.5em;
z-index: 10;

.file-compare-header-breadcrumbs {
padding: 1.2857em 0em;
background-color: var(--file-compare-background-light);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be var(--file-compare-header-background-light)

width: 100%;
}

.file-compare-header-project-overview {
Expand Down Expand Up @@ -49,8 +48,6 @@
}

.files-overview-container {
margin-left: 0.7143em;
margin-right: 0.7143em;
padding: 1.4286em;
border: 1px solid var(--file-compare-header-files-overview-border-color);
border-top: none;
Expand All @@ -67,4 +64,4 @@

.platform-apple {
color: var(--file-compare-header-platform-ios-color);
}
}
2 changes: 1 addition & 1 deletion app/components/file-compare/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
</:headerCTA>
</FileCompare::Header>

<div local-class='file-compare-tabs' class='px-3 pb-3'>
<div local-class='file-compare-tabs' class='pb-3'>
<AkTabs class='w-full' as |Akt|>
{{#each this.tabItems as |item|}}
<Akt.tabItem
Expand Down
2 changes: 1 addition & 1 deletion app/components/file-compare/index.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.file-compare-tabs {
position: sticky;
margin-top: 1.4286em;
top: calc(198px - 0.5em);
top: calc(198px - 0.53em);
z-index: 10;
background: var(--file-compare-tabs-background-color);
}
4 changes: 2 additions & 2 deletions app/components/file-compare/loader/index.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.loading {
border: 1px solid var(--appmonitoring-border-color);
border-radius: var(--appmonitoring-border-radius);
border: 1px solid var(--file-compare-loader-border-color);
border-radius: var(--file-compare-loader-border-radius);
width: 100%;
min-height: 35em;

Expand Down
2 changes: 1 addition & 1 deletion app/components/file-compare/table/index.hbs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class='pl-3 pr-3 mb-3' data-test-fileCompare-table-root>
<div class='mb-3' data-test-fileCompare-table-root>
<AkPaginationProvider
@results={{this.comparisonTableData}}
@onItemPerPageChange={{this.onItemPerPageChange}}
Expand Down
2 changes: 1 addition & 1 deletion app/components/file-compare/table/index.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.file-compare-table {
table {
background-color: transparent;
background-color: var(--file-compare-background-light);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be var(--file-compare-table-background-light)

}

tr:first-of-type:hover td {
Expand Down
4 changes: 2 additions & 2 deletions app/components/file-compare/vulnerability-details/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,13 @@

<AkStack
@direction='column'
{{style padding='0.7143em'}}
{{style paddingTop='0.7143em'}}
data-test-fileCompare-vulnerabilityDetails-root
>
<AkStack
@width='full'
local-class='file-compare-vulnerability-details-header-wrapper'
{{style paddingTop='1.4286em'}}
{{style marginTop='1.4286em'}}
data-test-fileCompare-vulnerabilityDetails-header
>
<AkStack
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
--file-compare-vulnerability-details-header-wrapper-background-color
);
position: sticky;
top: calc(198px - 0.5em);
top: calc(198px - 0.54em);
z-index: 1;

.file-compare-vulnerability-details-header {
Expand Down
89 changes: 43 additions & 46 deletions app/components/file-details/api-scan/index.hbs
Original file line number Diff line number Diff line change
@@ -1,55 +1,52 @@
<div local-class='api-scan-root'>
<div local-class='api-scan-container'>
<div local-class='api-scan-breadcrumbs-container'>
<AkBreadcrumbs::Container
data-test-fileDetails-apiScan-breadcrumbContainer
>
{{#each this.breadcrumbItems as |item|}}
<AkBreadcrumbs::Item
@route={{item.route}}
@model={{item.model}}
@linkTitle={{item.linkTitle}}
data-test-fileDetails-apiScan-breadcrumbItem='{{item.linkTitle}}'
/>
{{/each}}
</AkBreadcrumbs::Container>
</div>

<FileDetails::Summary @file={{@file}} />
<div local-class='api-scan-breadcrumbs-container' class='pb-3 pt-2'>
<AkBreadcrumbs::Container data-test-fileDetails-apiScan-breadcrumbContainer>
{{#each this.breadcrumbItems as |item|}}
<AkBreadcrumbs::Item
@route={{item.route}}
@model={{item.model}}
@linkTitle={{item.linkTitle}}
data-test-fileDetails-apiScan-breadcrumbItem='{{item.linkTitle}}'
/>
{{/each}}
</AkBreadcrumbs::Container>
</div>

<FileDetails::Summary @file={{@file}} />

<div class='my-3'>
<AkTabs local-class='api-scan-tabs-container' as |Akt|>
{{#each this.tabItems as |item|}}
<Akt.tabItem
@id={{item.id}}
@hasBadge={{item.hasBadge}}
@route={{item.route}}
@currentWhen={{item.currentWhen}}
@indicatorVariant='shadow'
data-test-fileDetails-apiScan-tabs='{{item.id}}-tab'
>
<:badge>
<AkStack @alignItems='center'>
<AkIcon @iconName='bug-report' @size='small' />
<div class='my-3'>
<AkTabs local-class='api-scan-tabs-container' as |Akt|>
{{#each this.tabItems as |item|}}
<Akt.tabItem
@id={{item.id}}
@hasBadge={{item.hasBadge}}
@route={{item.route}}
@currentWhen={{item.currentWhen}}
@indicatorVariant='shadow'
data-test-fileDetails-apiScan-tabs='{{item.id}}-tab'
>
<:badge>
<AkStack @alignItems='center'>
<AkIcon @iconName='bug-report' @size='small' />

<AkTypography
local-class='bagde-count-text'
@color='inherit'
@tag='span'
@fontWeight='bold'
>
{{item.badgeCount}}
</AkTypography>
</AkStack>
</:badge>
<AkTypography
local-class='bagde-count-text'
@color='inherit'
@tag='span'
@fontWeight='bold'
>
{{item.badgeCount}}
</AkTypography>
</AkStack>
</:badge>

<:default>{{item.label}}</:default>
</Akt.tabItem>
{{/each}}
</AkTabs>
<:default>{{item.label}}</:default>
</Akt.tabItem>
{{/each}}
</AkTabs>

{{yield}}
</div>
{{yield}}
</div>

{{#if this.apiScan.footerComponent}}
Expand Down
31 changes: 12 additions & 19 deletions app/components/file-details/api-scan/index.scss
Original file line number Diff line number Diff line change
@@ -1,30 +1,23 @@
$container-width: 1200px;

.api-scan-root {
padding: 0 1.5em 1.5em;
margin: -0.5em;
padding: 0 0em 1.5em;
background-color: var(--file-details-api-scan-background-color);
min-height: calc(100vh - 56px);

.api-scan-container {
max-width: $container-width;
margin: 0 auto;

.api-scan-breadcrumbs-container,
.api-scan-tabs-container {
position: sticky;
z-index: 100;
background-color: var(--file-details-api-scan-background-color);
}
.api-scan-breadcrumbs-container,
.api-scan-tabs-container {
position: sticky;
z-index: 100;
background-color: var(--file-details-api-scan-background-color);
}

.api-scan-breadcrumbs-container {
padding: 1.5em 0;
top: -0.5em;
}
.api-scan-breadcrumbs-container {
top: -0.5em;
}

.api-scan-tabs-container {
top: 3.5em;
}
.api-scan-tabs-container {
top: 3em;
}

.bagde-count-text {
Expand Down
2 changes: 1 addition & 1 deletion app/components/file-details/api-scan/results/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
--file-details-api-scan-results-tabs-container-background
);
position: sticky;
top: 6.42em;
top: 5.92em;
z-index: 100;
}

Expand Down
1 change: 1 addition & 0 deletions app/components/file-details/dynamic-scan/header/index.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<AkBreadcrumbs::Container
data-test-fileDetails-dynamicScan-header-breadcrumbContainer
local-class='breadcrumb-container'
class='pb-3 pt-2'
>
{{#each this.breadcrumbItems as |item|}}
<AkBreadcrumbs::Item
Expand Down
4 changes: 1 addition & 3 deletions app/components/file-details/dynamic-scan/header/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,11 @@

.breadcrumb-container {
top: -0.5em;
margin: 0;
padding: 1.5em 0em;
}

.dast-results-sticky-tabs {
margin-top: 1.5em;
top: 3.5em;
top: 3em;

.badge-count-text {
font-size: 0.857rem;
Expand Down
14 changes: 6 additions & 8 deletions app/components/file-details/dynamic-scan/index.hbs
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<FileDetails::DynamicScan::PageWrapper>
<FileDetails::DynamicScan::Header
@file={{@file}}
@profileId={{@profileId}}
@dynamicScan={{this.dynamicScan}}
/>
<FileDetails::DynamicScan::Header
@file={{@file}}
@profileId={{@profileId}}
@dynamicScan={{this.dynamicScan}}
/>

{{yield}}
</FileDetails::DynamicScan::PageWrapper>
{{yield}}

This file was deleted.

12 changes: 0 additions & 12 deletions app/components/file-details/dynamic-scan/page-wrapper/index.scss

This file was deleted.

15 changes: 0 additions & 15 deletions app/components/file-details/dynamic-scan/page-wrapper/index.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
.dast-results-tabs {
position: sticky;
background-color: var(--file-details-dynamic-scan-results-background-color);
top: 6.4em;
top: 5.92em;
z-index: 100;
width: 100%;
}
Loading
Loading