Commit 6cbadc95 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 5c3e0f61
...@@ -131,3 +131,7 @@ pre.well-pre { ...@@ -131,3 +131,7 @@ pre.well-pre {
.dropdown-menu > li > a:focus { .dropdown-menu > li > a:focus {
background: #29b; background: #29b;
} }
.gl-hide {
display: none;
}
...@@ -18,12 +18,12 @@ ...@@ -18,12 +18,12 @@
%div %div
= link_to '#', class: 'js-toggle-colors-link' do = link_to '#', class: 'js-toggle-colors-link' do
Customize colors Customize colors
.control-group.js-toggle-colors-container.hide .control-group.js-toggle-colors-container.gl-hide
= f.label :color, "Background Color" = f.label :color, "Background Color"
.controls .controls
= f.text_field :color, placeholder: "#AA33EE" = f.text_field :color, placeholder: "#AA33EE"
.light Hex values as 3 double digit numbers, starting with a # sign. .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" = f.label :font, "Font Color"
.controls .controls
= f.text_field :font, placeholder: "#224466" = f.text_field :font, placeholder: "#224466"
......
...@@ -5,4 +5,4 @@ ...@@ -5,4 +5,4 @@
.content_list .content_list
- else - else
%p.nothing_here_message Projects activity will be displayed here %p.nothing_here_message Projects activity will be displayed here
.loading.hide .loading.gl-hide
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
.content_list .content_list
- else - else
%p.nothing_here_message Project activity will be displayed here %p.nothing_here_message Project activity will be displayed here
.loading.hide .loading.gl-hide
.side.col-md-4 .side.col-md-4
- if @group.description.present? - if @group.description.present?
.description-block .description-block
......
#modal-shortcuts.modal.hide #modal-shortcuts.modal.gl-hide
.modal-header .modal-header
%a.close{href: "#", "data-dismiss" => "modal"} × %a.close{href: "#", "data-dismiss" => "modal"} ×
%h3 Keyboard Shortcuts %h3 Keyboard Shortcuts
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
%ul.nav.navbar-nav %ul.nav.navbar-nav
%li %li
%a %a
%div.hide.turbolink-spinner %div.gl-hide.turbolink-spinner
%i.icon-refresh.icon-spin %i.icon-refresh.icon-spin
Loading... Loading...
%li %li
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
%ul.nav %ul.nav
%li %li
%a %a
%div.hide.turbolink-spinner %div.gl-hide.turbolink-spinner
%i.icon-refresh.icon-spin %i.icon-refresh.icon-spin
Loading... Loading...
%li %li
......
...@@ -7,4 +7,4 @@ ...@@ -7,4 +7,4 @@
= hidden_field_tag :search_code, true = hidden_field_tag :search_code, true
= hidden_field_tag :repository_ref, @ref = hidden_field_tag :repository_ref, @ref
= submit_tag 'Go' if ENV['RAILS_ENV'] == 'test' = 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 @@ ...@@ -49,7 +49,7 @@
%div %div
= f.text_field :username, required: true, class: 'input-xlarge input-xpadding' = f.text_field :username, required: true, class: 'input-xlarge input-xpadding'
&nbsp; &nbsp;
%span.loading-gif.hide= image_tag "ajax_loader.gif" %span.loading-gif.gl-hide= image_tag "ajax_loader.gif"
%p.light %p.light
= user_url(@user) = user_url(@user)
%div %div
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
%span.btn.btn-tiny %span.btn.btn-tiny
%i.icon-chevron-down %i.icon-chevron-down
%span Advanced notifications settings %span Advanced notifications settings
.js-toggle-visibility-container.hide .js-toggle-visibility-container.gl-hide
%hr %hr
%h4 Groups: %h4 Groups:
%ul.bordered-list %ul.bordered-list
......
%div#modal-remove-blob.modal.hide %div#modal-remove-blob.modal.gl-hide
.modal-header .modal-header
%a.close{href: "#", "data-dismiss" => "modal"} × %a.close{href: "#", "data-dismiss" => "modal"} ×
%h3.page-title Remove #{@blob.name} %h3.page-title Remove #{@blob.name}
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
- if @branches.any? - if @branches.any?
and in and in
= link_to("#{pluralize(@branches.count, "other branch")}", "#", class: "js-details-expand") = 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_branches_links(@project, @branches)
.commit-box .commit-box
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
.frame.deleted .frame.deleted
%a{href: project_blob_path(@project, tree_join(@commit.parent_id, diff.old_path))} %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)}"} %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}" %span.meta-filesize= "#{number_to_human_size old_file.size}"
| |
%b W: %b W:
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
.frame.added .frame.added
%a{href: project_blob_path(@project, tree_join(@commit.id, diff.new_path))} %a{href: project_blob_path(@project, tree_join(@commit.id, diff.new_path))}
%img{src: "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"} %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}" %span.meta-filesize= "#{number_to_human_size file.size}"
| |
%b W: %b W:
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
%b H: %b H:
%span.meta-height %span.meta-height
%div.swipe.view.hide %div.swipe.view.gl-hide
.swipe-frame .swipe-frame
.frame.deleted .frame.deleted
%img{src: "data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"} %img{src: "data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"}
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
%span.top-handle %span.top-handle
%span.bottom-handle %span.bottom-handle
%div.onion-skin.view.hide %div.onion-skin.view.gl-hide
.onion-skin-frame .onion-skin-frame
.frame.deleted .frame.deleted
%img{src: "data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"} %img{src: "data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"}
...@@ -56,8 +56,8 @@ ...@@ -56,8 +56,8 @@
.opaque .opaque
.view-modes.hide .view-modes.gl-hide
%ul.view-modes-menu %ul.view-modes-menu
%li.two-up{data: {mode: 'two-up'}} 2-up %li.two-up{data: {mode: 'two-up'}} 2-up
%li.swipe{data: {mode: 'swipe'}} Swipe %li.swipe{data: {mode: 'swipe'}} Swipe
%li.onion-skin{data: {mode: 'onion-skin'}} Onion skin %li.onion-skin{data: {mode: 'onion-skin'}} Onion skin
\ No newline at end of file
...@@ -5,5 +5,5 @@ ...@@ -5,5 +5,5 @@
:plain :plain
$(".project-edit-errors").html("#{escape_javascript(render('errors'))}"); $(".project-edit-errors").html("#{escape_javascript(render('errors'))}");
$('.project-submit').enable(); $('.project-submit').enable();
$('.save-project-loader').hide(); $('.save-project-loader').gl-hide();
$('.project-edit-container').show(); $('.project-edit-container').show();
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
Show it to me Show it to me
%i.icon-chevron-down %i.icon-chevron-down
.js-toggle-visibility-container.hide .js-toggle-visibility-container.gl-hide
- if can? current_user, :archive_project, @project - if can? current_user, :archive_project, @project
.ui-box.ui-box-danger .ui-box.ui-box-danger
.title .title
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
- else - else
%p.nothing_here_message Only project owner can remove a project %p.nothing_here_message Only project owner can remove a project
.save-project-loader.hide .save-project-loader.gl-hide
%center %center
= image_tag "ajax_loader.gif" = image_tag "ajax_loader.gif"
%h3 Saving project. %h3 Saving project.
......
...@@ -21,14 +21,14 @@ ...@@ -21,14 +21,14 @@
%ol.contributors-list.clearfix %ol.contributors-list.clearfix
:javascript :javascript
$(".stat-graph").hide(); $(".stat-graph").gl-hide();
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: location.href, url: location.href,
complete: function() { complete: function() {
$(".stat-graph").fadeIn(); $(".stat-graph").fadeIn();
$(".loading-graph").hide(); $(".loading-graph").gl-hide();
}, },
dataType: "script" dataType: "script"
}); });
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
.title .title
= check_box_tag "check_all_issues", nil, false, class: "check_all_issues left" = check_box_tag "check_all_issues", nil, false, class: "check_all_issues left"
.clearfix .clearfix
.issues_bulk_update.hide .issues_bulk_update.gl-hide
= form_tag bulk_update_project_issues_path(@project), method: :post do = form_tag bulk_update_project_issues_path(@project), method: :post do
%span Update selected issues with &nbsp; %span Update selected issues with &nbsp;
= select_tag('update[status]', options_for_select(['open', 'closed']), prompt: "Status") = select_tag('update[status]', options_for_select(['open', 'closed']), prompt: "Status")
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
$('.issue-box .context').html("#{escape_javascript(render partial: 'issue_context', locals: { issue: @issue })}"); $('.issue-box .context').html("#{escape_javascript(render partial: 'issue_context', locals: { issue: @issue })}");
$('.issue-box .context').effect('highlight'); $('.issue-box .context').effect('highlight');
$('.chosen').chosen(); $('.chosen').chosen();
$('.edit-issue.inline-update input[type="submit"]').hide(); $('.edit-issue.inline-update input[type="submit"]').gl-hide();
- if @issue.milestone - 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')}") $('.milestone-nav-link').replaceWith("#{escape_javascript(link_to "| #{@issue.milestone.title}", project_milestone_path(@issue.project, @issue.milestone), :class => 'milestone-nav-link')}")
- else - else
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
8 of #{@commits.count} commits displayed. 8 of #{@commits.count} commits displayed.
%strong %strong
%a.show-all-commits Click here to show all %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| - @commits.each do |commit|
= render "projects/commits/commit", commit: commit, project: @merge_request.source_project = 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 .modal-header
%a.close{href: "#", "data-dismiss" => "modal"} × %a.close{href: "#", "data-dismiss" => "modal"} ×
%h3 How to merge %h3 How to merge
...@@ -46,6 +46,6 @@ ...@@ -46,6 +46,6 @@
modal.show(); modal.show();
}); });
$('.modal-header .close').bind("click", function(){ $('.modal-header .close').bind("click", function(){
modal.hide(); modal.gl-hide();
}) })
}) })
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
.alert.alert-info .alert.alert-info
%strong This merge request already can not be merged. Try to reload page. %strong This merge request already can not be merged. Try to reload page.
.merge-in-progress.hide .merge-in-progress.gl-hide
%span.cgray %span.cgray
%i.icon-refresh.icon-spin %i.icon-refresh.icon-spin
&nbsp; &nbsp;
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
= link_to "#", class: 'js-toggle-visibility-link' do = link_to "#", class: 'js-toggle-visibility-link' do
%span Customize repository name? %span Customize repository name?
.control-group.js-toggle-visibility-container.hide .control-group.js-toggle-visibility-container.gl-hide
= f.label :path do = f.label :path do
%span Repository name %span Repository name
.controls .controls
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
= link_to new_group_path, class: "btn btn-tiny" do = link_to new_group_path, class: "btn btn-tiny" do
Create a group Create a group
.save-project-loader.hide .save-project-loader.gl-hide
%center %center
= image_tag "ajax_loader.gif" = image_tag "ajax_loader.gif"
%h3 Creating project &amp; repository. %h3 Creating project &amp; repository.
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
.file= render "projects/notes/discussion_diff", discussion_notes: discussion_notes, note: note .file= render "projects/notes/discussion_diff", discussion_notes: discussion_notes, note: note
- else - else
= link_to 'show outdated discussion', '#', class: 'js-show-outdated-discussion' = link_to 'show outdated discussion', '#', class: 'js-show-outdated-discussion'
%div.hide.outdated-discussion %div.gl-hide.outdated-discussion
.content .content
.notes{ rel: discussion_notes.first.discussion_id } .notes{ rel: discussion_notes.first.discussion_id }
= render discussion_notes = render discussion_notes
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
= render "projects/notes/discussion_reply_button", note: discussion_notes.first = render "projects/notes/discussion_reply_button", note: discussion_notes.first
-# will be shown when the other one is hidden -# will be shown when the other one is hidden
.discussion-hidden.content.hide .discussion-hidden.content.gl-hide
.note .note
%em Hidden discussion. %em Hidden discussion.
= link_to "javascript:;", class: "js-details-target js-toggler-target" do = link_to "javascript:;", class: "js-details-target js-toggler-target" do
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
= render "events/event_last_push", event: @last_push = render "events/event_last_push", event: @last_push
= render 'shared/event_filter' = render 'shared/event_filter'
.content_list .content_list
.loading.hide .loading.gl-hide
.col-md-3.project-side .col-md-3.project-side
.clearfix .clearfix
- if @project.archived? - if @project.archived?
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
= tree_icon(type) = tree_icon(type)
%span= link_to truncate(blob_item.name, length: 40), project_blob_path(@project, tree_join(@id || @commit.id, blob_item.name)) %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 %td.tree_time_ago.cgray
%span.log_loading.hide %span.log_loading.gl-hide
Loading commit data... Loading commit data...
= image_tag "ajax_loader_tree.gif", width: 14 = image_tag "ajax_loader_tree.gif", width: 14
%td.tree_commit{ colspan: 2 } %td.tree_commit{ colspan: 2 }
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
= tree_icon(type) = tree_icon(type)
%span= link_to truncate(tree_item.name, length: 40), project_tree_path(@project, tree_join(@id || @commit.id, tree_item.name)) %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 %td.tree_time_ago.cgray
%span.log_loading.hide %span.log_loading.gl-hide
Loading commit data... Loading commit data...
= image_tag "ajax_loader_tree.gif", width: 14 = image_tag "ajax_loader_tree.gif", width: 14
%td.tree_commit{ colspan: 2 } %td.tree_commit{ colspan: 2 }
...@@ -4,6 +4,6 @@ ...@@ -4,6 +4,6 @@
- else - else
:plain :plain
$(".project-edit-errors").html("#{escape_javascript(render('errors'))}"); $(".project-edit-errors").html("#{escape_javascript(render('errors'))}");
$('.save-project-loader').hide(); $('.save-project-loader').gl-hide();
$('.project-edit-container').show(); $('.project-edit-container').show();
$('.project-edit-content .btn-save').enableButton(); $('.project-edit-content .btn-save').enableButton();
%div#modal-new-wiki.modal.hide %div#modal-new-wiki.modal.gl-hide
.modal-header .modal-header
%a.close{href: "#", "data-dismiss" => "modal"} × %a.close{href: "#", "data-dismiss" => "modal"} ×
%h3.page-title New Wiki Page %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 .no-ssh-key-message
.container .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 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 @@ ...@@ -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 = 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 %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| = form_for [@group, member], remote: true do |f|
.alert.prepend-top-20 .alert.prepend-top-20
= f.select :group_access, options_for_select(UsersGroup.group_access_roles, member.group_access) = f.select :group_access, options_for_select(UsersGroup.group_access_roles, member.group_access)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment