1
Download as
Browse Code »

Commit 709bf66ae35731a1204c8ff7766d593e958223c6

Authored by Sergio Oliveira
2 parents 8440c81e b642d938
Exists in master and in 28 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, colab-vcard, colab_search, colab_tag, colab_tag_merge, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_header, fixed_gitlab_import, go_to_profile_panel, mobile_user_scalable, paginate-threads, profile_integration, remove-gitlab-plugin, removing_namespace, search_block, search_filters, split_screen, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd

Merge branch 'fix_merge_button' into 'master' 

Fix merge button

Added better way to avoid '!important' display none inherited from Bootstrap's hide elements

See merge request !90
Showing 1 changed file with 6 additions and 1 deletions   Show diff stats
colab/plugins/gitlab/templates/proxy/gitlab.html
  Diff comments   View file @709bf66
@@ -38,7 +38,12 @@ @@ -38,7 +38,12 @@
38 // gitlab .hide elements NEVER have a display:block, so 38 // gitlab .hide elements NEVER have a display:block, so
39 // instead of editing bootstrap.css, we just removed '.hide' css class and 39 // instead of editing bootstrap.css, we just removed '.hide' css class and
40 // toggled 40 // toggled
41 - jQuery('.hide').removeClass('hide').css('display', 'none'); 41 + jQuery('.hide').each(function(){
  42 + display_status = this.style.display;
  43 + jQuery(this).removeClass('hide');
  44 + if(display_status != 'block')
  45 + this.style.display = 'none';
  46 + })
42 47
43 // Hit the SSH clone button to select it by default 48 // Hit the SSH clone button to select it by default
44 jQuery(".git-clone-holder .btn:contains('SSH')").click() 49 jQuery(".git-clone-holder .btn:contains('SSH')").click()