Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortauriedavis <taurie@gitlab.com>2016-11-08 03:18:42 +0300
committertauriedavis <taurie@gitlab.com>2016-11-08 21:03:17 +0300
commit5f2d9ba9ea9d86c409d74004ccf5811bc52a0828 (patch)
treea4e1c3824a7395b007e0a746a07a1ecef76a06f3 /app/assets/stylesheets/pages/merge_conflicts.scss
parent6be0c160d346c67967e541a76b6fbf6fc1ba2456 (diff)
24146 Add focus state to buttons and dropdowns
Diffstat (limited to 'app/assets/stylesheets/pages/merge_conflicts.scss')
-rw-r--r--app/assets/stylesheets/pages/merge_conflicts.scss1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/merge_conflicts.scss b/app/assets/stylesheets/pages/merge_conflicts.scss
index 032feae8854..19ab198c2e7 100644
--- a/app/assets/stylesheets/pages/merge_conflicts.scss
+++ b/app/assets/stylesheets/pages/merge_conflicts.scss
@@ -228,7 +228,6 @@ $colors: (
position: absolute;
right: 10px;
padding: 0;
- outline: none;
color: #fff;
width: 75px; // static width to make 2 buttons have same width
height: 19px;