diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index ae970dd67..caafdeab3 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -3,7 +3,7 @@ # the COPYRIGHT file. class ApplicationController < ActionController::Base - has_mobile_fu + #has_mobile_fu protect_from_forgery :except => :receive before_filter :set_contacts_and_status, :except => [:create, :update] diff --git a/app/views/shared/_aspect_contacts.haml b/app/views/shared/_aspect_contacts.haml index 5a2eaba3f..68658e487 100644 --- a/app/views/shared/_aspect_contacts.haml +++ b/app/views/shared/_aspect_contacts.haml @@ -21,7 +21,7 @@ -else .clear %br - = link_to t('.add_connections'), aspects_manage_path + = link_to t('.add_contacts'), aspects_manage_path %br %br diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 4e0f9d3ae..9cd4f4df5 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -14,7 +14,7 @@ body :padding 2em :margin 0 - :background-color rgba(252,252,252,1) + :background-color rgb(252,252,252) a :color #107FC9 :text @@ -107,8 +107,8 @@ header :background :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 -moz-linear-gradient( center bottom, rgb(31,31,31) 1%, rgb(51,51,51) 12%) + :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(21,21,21) 1%, rgb(51,51,51) 12%) :padding 0 :top 5px @@ -910,17 +910,18 @@ h1.big_text :padding 0 :display inline :margin 0 + :left -1px a - :-webkit-border-radius 5px 5px 0 0 - :-moz-border-radius 5px 5px 0 0 - :border-radius 5px 5px 0 0 + :-webkit-border-radius 4px 4px 0 0 + :-moz-border-radius 4px 4px 0 0 + :border-radius 4px 4px 0 0 :text-shadow 0 1px 0 #444 :line :height 22px - :padding 4px 10px + :padding 3px 10px :color #CCC :max-width 120px :overflow hidden diff --git a/public/stylesheets/sass/ui.sass b/public/stylesheets/sass/ui.sass index 72490eb0b..81cbb2c59 100644 --- a/public/stylesheets/sass/ui.sass +++ b/public/stylesheets/sass/ui.sass @@ -6,12 +6,11 @@ .button, .button_set :font :style normal - :weight bold + :weight normal :display inline - :padding 5px - :bottom 6px + :padding 4px 7px :min-width 26px :font-size 12px @@ -21,25 +20,25 @@ :min-height 10px - :background -webkit-gradient(linear, 0% 29%, 0% 85%, from(#FCFCFC), to(#F6F6F6)) - :background -moz-linear-gradient(top, #FCFCFC, #F6F6F6) + :background -webkit-gradient(linear, 0% 39%, 0% 100%, from(#FCFCFC), to(#d0d0d0)) + :background -moz-linear-gradient(top, #FCFCFC, #e0e0e0) - :border 1px solid #EEE - :bottom 1px solid #999 - :left 1px solid #ccc - :right 1px solid #ccc + :border 1px solid #cecece + :bottom 1px solid #777 + :left 1px solid #aaa + :right 1px solid #aaa - :border-radius 8px - :-moz-border-radius 8px - :-webkit-border-radius 8px + :border-radius 4px + :-moz-border-radius 4px + :-webkit-border-radius 4px :cursor pointer - :box-shadow 0 1px 1px #eee - :-webkit-box-shadow 0 1px 1px #eee - :-moz-box-shadow 0 1px 1px #eee + :box-shadow 0 1px 1px #ccc + :-webkit-box-shadow 0 1px 1px #ccc + :-moz-box-shadow 0 1px 1px #ccc - :color #666 + :color #444 &:hover :color #666