Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
2ab4a7a4
Commit
2ab4a7a4
authored
Jul 09, 2018
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Style MR widge report sections
parent
6902a422
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
45 additions
and
12 deletions
+45
-12
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+8
-2
ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/mr_widget_approvals.vue
...quest_widget/components/approvals/mr_widget_approvals.vue
+3
-3
ee/app/assets/javascripts/vue_shared/security_reports/components/report_section.vue
...vue_shared/security_reports/components/report_section.vue
+2
-2
ee/app/assets/stylesheets/pages/merge_requests.scss
ee/app/assets/stylesheets/pages/merge_requests.scss
+29
-5
ee/app/assets/stylesheets/pages/security_reports.scss
ee/app/assets/stylesheets/pages/security_reports.scss
+3
-0
No files found.
app/assets/stylesheets/pages/merge_requests.scss
View file @
2ab4a7a4
...
...
@@ -40,6 +40,14 @@
.mr-widget-section
,
.mr-widget-footer
{
padding
:
$gl-padding
;
.media
{
align-items
:
center
;
}
.code-text
{
flex
:
1
;
}
}
.mr-state-widget
{
...
...
@@ -116,10 +124,8 @@
.modify-merge-commit-link
{
padding
:
0
;
background-color
:
transparent
;
border
:
0
;
color
:
$gl-text-color
;
&
:hover
,
...
...
ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/mr_widget_approvals.vue
View file @
2ab4a7a4
...
...
@@ -59,9 +59,9 @@ export default {
};
</
script
>
<
template
>
<
div
<
section
v-if=
"mr.approvalsRequired"
class=
"mr-widget-approvals-container mr-widget-section media"
class=
"mr-widget-approvals-container mr-widget-section media
bordered-widget-section
"
>
<status-icon
:class=
"approvalsOptional ? 'zero-approvals' : ''"
...
...
@@ -98,5 +98,5 @@ export default {
:approvals-left=
"mr.approvals.approvals_left"
/>
</div>
</
div
>
</
section
>
</
template
>
ee/app/assets/javascripts/vue_shared/security_reports/components/report_section.vue
View file @
2ab4a7a4
...
...
@@ -138,7 +138,7 @@ export default {
};
</
script
>
<
template
>
<section>
<section
class=
"mr-widget-section bordered-widget-section"
>
<div
class=
"media"
>
...
...
@@ -146,7 +146,7 @@ export default {
:status=
"statusIconName"
/>
<div
class=
"media-body space-children"
class=
"media-body space-children
d-flex
"
>
<span
class=
"js-code-text code-text"
...
...
ee/app/assets/stylesheets/pages/merge_requests.scss
View file @
2ab4a7a4
...
...
@@ -16,18 +16,42 @@
}
.mr-widget-approvals-container
{
border
:
1px
solid
$border-color
;
margin-bottom
:
-1px
;
border-radius
:
$border-radius-default
$border-radius-default
0
0
;
align-items
:
center
;
.zero-approvals
.ci-status-icon-success
svg
{
fill
:
$gray-darkest
;
}
}
.bordered-widget-section
{
border
:
1px
solid
$border-color
;
margin-bottom
:
-1px
;
&
:first-of-type
{
border-radius
:
$border-radius-default
$border-radius-default
0
0
;
}
@include
media-breakpoint-down
(
md
)
{
align-items
:
flex-start
;
.media-body
{
flex-direction
:
column
;
align-items
:
flex-start
;
}
}
.code-text
{
@include
media-breakpoint-up
(
lg
)
{
align-self
:
center
;
}
}
}
.approvals-body
{
display
:
flex
;
align-items
:
center
;
@include
media-breakpoint-up
(
md
)
{
display
:
flex
;
align-items
:
center
;
}
.approve-btn
{
vertical-align
:
baseline
;
...
...
ee/app/assets/stylesheets/pages/security_reports.scss
View file @
2ab4a7a4
...
...
@@ -34,10 +34,13 @@
.code-text
{
width
:
100%
;
flex
:
1
;
}
}
.mr-widget-grouped-section
{
margin-top
:
$gl-padding
;
.report-block-container
{
max-height
:
170px
;
overflow
:
auto
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment