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

Clean up the footer links a bit

Browse source 
closes #7446
This commit is contained in:
flaburgan 2017-06-18 13:00:41 +02:00 committed by Benjamin Neff
parent ea9e50085d
commit ddda28102c
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
6 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -8,6 +8,7 @@
* Change email without confirmation when mail is disabled [#7455](https://github.com/diaspora/diaspora/pull/7455) * Change email without confirmation when mail is disabled [#7455](https://github.com/diaspora/diaspora/pull/7455)
* Warn users if they leave the profile editing page with unsaved changes [#7473](https://github.com/diaspora/diaspora/pull/7473) * Warn users if they leave the profile editing page with unsaved changes [#7473](https://github.com/diaspora/diaspora/pull/7473)
* Add admin pages to the mobile interface [#7295](https://github.com/diaspora/diaspora/pull/7295) * Add admin pages to the mobile interface [#7295](https://github.com/diaspora/diaspora/pull/7295)
* Add links to discourse to footer and sidebar [#7446](https://github.com/diaspora/diaspora/pull/7446)
# 0.6.6.0 # 0.6.6.0

10
app/assets/stylesheets/footer.scss
View file

@ -5,6 +5,11 @@ html {
body { margin-bottom: 150px; } body { margin-bottom: 150px; }
.powered-by-diaspora a {
color: $link-grey;
font-weight: bold;
}
footer.footer { footer.footer {
background-color: $background-grey; background-color: $background-grey;
border-top: 1px solid $border-grey; border-top: 1px solid $border-grey;
@ -15,11 +20,6 @@ footer.footer {
position: absolute; position: absolute;
width: 100%; width: 100%;
.powered-by-diaspora {
color: $link-grey;
font-weight: bold;
}
ul#footer_nav { ul#footer_nav {
margin: 0; margin: 0;
padding: 0; padding: 0;

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

@ -114,7 +114,8 @@
padding: 10px 20px 0; padding: 10px 20px 0;
.excellence-box, .excellence-box,
.info-links { .info-links,
.powered-box {
border-top: 1px solid $border-grey; border-top: 1px solid $border-grey;
padding: 5px; padding: 5px;
} }
@ -175,7 +176,6 @@
ul { ul {
list-style: none; list-style: none;
margin-bottom: 5px;
padding-left: 0; padding-left: 0;
} }

7
app/views/layouts/_footer.html.haml
View file

@ -1,7 +1,6 @@
%footer.footer %footer.footer
.container .container
.pull-left .powered-by-diaspora.pull-left
.powered-by-diaspora = link_to t("layouts.application.powered_by"), "https://diasporafoundation.org"
=t("layouts.application.powered_by")
%ul#footer_nav.pull-right %ul#footer_nav.pull-right
= render :partial =>'shared/links' = render partial: "shared/links"

6
app/views/shared/_links.haml
View file

@ -1,11 +1,9 @@
%li= link_to "diasporafoundation.org", "https://diasporafoundation.org"
%li= link_to "Wiki", "https://wiki.diasporafoundation.org"
%li= link_to t("layouts.application.discourse"), "https://discourse.diasporafoundation.org" %li= link_to t("layouts.application.discourse"), "https://discourse.diasporafoundation.org"
%li= link_to t("layouts.application.whats_new"), changelog_url %li= link_to t("layouts.application.whats_new"), changelog_url
%li= link_to t("layouts.header.code") + " " + pod_version, %li= link_to t("layouts.header.code") + " " + pod_version,
source_url.to_s, source_url.to_s,
title: t("layouts.application.source_package") title: t("layouts.application.source_package")
%li= link_to t("layouts.application.statistics_link"), statistics_path %li= link_to t("layouts.application.statistics_link"), statistics_path
%li= link_to(t("layouts.application.toggle"), toggle_mobile_path) %li= link_to t("layouts.application.toggle"), toggle_mobile_path
- if AppConfig.settings.terms.enable? - if AppConfig.settings.terms.enable?
%li= link_to(t("_terms"), terms_path) %li= link_to t("_terms"), terms_path

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

@ -170,6 +170,11 @@
%ul %ul
= render "shared/links" = render "shared/links"
.powered-box
.content
.powered-by-diaspora.text-center
= link_to t("layouts.application.powered_by"), "https://diasporafoundation.org"
.col-md-9 .col-md-9
.stream_container#aspect_stream_container .stream_container#aspect_stream_container
= render "aspects/aspect_stream", stream: @stream = render "aspects/aspect_stream", stream: @stream