diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
index 168352b0c..1840d7acc 100644
--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
@@ -1,14 +1,11 @@
= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
-
#user
-
%p.username
= f.label :username
= f.text_field :username
%p.user_network
="@#{request.host}"
-
%p
= f.label :password
= f.password_field :password
diff --git a/app/views/layouts/session_wall.html.haml b/app/views/layouts/session_wall.html.haml
index 989bf061f..945ddab92 100644
--- a/app/views/layouts/session_wall.html.haml
+++ b/app/views/layouts/session_wall.html.haml
@@ -2,20 +2,19 @@
%html
%head
%title
- = "diaspora"
+ DIASPORA | login
%meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/
%meta{"http-equiv"=> "X-UA-Compatible", :content =>"chrome=1" }
- = stylesheet_link_tag "blueprint/screen", :media => 'screen'
= stylesheet_link_tag "sessions"
/= javascript_include_tag"http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"
= javascript_include_tag 'jquery142', 'google'
= javascript_include_tag 'jquery.infieldlabel'
- = javascript_include_tag 'session_wall.js'
:javascript
$(document).ready(function(){
- $("#user_email").focus();
+ $("#user_username").focus();
+ $("label").inFieldLabels();
});
= csrf_meta_tag
@@ -44,7 +43,7 @@
- flash.each do |name, msg|
= content_tag :div, msg, :id => "flash_#{name}"
%div#huge_text
- diaspora
+ DIASPORA*
= yield
/= link_to "signup", "/signup"
diff --git a/public/javascripts/photos.js b/public/javascripts/photos.js
deleted file mode 100644
index 8b1378917..000000000
--- a/public/javascripts/photos.js
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/public/javascripts/session_wall.js b/public/javascripts/session_wall.js
deleted file mode 100644
index fd8636236..000000000
--- a/public/javascripts/session_wall.js
+++ /dev/null
@@ -1,5 +0,0 @@
-
-$(document).ready(function(){
- $("label").inFieldLabels();
-});
-
diff --git a/public/javascripts/stream.js b/public/javascripts/stream.js
index 82d971f3e..d1d91351a 100644
--- a/public/javascripts/stream.js
+++ b/public/javascripts/stream.js
@@ -1,11 +1,10 @@
$(document).ready(function(){
-
$('.comment_set').each(function(index) {
var $this = $(this);
if($this.children().length > 1) {
- var show_comments_toggle = $this.parent().prev().children(".show_post_comments");
- show_comments_toggle.click();
- };
+ var show_comments_toggle = $this.parent().prev().children(".show_post_comments");
+ show_comments_toggle.click();
+ }
});
});//end document ready
@@ -19,12 +18,15 @@ $("#stream li").live('mouseout',function() {
$(".show_post_comments").live('click', function(event) {
event.preventDefault();
- if( $(this).hasClass( "visible")) {
- $(this).html($(this).html().replace("hide", "show"));
- $(this).closest("li").children(".content").children(".comments").fadeOut(100);
+
+ var $this = $(this);
+
+ if( $this.hasClass( "visible")) {
+ $this.html($(this).html().replace("hide", "show"));
+ $this.closest("li").children(".content").children(".comments").fadeOut(100);
} else {
- $(this).html($(this).html().replace("show", "hide"));
- $(this).closest("li").children(".content").children(".comments").fadeIn(100);
+ $this.html($(this).html().replace("show", "hide"));
+ $this.closest("li").children(".content").children(".comments").fadeIn(100);
}
$(this).toggleClass( "visible" );
});
diff --git a/public/stylesheets/sass/sessions.sass b/public/stylesheets/sass/sessions.sass
index 34602615e..1ed00a615 100644
--- a/public/stylesheets/sass/sessions.sass
+++ b/public/stylesheets/sass/sessions.sass
@@ -1,28 +1,37 @@
-body
- :padding 2em
+@font-face
+ :font-family 'BrandonGrotesqueLightRegular'
+ :src url('brandongrotesque_light/Brandon_light-webfont.eot')
+ :src local('☺'), url('brandongrotesque_light/Brandon_light-webfont.woff') format('woff'), url('brandongrotesque_light/Brandon_light-webfont.ttf') format('truetype'), url('brandongrotesque_light/Brandon_light-webfont.svg#webfont') format('svg')
+ font
+ :weight normal
+ :style normal
+
+
+html /* via blueprint */
+ :font
+ :size 100.01%
+
+body /* via blueprint */
+ :font
+ :size 75%
+ :family "Helvetica Neue", Arial, Helvetica, sans-serif
+ :color #222
+ :background #fff
+
+ :margin
+ :left 2em
#huge_text
- :display inline block
:font
:size 40px
- :weight bold
+ :family 'BrandonGrotesqueLightRegular'
:line-height 120px
- :letter
- :spacing -2px
- :color #eaeaea
+ :color #333
:text-shadow 0 1px 1px #999
- span
- :display inline
- :color #666
-
input
:font
- :size 30px
- :width 200px
- :margin
- :bottom 0
- :top 0
+ :size 14px
form p
:position relative
@@ -31,8 +40,9 @@ form p
label
:color #999
:position absolute
- :top 3px
- :left 0.48em
+ :padding
+ :top 7px
+ :left 8px
:font
:size 14px
:weight normal
@@ -40,18 +50,10 @@ label
input[type='text'],
input[type='password']
:font
- :family 'lucida grande', 'sans-serif'
- :size 14px
+ :family "Helvetica Neue", Arial, Helvetica, sans-serif
:padding 0.3em
- :display block
:width 395px
- :box-shadow 0 2px 0px #fff
- :-webkit-box-shadow 0 2px 0px #fff
- :-moz-box-shadow 0 2px 0px #fff
:border-top 1px solid #999
- :height auto
- :border-radius 3px
- :-moz-border-radius 3px
#user
:display inline
diff --git a/public/stylesheets/sessions.css b/public/stylesheets/sessions.css
index f4c48299b..60ad0f519 100644
--- a/public/stylesheets/sessions.css
+++ b/public/stylesheets/sessions.css
@@ -1,23 +1,30 @@
+@font-face {
+ font-family: "BrandonGrotesqueLightRegular";
+ src: url("brandongrotesque_light/Brandon_light-webfont.eot");
+ src: local("☺"), url("brandongrotesque_light/Brandon_light-webfont.woff") format("woff"), url("brandongrotesque_light/Brandon_light-webfont.ttf") format("truetype"), url("brandongrotesque_light/Brandon_light-webfont.svg#webfont") format("svg");
+ font {
+ weight: normal;
+ style: normal; } }
+
+html {
+ font-size: 100.01%; }
+
body {
- padding: 2em; }
+ font-size: 75%;
+ font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
+ color: #222222;
+ background: white;
+ margin-left: 2em; }
#huge_text {
- display: inline block;
font-size: 40px;
- font-weight: bold;
+ font-family: "BrandonGrotesqueLightRegular";
line-height: 120px;
- letter-spacing: -2px;
- color: #eaeaea;
+ color: #333333;
text-shadow: 0 1px 1px #999999; }
- #huge_text span {
- display: inline;
- color: #666666; }
input {
- font-size: 30px;
- width: 200px;
- margin-bottom: 0;
- margin-top: 0; }
+ font-size: 14px; }
form p {
position: relative;
@@ -26,25 +33,17 @@ form p {
label {
color: #999999;
position: absolute;
- top: 3px;
- left: 0.48em;
+ padding-top: 7px;
+ left: 8px;
font-size: 14px;
font-weight: normal; }
input[type='text'],
input[type='password'] {
- font-family: "lucida grande", "sans-serif";
- font-size: 14px;
+ font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
padding: 0.3em;
- display: block;
width: 395px;
- box-shadow: 0 2px 0px white;
- -webkit-box-shadow: 0 2px 0px white;
- -moz-box-shadow: 0 2px 0px white;
- border-top: 1px solid #999999;
- height: auto;
- border-radius: 3px;
- -moz-border-radius: 3px; }
+ border-top: 1px solid #999999; }
#user {
display: inline;