From 3805797cae702e46a83b5da9b6411f1899c3d1a0 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sat, 13 Jul 2013 09:52:47 +0300 Subject: [PATCH] scss: rename file_content to file-content etc --- app/assets/javascripts/admin.js.coffee | 2 +- app/assets/stylesheets/gitlab_bootstrap/files.scss | 6 ++--- app/assets/stylesheets/sections/snippets.scss | 4 +-- app/views/admin/logs/show.html.haml | 24 ++++++++--------- app/views/help/api.html.haml | 6 ++--- app/views/help/raketasks.html.haml | 30 +++++++++++----------- app/views/projects/blame/show.html.haml | 6 ++--- app/views/projects/blob/_blob.html.haml | 4 +-- app/views/projects/blob/_download.html.haml | 2 +- app/views/projects/blob/_image.html.haml | 2 +- app/views/projects/blob/_text.html.haml | 6 ++--- app/views/projects/edit_tree/show.html.haml | 10 ++++---- app/views/projects/snippets/_blob.html.haml | 6 ++--- app/views/projects/snippets/_form.html.haml | 6 ++--- app/views/projects/tree/_readme.html.haml | 6 ++--- app/views/projects/wikis/show.html.haml | 4 +-- app/views/search/_blob.html.haml | 6 ++--- app/views/snippets/_blob.html.haml | 6 ++--- app/views/snippets/_form.html.haml | 6 ++--- 19 files changed, 71 insertions(+), 71 deletions(-) diff --git a/app/assets/javascripts/admin.js.coffee b/app/assets/javascripts/admin.js.coffee index da0077ea7..f75008e2b 100644 --- a/app/assets/javascripts/admin.js.coffee +++ b/app/assets/javascripts/admin.js.coffee @@ -14,7 +14,7 @@ class Admin $('.log-bottom').click (e) -> e.preventDefault() - visible_log = $(".file_content:visible") + visible_log = $(".file-content:visible") visible_log.animate({ scrollTop: visible_log.find('ol').height() }, "fast") modal = $('.change-owner-holder') diff --git a/app/assets/stylesheets/gitlab_bootstrap/files.scss b/app/assets/stylesheets/gitlab_bootstrap/files.scss index 4d42bf453..ec03fd0d8 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/files.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/files.scss @@ -2,12 +2,12 @@ * File content holder * */ -.file_holder { +.file-holder { border: 1px solid #BBB; margin-bottom: 1em; @include solid-shade; - .file_title { + .file-title { border-bottom: 1px solid #bbb; @include bg-dark-gray-gradient; margin: 0; @@ -33,7 +33,7 @@ } } } - .file_content { + .file-content { background: #fff; font-size: 11px; diff --git a/app/assets/stylesheets/sections/snippets.scss b/app/assets/stylesheets/sections/snippets.scss index 3944814fc..feeca655c 100644 --- a/app/assets/stylesheets/sections/snippets.scss +++ b/app/assets/stylesheets/sections/snippets.scss @@ -1,5 +1,5 @@ -.snippet.file_holder { - .file_title { +.snippet.file-holder { + .file-title { .snippet-file-name { position: relative; top: -4px; diff --git a/app/views/admin/logs/show.html.haml b/app/views/admin/logs/show.html.haml index fef72186b..cce8aeb02 100644 --- a/app/views/admin/logs/show.html.haml +++ b/app/views/admin/logs/show.html.haml @@ -11,57 +11,57 @@ %p.light To prevent performance issues admin logs output the last 2000 lines .tab-content .tab-pane.active#githost - .file_holder#README - .file_title + .file-holder#README + .file-title %i.icon-file githost.log .pull-right = link_to '#', class: 'log-bottom' do %i.icon-arrow-down Scroll down - .file_content.logs + .file-content.logs %ol - Gitlab::GitLogger.read_latest.each do |line| %li %p= line .tab-pane#application - .file_holder#README - .file_title + .file-holder#README + .file-title %i.icon-file application.log .pull-right = link_to '#', class: 'log-bottom' do %i.icon-arrow-down Scroll down - .file_content.logs + .file-content.logs %ol - Gitlab::AppLogger.read_latest.each do |line| %li %p= line .tab-pane#production - .file_holder#README - .file_title + .file-holder#README + .file-title %i.icon-file production.log .pull-right = link_to '#', class: 'log-bottom' do %i.icon-arrow-down Scroll down - .file_content.logs + .file-content.logs %ol - Gitlab::Logger.read_latest_for('production.log').each do |line| %li %p= line .tab-pane#sidekiq - .file_holder#README - .file_title + .file-holder#README + .file-title %i.icon-file sidekiq.log .pull-right = link_to '#', class: 'log-bottom' do %i.icon-arrow-down Scroll down - .file_content.logs + .file-content.logs %ol - Gitlab::Logger.read_latest_for('sidekiq.log').each do |line| %li diff --git a/app/views/help/api.html.haml b/app/views/help/api.html.haml index 5eb59ab26..889786519 100644 --- a/app/views/help/api.html.haml +++ b/app/views/help/api.html.haml @@ -6,10 +6,10 @@ = @category.titleize %br - .file_holder - .file_title + .file-holder + .file-title %i.icon-file = @category - .file_content.wiki + .file-content.wiki = preserve do = markdown File.read(Rails.root.join("doc", "api", "#{@category}.md")) diff --git a/app/views/help/raketasks.html.haml b/app/views/help/raketasks.html.haml index 0f02696a1..d92efd4d8 100644 --- a/app/views/help/raketasks.html.haml +++ b/app/views/help/raketasks.html.haml @@ -19,46 +19,46 @@ .tab-content .tab-pane.active#features - .file_holder - .file_title + .file-holder + .file-title %i.icon-file Features - .file_content.wiki + .file-content.wiki = preserve do = markdown File.read(Rails.root.join("doc", "raketasks", "features.md")) .tab-pane#maintenance - .file_holder - .file_title + .file-holder + .file-title %i.icon-file Maintenance - .file_content.wiki + .file-content.wiki = preserve do = markdown File.read(Rails.root.join("doc", "raketasks", "maintenance.md")) .tab-pane#user_management - .file_holder - .file_title + .file-holder + .file-title %i.icon-file User Management - .file_content.wiki + .file-content.wiki = preserve do = markdown File.read(Rails.root.join("doc", "raketasks", "user_management.md")) .tab-pane#cleanup - .file_holder - .file_title + .file-holder + .file-title %i.icon-file Cleanup - .file_content.wiki + .file-content.wiki = preserve do = markdown File.read(Rails.root.join("doc", "raketasks", "cleanup.md")) .tab-pane#backup_restore - .file_holder - .file_title + .file-holder + .file-title %i.icon-file Backup & Restore - .file_content.wiki + .file-content.wiki = preserve do = markdown File.read(Rails.root.join("doc", "raketasks", "backup_restore.md")) diff --git a/app/views/projects/blame/show.html.haml b/app/views/projects/blame/show.html.haml index 3f68db659..e9a693905 100644 --- a/app/views/projects/blame/show.html.haml +++ b/app/views/projects/blame/show.html.haml @@ -11,14 +11,14 @@ %li= link .clear - .file_holder - .file_title + .file-holder + .file-title %i.icon-file %span.file_name = @blob.name %small= number_to_human_size @blob.size %span.options= render "projects/blob/actions" - .file_content.blame + .file-content.blame %table - current_line = 1 - @blame.each do |commit, lines| diff --git a/app/views/projects/blob/_blob.html.haml b/app/views/projects/blob/_blob.html.haml index 68d6c0606..6524aaeef 100644 --- a/app/views/projects/blob/_blob.html.haml +++ b/app/views/projects/blob/_blob.html.haml @@ -17,8 +17,8 @@ = link_to title, '#' %div#tree-content-holder.tree-content-holder - .file_holder - .file_title + .file-holder + .file-title %i.icon-file %span.file_name = blob.name diff --git a/app/views/projects/blob/_download.html.haml b/app/views/projects/blob/_download.html.haml index 864c209db..951393b71 100644 --- a/app/views/projects/blob/_download.html.haml +++ b/app/views/projects/blob/_download.html.haml @@ -1,4 +1,4 @@ -.file_content.blob_file +.file-content.blob_file %center = link_to project_blob_path(@project, @id) do %div.padded diff --git a/app/views/projects/blob/_image.html.haml b/app/views/projects/blob/_image.html.haml index 7b23f0c81..c090f690d 100644 --- a/app/views/projects/blob/_image.html.haml +++ b/app/views/projects/blob/_image.html.haml @@ -1,2 +1,2 @@ -.file_content.image_file +.file-content.image_file %img{ src: "data:#{blob.mime_type};base64,#{Base64.encode64(blob.data)}"} diff --git a/app/views/projects/blob/_text.html.haml b/app/views/projects/blob/_text.html.haml index 122e27521..bed493d6d 100644 --- a/app/views/projects/blob/_text.html.haml +++ b/app/views/projects/blob/_text.html.haml @@ -1,12 +1,12 @@ - if gitlab_markdown?(blob.name) - .file_content.wiki + .file-content.wiki = preserve do = markdown(blob.data) - elsif markup?(blob.name) - .file_content.wiki + .file-content.wiki = raw GitHub::Markup.render(blob.name, blob.data) - else - .file_content.code + .file-content.code - unless blob.empty? %div{class: user_color_scheme_class} = raw blob.colorize(formatter: :gitlab) diff --git a/app/views/projects/edit_tree/show.html.haml b/app/views/projects/edit_tree/show.html.haml index 101b479af..25a361cb2 100644 --- a/app/views/projects/edit_tree/show.html.haml +++ b/app/views/projects/edit_tree/show.html.haml @@ -1,7 +1,7 @@ .file-editor = form_tag(project_edit_tree_path(@project, @id), method: :put, class: "form-horizontal") do - .file_holder - .file_title + .file-holder + .file-title %i.icon-file %span.file_name = @path @@ -11,7 +11,7 @@ %span.options .btn-group.tree-btn-group = link_to "Cancel", project_blob_path(@project, @id), class: "btn btn-tiny btn-cancel", confirm: leave_edit_message - .file_content.code + .file-content.code %pre#editor= @blob.data .control-group.commit_message-group @@ -21,7 +21,7 @@ = text_area_tag 'commit_message', '', placeholder: "Update #{@blob.name}", required: true, rows: 3 .form-actions = hidden_field_tag 'last_commit', @last_commit - = hidden_field_tag 'content', '', id: :file_content + = hidden_field_tag 'content', '', id: :file-content .commit-button-annotation = button_tag "Commit changes", class: 'btn commit-btn js-commit-button btn-primary' .message @@ -40,6 +40,6 @@ disableButtonIfEmptyField("#commit_message", ".js-commit-button"); $(".js-commit-button").click(function(){ - $("#file_content").val(editor.getValue()); + $("#file-content").val(editor.getValue()); $(".file-editor form").submit(); }); diff --git a/app/views/projects/snippets/_blob.html.haml b/app/views/projects/snippets/_blob.html.haml index e0d1669ac..f14a2bd4e 100644 --- a/app/views/projects/snippets/_blob.html.haml +++ b/app/views/projects/snippets/_blob.html.haml @@ -1,5 +1,5 @@ -.file_holder - .file_title +.file-holder + .file-title %i.icon-file %strong= @snippet.file_name %span.options @@ -7,7 +7,7 @@ - if can?(current_user, :admin_project_snippet, @project) || @snippet.author == current_user = link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn btn-tiny", title: 'Edit Snippet' = link_to "raw", raw_project_snippet_path(@project, @snippet), class: "btn btn-tiny", target: "_blank" - .file_content.code + .file-content.code - unless @snippet.content.empty? %div{class: user_color_scheme_class} = raw @snippet.colorize(formatter: :gitlab) diff --git a/app/views/projects/snippets/_form.html.haml b/app/views/projects/snippets/_form.html.haml index a4f307347..a8aa5460f 100644 --- a/app/views/projects/snippets/_form.html.haml +++ b/app/views/projects/snippets/_form.html.haml @@ -19,10 +19,10 @@ .file-editor = f.label :file_name, "File" .input - .file_holder.snippet - .file_title + .file-holder.snippet + .file-title = f.text_field :file_name, placeholder: "example.rb", class: 'snippet-file-name', required: true - .file_content.code + .file-content.code %pre#editor= @snippet.content = f.hidden_field :content, class: 'snippet-file-content' diff --git a/app/views/projects/tree/_readme.html.haml b/app/views/projects/tree/_readme.html.haml index e9bb11274..98bacb495 100644 --- a/app/views/projects/tree/_readme.html.haml +++ b/app/views/projects/tree/_readme.html.haml @@ -1,8 +1,8 @@ -.file_holder#README - .file_title +.file-holder#README + .file-title %i.icon-file = readme.name - .file_content.wiki + .file-content.wiki - if gitlab_markdown?(readme.name) = preserve do = markdown(readme.data) diff --git a/app/views/projects/wikis/show.html.haml b/app/views/projects/wikis/show.html.haml index 2fdaa8d00..f1cd78241 100644 --- a/app/views/projects/wikis/show.html.haml +++ b/app/views/projects/wikis/show.html.haml @@ -8,8 +8,8 @@ This is an old version of this page. You can view the #{link_to "most recent version", project_wiki_path(@project, @wiki)} or browse the #{link_to "history", history_project_wiki_path(@project, @wiki)}. -.file_holder - .file_content.wiki +.file-holder + .file-content.wiki = preserve do = render_wiki_content(@wiki) diff --git a/app/views/search/_blob.html.haml b/app/views/search/_blob.html.haml index 39e711707..559fdd794 100644 --- a/app/views/search/_blob.html.haml +++ b/app/views/search/_blob.html.haml @@ -1,10 +1,10 @@ %li - .file_holder - .file_title + .file-holder + .file-title = link_to project_blob_path(@project, tree_join(blob.ref, blob.filename), :anchor => "L" + blob.startline.to_s) do %i.icon-file %strong = blob.filename - .file_content.code.term + .file-content.code.term %div{class: user_color_scheme_class} = raw blob.colorize( formatter: :gitlab, options: { first_line_number: blob.startline } ) diff --git a/app/views/snippets/_blob.html.haml b/app/views/snippets/_blob.html.haml index c538da0be..c2e0d97a1 100644 --- a/app/views/snippets/_blob.html.haml +++ b/app/views/snippets/_blob.html.haml @@ -1,5 +1,5 @@ -.file_holder - .file_title +.file-holder + .file-title %i.icon-file %strong= @snippet.file_name %span.options @@ -8,7 +8,7 @@ = link_to "Edit", edit_snippet_path(@snippet), class: "btn btn-tiny", title: 'Edit Snippet' = link_to "Delete", snippet_path(@snippet), method: :delete, confirm: "Are you sure?", class: "btn btn-tiny", title: 'Delete Snippet' = link_to "Raw", raw_snippet_path(@snippet), class: "btn btn-tiny", target: "_blank" - .file_content.code + .file-content.code - unless @snippet.content.empty? %div{class: user_color_scheme_class} = raw @snippet.colorize(formatter: :gitlab) diff --git a/app/views/snippets/_form.html.haml b/app/views/snippets/_form.html.haml index e05794e82..05502503b 100644 --- a/app/views/snippets/_form.html.haml +++ b/app/views/snippets/_form.html.haml @@ -22,10 +22,10 @@ .file-editor = f.label :file_name, "File" .input - .file_holder.snippet - .file_title + .file-holder.snippet + .file-title = f.text_field :file_name, placeholder: "example.rb", class: 'snippet-file-name', required: true - .file_content.code + .file-content.code %pre#editor= @snippet.content = f.hidden_field :content, class: 'snippet-file-content' -- 2.11.0