Unverified Commit ddda2810 authored by flaburgan's avatar flaburgan Committed by Benjamin Neff

Clean up the footer links a bit

closes #7446
parent ea9e5008
......@@ -8,6 +8,7 @@
* 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)
* 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
......
......@@ -5,6 +5,11 @@ html {
body { margin-bottom: 150px; }
.powered-by-diaspora a {
color: $link-grey;
font-weight: bold;
}
footer.footer {
background-color: $background-grey;
border-top: 1px solid $border-grey;
......@@ -15,11 +20,6 @@ footer.footer {
position: absolute;
width: 100%;
.powered-by-diaspora {
color: $link-grey;
font-weight: bold;
}
ul#footer_nav {
margin: 0;
padding: 0;
......
......@@ -114,7 +114,8 @@
padding: 10px 20px 0;
.excellence-box,
.info-links {
.info-links,
.powered-box {
border-top: 1px solid $border-grey;
padding: 5px;
}
......@@ -175,7 +176,6 @@
ul {
list-style: none;
margin-bottom: 5px;
padding-left: 0;
}
......
%footer.footer
.container
.pull-left
.powered-by-diaspora
=t("layouts.application.powered_by")
.powered-by-diaspora.pull-left
= link_to t("layouts.application.powered_by"), "https://diasporafoundation.org"
%ul#footer_nav.pull-right
= render :partial =>'shared/links'
= render partial: "shared/links"
%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.whats_new"), changelog_url
%li= link_to t("layouts.header.code") + " " + pod_version,
source_url.to_s,
title: t("layouts.application.source_package")
%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?
%li= link_to(t("_terms"), terms_path)
%li= link_to t("_terms"), terms_path
......@@ -170,6 +170,11 @@
%ul
= render "shared/links"
.powered-box
.content
.powered-by-diaspora.text-center
= link_to t("layouts.application.powered_by"), "https://diasporafoundation.org"
.col-md-9
.stream_container#aspect_stream_container
= render "aspects/aspect_stream", stream: @stream
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment