Skip to content
Extraits de code Groupes Projets
Valider 55cb070a rédigé par Jonne Haß's avatar Jonne Haß
Parcourir les fichiers

add header to sign up page

parent ffc6c110
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -12,6 +12,7 @@
* Refactor people_controller#show and photos_controller#index [#4002](https://github.com/diaspora/diaspora/issues/4002)
* Modularize layout [#3944](https://github.com/diaspora/diaspora/pull/3944)
* Add header to the sign up page [#3944](https://github.com/diaspora/diaspora/pull/3944)
## Features
......
#registration {
position : absolute;
top : 0;
left : 0;
background-color : #afc652;
min-height : 100%;
......@@ -8,10 +7,6 @@
color : #fff;
.container {
margin-top : 100px;
}
#create-something-text {
font-family : Roboto-Light;
font-size : 100px;
......@@ -52,3 +47,55 @@
}
}
}
ul#landing_nav {
margin: 0;
padding: 0;
position: absolute;
top: 10px;
right: 20px;
> li {
display: inline;
margin-right: 0.5em;
&:last-child {
margin-right: 0;
}
a {
color: $blue;
&.login {
@include border-radius(5px);
@include box-shadow(0,1px,1px,#666);
padding: 5px 8px;
background-color: #000;
border-top: 1px solid #000;
&:hover {
background-color: #222;
}
}
}
text-shadow: 0 1px 0 #000;
}
}
body > header {
@include box-shadow(0,1px,3px,rgba(0,0,0,0.9));
background-color: rgb(40,35,35);
background-image: image-url('header-bg.png');
z-index: 1001;
padding: 6px 0;
color: #CCC;
height: 26px;
}
......@@ -5,7 +5,7 @@
class RegistrationsController < Devise::RegistrationsController
before_filter :check_registrations_open_or_vaild_invite!, :check_valid_invite!
layout "application", :only => [:new]
layout "with_header", :only => [:new]
before_filter -> { @css_framework = :bootstrap }, only: [:new]
def create
......
......@@ -5,7 +5,7 @@
%header
- unless current_user
.container{:style => "position:relative;"}
= link_to image_tag('branding/logo_small.png', :height => "16px", :width => "161px", :style => 'position:relative;top:5px;'), root_path
= link_to image_tag('branding/logo_small.png', :height => "16px", :width => "161px", :style => 'margin-left: 10px'), root_path
%ul#landing_nav
%li= link_to '@joindiaspora', "http://twitter.com/joindiaspora"
......
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