nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

split left column

Browse source
This commit is contained in:
Flaburgan 2016-03-21 15:24:03 +01:00
parent 5ff085afff
commit 847fdb0de9
4 changed files with 103 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/assets/stylesheets/navbar_left.scss
View file

@ -1,5 +1,6 @@
.left-navbar { .left-navbar {
padding: 0; padding: 0;
padding-bottom: 10px;
a { a {
text-decoration: none; text-decoration: none;
@ -101,8 +102,14 @@
} }
.info-bar { .info-bar {
margin-top: 20px;
padding: 10px 20px 0;
.info-links {
border-top: 1px solid $border-grey; border-top: 1px solid $border-grey;
padding: 0 20px; margin-top: 10px;
padding: 5px;
}
.section { .section {
margin-top: 10px; margin-top: 10px;

2
app/assets/stylesheets/stream.scss
View file

@ -17,7 +17,7 @@
} }
} }
@media(max-width: $screen-xs) { @media(max-width: $screen-xs-max) {
.main-stream-publisher .publisher { .main-stream-publisher .publisher {
margin-left: 0; margin-left: 0;

5
app/views/aspects/_aspect_stream.haml
View file

@ -11,8 +11,11 @@
= owner_image_link = owner_image_link
= render "publisher/publisher", publisher_aspects_for(stream) = render "publisher/publisher", publisher_aspects_for(stream)
.stream#main_stream{:title => popover_with_close_html("3. #{t('.stay_updated')}"), - if current_user.getting_started?
.stream#main_stream{:title => popover_with_close_html("3. #{t('.stay_updated')}"),
"data-content" => t(".stay_updated_explanation")} "data-content" => t(".stay_updated_explanation")}
- else
.stream#main_stream
#paginate #paginate
%span.loader.hidden %span.loader.hidden

4
app/views/streams/main_stream.html.haml
View file

@ -38,7 +38,7 @@
%li{data: {stream: "public"}} %li{data: {stream: "public"}}
= link_to t("streams.public.title"), public_stream_path, rel: "backbone", class: "hoverable" = link_to t("streams.public.title"), public_stream_path, rel: "backbone", class: "hoverable"
.info-bar.hidden-xs .sidebar.info-bar.hidden-xs
- if AppConfig.settings.invitations.open? - if AppConfig.settings.invitations.open?
.section.collapsed .section.collapsed
.title .title
@ -149,7 +149,7 @@
%p %p
= link_to t("aspects.index.help.mail_podmin"), "mailto:#{AppConfig.admins.podmin_email}" = link_to t("aspects.index.help.mail_podmin"), "mailto:#{AppConfig.admins.podmin_email}"
.info-bar .info-links
.content .content
%ul %ul
= render "shared/links" = render "shared/links"