nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:diaspora/diaspora_rails

Browse source
This commit is contained in:
Raphael 2010-07-01 17:13:17 -07:00
commit 80b69fd3ec
3 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/views/layouts/session_wall.html.haml
View file

@ -11,6 +11,12 @@
/= javascript_include_tag"http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" /= javascript_include_tag"http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"
= javascript_include_tag 'jquery142' = javascript_include_tag 'jquery142'
= csrf_meta_tag
= yield(:head)
%body
.container
:plain :plain
<!--[if lt IE 8]> <!--[if lt IE 8]>
<div style='border: 1px solid #F7941D; background: #FEEFDA; text-align: center; clear: both; height: 75px; position: relative;'> <div style='border: 1px solid #F7941D; background: #FEEFDA; text-align: center; clear: both; height: 75px; position: relative;'>
@ -30,11 +36,7 @@
<![endif]--> <![endif]-->
= csrf_meta_tag
= yield(:head)
%body
.container
- flash.each do |name, msg| - flash.each do |name, msg|
= content_tag :div, msg, :id => "flash_#{name}" = content_tag :div, msg, :id => "flash_#{name}"
- if User.first - if User.first

2
config/routes.rb
View file

@ -1,4 +1,4 @@
lsDiaspora::Application.routes.draw do |map| Diaspora::Application.routes.draw do |map|
resources :blogs resources :blogs
resources :bookmarks resources :bookmarks
resources :friends resources :friends

1
public/stylesheets/application.css
View file

@ -137,7 +137,6 @@ h1 {
line-height: 36px; } line-height: 36px; }
h1 p.description, h1 span.description { h1 p.description, h1 span.description {
font-weight: 200; font-weight: 200;
font-family: "helvetica neue", "lucida grande", "sans-serif";
color: #999999; color: #999999;
padding: 0.1em; } padding: 0.1em; }