Skip to content

Commit a836ca6

Browse files
committed
[#55033] harmonized github and gitlab tab headers
- used op-tab-content styles - similar to files tab - removed custom style for headers - added op-tab-content--text-box style (spacing top) for empty state
1 parent 1e3221d commit a836ca6

File tree

10 files changed

+18
-29
lines changed

10 files changed

+18
-29
lines changed

frontend/src/global_styles/content/work_packages/tabs/_tab_content.sass

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@
3737
.op-files-tab--storage-info-box:not(:last-child)
3838
margin-bottom: $spot-spacing-1
3939

40+
&--text-box
41+
margin-top: $spot-spacing-0_5
42+
4043
&--header
4144
border-bottom: 1px solid #ddd
4245
padding-bottom: $spot-spacing-0_75

modules/github_integration/frontend/module/tab-header/styles/tab-header.sass

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,6 @@
2727
*/
2828

2929
.github-pr-header
30-
display: flex
31-
flex-wrap: wrap-reverse
32-
justify-content: flex-end
33-
34-
padding-bottom: 4px
35-
border-bottom: 1px solid #ddd
36-
37-
margin: 0 0 0.8rem 0
38-
3930
.title
4031
flex: 1 1 auto
4132
border-bottom: 0

modules/github_integration/frontend/module/tab-header/tab-header.template.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="github-pr-header">
1+
<div class="github-pr-header op-tab-content--header">
22
<h3 class="title">
33
<op-icon icon-classes="button--icon icon-merge-branch"></op-icon>
44
{{text.title}}

modules/github_integration/frontend/module/tab-prs/tab-prs.component.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<ng-container *ngIf="(pullRequests$ | async)?.length === 0">
2-
<p [innerHTML]="emptyText"></p>
2+
<p
3+
class="op-tab-content--text-box"
4+
[innerHTML]="emptyText"
5+
></p>
36
</ng-container>
47

58
<op-github-pull-request

modules/gitlab_integration/frontend/module/tab-header-issue/styles/tab-header-issue.sass

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,6 @@
2828
//++
2929
3030
.gitlab-issue-header
31-
display: flex
32-
flex-wrap: wrap-reverse
33-
justify-content: flex-end
34-
35-
border-bottom: 1px solid #ddd
36-
background-color: var(--body-background)
37-
3831
.title
3932
flex: 1 1 auto
4033
border-bottom: 0

modules/gitlab_integration/frontend/module/tab-header-issue/tab-header-issue.template.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="gitlab-issue-header">
1+
<div class="gitlab-issue-header op-tab-content--header">
22
<svg class="s16x32"><use xlink:href="#issue_open" /></svg>
33
<h3 class="title">
44
{{text.title}}

modules/gitlab_integration/frontend/module/tab-header-mr/styles/tab-header-mr.sass

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,6 @@
2828
//++
2929
3030
.gitlab-mr-header
31-
display: flex
32-
flex-wrap: wrap-reverse
33-
justify-content: flex-end
34-
35-
border-bottom: 1px solid #ddd
36-
background-color: var(--body-background)
37-
3831
.title
3932
flex: 1 1 auto
4033
border-bottom: 0

modules/gitlab_integration/frontend/module/tab-header-mr/tab-header-mr.template.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="gitlab-mr-header">
1+
<div class="gitlab-mr-header op-tab-content--header">
22
<svg class="s16x32"><use xlink:href="#merge-request_open" /></svg>
33
<h3 class="title">
44
{{text.title}}
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<ng-container *ngIf="gitlabIssues.length === 0">
2-
<p [innerHTML]="getEmptyText()"></p>
2+
<p
3+
class="op-tab-content--text-box"
4+
[innerHTML]="getEmptyText()"
5+
></p>
36
</ng-container>
47

58
<gitlab-issue [gitlabIssue]="gitlabIssue" *ngFor="let gitlabIssue of gitlabIssues"></gitlab-issue>
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<ng-container *ngIf="mergeRequests.length === 0">
2-
<p [innerHTML]="getEmptyText()"></p>
2+
<p
3+
class="op-tab-content--text-box"
4+
[innerHTML]="getEmptyText()"
5+
></p>
36
</ng-container>
47

58
<gitlab-merge-request [mergeRequest]="mergeRequest" *ngFor="let mergeRequest of mergeRequests"></gitlab-merge-request>

0 commit comments

Comments
 (0)