Remove remaining span-* and improve mobile photos page
This commit is contained in:
parent
602ad2d209
commit
816092c477
7 changed files with 38 additions and 57 deletions
|
|
@ -459,7 +459,7 @@ h3 { margin-top: 0; }
|
||||||
width: 20px;
|
width: 20px;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
margin-left: 15px;
|
margin-left: 15px;
|
||||||
|
|
||||||
&:last-child{
|
&:last-child{
|
||||||
margin-right: 5px;
|
margin-right: 5px;
|
||||||
}
|
}
|
||||||
|
|
@ -688,18 +688,6 @@ form#new_conversation.new_conversation {
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
line-height: 20px;
|
line-height: 20px;
|
||||||
}
|
}
|
||||||
.span-10 {
|
|
||||||
margin: 5px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.span-2 {
|
|
||||||
margin: 5px 5px;
|
|
||||||
text-transform: uppercase;
|
|
||||||
}
|
|
||||||
|
|
||||||
.span-10 {
|
|
||||||
width: 100%;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
textarea#conversation_text {
|
textarea#conversation_text {
|
||||||
|
|
|
||||||
|
|
@ -189,13 +189,6 @@ form p.checkbox_select label {
|
||||||
padding-left: 0;
|
padding-left: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.span-2 {
|
|
||||||
float: right;
|
|
||||||
text-align: right;
|
|
||||||
margin-left: 0;
|
|
||||||
margin-right: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
textarea.comment_box {
|
textarea.comment_box {
|
||||||
left: auto;
|
left: auto;
|
||||||
right: -9999px;
|
right: -9999px;
|
||||||
|
|
@ -221,12 +214,6 @@ ul#settings_nav > li {
|
||||||
margin-right: 0;
|
margin-right: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.column, .span-1, .span-2, .span-3, .span-4, .span-5, .span-6, .span-7, .span-8, .span-9, .span-10, .span-11, .span-12, .span-13, .span-14, .span-15, .span-16, .span-17, .span-18, .span-19, .span-20, .span-21, .span-22, .span-23, .span-24 {
|
|
||||||
float: right;
|
|
||||||
margin-left: 10px;
|
|
||||||
margin-right: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.last {
|
.last {
|
||||||
margin-left: 0;
|
margin-left: 0;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
background-color: $brand-success;
|
background-color: $brand-success;
|
||||||
}
|
}
|
||||||
|
|
||||||
.span-3 {
|
.statistic {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 150px;
|
height: 150px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
|
|
||||||
|
|
@ -3,19 +3,17 @@
|
||||||
-# the COPYRIGHT file.
|
-# the COPYRIGHT file.
|
||||||
|
|
||||||
- content_for :page_title do
|
- content_for :page_title do
|
||||||
= t('.title')
|
= t(".title")
|
||||||
|
|
||||||
#section_header
|
#section_header
|
||||||
%h2
|
%h2
|
||||||
= t('.title')
|
= t(".title")
|
||||||
|
|
||||||
.span-18.last
|
|
||||||
#people_stream.stream.contacts
|
|
||||||
- if @contacts.size > 0
|
|
||||||
- for contact in @contacts
|
|
||||||
= render 'people/person', :person => contact.person, :contact => contact
|
|
||||||
= will_paginate @contacts, :renderer => WillPaginate::ActionView::BootstrapLinkRenderer
|
|
||||||
- else
|
|
||||||
%h3.no_contacts
|
|
||||||
= t('.no_contacts')
|
|
||||||
|
|
||||||
|
#people_stream.stream.contacts
|
||||||
|
- if @contacts.size > 0
|
||||||
|
- for contact in @contacts
|
||||||
|
= render "people/person", person: contact.person, contact: contact
|
||||||
|
= will_paginate @contacts, renderer: WillPaginate::ActionView::BootstrapLinkRenderer
|
||||||
|
- else
|
||||||
|
%h3.no_contacts
|
||||||
|
= t(".no_contacts")
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
.col-md-3
|
.statistic
|
||||||
.span-3
|
%h3{class: activated}
|
||||||
%h3{class: activated}
|
= name
|
||||||
= name
|
.data
|
||||||
.data
|
= value
|
||||||
= value
|
|
||||||
|
|
|
||||||
|
|
@ -5,18 +5,27 @@
|
||||||
.container-fluid
|
.container-fluid
|
||||||
.row
|
.row
|
||||||
%h1= t("_statistics")
|
%h1= t("_statistics")
|
||||||
= render "statistic", name: t("statistics.name"), value: @statistics.name, activated: "serv-enabled"
|
.col-md-3
|
||||||
= render "statistic", name: t("statistics.version"), value: @statistics.version, activated: "serv-enabled"
|
= render "statistic", name: t("statistics.name"), value: @statistics.name, activated: "serv-enabled"
|
||||||
= render "statistic", name: t("statistics.registrations"), value: registrations_status(@statistics), activated: registrations_status_class(@statistics)
|
.col-md-3
|
||||||
|
= render "statistic", name: t("statistics.version"), value: @statistics.version, activated: "serv-enabled"
|
||||||
|
.col-md-3
|
||||||
|
= render "statistic", name: t("statistics.registrations"), value: registrations_status(@statistics), activated: registrations_status_class(@statistics)
|
||||||
- if @statistics.expose_user_counts?
|
- if @statistics.expose_user_counts?
|
||||||
= render "statistic", name: t("statistics.total_users"), value: @statistics.total_users, activated: "serv-enabled"
|
.col-md-3
|
||||||
= render "statistic", name: t("statistics.active_users_halfyear"), value: @statistics.halfyear_users, activated: "serv-enabled"
|
= render "statistic", name: t("statistics.total_users"), value: @statistics.total_users, activated: "serv-enabled"
|
||||||
= render "statistic", name: t("statistics.active_users_monthly"), value: @statistics.monthly_users, activated: "serv-enabled"
|
.col-md-3
|
||||||
|
= render "statistic", name: t("statistics.active_users_halfyear"), value: @statistics.halfyear_users, activated: "serv-enabled"
|
||||||
|
.col-md-3
|
||||||
|
= render "statistic", name: t("statistics.active_users_monthly"), value: @statistics.monthly_users, activated: "serv-enabled"
|
||||||
- if @statistics.expose_posts_counts?
|
- if @statistics.expose_posts_counts?
|
||||||
= render "statistic", name: t("statistics.local_posts"), value: @statistics.local_posts, activated: "serv-enabled"
|
.col-md-3
|
||||||
|
= render "statistic", name: t("statistics.local_posts"), value: @statistics.local_posts, activated: "serv-enabled"
|
||||||
- if @statistics.expose_comment_counts?
|
- if @statistics.expose_comment_counts?
|
||||||
= render "statistic", name: t("statistics.local_comments"), value: @statistics.local_comments, activated: "serv-enabled"
|
.col-md-3
|
||||||
|
= render "statistic", name: t("statistics.local_comments"), value: @statistics.local_comments, activated: "serv-enabled"
|
||||||
.row
|
.row
|
||||||
%h1= t("statistics.services")
|
%h1= t("statistics.services")
|
||||||
- Configuration::KNOWN_SERVICES.each do |service|
|
- Configuration::KNOWN_SERVICES.each do |service|
|
||||||
= render "statistic", name: "#{service.capitalize}", value: service_status(service, @statistics.available_services), activated: service_class(service, @statistics.available_services)
|
.col-md-3
|
||||||
|
= render "statistic", name: "#{service.capitalize}", value: service_status(service, @statistics.available_services), activated: service_class(service, @statistics.available_services)
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
-# licensed under the Affero General Public License version 3 or later. See
|
-# licensed under the Affero General Public License version 3 or later. See
|
||||||
-# the COPYRIGHT file.
|
-# the COPYRIGHT file.
|
||||||
|
|
||||||
|
.row
|
||||||
#thumbnails.span-15.last
|
|
||||||
- for photo in photos
|
- for photo in photos
|
||||||
= link_to (image_tag photo.url(:thumb_large), "data-message-guid" => photo.status_message_guid ), person_photo_path(photo.author, photo)
|
.col-xs-12.col-sm-4
|
||||||
|
= link_to image_tag(photo.url(:thumb_large)), person_photo_path(photo.author, photo), class: "thumbnail"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue