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
3c53f66c
Commit
3c53f66c
authored
Mar 10, 2017
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Consistent button colors for disabled buttons
parent
7867b992
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
app/assets/stylesheets/framework/dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+1
-1
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+0
-4
changelogs/unreleased/29263-merge-button-color.yml
changelogs/unreleased/29263-merge-button-color.yml
+4
-0
No files found.
app/assets/stylesheets/framework/dropdowns.scss
View file @
3c53f66c
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
white-space
:
nowrap
;
white-space
:
nowrap
;
&
[
disabled
]
{
&
[
disabled
]
{
background-color
:
$input-bg-disabled
;
opacity
:
.65
;
cursor
:
not
-
allowed
;
cursor
:
not
-
allowed
;
}
}
...
...
app/assets/stylesheets/pages/merge_requests.scss
View file @
3c53f66c
...
@@ -24,10 +24,6 @@
...
@@ -24,10 +24,6 @@
color
:
inherit
;
color
:
inherit
;
}
}
.btn-success.dropdown-toggle
:disabled
{
background-color
:
$gl-success
;
}
.accept-merge-request
{
.accept-merge-request
{
&
.ci-pending
,
&
.ci-pending
,
&
.ci-running
{
&
.ci-running
{
...
...
changelogs/unreleased/29263-merge-button-color.yml
0 → 100644
View file @
3c53f66c
---
title
:
ensure MR widget dropdown is same color as button
merge_request
:
author
:
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