Download as
Browse Code »

Commit 8c1d414674d817d452c92b2fd95e722d52fc51fc

Authored by Dmitriy Zaporozhets
1 parent a379bd00
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Include tw bootstrap manually. Fix hide class 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 37 changed files with 127 additions and 50 deletions   Show diff stats
app/assets/javascripts/behaviors/toggler_behavior.coffee
  Diff comments   View file @8c1d414
... ... @@ -9,7 +9,7 @@ $ -&gt;
9 9 toggleClass('icon-chevron-down').
10 10 toggleClass('icon-chevron-up')
11 11 container = $(".js-toggle-visibility-container")
12   - container.toggleClass("gl-hide")
  12 + container.toggleClass("hide")
13 13 e.preventDefault()
14 14  
15 15 $("body").on "click", ".js-toggle-button", (e) ->
... ...
app/assets/stylesheets/application.scss
  Diff comments   View file @8c1d414
... ... @@ -14,9 +14,9 @@
14 14 @import "main/fonts.scss";
15 15  
16 16 /**
17   - * Twitter bootstrap:
  17 + * Customized Twitter bootstrap
18 18 */
19   -@import 'bootstrap';
  19 +@import 'gl_bootstrap';
20 20  
21 21 /**
22 22 * Font icons
... ...
app/assets/stylesheets/generic/common.scss
  Diff comments   View file @8c1d414
... ... @@ -127,10 +127,6 @@ pre.well-pre {
127 127 background: #29b;
128 128 }
129 129  
130   -.gl-hide {
131   - display: none;
132   -}
133   -
134 130 .breadcrumb > li + li:before {
135 131 content: "/";
136 132 padding: 0;
... ...
app/assets/stylesheets/gl_bootstrap.scss 0 → 100644
  Diff comments   View file @8c1d414
... ... @@ -0,0 +1,80 @@
  1 +// Core variables and mixins
  2 +@import "bootstrap/variables";
  3 +@import "bootstrap/mixins";
  4 +
  5 +// Reset
  6 +@import "bootstrap/normalize";
  7 +@import "bootstrap/print";
  8 +
  9 +// Core CSS
  10 +@import "bootstrap/scaffolding";
  11 +@import "bootstrap/type";
  12 +@import "bootstrap/code";
  13 +@import "bootstrap/grid";
  14 +@import "bootstrap/tables";
  15 +@import "bootstrap/forms";
  16 +@import "bootstrap/buttons";
  17 +
  18 +// Components
  19 +@import "bootstrap/component-animations";
  20 +@import "bootstrap/glyphicons";
  21 +@import "bootstrap/dropdowns";
  22 +@import "bootstrap/button-groups";
  23 +@import "bootstrap/input-groups";
  24 +@import "bootstrap/navs";
  25 +@import "bootstrap/navbar";
  26 +@import "bootstrap/breadcrumbs";
  27 +@import "bootstrap/pagination";
  28 +@import "bootstrap/pager";
  29 +@import "bootstrap/labels";
  30 +@import "bootstrap/badges";
  31 +@import "bootstrap/jumbotron";
  32 +@import "bootstrap/thumbnails";
  33 +@import "bootstrap/alerts";
  34 +@import "bootstrap/progress-bars";
  35 +@import "bootstrap/media";
  36 +@import "bootstrap/list-group";
  37 +@import "bootstrap/panels";
  38 +@import "bootstrap/wells";
  39 +@import "bootstrap/close";
  40 +
  41 +// Components w/ JavaScript
  42 +@import "bootstrap/modals";
  43 +@import "bootstrap/tooltip";
  44 +@import "bootstrap/popovers";
  45 +@import "bootstrap/carousel";
  46 +
  47 +// Utility classes
  48 +.clearfix {
  49 + @include clearfix();
  50 +}
  51 +.center-block {
  52 + @include center-block();
  53 +}
  54 +.pull-right {
  55 + float: right !important;
  56 +}
  57 +.pull-left {
  58 + float: left !important;
  59 +}
  60 +.hide {
  61 + display: none;
  62 +}
  63 +.show {
  64 + display: block !important;
  65 +}
  66 +.invisible {
  67 + visibility: hidden;
  68 +}
  69 +.text-hide {
  70 + @include text-hide();
  71 +}
  72 +.hidden {
  73 + display: none !important;
  74 + visibility: hidden !important;
  75 +}
  76 +.affix {
  77 + position: fixed;
  78 +}
  79 +
  80 +@import "bootstrap/responsive-utilities";
... ...
app/assets/stylesheets/sections/events.scss
  Diff comments   View file @8c1d414
... ... @@ -75,6 +75,7 @@
75 75 margin-top: 4px;
76 76 margin-left: 0px;
77 77 max-width: 200px;
  78 + float: none;
78 79 }
79 80  
80 81 p:last-child {
... ...
app/assets/stylesheets/sections/notes.scss
  Diff comments   View file @8c1d414
... ... @@ -80,7 +80,6 @@ ul.notes {
80 80 overflow: hidden;
81 81 display: block;
82 82 position:relative;
83   - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
84 83 p { color: $style_color; }
85 84  
86 85 .avatar {
... ... @@ -122,6 +121,7 @@ ul.notes {
122 121 .file .notes_holder {
123 122 font-size: 13px;
124 123 line-height: 18px;
  124 + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
125 125  
126 126 td {
127 127 border: 1px solid #ddd;
... ...
app/views/admin/broadcast_messages/index.html.haml
  Diff comments   View file @8c1d414
... ... @@ -18,12 +18,12 @@
18 18 %div
19 19 = link_to '#', class: 'js-toggle-colors-link' do
20 20 Customize colors
21   - .form-group.js-toggle-colors-container.gl-hide
  21 + .form-group.js-toggle-colors-container.hide
22 22 = f.label :color, "Background Color"
23 23 .col-sm-10
24 24 = f.text_field :color, placeholder: "#AA33EE"
25 25 .light Hex values as 3 double digit numbers, starting with a # sign.
26   - .form-group.js-toggle-colors-container.gl-hide
  26 + .form-group.js-toggle-colors-container.hide
27 27 = f.label :font, "Font Color"
28 28 .col-sm-10
29 29 = f.text_field :font, placeholder: "#224466"
... ...
app/views/dashboard/_activities.html.haml
  Diff comments   View file @8c1d414
... ... @@ -5,4 +5,4 @@
5 5 .content_list
6 6 - else
7 7 %p.nothing_here_message Projects activity will be displayed here
8   -.loading.gl-hide
  8 +.loading.hide
... ...
app/views/groups/show.html.haml
  Diff comments   View file @8c1d414
... ... @@ -11,7 +11,7 @@
11 11 .content_list
12 12 - else
13 13 %p.nothing_here_message Project activity will be displayed here
14   - .loading.gl-hide
  14 + .loading.hide
15 15 .side.col-md-4
16 16 - if @group.description.present?
17 17 .description-block
... ...
app/views/help/_shortcuts.html.haml
  Diff comments   View file @8c1d414
1   -#modal-shortcuts.modal.gl-hide
  1 +#modal-shortcuts.modal.hide
2 2 .modal-header
3 3 %a.close{href: "#", "data-dismiss" => "modal"} ×
4 4 %h3 Keyboard Shortcuts
... ...
app/views/layouts/_head_panel.html.haml
  Diff comments   View file @8c1d414
... ... @@ -12,7 +12,7 @@
12 12 %ul.nav.navbar-nav
13 13 %li
14 14 %a
15   - %div.gl-hide.turbolink-spinner
  15 + %div.hide.turbolink-spinner
16 16 %i.icon-refresh.icon-spin
17 17 Loading...
18 18 %li.hidden-sm
... ...
app/views/layouts/_public_head_panel.html.haml
  Diff comments   View file @8c1d414
... ... @@ -15,7 +15,7 @@
15 15 %ul.nav
16 16 %li
17 17 %a
18   - %div.gl-hide.turbolink-spinner
  18 + %div.hide.turbolink-spinner
19 19 %i.icon-refresh.icon-spin
20 20 Loading...
21 21 %li
... ...
app/views/layouts/_search.html.haml
  Diff comments   View file @8c1d414
... ... @@ -7,4 +7,4 @@
7 7 = hidden_field_tag :search_code, true
8 8 = hidden_field_tag :repository_ref, @ref
9 9 = submit_tag 'Go' if ENV['RAILS_ENV'] == 'test'
10   - .search-autocomplete-json.gl-hide{:'data-autocomplete-opts' => search_autocomplete_source }
  10 + .search-autocomplete-json.hide{:'data-autocomplete-opts' => search_autocomplete_source }
... ...
app/views/profiles/accounts/show.html.haml
  Diff comments   View file @8c1d414
... ... @@ -50,7 +50,7 @@
50 50 %div
51 51 = f.text_field :username, required: true, class: 'form-control'
52 52 &nbsp;
53   - %span.loading-gif.gl-hide= image_tag "ajax_loader.gif"
  53 + %span.loading-gif.hide= image_tag "ajax_loader.gif"
54 54 %p.light
55 55 = user_url(@user)
56 56 %div
... ...
app/views/profiles/notifications/show.html.haml
  Diff comments   View file @8c1d414
... ... @@ -43,7 +43,7 @@
43 43 %span.btn.btn-tiny
44 44 %i.icon-chevron-down
45 45 %span Advanced notifications settings
46   -.js-toggle-visibility-container.gl-hide
  46 +.js-toggle-visibility-container.hide
47 47 %hr
48 48 %h4 Groups:
49 49 %ul.bordered-list
... ...
app/views/projects/blob/_remove.html.haml
  Diff comments   View file @8c1d414
1   -%div#modal-remove-blob.modal.gl-hide
  1 +%div#modal-remove-blob.modal.hide
2 2 .modal-header
3 3 %a.close{href: "#", "data-dismiss" => "modal"} ×
4 4 %h3.page-title Remove #{@blob.name}
... ...
app/views/projects/commit/_commit_box.html.haml
  Diff comments   View file @8c1d414
... ... @@ -47,7 +47,7 @@
47 47 - if @branches.any?
48 48 and in
49 49 = link_to("#{pluralize(@branches.count, "other branch")}", "#", class: "js-details-expand")
50   - %span.js-details-contain.gl-hide
  50 + %span.js-details-contain.hide
51 51 = commit_branches_links(@project, @branches)
52 52  
53 53 .commit-box
... ...
app/views/projects/commits/_image.html.haml
  Diff comments   View file @8c1d414
... ... @@ -11,7 +11,7 @@
11 11 .frame.deleted
12 12 %a{href: project_blob_path(@project, tree_join(@commit.parent_id, diff.old_path))}
13 13 %img{src: "data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"}
14   - %p.image-info.gl-hide
  14 + %p.image-info.hide
15 15 %span.meta-filesize= "#{number_to_human_size old_file.size}"
16 16 |
17 17 %b W:
... ... @@ -23,7 +23,7 @@
23 23 .frame.added
24 24 %a{href: project_blob_path(@project, tree_join(@commit.id, diff.new_path))}
25 25 %img{src: "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}
26   - %p.image-info.gl-hide
  26 + %p.image-info.hide
27 27 %span.meta-filesize= "#{number_to_human_size file.size}"
28 28 |
29 29 %b W:
... ... @@ -32,7 +32,7 @@
32 32 %b H:
33 33 %span.meta-height
34 34  
35   - %div.swipe.view.gl-hide
  35 + %div.swipe.view.hide
36 36 .swipe-frame
37 37 .frame.deleted
38 38 %img{src: "data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"}
... ... @@ -43,7 +43,7 @@
43 43 %span.top-handle
44 44 %span.bottom-handle
45 45  
46   - %div.onion-skin.view.gl-hide
  46 + %div.onion-skin.view.hide
47 47 .onion-skin-frame
48 48 .frame.deleted
49 49 %img{src: "data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"}
... ... @@ -56,7 +56,7 @@
56 56 .opaque
57 57  
58 58  
59   - .view-modes.gl-hide
  59 + .view-modes.hide
60 60 %ul.view-modes-menu
61 61 %li.two-up{data: {mode: 'two-up'}} 2-up
62 62 %li.swipe{data: {mode: 'swipe'}} Swipe
... ...
app/views/projects/create.js.haml
  Diff comments   View file @8c1d414
... ... @@ -5,5 +5,5 @@
5 5 :plain
6 6 $(".project-edit-errors").html("#{escape_javascript(render('errors'))}");
7 7 $('.project-submit').enable();
8   - $('.save-project-loader').gl-hide();
  8 + $('.save-project-loader').hide();
9 9 $('.project-edit-container').show();
... ...
app/views/projects/edit.html.haml
  Diff comments   View file @8c1d414
... ... @@ -97,7 +97,7 @@
97 97 Show it to me
98 98 %i.icon-chevron-down
99 99  
100   - .js-toggle-visibility-container.gl-hide
  100 + .js-toggle-visibility-container.hide
101 101 - if can? current_user, :archive_project, @project
102 102 .ui-box.ui-box-danger
103 103 .title
... ... @@ -182,7 +182,7 @@
182 182 - else
183 183 %p.nothing_here_message Only project owner can remove a project
184 184  
185   -.save-project-loader.gl-hide
  185 +.save-project-loader.hide
186 186 %center
187 187 = image_tag "ajax_loader.gif"
188 188 %h3 Saving project.
... ...
app/views/projects/graphs/show.html.haml
  Diff comments   View file @8c1d414
... ... @@ -21,14 +21,14 @@
21 21 %ol.contributors-list.clearfix
22 22  
23 23 :javascript
24   - $(".stat-graph").gl-hide();
  24 + $(".stat-graph").hide();
25 25  
26 26 $.ajax({
27 27 type: "GET",
28 28 url: location.href,
29 29 complete: function() {
30 30 $(".stat-graph").fadeIn();
31   - $(".loading-graph").gl-hide();
  31 + $(".loading-graph").hide();
32 32 },
33 33 dataType: "script"
34 34 });
... ...
app/views/projects/issues/_issues.html.haml
  Diff comments   View file @8c1d414
... ... @@ -2,7 +2,7 @@
2 2 .title
3 3 = check_box_tag "check_all_issues", nil, false, class: "check_all_issues left"
4 4 .clearfix
5   - .issues_bulk_update.gl-hide
  5 + .issues_bulk_update.hide
6 6 = form_tag bulk_update_project_issues_path(@project), method: :post do
7 7 %span Update selected issues with &nbsp;
8 8 = select_tag('update[status]', options_for_select(['open', 'closed']), prompt: "Status")
... ...
app/views/projects/issues/update.js.haml
  Diff comments   View file @8c1d414
... ... @@ -6,7 +6,7 @@
6 6 $('.issue-box .context').html("#{escape_javascript(render partial: 'issue_context', locals: { issue: @issue })}");
7 7 $('.issue-box .context').effect('highlight');
8 8 $('.chosen').chosen();
9   - $('.edit-issue.inline-update input[type="submit"]').gl-hide();
  9 + $('.edit-issue.inline-update input[type="submit"]').hide();
10 10 - if @issue.milestone
11 11 $('.milestone-nav-link').replaceWith("#{escape_javascript(link_to "| #{@issue.milestone.title}", project_milestone_path(@issue.project, @issue.milestone), :class => 'milestone-nav-link')}")
12 12 - else
... ...
app/views/projects/merge_requests/show/_commits.html.haml
  Diff comments   View file @8c1d414
... ... @@ -12,7 +12,7 @@
12 12 8 of #{@commits.count} commits displayed.
13 13 %strong
14 14 %a.show-all-commits Click here to show all
15   - %ul.all-commits.gl-hide.well-list
  15 + %ul.all-commits.hide.well-list
16 16 - @commits.each do |commit|
17 17 = render "projects/commits/commit", commit: commit, project: @merge_request.source_project
18 18  
... ...
app/views/projects/merge_requests/show/_how_to_merge.html.haml
  Diff comments   View file @8c1d414
1   -%div#modal_merge_info.modal.gl-hide
  1 +%div#modal_merge_info.modal.hide
2 2 .modal-header
3 3 %a.close{href: "#", "data-dismiss" => "modal"} ×
4 4 %h3 How to merge
... ... @@ -46,6 +46,6 @@
46 46 modal.show();
47 47 });
48 48 $('.modal-header .close').bind("click", function(){
49   - modal.gl-hide();
  49 + modal.hide();
50 50 })
51 51 })
... ...
app/views/projects/merge_requests/show/_mr_accept.html.haml
  Diff comments   View file @8c1d414
... ... @@ -46,7 +46,7 @@
46 46 .alert.alert-info
47 47 %strong This merge request already can not be merged. Try to reload page.
48 48  
49   - .merge-in-progress.gl-hide
  49 + .merge-in-progress.hide
50 50 %span.cgray
51 51 %i.icon-refresh.icon-spin
52 52 &nbsp;
... ...
app/views/projects/new.html.haml
  Diff comments   View file @8c1d414
... ... @@ -13,7 +13,7 @@
13 13 = link_to "#", class: 'js-toggle-visibility-link' do
14 14 %span Customize repository name?
15 15  
16   - .form-group.js-toggle-visibility-container.gl-hide
  16 + .form-group.js-toggle-visibility-container.hide
17 17 = f.label :path, class: 'control-label' do
18 18 %span Repository name
19 19 .col-sm-10
... ... @@ -60,7 +60,7 @@
60 60 = link_to new_group_path, class: "btn btn-tiny" do
61 61 Create a group
62 62  
63   -.save-project-loader.gl-hide
  63 +.save-project-loader.hide
64 64 %center
65 65 = image_tag "ajax_loader.gif"
66 66 %h3 Creating project &amp; repository.
... ...
app/views/projects/notes/_discussion.html.haml
  Diff comments   View file @8c1d414
... ... @@ -40,7 +40,7 @@
40 40 .file= render "projects/notes/discussion_diff", discussion_notes: discussion_notes, note: note
41 41 - else
42 42 = link_to 'show outdated discussion', '#', class: 'js-show-outdated-discussion'
43   - %div.gl-hide.outdated-discussion
  43 + %div.hide.outdated-discussion
44 44 .content
45 45 .notes{ rel: discussion_notes.first.discussion_id }
46 46 = render discussion_notes
... ... @@ -53,7 +53,7 @@
53 53 = render "projects/notes/discussion_reply_button", note: discussion_notes.first
54 54  
55 55 -# will be shown when the other one is hidden
56   - .discussion-hidden.content.gl-hide
  56 + .discussion-hidden.content.hide
57 57 .note
58 58 %em Hidden discussion.
59 59 = link_to "javascript:;", class: "js-details-target js-toggler-target" do
... ...
app/views/projects/notes/_form.html.haml
  Diff comments   View file @8c1d414
... ... @@ -33,6 +33,6 @@
33 33 %span Choose File ...
34 34 &nbsp;
35 35 %span.file_name.js-attachment-filename File name...
36   - = f.file_field :attachment, class: "js-note-attachment-input hide"
  36 + = f.file_field :attachment, class: "js-note-attachment-input hidden"
37 37  
38 38 .clearfix
... ...
app/views/projects/notes/_note.html.haml
  Diff comments   View file @8c1d414
... ... @@ -37,7 +37,7 @@
37 37 = form_for note, url: project_note_path(@project, note), method: :put, remote: true, authenticity_token: true do |f|
38 38 = f.text_area :note, class: 'note_text js-note-text js-gfm-input turn-on'
39 39  
40   - .form-actions
  40 + .form-actions.clearfix
41 41 = f.submit 'Save changes', class: "btn btn-primary btn-save"
42 42  
43 43 .note-form-option
... ... @@ -46,7 +46,7 @@
46 46 %span Choose File ...
47 47 &nbsp;
48 48 %span.file_name.js-attachment-filename File name...
49   - = f.file_field :attachment, class: "js-note-attachment-input hide"
  49 + = f.file_field :attachment, class: "js-note-attachment-input hidden"
50 50  
51 51 = link_to 'Cancel', "#", class: "btn btn-cancel note-edit-cancel"
52 52  
... ...
app/views/projects/show.html.haml
  Diff comments   View file @8c1d414
... ... @@ -5,7 +5,7 @@
5 5 = render "events/event_last_push", event: @last_push
6 6 = render 'shared/event_filter'
7 7 .content_list
8   - .loading.gl-hide
  8 + .loading.hide
9 9 .col-md-3.project-side
10 10 .clearfix
11 11 - if @project.archived?
... ...
app/views/projects/tree/_blob_item.html.haml
  Diff comments   View file @8c1d414
... ... @@ -3,7 +3,7 @@
3 3 = tree_icon(type)
4 4 %span= link_to truncate(blob_item.name, length: 40), project_blob_path(@project, tree_join(@id || @commit.id, blob_item.name))
5 5 %td.tree_time_ago.cgray
6   - %span.log_loading.gl-hide
  6 + %span.log_loading.hide
7 7 Loading commit data...
8 8 = image_tag "ajax_loader_tree.gif", width: 14
9 9 %td.tree_commit{ colspan: 2 }
... ...
app/views/projects/tree/_tree_item.html.haml
  Diff comments   View file @8c1d414
... ... @@ -3,7 +3,7 @@
3 3 = tree_icon(type)
4 4 %span= link_to truncate(tree_item.name, length: 40), project_tree_path(@project, tree_join(@id || @commit.id, tree_item.name))
5 5 %td.tree_time_ago.cgray
6   - %span.log_loading.gl-hide
  6 + %span.log_loading.hide
7 7 Loading commit data...
8 8 = image_tag "ajax_loader_tree.gif", width: 14
9 9 %td.tree_commit{ colspan: 2 }
... ...
app/views/projects/update.js.haml
  Diff comments   View file @8c1d414
... ... @@ -4,6 +4,6 @@
4 4 - else
5 5 :plain
6 6 $(".project-edit-errors").html("#{escape_javascript(render('errors'))}");
7   - $('.save-project-loader').gl-hide();
  7 + $('.save-project-loader').hide();
8 8 $('.project-edit-container').show();
9 9 $('.project-edit-content .btn-save').enableButton();
... ...
app/views/projects/walls/show.html.haml
  Diff comments   View file @8c1d414
... ... @@ -17,7 +17,7 @@
17 17 %span Choose File ...
18 18 &nbsp;
19 19 %span.file_name.js-attachment-filename File name...
20   - = f.file_field :attachment, class: "js-note-attachment-input hide"
  20 + = f.file_field :attachment, class: "js-note-attachment-input hidden"
21 21  
22 22 .hint.pull-right CTRL + Enter to send message
23 23 .clearfix
... ...
app/views/projects/wikis/_new.html.haml
  Diff comments   View file @8c1d414
1   -%div#modal-new-wiki.modal.gl-hide
  1 +%div#modal-new-wiki.modal.hide
2 2 .modal-header
3 3 %a.close{href: "#", "data-dismiss" => "modal"} ×
4 4 %h3.page-title New Wiki Page
... ...
app/views/users_groups/_users_group.html.haml
  Diff comments   View file @8c1d414
... ... @@ -16,7 +16,7 @@
16 16 = 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
17 17 %i.icon-minus.icon-white
18 18  
19   - .edit-member.gl-hide.js-toggle-content
  19 + .edit-member.hide.js-toggle-content
20 20 = form_for [@group, member], remote: true do |f|
21 21 .alert.prepend-top-20
22 22 = f.select :group_access, options_for_select(UsersGroup.group_access_roles, member.group_access)
... ...