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

resolved missing translation, tweaked button css, commented out mobile_fu in application controller

Browse source
This commit is contained in:
danielvincent 2010-11-13 00:26:24 -08:00
parent 4d6295a292
commit 988e2afe3d
4 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/application_controller.rb
View file

@ -3,7 +3,7 @@
# the COPYRIGHT file. # the COPYRIGHT file.
class ApplicationController < ActionController::Base class ApplicationController < ActionController::Base
has_mobile_fu #has_mobile_fu
protect_from_forgery :except => :receive protect_from_forgery :except => :receive
before_filter :set_contacts_and_status, :except => [:create, :update] before_filter :set_contacts_and_status, :except => [:create, :update]

2
app/views/shared/_aspect_contacts.haml
View file

@ -21,7 +21,7 @@
-else -else
.clear .clear
%br %br
= link_to t('.add_connections'), aspects_manage_path = link_to t('.add_contacts'), aspects_manage_path
%br %br
%br %br

15
public/stylesheets/sass/application.sass
View file

@ -14,7 +14,7 @@
body body
:padding 2em :padding 2em
:margin 0 :margin 0
:background-color rgba(252,252,252,1) :background-color rgb(252,252,252)
a a
:color #107FC9 :color #107FC9
:text :text
@ -107,8 +107,8 @@ header
:background :background
:color #333 :color #333
:background -webkit-gradient( linear, left bottom, left top, color-stop(0.01, rgb(31,31,31)), color-stop(0.12, rgb(51,51,51))) :background -webkit-gradient( linear, left bottom, left top, color-stop(0.01, rgb(21,21,21)), color-stop(0.12, rgb(51,51,51)))
:background -moz-linear-gradient( center bottom, rgb(31,31,31) 1%, rgb(51,51,51) 12%) :background -moz-linear-gradient( center bottom, rgb(21,21,21) 1%, rgb(51,51,51) 12%)
:padding 0 :padding 0
:top 5px :top 5px
@ -910,17 +910,18 @@ h1.big_text
:padding 0 :padding 0
:display inline :display inline
:margin 0 :margin 0
:left -1px
a a
:-webkit-border-radius 5px 5px 0 0 :-webkit-border-radius 4px 4px 0 0
:-moz-border-radius 5px 5px 0 0 :-moz-border-radius 4px 4px 0 0
:border-radius 5px 5px 0 0 :border-radius 4px 4px 0 0
:text-shadow 0 1px 0 #444 :text-shadow 0 1px 0 #444
:line :line
:height 22px :height 22px
:padding 4px 10px :padding 3px 10px
:color #CCC :color #CCC
:max-width 120px :max-width 120px
:overflow hidden :overflow hidden

31
public/stylesheets/sass/ui.sass
View file

@ -6,12 +6,11 @@
.button, .button_set .button, .button_set
:font :font
:style normal :style normal
:weight bold :weight normal
:display inline :display inline
:padding 5px :padding 4px 7px
:bottom 6px
:min-width 26px :min-width 26px
:font-size 12px :font-size 12px
@ -21,25 +20,25 @@
:min-height 10px :min-height 10px
:background -webkit-gradient(linear, 0% 29%, 0% 85%, from(#FCFCFC), to(#F6F6F6)) :background -webkit-gradient(linear, 0% 39%, 0% 100%, from(#FCFCFC), to(#d0d0d0))
:background -moz-linear-gradient(top, #FCFCFC, #F6F6F6) :background -moz-linear-gradient(top, #FCFCFC, #e0e0e0)
:border 1px solid #EEE :border 1px solid #cecece
:bottom 1px solid #999 :bottom 1px solid #777
:left 1px solid #ccc :left 1px solid #aaa
:right 1px solid #ccc :right 1px solid #aaa
:border-radius 8px :border-radius 4px
:-moz-border-radius 8px :-moz-border-radius 4px
:-webkit-border-radius 8px :-webkit-border-radius 4px
:cursor pointer :cursor pointer
:box-shadow 0 1px 1px #eee :box-shadow 0 1px 1px #ccc
:-webkit-box-shadow 0 1px 1px #eee :-webkit-box-shadow 0 1px 1px #ccc
:-moz-box-shadow 0 1px 1px #eee :-moz-box-shadow 0 1px 1px #ccc
:color #666 :color #444
&:hover &:hover
:color #666 :color #666