Merge Request #90

← To merge requests From fix_merge_button into master
Merged
softwarepublico/colab!90
Created by Charles Oliveira

Fix merge button

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

Assignee: Sergio Oliveira
Milestone: None

Merged by Sergio Oliveira

Source branch has been removed
Commits (1)
2 participants
Showing 1 changed file   Show diff stats
colab/plugins/gitlab/templates/proxy/gitlab.html
  Diff comments   Edit   View file @b642d93
... ... @@ -38,7 +38,12 @@
38 38 // gitlab .hide elements NEVER have a display:block, so
39 39 // instead of editing bootstrap.css, we just removed '.hide' css class and
40 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 48 // Hit the SSH clone button to select it by default
44 49 jQuery(".git-clone-holder .btn:contains('SSH')").click()
... ...