add the footer to the SPV
This commit is contained in:
parent
039cf4dea1
commit
0012a82f48
5 changed files with 49 additions and 43 deletions
|
|
@ -6,6 +6,7 @@
|
|||
|
||||
@import 'sidebar'
|
||||
@import 'header'
|
||||
@import 'footer'
|
||||
@import 'sprites'
|
||||
@import 'opengraph'
|
||||
|
||||
|
|
@ -1154,47 +1155,6 @@ ul#request_result
|
|||
:top 2px
|
||||
:right 1em
|
||||
|
||||
footer
|
||||
:width 100%
|
||||
:left 0
|
||||
:bottom 0
|
||||
:color #999
|
||||
|
||||
.container
|
||||
:margin
|
||||
:top 4em
|
||||
:padding 0
|
||||
:top 0.5em
|
||||
:border
|
||||
:top 1px solid #ddd
|
||||
|
||||
.branding-powered_by_diaspora
|
||||
:display inline-block
|
||||
:margin-top 3px
|
||||
:height 11px
|
||||
:width 145px
|
||||
|
||||
ul#footer_nav
|
||||
:margin 0
|
||||
:padding 0
|
||||
:display inline-block
|
||||
:float right
|
||||
|
||||
> li
|
||||
:display inline
|
||||
:margin
|
||||
:right 1em
|
||||
|
||||
&.separator
|
||||
:margin-left -.35em
|
||||
:margin-right .65em
|
||||
@include opacity(.6)
|
||||
|
||||
&:last-child
|
||||
:margin 0
|
||||
a
|
||||
:color #777
|
||||
|
||||
#signup_field
|
||||
:margin
|
||||
:top -200px
|
||||
|
|
|
|||
46
app/assets/stylesheets/footer.css.scss
Normal file
46
app/assets/stylesheets/footer.css.scss
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
footer {
|
||||
width: 100%;
|
||||
left: 0;
|
||||
bottom: 0;
|
||||
color: #999;
|
||||
|
||||
.container {
|
||||
width: 95%;
|
||||
margin: 4em auto 0 auto;
|
||||
padding: 0.5em 0 1em 0;
|
||||
border-top: 1px solid #ddd;
|
||||
}
|
||||
|
||||
.branding-powered_by_diaspora {
|
||||
display: inline-block;
|
||||
margin-top: 3px;
|
||||
height: 11px;
|
||||
width: 145px;
|
||||
}
|
||||
|
||||
ul#footer_nav {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
display: inline-block;
|
||||
float: right;
|
||||
|
||||
> li {
|
||||
display: inline;
|
||||
margin-right: 1em;
|
||||
|
||||
&.separator {
|
||||
margin-left: -.35em;
|
||||
margin-right: .65em;
|
||||
@include opacity(.6);
|
||||
}
|
||||
|
||||
&:last-child {
|
||||
margin: 0;
|
||||
}
|
||||
}
|
||||
|
||||
a {
|
||||
color: #777;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -21,6 +21,7 @@
|
|||
|
||||
/* new SPV */
|
||||
@import 'header';
|
||||
@import 'footer';
|
||||
@import 'bootstrap-headerfix';
|
||||
@import 'opengraph';
|
||||
@import 'single-post-view';
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
#single-post-container {
|
||||
padding-top: 20px;
|
||||
padding-bottom: 3em;
|
||||
}
|
||||
|
||||
#single-post-content {
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ class PostsController < ApplicationController
|
|||
mark_corresponding_notifications_read if user_signed_in?
|
||||
|
||||
respond_to do |format|
|
||||
format.html{ gon.post = PostPresenter.new(@post, current_user); render 'posts/show', layout: 'with_header' }
|
||||
format.html{ gon.post = PostPresenter.new(@post, current_user); render 'posts/show', layout: 'with_header_with_footer' }
|
||||
format.xml{ render :xml => @post.to_diaspora_xml }
|
||||
format.mobile{render 'posts/show' }
|
||||
format.json{ render :json => PostPresenter.new(@post, current_user) }
|
||||
|
|
|
|||
Loading…
Reference in a new issue