diff --git a/app/assets/javascripts/behaviors/toggler_behavior.coffee b/app/assets/javascripts/behaviors/toggler_behavior.coffee index c7c6a81..5afb656 100644 --- a/app/assets/javascripts/behaviors/toggler_behavior.coffee +++ b/app/assets/javascripts/behaviors/toggler_behavior.coffee @@ -9,7 +9,7 @@ $ -> toggleClass('icon-chevron-down'). toggleClass('icon-chevron-up') container = $(".js-toggle-visibility-container") - container.toggleClass("gl-hide") + container.toggleClass("hide") e.preventDefault() $("body").on "click", ".js-toggle-button", (e) -> diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index d91eec4..ea5e556 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -14,9 +14,9 @@ @import "main/fonts.scss"; /** - * Twitter bootstrap: + * Customized Twitter bootstrap */ -@import 'bootstrap'; +@import 'gl_bootstrap'; /** * Font icons diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss index f185bd7..1544764 100644 --- a/app/assets/stylesheets/generic/common.scss +++ b/app/assets/stylesheets/generic/common.scss @@ -127,10 +127,6 @@ pre.well-pre { background: #29b; } -.gl-hide { - display: none; -} - .breadcrumb > li + li:before { content: "/"; padding: 0; diff --git a/app/assets/stylesheets/gl_bootstrap.scss b/app/assets/stylesheets/gl_bootstrap.scss new file mode 100644 index 0000000..c30be49 --- /dev/null +++ b/app/assets/stylesheets/gl_bootstrap.scss @@ -0,0 +1,80 @@ +// Core variables and mixins +@import "bootstrap/variables"; +@import "bootstrap/mixins"; + +// Reset +@import "bootstrap/normalize"; +@import "bootstrap/print"; + +// Core CSS +@import "bootstrap/scaffolding"; +@import "bootstrap/type"; +@import "bootstrap/code"; +@import "bootstrap/grid"; +@import "bootstrap/tables"; +@import "bootstrap/forms"; +@import "bootstrap/buttons"; + +// Components +@import "bootstrap/component-animations"; +@import "bootstrap/glyphicons"; +@import "bootstrap/dropdowns"; +@import "bootstrap/button-groups"; +@import "bootstrap/input-groups"; +@import "bootstrap/navs"; +@import "bootstrap/navbar"; +@import "bootstrap/breadcrumbs"; +@import "bootstrap/pagination"; +@import "bootstrap/pager"; +@import "bootstrap/labels"; +@import "bootstrap/badges"; +@import "bootstrap/jumbotron"; +@import "bootstrap/thumbnails"; +@import "bootstrap/alerts"; +@import "bootstrap/progress-bars"; +@import "bootstrap/media"; +@import "bootstrap/list-group"; +@import "bootstrap/panels"; +@import "bootstrap/wells"; +@import "bootstrap/close"; + +// Components w/ JavaScript +@import "bootstrap/modals"; +@import "bootstrap/tooltip"; +@import "bootstrap/popovers"; +@import "bootstrap/carousel"; + +// Utility classes +.clearfix { + @include clearfix(); +} +.center-block { + @include center-block(); +} +.pull-right { + float: right !important; +} +.pull-left { + float: left !important; +} +.hide { + display: none; +} +.show { + display: block !important; +} +.invisible { + visibility: hidden; +} +.text-hide { + @include text-hide(); +} +.hidden { + display: none !important; + visibility: hidden !important; +} +.affix { + position: fixed; +} + +@import "bootstrap/responsive-utilities"; diff --git a/app/assets/stylesheets/sections/events.scss b/app/assets/stylesheets/sections/events.scss index 9cd6c65..a576fef 100644 --- a/app/assets/stylesheets/sections/events.scss +++ b/app/assets/stylesheets/sections/events.scss @@ -75,6 +75,7 @@ margin-top: 4px; margin-left: 0px; max-width: 200px; + float: none; } p:last-child { diff --git a/app/assets/stylesheets/sections/notes.scss b/app/assets/stylesheets/sections/notes.scss index 4d66faf..1ae0e16 100644 --- a/app/assets/stylesheets/sections/notes.scss +++ b/app/assets/stylesheets/sections/notes.scss @@ -80,7 +80,6 @@ ul.notes { overflow: hidden; display: block; position:relative; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; p { color: $style_color; } .avatar { @@ -122,6 +121,7 @@ ul.notes { .file .notes_holder { font-size: 13px; line-height: 18px; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; td { border: 1px solid #ddd; diff --git a/app/views/admin/broadcast_messages/index.html.haml b/app/views/admin/broadcast_messages/index.html.haml index f265a62..702b640 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 - .form-group.js-toggle-colors-container.gl-hide + .form-group.js-toggle-colors-container.hide = f.label :color, "Background Color" .col-sm-10 = f.text_field :color, placeholder: "#AA33EE" .light Hex values as 3 double digit numbers, starting with a # sign. - .form-group.js-toggle-colors-container.gl-hide + .form-group.js-toggle-colors-container.hide = f.label :font, "Font Color" .col-sm-10 = f.text_field :font, placeholder: "#224466" diff --git a/app/views/dashboard/_activities.html.haml b/app/views/dashboard/_activities.html.haml index 256f0ff..8911772 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.gl-hide +.loading.hide diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index a52e7d2..f4925b4 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.gl-hide + .loading.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 5e5215f..e979e7c 100644 --- a/app/views/help/_shortcuts.html.haml +++ b/app/views/help/_shortcuts.html.haml @@ -1,4 +1,4 @@ -#modal-shortcuts.modal.gl-hide +#modal-shortcuts.modal.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 aa30ae2..ee97f86 100644 --- a/app/views/layouts/_head_panel.html.haml +++ b/app/views/layouts/_head_panel.html.haml @@ -12,7 +12,7 @@ %ul.nav.navbar-nav %li %a - %div.gl-hide.turbolink-spinner + %div.hide.turbolink-spinner %i.icon-refresh.icon-spin Loading... %li.hidden-sm diff --git a/app/views/layouts/_public_head_panel.html.haml b/app/views/layouts/_public_head_panel.html.haml index 915dd07..3c4bd85 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.gl-hide.turbolink-spinner + %div.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 c8d9944..9a0db99 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.gl-hide{:'data-autocomplete-opts' => search_autocomplete_source } + .search-autocomplete-json.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 d48e266..3220736 100644 --- a/app/views/profiles/accounts/show.html.haml +++ b/app/views/profiles/accounts/show.html.haml @@ -50,7 +50,7 @@ %div = f.text_field :username, required: true, class: 'form-control'   - %span.loading-gif.gl-hide= image_tag "ajax_loader.gif" + %span.loading-gif.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 ea3511f..ecec8f7 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.gl-hide +.js-toggle-visibility-container.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 582105a..a4600d8 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.gl-hide +%div#modal-remove-blob.modal.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 066a939..3d66680 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.gl-hide + %span.js-details-contain.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 5bb8af4..9a8b7c8 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.gl-hide + %p.image-info.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.gl-hide + %p.image-info.hide %span.meta-filesize= "#{number_to_human_size file.size}" | %b W: @@ -32,7 +32,7 @@ %b H: %span.meta-height - %div.swipe.view.gl-hide + %div.swipe.view.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.gl-hide + %div.onion-skin.view.hide .onion-skin-frame .frame.deleted %img{src: "data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"} @@ -56,7 +56,7 @@ .opaque - .view-modes.gl-hide + .view-modes.hide %ul.view-modes-menu %li.two-up{data: {mode: 'two-up'}} 2-up %li.swipe{data: {mode: 'swipe'}} Swipe diff --git a/app/views/projects/create.js.haml b/app/views/projects/create.js.haml index c39cef0..a444b8b 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').gl-hide(); + $('.save-project-loader').hide(); $('.project-edit-container').show(); diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index 51f2e23..a0c95e0 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.gl-hide + .js-toggle-visibility-container.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.gl-hide +.save-project-loader.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 1d789f3..a21cb9e 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").gl-hide(); + $(".stat-graph").hide(); $.ajax({ type: "GET", url: location.href, complete: function() { $(".stat-graph").fadeIn(); - $(".loading-graph").gl-hide(); + $(".loading-graph").hide(); }, dataType: "script" }); diff --git a/app/views/projects/issues/_issues.html.haml b/app/views/projects/issues/_issues.html.haml index a9ad8b2..e2ce26f 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.gl-hide + .issues_bulk_update.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 4f14cd8..2be1d0f 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"]').gl-hide(); + $('.edit-issue.inline-update input[type="submit"]').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 c0de572..7b0e670 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.gl-hide.well-list + %ul.all-commits.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 c39ecac..98d373e 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.gl-hide +%div#modal_merge_info.modal.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.gl-hide(); + modal.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 5a6b6a5..4dfb7c6 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.gl-hide + .merge-in-progress.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 4a9a0d7..c3e1e33 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? - .form-group.js-toggle-visibility-container.gl-hide + .form-group.js-toggle-visibility-container.hide = f.label :path, class: 'control-label' do %span Repository name .col-sm-10 @@ -60,7 +60,7 @@ = link_to new_group_path, class: "btn btn-tiny" do Create a group -.save-project-loader.gl-hide +.save-project-loader.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 30030f3..ee65ae1 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.gl-hide.outdated-discussion + %div.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.gl-hide + .discussion-hidden.content.hide .note %em Hidden discussion. = link_to "javascript:;", class: "js-details-target js-toggler-target" do diff --git a/app/views/projects/notes/_form.html.haml b/app/views/projects/notes/_form.html.haml index 33667d3..bcaedc8 100644 --- a/app/views/projects/notes/_form.html.haml +++ b/app/views/projects/notes/_form.html.haml @@ -33,6 +33,6 @@ %span Choose File ...   %span.file_name.js-attachment-filename File name... - = f.file_field :attachment, class: "js-note-attachment-input hide" + = f.file_field :attachment, class: "js-note-attachment-input hidden" .clearfix diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index 1c3bd61..fd2a3f4 100644 --- a/app/views/projects/notes/_note.html.haml +++ b/app/views/projects/notes/_note.html.haml @@ -37,7 +37,7 @@ = form_for note, url: project_note_path(@project, note), method: :put, remote: true, authenticity_token: true do |f| = f.text_area :note, class: 'note_text js-note-text js-gfm-input turn-on' - .form-actions + .form-actions.clearfix = f.submit 'Save changes', class: "btn btn-primary btn-save" .note-form-option @@ -46,7 +46,7 @@ %span Choose File ...   %span.file_name.js-attachment-filename File name... - = f.file_field :attachment, class: "js-note-attachment-input hide" + = f.file_field :attachment, class: "js-note-attachment-input hidden" = link_to 'Cancel', "#", class: "btn btn-cancel note-edit-cancel" diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index c04e809..8eac4cb 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.gl-hide + .loading.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 8d5e853..b179ad7 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.gl-hide + %span.log_loading.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 7a0edd3..f8856af 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.gl-hide + %span.log_loading.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 e4a50b0..cbb21f2 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').gl-hide(); + $('.save-project-loader').hide(); $('.project-edit-container').show(); $('.project-edit-content .btn-save').enableButton(); diff --git a/app/views/projects/walls/show.html.haml b/app/views/projects/walls/show.html.haml index 4fe3e6b..c6afec4 100644 --- a/app/views/projects/walls/show.html.haml +++ b/app/views/projects/walls/show.html.haml @@ -17,7 +17,7 @@ %span Choose File ...   %span.file_name.js-attachment-filename File name... - = f.file_field :attachment, class: "js-note-attachment-input hide" + = f.file_field :attachment, class: "js-note-attachment-input hidden" .hint.pull-right CTRL + Enter to send message .clearfix diff --git a/app/views/projects/wikis/_new.html.haml b/app/views/projects/wikis/_new.html.haml index 1d3f22b..38462c7 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.gl-hide +%div#modal-new-wiki.modal.hide .modal-header %a.close{href: "#", "data-dismiss" => "modal"} × %h3.page-title New Wiki Page diff --git a/app/views/users_groups/_users_group.html.haml b/app/views/users_groups/_users_group.html.haml index fb8aff1..5f477f3 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.gl-hide.js-toggle-content + .edit-member.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) -- libgit2 0.21.2