Skip to content
Extraits de code Groupes Projets
Valider 0012a82f rédigé par Jonne Haß's avatar Jonne Haß Validation de Roger Braun
Parcourir les fichiers

add the footer to the SPV

parent 039cf4de
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
@import 'sidebar' @import 'sidebar'
@import 'header' @import 'header'
@import 'footer'
@import 'sprites' @import 'sprites'
@import 'opengraph' @import 'opengraph'
...@@ -1154,47 +1155,6 @@ ul#request_result ...@@ -1154,47 +1155,6 @@ ul#request_result
:top 2px :top 2px
:right 1em :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 #signup_field
:margin :margin
:top -200px :top -200px
......
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 @@ ...@@ -21,6 +21,7 @@
/* new SPV */ /* new SPV */
@import 'header'; @import 'header';
@import 'footer';
@import 'bootstrap-headerfix'; @import 'bootstrap-headerfix';
@import 'opengraph'; @import 'opengraph';
@import 'single-post-view'; @import 'single-post-view';
#single-post-container { #single-post-container {
padding-top: 20px; padding-top: 20px;
padding-bottom: 3em;
} }
#single-post-content { #single-post-content {
......
...@@ -26,7 +26,7 @@ class PostsController < ApplicationController ...@@ -26,7 +26,7 @@ class PostsController < ApplicationController
mark_corresponding_notifications_read if user_signed_in? mark_corresponding_notifications_read if user_signed_in?
respond_to do |format| 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.xml{ render :xml => @post.to_diaspora_xml }
format.mobile{render 'posts/show' } format.mobile{render 'posts/show' }
format.json{ render :json => PostPresenter.new(@post, current_user) } format.json{ render :json => PostPresenter.new(@post, current_user) }
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter