From 6cbadc953f172bf331c059b05c71ca85736d3030 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 31 Dec 2013 00:38:53 +0200
Subject: [PATCH] css class .hide has \!important so use gl-hide instead
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
app/assets/stylesheets/gitlab_bootstrap/common.scss | 4 ++++
app/views/admin/broadcast_messages/index.html.haml | 4 ++--
app/views/dashboard/_activities.html.haml | 2 +-
app/views/groups/show.html.haml | 2 +-
app/views/help/_shortcuts.html.haml | 2 +-
app/views/layouts/_head_panel.html.haml | 2 +-
app/views/layouts/_public_head_panel.html.haml | 2 +-
app/views/layouts/_search.html.haml | 2 +-
app/views/profiles/accounts/show.html.haml | 2 +-
app/views/profiles/notifications/show.html.haml | 2 +-
app/views/projects/blob/_remove.html.haml | 2 +-
app/views/projects/commit/_commit_box.html.haml | 2 +-
app/views/projects/commits/_image.html.haml | 12 ++++++------
app/views/projects/create.js.haml | 2 +-
app/views/projects/edit.html.haml | 4 ++--
app/views/projects/graphs/show.html.haml | 4 ++--
app/views/projects/issues/_issues.html.haml | 2 +-
app/views/projects/issues/update.js.haml | 2 +-
.../projects/merge_requests/show/_commits.html.haml | 2 +-
.../merge_requests/show/_how_to_merge.html.haml | 4 ++--
.../merge_requests/show/_mr_accept.html.haml | 2 +-
app/views/projects/new.html.haml | 4 ++--
app/views/projects/notes/_discussion.html.haml | 4 ++--
app/views/projects/show.html.haml | 2 +-
app/views/projects/tree/_blob_item.html.haml | 2 +-
app/views/projects/tree/_tree_item.html.haml | 2 +-
app/views/projects/update.js.haml | 2 +-
app/views/projects/wikis/_new.html.haml | 2 +-
app/views/shared/_no_ssh.html.haml | 2 +-
app/views/users_groups/_users_group.html.haml | 2 +-
30 files changed, 44 insertions(+), 40 deletions(-)
diff --git a/app/assets/stylesheets/gitlab_bootstrap/common.scss b/app/assets/stylesheets/gitlab_bootstrap/common.scss
index d5426982428..617537793d0 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/common.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/common.scss
@@ -131,3 +131,7 @@ pre.well-pre {
.dropdown-menu > li > a:focus {
background: #29b;
}
+
+.gl-hide {
+ display: none;
+}
diff --git a/app/views/admin/broadcast_messages/index.html.haml b/app/views/admin/broadcast_messages/index.html.haml
index d7c78950b95..043ce4fd817 100644
--- a/app/views/admin/broadcast_messages/index.html.haml
+++ b/app/views/admin/broadcast_messages/index.html.haml
@@ -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"
diff --git a/app/views/dashboard/_activities.html.haml b/app/views/dashboard/_activities.html.haml
index 89117726317..256f0ff29ab 100644
--- a/app/views/dashboard/_activities.html.haml
+++ b/app/views/dashboard/_activities.html.haml
@@ -5,4 +5,4 @@
.content_list
- else
%p.nothing_here_message Projects activity will be displayed here
-.loading.hide
+.loading.gl-hide
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index f4925b434d3..a52e7d28023 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -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
diff --git a/app/views/help/_shortcuts.html.haml b/app/views/help/_shortcuts.html.haml
index e979e7c0d07..5e5215f7289 100644
--- a/app/views/help/_shortcuts.html.haml
+++ b/app/views/help/_shortcuts.html.haml
@@ -1,4 +1,4 @@
-#modal-shortcuts.modal.hide
+#modal-shortcuts.modal.gl-hide
.modal-header
%a.close{href: "#", "data-dismiss" => "modal"} ×
%h3 Keyboard Shortcuts
diff --git a/app/views/layouts/_head_panel.html.haml b/app/views/layouts/_head_panel.html.haml
index b1fe3aafff6..549ca58407e 100644
--- a/app/views/layouts/_head_panel.html.haml
+++ b/app/views/layouts/_head_panel.html.haml
@@ -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
diff --git a/app/views/layouts/_public_head_panel.html.haml b/app/views/layouts/_public_head_panel.html.haml
index 3c4bd857c22..915dd07cfbb 100644
--- a/app/views/layouts/_public_head_panel.html.haml
+++ b/app/views/layouts/_public_head_panel.html.haml
@@ -15,7 +15,7 @@
%ul.nav
%li
%a
- %div.hide.turbolink-spinner
+ %div.gl-hide.turbolink-spinner
%i.icon-refresh.icon-spin
Loading...
%li
diff --git a/app/views/layouts/_search.html.haml b/app/views/layouts/_search.html.haml
index 9a0db99332a..c8d9944f7b2 100644
--- a/app/views/layouts/_search.html.haml
+++ b/app/views/layouts/_search.html.haml
@@ -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 }
diff --git a/app/views/profiles/accounts/show.html.haml b/app/views/profiles/accounts/show.html.haml
index 0b1ccee9c39..36cb8b66c1f 100644
--- a/app/views/profiles/accounts/show.html.haml
+++ b/app/views/profiles/accounts/show.html.haml
@@ -49,7 +49,7 @@
%div
= f.text_field :username, required: true, class: 'input-xlarge input-xpadding'
- %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
diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml
index a25fe944b1b..519d2aa5937 100644
--- a/app/views/profiles/notifications/show.html.haml
+++ b/app/views/profiles/notifications/show.html.haml
@@ -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
diff --git a/app/views/projects/blob/_remove.html.haml b/app/views/projects/blob/_remove.html.haml
index 1c097330c44..735863acd4f 100644
--- a/app/views/projects/blob/_remove.html.haml
+++ b/app/views/projects/blob/_remove.html.haml
@@ -1,4 +1,4 @@
-%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}
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml
index 3d666807cf9..066a93918e8 100644
--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
@@ -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
diff --git a/app/views/projects/commits/_image.html.haml b/app/views/projects/commits/_image.html.haml
index 73f87289d3d..d892a6819c4 100644
--- a/app/views/projects/commits/_image.html.haml
+++ b/app/views/projects/commits/_image.html.haml
@@ -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
diff --git a/app/views/projects/create.js.haml b/app/views/projects/create.js.haml
index a444b8b59a6..c39cef0889b 100644
--- a/app/views/projects/create.js.haml
+++ b/app/views/projects/create.js.haml
@@ -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();
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 20656d297e5..458ec1f86d6 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -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.
diff --git a/app/views/projects/graphs/show.html.haml b/app/views/projects/graphs/show.html.haml
index a21cb9e7861..1d789f325ef 100644
--- a/app/views/projects/graphs/show.html.haml
+++ b/app/views/projects/graphs/show.html.haml
@@ -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"
});
diff --git a/app/views/projects/issues/_issues.html.haml b/app/views/projects/issues/_issues.html.haml
index e2ce26feac3..a9ad8b28c82 100644
--- a/app/views/projects/issues/_issues.html.haml
+++ b/app/views/projects/issues/_issues.html.haml
@@ -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
= select_tag('update[status]', options_for_select(['open', 'closed']), prompt: "Status")
diff --git a/app/views/projects/issues/update.js.haml b/app/views/projects/issues/update.js.haml
index 2be1d0f0db0..4f14cd809cd 100644
--- a/app/views/projects/issues/update.js.haml
+++ b/app/views/projects/issues/update.js.haml
@@ -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
diff --git a/app/views/projects/merge_requests/show/_commits.html.haml b/app/views/projects/merge_requests/show/_commits.html.haml
index 7b0e67053a5..c0de5728816 100644
--- a/app/views/projects/merge_requests/show/_commits.html.haml
+++ b/app/views/projects/merge_requests/show/_commits.html.haml
@@ -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
diff --git a/app/views/projects/merge_requests/show/_how_to_merge.html.haml b/app/views/projects/merge_requests/show/_how_to_merge.html.haml
index 98d373e8ad4..c39ecac4b59 100644
--- a/app/views/projects/merge_requests/show/_how_to_merge.html.haml
+++ b/app/views/projects/merge_requests/show/_how_to_merge.html.haml
@@ -1,4 +1,4 @@
-%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();
})
})
diff --git a/app/views/projects/merge_requests/show/_mr_accept.html.haml b/app/views/projects/merge_requests/show/_mr_accept.html.haml
index 299e1bc1e08..bd29de895d5 100644
--- a/app/views/projects/merge_requests/show/_mr_accept.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml
@@ -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
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml
index ee6c42b6ea8..2b3eb2b81b4 100644
--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
@@ -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 & repository.
diff --git a/app/views/projects/notes/_discussion.html.haml b/app/views/projects/notes/_discussion.html.haml
index ee65ae1e2f5..30030f3245e 100644
--- a/app/views/projects/notes/_discussion.html.haml
+++ b/app/views/projects/notes/_discussion.html.haml
@@ -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
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index 8eac4cb4e2d..c04e809b7dd 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -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?
diff --git a/app/views/projects/tree/_blob_item.html.haml b/app/views/projects/tree/_blob_item.html.haml
index b179ad7d245..8d5e85357c3 100644
--- a/app/views/projects/tree/_blob_item.html.haml
+++ b/app/views/projects/tree/_blob_item.html.haml
@@ -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 }
diff --git a/app/views/projects/tree/_tree_item.html.haml b/app/views/projects/tree/_tree_item.html.haml
index f8856afc866..7a0edd323a6 100644
--- a/app/views/projects/tree/_tree_item.html.haml
+++ b/app/views/projects/tree/_tree_item.html.haml
@@ -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 }
diff --git a/app/views/projects/update.js.haml b/app/views/projects/update.js.haml
index cbb21f2b9fb..e4a50b0dae9 100644
--- a/app/views/projects/update.js.haml
+++ b/app/views/projects/update.js.haml
@@ -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();
diff --git a/app/views/projects/wikis/_new.html.haml b/app/views/projects/wikis/_new.html.haml
index f64772b2001..86fbab0a67f 100644
--- a/app/views/projects/wikis/_new.html.haml
+++ b/app/views/projects/wikis/_new.html.haml
@@ -1,4 +1,4 @@
-%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
diff --git a/app/views/shared/_no_ssh.html.haml b/app/views/shared/_no_ssh.html.haml
index 077e6c6a808..62093a294a6 100644
--- a/app/views/shared/_no_ssh.html.haml
+++ b/app/views/shared/_no_ssh.html.haml
@@ -1,4 +1,4 @@
-- 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
diff --git a/app/views/users_groups/_users_group.html.haml b/app/views/users_groups/_users_group.html.haml
index 5f477f3c976..fb8aff17f50 100644
--- a/app/views/users_groups/_users_group.html.haml
+++ b/app/views/users_groups/_users_group.html.haml
@@ -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)
--
GitLab