diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-23 06:37:35 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-23 06:37:35 +0000 |
commit | 5b8c1767676b94f58558e6de320965c68b57de42 (patch) | |
tree | 051d782b7c0935b573a20a20761411baa9a76b6a | |
parent | fe00d0f50db47efff01d69f3cd4d3d7739266f8a (diff) | |
parent | 91c38a199f0f0fed1a9dc9251dac4a7c6f017b41 (diff) | |
download | gitlab-ce-5b8c1767676b94f58558e6de320965c68b57de42.tar.gz |
Merge branch 'html-semantic' into 'master'
Use html5 tags for better semantic
-rw-r--r-- | app/views/dashboard/show.html.haml | 4 | ||||
-rw-r--r-- | app/views/groups/show.html.haml | 4 | ||||
-rw-r--r-- | app/views/layouts/_search.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/blob/_blob.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/show.html.haml | 4 | ||||
-rw-r--r-- | app/views/projects/tree/_readme.html.haml | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/app/views/dashboard/show.html.haml b/app/views/dashboard/show.html.haml index 306b71717ef..6a08b1aa640 100644 --- a/app/views/dashboard/show.html.haml +++ b/app/views/dashboard/show.html.haml @@ -1,8 +1,8 @@ - if @has_authorized_projects .dashboard.row - .activities.col-md-8 + %section.activities.col-md-8 = render 'activities' - .side.col-md-4.left.responsive-side + %aside.side.col-md-4.left.responsive-side = render 'sidebar' .fixed.sidebar-expand-button.hidden-lg.hidden-md diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index 06183dd74a9..6db393c882c 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -1,5 +1,5 @@ .dashboard - .activities.col-md-8.hidden-sm.hidden-xs + %section.activities.col-md-8.hidden-sm.hidden-xs - if current_user = render "events/event_last_push", event: @last_push = link_to dashboard_path, class: 'btn btn-tiny' do @@ -16,7 +16,7 @@ - else .nothing-here-block Project activity will be displayed here = spinner - .side.col-md-4 + %aside.side.col-md-4 .light-well.append-bottom-20 = image_tag group_icon(@group.path), class: "avatar s90" .clearfix.light diff --git a/app/views/layouts/_search.html.haml b/app/views/layouts/_search.html.haml index a0e55b21c32..caf0e39234a 100644 --- a/app/views/layouts/_search.html.haml +++ b/app/views/layouts/_search.html.haml @@ -1,6 +1,6 @@ .search = form_tag search_path, method: :get, class: 'navbar-form pull-left' do |f| - = text_field_tag "search", nil, placeholder: search_placeholder, class: "search-input" + = search_field_tag "search", nil, placeholder: search_placeholder, class: "search-input" = hidden_field_tag :group_id, @group.try(:id) - if @project && @project.persisted? = hidden_field_tag :project_id, @project.id diff --git a/app/views/projects/blob/_blob.html.haml b/app/views/projects/blob/_blob.html.haml index 87574d4648b..be785dacedb 100644 --- a/app/views/projects/blob/_blob.html.haml +++ b/app/views/projects/blob/_blob.html.haml @@ -20,7 +20,7 @@ = render blob_commit, project: @project %div#tree-content-holder.tree-content-holder - .file-holder + %article.file-holder .file-title.clearfix %i.icon-file %span.file_name diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index 7e9f1122aa9..9484dc9464c 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -1,12 +1,12 @@ = render "home_panel" .row - .col-md-9 + %section.col-md-9 = render "events/event_last_push", event: @last_push = render 'shared/event_filter' .content_list = spinner - .col-md-3.project-side.hidden-sm.hidden-xs + %aside.col-md-3.project-side.hidden-sm.hidden-xs .clearfix - if @project.archived? .alert.alert-warning diff --git a/app/views/projects/tree/_readme.html.haml b/app/views/projects/tree/_readme.html.haml index 0c19109445a..c066b7102fd 100644 --- a/app/views/projects/tree/_readme.html.haml +++ b/app/views/projects/tree/_readme.html.haml @@ -1,4 +1,4 @@ -.readme-holder#README +%article.readme-holder#README %h4.readme-file-title %i.icon-file = readme.name |