From 2e96fcff12a8944b1f9bd5179381094ed4498bd5 Mon Sep 17 00:00:00 2001
From: Patricio Cano <suprnova32@gmail.com>
Date: Wed, 29 Jun 2016 15:26:02 -0500
Subject: [PATCH] Clone button should not be clickable when there is a disabled
protocol
---
CHANGELOG | 1 -
app/assets/stylesheets/framework/buttons.scss | 11 +++++++++++
app/views/shared/_clone_panel.html.haml | 4 ++--
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 11dd510d802..8ef934bf80d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -24,7 +24,6 @@ v 8.10.0 (unreleased)
- Allow importing from Github using Personal Access Tokens. (Eric K Idema)
- API: Todos !3188 (Robert Schilling)
- Add "Enabled Git access protocols" to Application Settings
- - Implement Subresource Integrity for CSS and JavaScript assets. This prevents malicious assets from loading in the case of a CDN compromise.
- Fix user creation with stronger minimum password requirements !4054 (nathan-pmt)
- PipelinesFinder uses git cache data
- Check for conflicts with existing Project's wiki path when creating a new project.
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index a431fa59a57..590b8f54363 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -288,3 +288,14 @@
text-decoration: none;
}
}
+
+.btn-static {
+ background-color: $background-color !important;
+ border: 1px solid lightgrey;
+ cursor: default;
+ &:active {
+ -moz-box-shadow: inset 0 0 0 white;
+ -webkit-box-shadow: inset 0 0 0 white;
+ box-shadow: inset 0 0 0 white;
+ }
+}
diff --git a/app/views/shared/_clone_panel.html.haml b/app/views/shared/_clone_panel.html.haml
index 565bd869749..3b82d8e686f 100644
--- a/app/views/shared/_clone_panel.html.haml
+++ b/app/views/shared/_clone_panel.html.haml
@@ -3,9 +3,9 @@
.git-clone-holder.input-group
.input-group-btn
-if allowed_protocols_present?
- .clone-dropdown-btn.btn
+ .clone-dropdown-btn.btn.btn-static
%span
- = enabled_project_tooltip(project, enabled_protocol)
+ = enabled_project_button(project, enabled_protocol)
- else
%a#clone-dropdown.clone-dropdown-btn.btn{href: '#', data: { toggle: 'dropdown' }}
%span
--
GitLab