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
2539f110
Commit
2539f110
authored
Jul 10, 2018
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add generic media-section class to report_section
parent
efdf7759
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
26 deletions
+27
-26
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+2
-8
ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/mr_widget_approvals.vue
...quest_widget/components/approvals/mr_widget_approvals.vue
+1
-1
ee/app/assets/javascripts/vue_shared/security_reports/components/report_section.vue
...vue_shared/security_reports/components/report_section.vue
+1
-1
ee/app/assets/stylesheets/pages/merge_requests.scss
ee/app/assets/stylesheets/pages/merge_requests.scss
+23
-8
ee/app/assets/stylesheets/pages/security_reports.scss
ee/app/assets/stylesheets/pages/security_reports.scss
+0
-8
No files found.
app/assets/stylesheets/pages/merge_requests.scss
View file @
2539f110
...
...
@@ -40,14 +40,6 @@
.mr-widget-section
,
.mr-widget-footer
{
padding
:
$gl-padding
;
.media
{
align-items
:
center
;
}
.code-text
{
flex
:
1
;
}
}
.mr-state-widget
{
...
...
@@ -124,8 +116,10 @@
.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 @
2539f110
...
...
@@ -61,7 +61,7 @@ export default {
<
template
>
<section
v-if=
"mr.approvalsRequired"
class=
"mr-widget-approvals-container mr-widget-section media
bordered-widget
-section"
class=
"mr-widget-approvals-container mr-widget-section media
media
-section"
>
<status-icon
:class=
"approvalsOptional ? 'zero-approvals' : ''"
...
...
ee/app/assets/javascripts/vue_shared/security_reports/components/report_section.vue
View file @
2539f110
...
...
@@ -138,7 +138,7 @@ export default {
};
</
script
>
<
template
>
<section
class=
"m
r-widget-section bordered-widget
-section"
>
<section
class=
"m
edia
-section"
>
<div
class=
"media"
>
...
...
ee/app/assets/stylesheets/pages/merge_requests.scss
View file @
2539f110
...
...
@@ -23,14 +23,7 @@
}
}
.bordered-widget-section
{
border
:
1px
solid
$border-color
;
margin-bottom
:
-1px
;
&
:first-of-type
{
border-radius
:
$border-radius-default
$border-radius-default
0
0
;
}
.media-section
{
@include
media-breakpoint-down
(
md
)
{
align-items
:
flex-start
;
...
...
@@ -97,3 +90,25 @@
position
:
relative
;
}
}
.mr-state-widget
{
.media-section
{
padding
:
$gl-padding
;
border
:
1px
solid
$border-color
;
margin-bottom
:
-1px
;
&
:first-of-type
{
border-radius
:
$border-radius-default
$border-radius-default
0
0
;
}
}
}
.mr-widget-section
{
.media
{
align-items
:
center
;
}
.code-text
{
flex
:
1
;
}
}
ee/app/assets/stylesheets/pages/security_reports.scss
View file @
2539f110
...
...
@@ -164,11 +164,3 @@
display
:
none
;
}
}
.build-security.tab-pane
{
.mr-widget-section
{
padding
:
0
;
border
:
0
;
border-bottom
:
1px
solid
$gray-darker
;
}
}
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