css class .hide has \!important so use gl-hide instead

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

css class .hide has \!important so use gl-hide instead
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets
1 parent 5c3e0f61
Showing 30 changed files with 44 additions and 40 deletions Show diff stats
app/assets/stylesheets/gitlab_bootstrap/common.scss
app/views/admin/broadcast_messages/index.html.haml
app/views/dashboard/_activities.html.haml
app/views/groups/show.html.haml
app/views/help/_shortcuts.html.haml
app/views/layouts/_head_panel.html.haml
app/views/layouts/_public_head_panel.html.haml
app/views/layouts/_search.html.haml
app/views/profiles/accounts/show.html.haml
app/views/profiles/notifications/show.html.haml
app/views/projects/blob/_remove.html.haml
app/views/projects/commit/_commit_box.html.haml
app/views/projects/commits/_image.html.haml
app/views/projects/create.js.haml
app/views/projects/edit.html.haml
app/views/projects/graphs/show.html.haml
app/views/projects/issues/_issues.html.haml
app/views/projects/issues/update.js.haml
app/views/projects/merge_requests/show/_commits.html.haml
app/views/projects/merge_requests/show/_how_to_merge.html.haml
@@ -131,3 +131,7 @@ pre.well-pre {
 .dropdown-menu > li > a:focus {
   background: #29b;
 }
+
+.gl-hide {
+  display: none;
+}
@@ -18,12 +18,12 @@
       %div
         = link_to '#', class: 'js-toggle-colors-link' do
           Customize colors
-  .control-group.js-toggle-colors-container.hide
+  .control-group.js-toggle-colors-container.gl-hide
     = f.label :color, "Background Color"
     .controls
       = f.text_field :color, placeholder: "#AA33EE"
       .light Hex values as 3 double digit numbers, starting with a # sign.
-  .control-group.js-toggle-colors-container.hide
+  .control-group.js-toggle-colors-container.gl-hide
     = f.label :font, "Font Color"
     .controls
       = f.text_field :font, placeholder: "#224466"
@@ -5,4 +5,4 @@
   .content_list
 - else
   %p.nothing_here_message Projects activity will be displayed here
-.loading.hide
+.loading.gl-hide
@@ -11,7 +11,7 @@
       .content_list
     - else
       %p.nothing_here_message Project activity will be displayed here
-    .loading.hide
+    .loading.gl-hide
   .side.col-md-4
     - if @group.description.present?
       .description-block
-#modal-shortcuts.modal.hide
+#modal-shortcuts.modal.gl-hide
   .modal-header
     %a.close{href: "#", "data-dismiss" => "modal"} ×
     %h3 Keyboard Shortcuts
@@ -10,7 +10,7 @@
       %ul.nav.navbar-nav
         %li
           %a
-            %div.hide.turbolink-spinner
+            %div.gl-hide.turbolink-spinner
               %i.icon-refresh.icon-spin
               Loading...
         %li
@@ -15,7 +15,7 @@
       %ul.nav
         %li
           %a
-            %div.hide.turbolink-spinner
+            %div.gl-hide.turbolink-spinner
               %i.icon-refresh.icon-spin
               Loading...
         %li
@@ -7,4 +7,4 @@
       = hidden_field_tag :search_code, true
     = hidden_field_tag :repository_ref, @ref
     = submit_tag 'Go' if ENV['RAILS_ENV'] == 'test'
-    .search-autocomplete-json.hide{:'data-autocomplete-opts' => search_autocomplete_source }
+    .search-autocomplete-json.gl-hide{:'data-autocomplete-opts' => search_autocomplete_source }
@@ -49,7 +49,7 @@
         %div
           = f.text_field :username, required: true, class: 'input-xlarge input-xpadding'
           &nbsp;
-          %span.loading-gif.hide= image_tag "ajax_loader.gif"
+          %span.loading-gif.gl-hide= image_tag "ajax_loader.gif"
         %p.light
           = user_url(@user)
         %div
@@ -43,7 +43,7 @@
   %span.btn.btn-tiny
     %i.icon-chevron-down
     %span Advanced notifications settings
-.js-toggle-visibility-container.hide
+.js-toggle-visibility-container.gl-hide
   %hr
   %h4 Groups:
   %ul.bordered-list
-%div#modal-remove-blob.modal.hide
+%div#modal-remove-blob.modal.gl-hide
   .modal-header
     %a.close{href: "#", "data-dismiss" => "modal"} ×
     %h3.page-title Remove #{@blob.name}
@@ -47,7 +47,7 @@
       - if @branches.any?
         and in
         = link_to("#{pluralize(@branches.count, "other branch")}", "#", class: "js-details-expand")
-        %span.js-details-contain.hide
+        %span.js-details-contain.gl-hide
           = commit_branches_links(@project, @branches)
 .commit-box
@@ -11,7 +11,7 @@
         .frame.deleted
           %a{href: project_blob_path(@project, tree_join(@commit.parent_id, diff.old_path))}
             %img{src: "data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"}
-        %p.image-info.hide
+        %p.image-info.gl-hide
           %span.meta-filesize= "#{number_to_human_size old_file.size}"
           |
           %b W:
@@ -23,7 +23,7 @@
         .frame.added
           %a{href: project_blob_path(@project, tree_join(@commit.id, diff.new_path))}
             %img{src: "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}
-        %p.image-info.hide
+        %p.image-info.gl-hide
           %span.meta-filesize= "#{number_to_human_size file.size}"
           |
           %b W:
@@ -32,7 +32,7 @@
           %b H:
           %span.meta-height
-    %div.swipe.view.hide
+    %div.swipe.view.gl-hide
       .swipe-frame
         .frame.deleted
           %img{src: "data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"}
@@ -43,7 +43,7 @@
           %span.top-handle
           %span.bottom-handle
-    %div.onion-skin.view.hide
+    %div.onion-skin.view.gl-hide
       .onion-skin-frame
         .frame.deleted
           %img{src: "data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"}
@@ -56,8 +56,8 @@
           .opaque
-  .view-modes.hide
+  .view-modes.gl-hide
     %ul.view-modes-menu
       %li.two-up{data: {mode: 'two-up'}} 2-up
       %li.swipe{data: {mode: 'swipe'}} Swipe
-      %li.onion-skin{data: {mode: 'onion-skin'}} Onion skin
 \ No newline at end of file
+      %li.onion-skin{data: {mode: 'onion-skin'}} Onion skin
@@ -5,5 +5,5 @@
   :plain
     $(".project-edit-errors").html("#{escape_javascript(render('errors'))}");
     $('.project-submit').enable();
-    $('.save-project-loader').hide();
+    $('.save-project-loader').gl-hide();
     $('.project-edit-container').show();
@@ -97,7 +97,7 @@
         Show it to me
         %i.icon-chevron-down
-    .js-toggle-visibility-container.hide
+    .js-toggle-visibility-container.gl-hide
       - if can? current_user, :archive_project, @project
         .ui-box.ui-box-danger
           .title
@@ -182,7 +182,7 @@
       - else
         %p.nothing_here_message Only project owner can remove a project
-.save-project-loader.hide
+.save-project-loader.gl-hide
   %center
     = image_tag "ajax_loader.gif"
     %h3 Saving project.
@@ -21,14 +21,14 @@
       %ol.contributors-list.clearfix
 :javascript
-  $(".stat-graph").hide();
+  $(".stat-graph").gl-hide();
   $.ajax({
     type: "GET",
     url: location.href,
     complete: function() {
       $(".stat-graph").fadeIn();
-      $(".loading-graph").hide();
+      $(".loading-graph").gl-hide();
     },
     dataType: "script"
   });
@@ -2,7 +2,7 @@
   .title
     = check_box_tag "check_all_issues", nil, false, class: "check_all_issues left"
     .clearfix
-      .issues_bulk_update.hide
+      .issues_bulk_update.gl-hide
         = form_tag bulk_update_project_issues_path(@project), method: :post  do
           %span Update selected issues with &nbsp;
           = select_tag('update[status]', options_for_select(['open', 'closed']), prompt: "Status")
@@ -6,7 +6,7 @@
   $('.issue-box .context').html("#{escape_javascript(render partial: 'issue_context', locals: { issue: @issue })}");
   $('.issue-box .context').effect('highlight');
   $('.chosen').chosen();
-  $('.edit-issue.inline-update input[type="submit"]').hide();
+  $('.edit-issue.inline-update input[type="submit"]').gl-hide();
   - if @issue.milestone
     $('.milestone-nav-link').replaceWith("#{escape_javascript(link_to "| #{@issue.milestone.title}", project_milestone_path(@issue.project, @issue.milestone), :class => 'milestone-nav-link')}")
   - else
@@ -12,7 +12,7 @@
             8 of #{@commits.count} commits displayed.
             %strong
               %a.show-all-commits Click here to show all
-        %ul.all-commits.hide.well-list
+        %ul.all-commits.gl-hide.well-list
           - @commits.each do |commit|
             = render "projects/commits/commit", commit: commit, project: @merge_request.source_project
-%div#modal_merge_info.modal.hide
+%div#modal_merge_info.modal.gl-hide
   .modal-header
     %a.close{href: "#", "data-dismiss" => "modal"} ×
     %h3 How to merge
@@ -46,6 +46,6 @@
       modal.show();
     });
     $('.modal-header .close').bind("click", function(){
-      modal.hide();
+      modal.gl-hide();
     })
   })
@@ -46,7 +46,7 @@
     .alert.alert-info
       %strong This merge request already can not be merged. Try to reload page.
-  .merge-in-progress.hide
+  .merge-in-progress.gl-hide
     %span.cgray
       %i.icon-refresh.icon-spin
       &nbsp;
@@ -13,7 +13,7 @@
             = link_to "#", class: 'js-toggle-visibility-link' do
               %span Customize repository name?
-      .control-group.js-toggle-visibility-container.hide
+      .control-group.js-toggle-visibility-container.gl-hide
         = f.label :path do
           %span Repository name
         .controls
@@ -59,7 +59,7 @@
               = link_to new_group_path, class: "btn btn-tiny" do
                 Create a group
-.save-project-loader.hide
+.save-project-loader.gl-hide
   %center
     = image_tag "ajax_loader.gif"
     %h3 Creating project &amp; repository.
@@ -40,7 +40,7 @@
           .file= render "projects/notes/discussion_diff", discussion_notes: discussion_notes, note: note
       - else
         = link_to 'show outdated discussion', '#', class: 'js-show-outdated-discussion'
-        %div.hide.outdated-discussion
+        %div.gl-hide.outdated-discussion
           .content
             .notes{ rel: discussion_notes.first.discussion_id }
               = render discussion_notes
@@ -53,7 +53,7 @@
         = render "projects/notes/discussion_reply_button", note: discussion_notes.first
     -# will be shown when the other one is hidden
-    .discussion-hidden.content.hide
+    .discussion-hidden.content.gl-hide
       .note
         %em Hidden discussion.
         = link_to "javascript:;", class: "js-details-target js-toggler-target" do
@@ -5,7 +5,7 @@
     = render "events/event_last_push", event: @last_push
     = render 'shared/event_filter'
     .content_list
-    .loading.hide
+    .loading.gl-hide
   .col-md-3.project-side
     .clearfix
       - if @project.archived?
@@ -3,7 +3,7 @@
     = tree_icon(type)
     %span= link_to truncate(blob_item.name, length: 40), project_blob_path(@project, tree_join(@id || @commit.id, blob_item.name))
   %td.tree_time_ago.cgray
-    %span.log_loading.hide
+    %span.log_loading.gl-hide
       Loading commit data...
       = image_tag "ajax_loader_tree.gif", width: 14
   %td.tree_commit{ colspan: 2 }
@@ -3,7 +3,7 @@
     = tree_icon(type)
     %span= link_to truncate(tree_item.name, length: 40), project_tree_path(@project, tree_join(@id || @commit.id, tree_item.name))
   %td.tree_time_ago.cgray
-    %span.log_loading.hide
+    %span.log_loading.gl-hide
       Loading commit data...
       = image_tag "ajax_loader_tree.gif", width: 14
   %td.tree_commit{ colspan: 2 }
@@ -4,6 +4,6 @@
 - else
   :plain
     $(".project-edit-errors").html("#{escape_javascript(render('errors'))}");
-    $('.save-project-loader').hide();
+    $('.save-project-loader').gl-hide();
     $('.project-edit-container').show();
     $('.project-edit-content .btn-save').enableButton();
-%div#modal-new-wiki.modal.hide
+%div#modal-new-wiki.modal.gl-hide
   .modal-header
     %a.close{href: "#", "data-dismiss" => "modal"} ×
     %h3.page-title New Wiki Page
-- if cookies[:hide_no_ssh_message].blank? && current_user.require_ssh_key? && !current_user.hide_no_ssh_key
+- if cookies[:hide_no_ssh_message].blank? && current_user.require_ssh_key? && !current_user.gl-hide_no_ssh_key
   .no-ssh-key-message
     .container
       You won't be able to pull or push project code via SSH until you #{link_to 'add an SSH key', new_profile_key_path} to your profile
@@ -16,7 +16,7 @@
       = link_to group_users_group_path(@group, member), data: { confirm: remove_user_from_group_message(@group, user) }, method: :delete, remote: true, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do
         %i.icon-minus.icon-white
-  .edit-member.hide.js-toggle-content
+  .edit-member.gl-hide.js-toggle-content
     = form_for [@group, member], remote: true do |f|
       .alert.prepend-top-20
         = f.select :group_access, options_for_select(UsersGroup.group_access_roles, member.group_access)
	@@ -131,3 +131,7 @@ pre.well-pre {		@@ -131,3 +131,7 @@ pre.well-pre {
131	.dropdown-menu > li > a:focus {	131	.dropdown-menu > li > a:focus {
132	background: #29b;	132	background: #29b;
133	}	133	}
		134	+
		135	+.gl-hide {
		136	+ display: none;
		137	+}
	@@ -18,12 +18,12 @@		@@ -18,12 +18,12 @@
18	%div	18	%div
19	= link_to '#', class: 'js-toggle-colors-link' do	19	= link_to '#', class: 'js-toggle-colors-link' do
20	Customize colors	20	Customize colors
21	- .control-group.js-toggle-colors-container.hide	21	+ .control-group.js-toggle-colors-container.gl-hide
22	= f.label :color, "Background Color"	22	= f.label :color, "Background Color"
23	.controls	23	.controls
24	= f.text_field :color, placeholder: "#AA33EE"	24	= f.text_field :color, placeholder: "#AA33EE"
25	.light Hex values as 3 double digit numbers, starting with a # sign.	25	.light Hex values as 3 double digit numbers, starting with a # sign.
26	- .control-group.js-toggle-colors-container.hide	26	+ .control-group.js-toggle-colors-container.gl-hide
27	= f.label :font, "Font Color"	27	= f.label :font, "Font Color"
28	.controls	28	.controls
29	= f.text_field :font, placeholder: "#224466"	29	= f.text_field :font, placeholder: "#224466"
	@@ -5,4 +5,4 @@		@@ -5,4 +5,4 @@
5	.content_list	5	.content_list
6	- else	6	- else
7	%p.nothing_here_message Projects activity will be displayed here	7	%p.nothing_here_message Projects activity will be displayed here
8	-.loading.hide	8	+.loading.gl-hide
	@@ -11,7 +11,7 @@		@@ -11,7 +11,7 @@
11	.content_list	11	.content_list
12	- else	12	- else
13	%p.nothing_here_message Project activity will be displayed here	13	%p.nothing_here_message Project activity will be displayed here
14	- .loading.hide	14	+ .loading.gl-hide
15	.side.col-md-4	15	.side.col-md-4
16	- if @group.description.present?	16	- if @group.description.present?
17	.description-block	17	.description-block
1	-#modal-shortcuts.modal.hide	1	+#modal-shortcuts.modal.gl-hide
2	.modal-header	2	.modal-header
3	%a.close{href: "#", "data-dismiss" => "modal"} ×	3	%a.close{href: "#", "data-dismiss" => "modal"} ×
4	%h3 Keyboard Shortcuts	4	%h3 Keyboard Shortcuts
	@@ -10,7 +10,7 @@		@@ -10,7 +10,7 @@
10	%ul.nav.navbar-nav	10	%ul.nav.navbar-nav
11	%li	11	%li
12	%a	12	%a
13	- %div.hide.turbolink-spinner	13	+ %div.gl-hide.turbolink-spinner
14	%i.icon-refresh.icon-spin	14	%i.icon-refresh.icon-spin
15	Loading...	15	Loading...
16	%li	16	%li
	@@ -15,7 +15,7 @@		@@ -15,7 +15,7 @@
15	%ul.nav	15	%ul.nav
16	%li	16	%li
17	%a	17	%a
18	- %div.hide.turbolink-spinner	18	+ %div.gl-hide.turbolink-spinner
19	%i.icon-refresh.icon-spin	19	%i.icon-refresh.icon-spin
20	Loading...	20	Loading...
21	%li	21	%li
	@@ -7,4 +7,4 @@		@@ -7,4 +7,4 @@
7	= hidden_field_tag :search_code, true	7	= hidden_field_tag :search_code, true
8	= hidden_field_tag :repository_ref, @ref	8	= hidden_field_tag :repository_ref, @ref
9	= submit_tag 'Go' if ENV['RAILS_ENV'] == 'test'	9	= submit_tag 'Go' if ENV['RAILS_ENV'] == 'test'
10	- .search-autocomplete-json.hide{:'data-autocomplete-opts' => search_autocomplete_source }	10	+ .search-autocomplete-json.gl-hide{:'data-autocomplete-opts' => search_autocomplete_source }
	@@ -49,7 +49,7 @@		@@ -49,7 +49,7 @@
49	%div	49	%div
50	= f.text_field :username, required: true, class: 'input-xlarge input-xpadding'	50	= f.text_field :username, required: true, class: 'input-xlarge input-xpadding'
51		51
52	- %span.loading-gif.hide= image_tag "ajax_loader.gif"	52	+ %span.loading-gif.gl-hide= image_tag "ajax_loader.gif"
53	%p.light	53	%p.light
54	= user_url(@user)	54	= user_url(@user)
55	%div	55	%div
	@@ -43,7 +43,7 @@		@@ -43,7 +43,7 @@
43	%span.btn.btn-tiny	43	%span.btn.btn-tiny
44	%i.icon-chevron-down	44	%i.icon-chevron-down
45	%span Advanced notifications settings	45	%span Advanced notifications settings
46	-.js-toggle-visibility-container.hide	46	+.js-toggle-visibility-container.gl-hide
47	%hr	47	%hr
48	%h4 Groups:	48	%h4 Groups:
49	%ul.bordered-list	49	%ul.bordered-list