summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorhaseeb <haseebeqx@yahoo.com>2018-02-22 19:34:35 +0530
committerhaseeb <haseebeqx@yahoo.com>2018-02-28 18:48:26 +0530
commit3bed273d60554be06a9c464ed6f04f71d91c7f28 (patch)
tree178bc7100b341b0c17018ef6f4e1b665cbb0a66f /app/assets
parent174ee4e182522545baf05669d7dd03ff3753d322 (diff)
downloadgitlab-ce-3bed273d60554be06a9c464ed6f04f71d91c7f28.tar.gz
dropdown style fixes
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/snippet/snippet_embed.js4
-rw-r--r--app/assets/stylesheets/framework/snippets.scss6
2 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/javascripts/snippet/snippet_embed.js b/app/assets/javascripts/snippet/snippet_embed.js
index c032414552e..dc808b68123 100644
--- a/app/assets/javascripts/snippet/snippet_embed.js
+++ b/app/assets/javascripts/snippet/snippet_embed.js
@@ -4,12 +4,16 @@
$('#share-btn').click((event) => {
event.preventDefault();
+ $('#share-btn').addClass('is-active');
+ $('#embed-btn').removeClass('is-active');
$('#snippet-url-area').val(`${protocol}//${host + pathname}`);
$('#embed-action').html('Share');
});
$('#embed-btn').click((event) => {
event.preventDefault();
+ $('#embed-btn').addClass('is-active');
+ $('#share-btn').removeClass('is-active');
const scriptTag = `<script src="${protocol}//${host + pathname}.js"></script>`;
$('#snippet-url-area').val(scriptTag);
$('#embed-action').html('Embed');
diff --git a/app/assets/stylesheets/framework/snippets.scss b/app/assets/stylesheets/framework/snippets.scss
index 462aca905d8..74f56e6e2f9 100644
--- a/app/assets/stylesheets/framework/snippets.scss
+++ b/app/assets/stylesheets/framework/snippets.scss
@@ -60,7 +60,11 @@
.form-control {
cursor: auto;
width: 101%;
- margin-left: -1;
+ margin-left: -1px;
+ }
+
+ .embed-toggle-list li a {
+ padding: 8px 40px;
}
.embed-toggle {