Merge branch 'master' of github.com:diaspora/diaspora into salmon
This commit is contained in:
Raphael
commit
d0de8b4988
24 changed files with 240 additions and 214 deletions
|
|
@ -5,7 +5,7 @@ class GroupsController < ApplicationController
|
|||
respond_to :json, :only => :show
|
||||
|
||||
def index
|
||||
@posts = current_user.visible_posts(:by_members_of => :all).paginate :page => params[:page], :order => 'created_at DESC'
|
||||
@posts = current_user.visible_posts(:by_members_of => :all).paginate :page => params[:page], :per_page => 15, :order => 'created_at DESC'
|
||||
@group = :all
|
||||
end
|
||||
|
||||
|
|
@ -27,7 +27,7 @@ class GroupsController < ApplicationController
|
|||
def show
|
||||
@group = Group.find_by_id params[:id]
|
||||
@friends = @group.people
|
||||
@posts = current_user.visible_posts( :by_members_of => @group ).paginate :order => 'created_at DESC'
|
||||
@posts = current_user.visible_posts( :by_members_of => @group ).paginate :per_page => 15, :order => 'created_at DESC'
|
||||
|
||||
respond_with @group
|
||||
end
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ class UsersController < ApplicationController
|
|||
def show
|
||||
@user = User.find_by_id params[:id]
|
||||
@user_profile = @user.person.profile
|
||||
|
||||
respond_with @user
|
||||
end
|
||||
|
||||
|
|
@ -21,6 +20,6 @@ class UsersController < ApplicationController
|
|||
def update
|
||||
@user = User.find_by_id params[:id]
|
||||
@user.update_profile params[:user]
|
||||
respond_with @user
|
||||
respond_with(@user, :location => root_url)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -4,7 +4,9 @@
|
|||
$("#add_album_button").fancybox();
|
||||
});
|
||||
|
||||
.back= link_to "⇧ home", root_path
|
||||
= content_for :page_title do
|
||||
= link_to "Albums", albums_path
|
||||
|
||||
%h1.big_text
|
||||
Albums
|
||||
.right
|
||||
|
|
|
|||
|
|
@ -5,19 +5,16 @@
|
|||
});
|
||||
});
|
||||
|
||||
= content_for :page_title do
|
||||
= link_to @album.name, @album
|
||||
|
||||
|
||||
.album_id{:id => @album.id, :style => "display:hidden;"}
|
||||
.back= link_to '⇧ albums', albums_path
|
||||
%h1.big_text
|
||||
|
||||
%h1.big_text
|
||||
= @album.name
|
||||
|
||||
-if current_user.owns? @album
|
||||
.right
|
||||
#add_photo_loader
|
||||
= image_tag 'ajax-loader.gif'
|
||||
= link_to 'Add Photos', '#new_photo_pane', :class => 'button', :id => "add_photo_button"
|
||||
|
||||
-if current_user.owns? @album
|
||||
=render 'photos/new_photo'
|
||||
|
||||
.yo{:style => "display:none;"}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,10 @@
|
|||
= 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
|
||||
@tom.joindiaspora.com
|
||||
|
||||
="@#{request.host}"
|
||||
|
||||
%p
|
||||
= f.label :password
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
%h1
|
||||
stream for
|
||||
= link_to 'everybody', root_path
|
||||
= render "shared/publisher", :group_ids => :all
|
||||
- content_for :page_title do
|
||||
Home
|
||||
|
||||
%ul#stream
|
||||
- for post in @posts
|
||||
= render type_partial(post), :post => post unless post.class == Album
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
%h1
|
||||
stream for
|
||||
= link_to @group.name, @group
|
||||
= render "shared/publisher", :group_ids => :all
|
||||
- content_for :page_title do
|
||||
Home
|
||||
|
||||
%ul#stream
|
||||
- for post in @posts
|
||||
= render type_partial(post), :post => post
|
||||
|
|
|
|||
|
|
@ -50,19 +50,29 @@
|
|||
= owner_image_tag
|
||||
= link_to current_user.real_name, current_user.person
|
||||
%li.requests= link_to "requests (#{@request_count})", requests_path, :class => new_request(@request_count)
|
||||
%li.settings= link_to "settings", edit_user_path(current_user)
|
||||
%li.settings= link_to "edit profile", edit_user_path(current_user)
|
||||
%li.logout= link_to "logout", destroy_user_session_path
|
||||
|
||||
= render "shared/group_nav"
|
||||
|
||||
#group_header
|
||||
.container
|
||||
.span-5.last
|
||||
- if @group == :all
|
||||
%h1
|
||||
= link_to "All Groups", root_path
|
||||
- else
|
||||
%h1
|
||||
= link_to @group.name, @group
|
||||
|
||||
.page_title
|
||||
= yield :page_title
|
||||
|
||||
.span-19.last
|
||||
= render "shared/publisher", :group_ids => :all
|
||||
|
||||
.container
|
||||
.span-5.last
|
||||
%h1
|
||||
- if @group == :all
|
||||
= link_to "Everybody", root_path
|
||||
- else
|
||||
= link_to @group.name, @group
|
||||
|
||||
= render "shared/group_friends"
|
||||
|
||||
.span-19.last
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -10,8 +10,10 @@
|
|||
}
|
||||
});
|
||||
|
||||
= content_for :page_title do
|
||||
= link_to "Photo", @photo
|
||||
|
||||
|
||||
.back= link_to "⇧ #{@album.name}", album_path(@album)
|
||||
%h1.big_text
|
||||
= @photo.image
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#debug_info
|
||||
%h5 DEBUG INFO
|
||||
#debug_more
|
||||
#debug_more{ :style => "display:none;" }
|
||||
%ul
|
||||
%li
|
||||
%b params
|
||||
|
|
|
|||
|
|
@ -17,3 +17,4 @@
|
|||
.yo{ :style => "display:none;"}
|
||||
#add_group_pane
|
||||
= render "groups/new_group"
|
||||
|
||||
|
|
|
|||
|
|
@ -6,11 +6,12 @@
|
|||
%p
|
||||
%label{:for => "status_message_message"} Message
|
||||
= f.text_area :message, :rows => 2
|
||||
|
||||
%ul.group_selector
|
||||
|
||||
%ul.group_selector{ :style => "display:none;"}
|
||||
going to...
|
||||
- for group in @groups
|
||||
%li
|
||||
= check_box_tag("group_ids[]", group.id, @group == :all || current_group?(group) )
|
||||
= group.name
|
||||
= f.submit "Post"
|
||||
|
||||
= f.submit "Share"
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
- title "New User"
|
||||
|
||||
= form_for @user do |f|
|
||||
= f.error_messages
|
||||
%p
|
||||
= f.label :password
|
||||
%br
|
||||
= f.password_field :password
|
||||
%p
|
||||
= f.submit
|
||||
|
||||
|
||||
%p= link_to "Back to List", users_path
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
.span-20.last
|
||||
%h1= "#{@user.real_name}"
|
||||
- if @user_profile
|
||||
%p
|
||||
%b url
|
||||
%p
|
||||
= @user.url
|
||||
%p
|
||||
%b Serialized Key
|
||||
%p
|
||||
= @user.serialized_key
|
||||
|
|
@ -1 +0,0 @@
|
|||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
|
||||
$(document).ready(function(){
|
||||
$("label").inFieldLabels();
|
||||
});
|
||||
|
||||
|
|
@ -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" );
|
||||
});
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ a {
|
|||
#flash_notice,
|
||||
#flash_error,
|
||||
#flash_alert {
|
||||
z-index: 3;
|
||||
z-index: 100;
|
||||
top: 32px;
|
||||
position: absolute;
|
||||
color: black;
|
||||
|
|
@ -75,8 +75,9 @@ header {
|
|||
color: black;
|
||||
background-color: #333333;
|
||||
padding: 0;
|
||||
border-bottom: 1px solid #555555; }
|
||||
border-bottom: 1px solid #cccccc; }
|
||||
header #diaspora_text {
|
||||
z-index: 6;
|
||||
position: absolute;
|
||||
display: inline;
|
||||
font-family: "BrandonGrotesqueLightRegular";
|
||||
|
|
@ -95,9 +96,26 @@ header {
|
|||
position: relative;
|
||||
display: inline;
|
||||
float: right;
|
||||
z-index: 3;
|
||||
padding-right: 10px; }
|
||||
header #session_action a.new_requests {
|
||||
color: #df0101; }
|
||||
header #group_header {
|
||||
z-index: 5;
|
||||
text-shadow: 0 2px 0 white;
|
||||
background-color: #eeeeee;
|
||||
border-top: 1px solid #555555;
|
||||
height: 85px; }
|
||||
header #group_header h1 {
|
||||
margin-bottom: 0;
|
||||
margin-top: 15px; }
|
||||
header #group_header a {
|
||||
color: #111111; }
|
||||
header #group_header a:hover {
|
||||
background: none;
|
||||
color: #333333; }
|
||||
header #group_header .page_title {
|
||||
text-transform: uppercase; }
|
||||
|
||||
#show_filters {
|
||||
z-index: 100;
|
||||
|
|
@ -120,6 +138,8 @@ ul#stream {
|
|||
list-style: none;
|
||||
padding: 12px 0;
|
||||
border-bottom: 1px solid #eeeeee; }
|
||||
ul#stream > li:first-child {
|
||||
padding-top: 0; }
|
||||
|
||||
li.message {
|
||||
position: relative;
|
||||
|
|
@ -282,7 +302,10 @@ ul.comment_set {
|
|||
font-size: larger; }
|
||||
|
||||
#debug_info {
|
||||
margin-top: 20px; }
|
||||
margin-top: 20px;
|
||||
color: #cccccc; }
|
||||
#debug_info h5 {
|
||||
color: #cccccc; }
|
||||
|
||||
input[type='text'], textarea {
|
||||
font-family: "lucida grande", "sans-serif";
|
||||
|
|
@ -313,8 +336,7 @@ label {
|
|||
color: #999999;
|
||||
position: relative;
|
||||
height: 63px;
|
||||
margin-bottom: 10px;
|
||||
border-bottom: 1px solid #666666; }
|
||||
margin-top: 20px; }
|
||||
#publisher .avatar {
|
||||
float: left;
|
||||
margin-right: 15px; }
|
||||
|
|
@ -326,31 +348,12 @@ label {
|
|||
#publisher form input[type='submit'] {
|
||||
float: right;
|
||||
margin-right: 20px;
|
||||
margin-top: 28px; }
|
||||
margin-top: 26px; }
|
||||
#publisher textarea {
|
||||
width: 485px;
|
||||
width: 600px;
|
||||
height: 40px;
|
||||
margin-top: 0; }
|
||||
#publisher ul.group_selector {
|
||||
left: 510px;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
width: 110px;
|
||||
z-index: 10;
|
||||
position: absolute;
|
||||
height: auto;
|
||||
overflow: visible;
|
||||
list-style: none; }
|
||||
#publisher ul.group_selector > li {
|
||||
height: auto;
|
||||
font-size: smaller;
|
||||
padding: 2px;
|
||||
display: none;
|
||||
background-color: #eeeeee; }
|
||||
#publisher ul.group_selector > li:active {
|
||||
background-color: yellow; }
|
||||
#publisher ul.group_selector:hover li {
|
||||
display: block; }
|
||||
margin-top: 0;
|
||||
-webkit-box-shadow: 0 1px 0 white; }
|
||||
#publisher .button {
|
||||
margin-left: 100px; }
|
||||
|
||||
|
|
@ -484,15 +487,15 @@ h1.big_text {
|
|||
background-color: #444444; }
|
||||
#group_nav ul > li:hover a {
|
||||
color: #999999; }
|
||||
#group_nav ul .selected {
|
||||
font-weight: bold;
|
||||
background-color: white;
|
||||
border-bottom: 1px solid white;
|
||||
color: black; }
|
||||
#group_nav ul .selected:hover {
|
||||
background-color: #eeeeee; }
|
||||
#group_nav ul .selected a {
|
||||
#group_nav ul > li.selected {
|
||||
font-weight: bold;
|
||||
background-color: #eeeeee;
|
||||
border-bottom: 1px solid #eeeeee;
|
||||
color: black; }
|
||||
#group_nav ul > li.selected:hover {
|
||||
background-color: #efefef; }
|
||||
#group_nav ul > li.selected a {
|
||||
color: black; }
|
||||
|
||||
#add_photo_loader {
|
||||
position: absolute;
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ a
|
|||
#flash_notice,
|
||||
#flash_error,
|
||||
#flash_alert
|
||||
:z-index 3
|
||||
:z-index 100
|
||||
:top 32px
|
||||
:position absolute
|
||||
:color #000
|
||||
|
|
@ -82,9 +82,10 @@ header
|
|||
:color #333
|
||||
:padding 0
|
||||
:border
|
||||
:bottom 1px solid #555
|
||||
:bottom 1px solid #ccc
|
||||
|
||||
#diaspora_text
|
||||
:z-index 6
|
||||
:position absolute
|
||||
:display inline
|
||||
:font
|
||||
|
|
@ -109,11 +110,37 @@ header
|
|||
:position relative
|
||||
:display inline
|
||||
:float right
|
||||
:z-index 3
|
||||
a
|
||||
&.new_requests
|
||||
:color #DF0101
|
||||
:padding-right 10px
|
||||
|
||||
#group_header
|
||||
:z-index 5
|
||||
:text-shadow 0 2px 0 #fff
|
||||
:background
|
||||
:color #eee
|
||||
:border
|
||||
:top 1px solid #555
|
||||
:height 85px
|
||||
|
||||
h1
|
||||
:margin
|
||||
:bottom 0
|
||||
:top 15px
|
||||
|
||||
a
|
||||
:color #111
|
||||
&:hover
|
||||
:background none
|
||||
:color #333
|
||||
|
||||
.page_title
|
||||
:text
|
||||
:transform uppercase
|
||||
|
||||
|
||||
#show_filters
|
||||
:z-index 100
|
||||
:position absolute
|
||||
|
|
@ -136,6 +163,10 @@ ul#stream
|
|||
:border
|
||||
:bottom 1px solid #eee
|
||||
|
||||
> li:first-child
|
||||
:padding
|
||||
:top 0
|
||||
|
||||
li.message
|
||||
:position relative
|
||||
:line-height 140%
|
||||
|
|
@ -349,6 +380,10 @@ ul.comment_set
|
|||
|
||||
#debug_info
|
||||
:margin-top 20px
|
||||
:color #ccc
|
||||
|
||||
h5
|
||||
:color #ccc
|
||||
|
||||
|
||||
input[type='text'], textarea
|
||||
|
|
@ -385,9 +420,7 @@ label
|
|||
:position relative
|
||||
:height 63px
|
||||
:margin
|
||||
:bottom 10px
|
||||
:border
|
||||
:bottom 1px solid #666
|
||||
:top 20px
|
||||
|
||||
.avatar
|
||||
:float left
|
||||
|
|
@ -397,7 +430,7 @@ label
|
|||
p
|
||||
:position absolute
|
||||
:left 0
|
||||
|
||||
|
||||
form
|
||||
:display inline
|
||||
|
||||
|
|
@ -405,41 +438,16 @@ label
|
|||
:float right
|
||||
:margin
|
||||
:right 20px
|
||||
:top 28px
|
||||
:top 26px
|
||||
|
||||
textarea
|
||||
:width 485px
|
||||
:width 600px
|
||||
:height 40px
|
||||
:margin
|
||||
:top 0
|
||||
|
||||
ul.group_selector
|
||||
:left 510px
|
||||
:padding 0
|
||||
:margin 0
|
||||
:width 110px
|
||||
:z-index 10
|
||||
:position absolute
|
||||
:height auto
|
||||
:overflow visible
|
||||
:list
|
||||
:style none
|
||||
:-webkit-box-shadow 0 1px 0 #fff
|
||||
|
||||
> li
|
||||
:height auto
|
||||
:font-size smaller
|
||||
:padding 2px
|
||||
:display none
|
||||
:background
|
||||
:color #eee
|
||||
|
||||
&:active
|
||||
:background
|
||||
:color yellow
|
||||
|
||||
&:hover li
|
||||
:display block
|
||||
|
||||
.button
|
||||
:margin-left 100px
|
||||
|
||||
|
|
@ -570,6 +578,7 @@ h1.big_text
|
|||
:position relative
|
||||
:color #000
|
||||
|
||||
|
||||
#group_edit_button
|
||||
:display inline
|
||||
:margin
|
||||
|
|
@ -601,7 +610,6 @@ h1.big_text
|
|||
:margin
|
||||
:right 0.5em
|
||||
:padding 3px 8px
|
||||
|
||||
:border 1px solid #555
|
||||
|
||||
&.last-child
|
||||
|
|
@ -621,21 +629,19 @@ h1.big_text
|
|||
a
|
||||
:color #999
|
||||
|
||||
|
||||
|
||||
.selected
|
||||
:font
|
||||
:weight bold
|
||||
:background
|
||||
:color #fff
|
||||
:border
|
||||
:bottom 1px solid #fff
|
||||
:color #000
|
||||
&:hover
|
||||
&.selected
|
||||
:font
|
||||
:weight bold
|
||||
:background
|
||||
:color #eee
|
||||
a
|
||||
:border
|
||||
:bottom 1px solid #eee
|
||||
:color #000
|
||||
&:hover
|
||||
:background
|
||||
:color #efefef
|
||||
a
|
||||
:color #000
|
||||
|
||||
#add_photo_loader
|
||||
:position absolute
|
||||
|
|
|
|||
|
|
@ -1,28 +1,55 @@
|
|||
@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
|
||||
|
||||
/* via blueprint */
|
||||
html
|
||||
:font
|
||||
:size 100.01%
|
||||
|
||||
/* via blueprint */
|
||||
body
|
||||
:padding 2em
|
||||
:font
|
||||
:size 75%
|
||||
:family "Helvetica Neue", Arial, Helvetica, sans-serif
|
||||
:color #222
|
||||
:background #fff
|
||||
|
||||
:margin
|
||||
:left 2em
|
||||
|
||||
/* via blueprint */
|
||||
input[type=text],
|
||||
input[type=password],
|
||||
textarea, select
|
||||
:background
|
||||
:color #fff
|
||||
:border 1px solid #bbb
|
||||
|
||||
/* via blueprint */
|
||||
input[type=text]:focus,
|
||||
input[type=password]:focus,
|
||||
input.text:focus,
|
||||
input.title:focus,
|
||||
textarea:focus, select:focus
|
||||
:border
|
||||
:color #666
|
||||
|
||||
#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 +58,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 +68,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
|
||||
|
|
|
|||
|
|
@ -48,6 +48,9 @@
|
|||
:border
|
||||
:top 1px solid #ccc
|
||||
|
||||
input.button
|
||||
:padding 5px
|
||||
:bottom 6px
|
||||
|
||||
ul.button_set
|
||||
|
||||
|
|
|
|||
|
|
@ -1,23 +1,43 @@
|
|||
@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; }
|
||||
|
||||
input[type=text],
|
||||
input[type=password],
|
||||
textarea, select {
|
||||
background-color: white;
|
||||
border: 1px solid #bbbbbb; }
|
||||
|
||||
input[type=text]:focus,
|
||||
input[type=password]:focus,
|
||||
input.text:focus,
|
||||
input.title:focus,
|
||||
textarea:focus, select:focus {
|
||||
border-color: #666666; }
|
||||
|
||||
#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 +46,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;
|
||||
|
|
|
|||
|
|
@ -32,6 +32,10 @@
|
|||
background: -moz-linear-gradient(top, #f0f0f0, #fafafa);
|
||||
border-top: 1px solid #cccccc; }
|
||||
|
||||
input.button {
|
||||
padding: 5px;
|
||||
padding-bottom: 6px; }
|
||||
|
||||
ul.button_set {
|
||||
padding-left: 0;
|
||||
padding-right: 0; }
|
||||
|
|
|
|||
Loading…
Reference in a new issue