Merge branch 'html-semantic' into 'master'

Use html5 tags for better semantic
This commit is contained in:
Dmitriy Zaporozhets 2014-06-23 06:37:35 +00:00
commit 5b8c176767
6 changed files with 9 additions and 9 deletions

View file

@ -1,8 +1,8 @@
- if @has_authorized_projects - if @has_authorized_projects
.dashboard.row .dashboard.row
.activities.col-md-8 %section.activities.col-md-8
= render 'activities' = render 'activities'
.side.col-md-4.left.responsive-side %aside.side.col-md-4.left.responsive-side
= render 'sidebar' = render 'sidebar'
.fixed.sidebar-expand-button.hidden-lg.hidden-md .fixed.sidebar-expand-button.hidden-lg.hidden-md

View file

@ -1,5 +1,5 @@
.dashboard .dashboard
.activities.col-md-8.hidden-sm.hidden-xs %section.activities.col-md-8.hidden-sm.hidden-xs
- if current_user - if current_user
= render "events/event_last_push", event: @last_push = render "events/event_last_push", event: @last_push
= link_to dashboard_path, class: 'btn btn-tiny' do = link_to dashboard_path, class: 'btn btn-tiny' do
@ -16,7 +16,7 @@
- else - else
.nothing-here-block Project activity will be displayed here .nothing-here-block Project activity will be displayed here
= spinner = spinner
.side.col-md-4 %aside.side.col-md-4
.light-well.append-bottom-20 .light-well.append-bottom-20
= image_tag group_icon(@group.path), class: "avatar s90" = image_tag group_icon(@group.path), class: "avatar s90"
.clearfix.light .clearfix.light

View file

@ -1,6 +1,6 @@
.search .search
= form_tag search_path, method: :get, class: 'navbar-form pull-left' do |f| = 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) = hidden_field_tag :group_id, @group.try(:id)
- if @project && @project.persisted? - if @project && @project.persisted?
= hidden_field_tag :project_id, @project.id = hidden_field_tag :project_id, @project.id

View file

@ -20,7 +20,7 @@
= render blob_commit, project: @project = render blob_commit, project: @project
%div#tree-content-holder.tree-content-holder %div#tree-content-holder.tree-content-holder
.file-holder %article.file-holder
.file-title.clearfix .file-title.clearfix
%i.icon-file %i.icon-file
%span.file_name %span.file_name

View file

@ -1,12 +1,12 @@
= render "home_panel" = render "home_panel"
.row .row
.col-md-9 %section.col-md-9
= 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
= spinner = spinner
.col-md-3.project-side.hidden-sm.hidden-xs %aside.col-md-3.project-side.hidden-sm.hidden-xs
.clearfix .clearfix
- if @project.archived? - if @project.archived?
.alert.alert-warning .alert.alert-warning

View file

@ -1,4 +1,4 @@
.readme-holder#README %article.readme-holder#README
%h4.readme-file-title %h4.readme-file-title
%i.icon-file %i.icon-file
= readme.name = readme.name