diff --git a/app/assets/stylesheets/all.sass b/app/assets/stylesheets/all.sass index 851cf3ce..5cfafd51 100644 --- a/app/assets/stylesheets/all.sass +++ b/app/assets/stylesheets/all.sass @@ -117,8 +117,6 @@ main, body.mce-content-body text-align: left ul, ol text-align: left - li - margin-left: 2em p text-align: justify &.label diff --git a/app/assets/stylesheets/list.sass b/app/assets/stylesheets/list.sass index 39dc2210..3f31081d 100644 --- a/app/assets/stylesheets/list.sass +++ b/app/assets/stylesheets/list.sass @@ -1,7 +1,7 @@ @import compass .quantity - text-align: right + text-align: right !important white-space: nowrap table @@ -20,6 +20,9 @@ table font-size: larger td padding: 0.2em + text-align: left + &.updated_at + text-align: center dl margin: 1em auto diff --git a/app/assets/stylesheets/mobile.sass b/app/assets/stylesheets/mobile.sass index e2d52508..c6de635a 100644 --- a/app/assets/stylesheets/mobile.sass +++ b/app/assets/stylesheets/mobile.sass @@ -62,10 +62,10 @@ form#orga_search display: none - body.events.index table - thead + body.index + table thead display: none - tr td + &.events table tr td clear: both width: auto height: auto @@ -79,6 +79,20 @@ .day_number float: right + &.versions, &.orgas + table tbody + tr td + width: auto + padding: 0 0.2em + display: block + &:first-child + float: left + td + td + td + display: inline-block + td:first-child + td + width: 100% + display: block + dl dt min-width: auto diff --git a/app/views/orgas/index.html.haml b/app/views/orgas/index.html.haml index 53241bfa..c32a660e 100644 --- a/app/views/orgas/index.html.haml +++ b/app/views/orgas/index.html.haml @@ -9,7 +9,7 @@ %table.list.autopagerize_page_element %thead - %th.kind= sort_link @search, :kind_name, Orga.human_attribute_name(:kind) + %th %th.name= sort_link @search, :name %th.city= sort_link @search, :city %th.department= sort_link @search, :department @@ -18,46 +18,46 @@ %th.tags= sort_link @search, :tags, Orga.human_attribute_name(:tags) %th.updated_at= sort_link @search, :updated_at, Orga.human_attribute_name(:updated_at) - %th.url/ - %th.diaspora/ - %th.feed/ + %th + %th + %th %th.view/ %th.edit/ %tbody - @orgas.each do |orga| %tr{ class: orga.active ? 'active' : 'inactive' } - %td + %td.kind - if orga.kind %em.fa{ class: "fa-#{orga.kind.icon}", title: Kind.human_attribute_name("name_#{orga.kind.name}") } - %td + %td.name = orga.name - if orga.url =~ /^http/ = image_tag orga.url + '/favicon.ico', alt: '', class: :favicon - %td= orga.city - %td= orga.department - %td= orga.region - %td= orga.tags - %td + %td.city= orga.city + %td.department= orga.department + %td.region= orga.region + %td.tags= orga.tags + %td.updated_at - if orga.updated_at.present? = l orga.updated_at.to_date - %td + %td.url - if orga.url.present? = link_to orga.url do %em.fa.fa-external-link{ title: Orga.human_attribute_name(:url) } - %td + %td.diaspora - if orga.diaspora.present? = link_to orga.diaspora do %em.fa.fa-bullhorn{ title: Orga.human_attribute_name(:diaspora) } - %td + %td.feed - if orga.feed.present? = link_to orga.feed do %em.fa.fa-rss{ title: Orga.human_attribute_name(:feed) } - %td + %td.view = link_to orga_path(orga, q: params[:q], page: params[:page]) do %em.fa.fa-eye - %td + %td.edit - if orga.secret.nil? || user_signed_in? = link_to edit_orga_path orga do %em.fa.fa-pencil diff --git a/app/views/versions/index.haml b/app/views/versions/index.haml index 0aa82ea3..49b1ba55 100644 --- a/app/views/versions/index.haml +++ b/app/views/versions/index.haml @@ -4,7 +4,7 @@ %table.list.autopagerize_page_element %thead - %th.event= sort_link @search, :event + %th.event %th.whodunnit= sort_link @search, :whodunnit %th.object= sort_link @search, :object_id %th.created_at= sort_link @search, :created_at