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
4756f4dd
Commit
4756f4dd
authored
Dec 19, 2016
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve approvers CSS organization.
parent
ad6085c9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
17 deletions
+27
-17
app/assets/javascripts/merge_request_widget/approvals/components/approvals_footer.js.es6
...quest_widget/approvals/components/approvals_footer.js.es6
+1
-1
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+26
-16
No files found.
app/assets/javascripts/merge_request_widget/approvals/components/approvals_footer.js.es6
View file @
4756f4dd
...
...
@@ -44,7 +44,7 @@
</span>
<span class='unapprove-btn-wrap' v-if='showUnapproveButton'>
<i class='fa fa-close'></i>
<span @click='removeApproval()'>Remove your approval</span>
<span
class='unapprove-btn'
@click='removeApproval()'>Remove your approval</span>
</span>
</div>
`,
...
...
app/assets/stylesheets/pages/merge_requests.scss
View file @
4756f4dd
...
...
@@ -93,9 +93,6 @@
display
:
inline-block
;
}
.mr-widget-body
~
.mr-widget-body
{
border-top
:
1px
solid
$well-inner-border
;
}
.mr-widget-body
{
h4
{
...
...
@@ -431,19 +428,19 @@
padding-right
:
0
;
}
}
.approvals-body
{
.approve-btn
{
margin-top
:
20px
;
}
.approvals-components
{
border-top
:
1px
solid
$well-inner-border
;
}
.approvals-body
.approve-btn
{
margin-top
:
20px
;
}
.approvals-footer
{
display
:
flex
;
a
.disabled
{
pointer-events
:
none
;
cursor
:
default
;
}
// vertically centers all children
>
span
{
align-self
:
center
;
}
...
...
@@ -457,21 +454,22 @@
border
:
none
;
}
}
.avatar
{
margin-bottom
:
-2px
;
margin-right
:
3px
;
}
.unapprove-btn-wrap
{
cursor
:
pointer
;
border-left
:
1px
solid
$gl-gray-light
;
padding-left
:
15px
;
margin-left
:
10px
;
}
.unapprove-btn
{
cursor
:
pointer
;
&
:hover
{
color
:
$gl-gray-light
;
}
}
// styles for approver avatar checkmark
.approver-avatar
{
position
:
relative
;
display
:
inline-block
;
...
...
@@ -485,3 +483,15 @@
}
}
}
.link-to-member-avatar
{
.disabled
{
pointer-events
:
none
;
cursor
:
default
;
}
.avatar
{
margin-bottom
:
-2px
;
margin-right
:
3px
;
}
}
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