diff --git a/.gitignore b/.gitignore index d02467332235dbd662db0ca040f361d16a771390..bd8338dc55266b3febf5dc901181674e79061f21 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ config/app_config.yml bin/* nbproject config/initializers/secret_token.rb +public/source.tar diff --git a/Gemfile b/Gemfile index 16788eeb3a79d1c3f4cea600e9ccb83b20a56f68..29ad0f73d0ec7002f991c173e71c051da6f6e6a7 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'http://rubygems.org' gem 'rails', '3.0.0' -gem 'bundler', '1.0.0' +gem 'bundler', '>= 1.0.0' #Security gem 'devise', :git => 'http://github.com/BadMinus/devise.git' diff --git a/config/deploy_config.yml b/config/deploy_config.yml index 6aacbf3fff11f287b6162f1ce5313de3f7820f10..c7477314a2b359c2e9b6b15dafbda3602d4a8eed 100644 --- a/config/deploy_config.yml +++ b/config/deploy_config.yml @@ -12,51 +12,11 @@ servers: tom: - url: 'tom.joindiaspora.com' backer: - - username: 'washington' - given_name: 'George' - family_name: 'Washington' - number: 0 - pin: 5072 - - username: 'adams' - given_name: 'John' - family_name: 'Adams' - number: 1 - pin: 3742 - - username: 'jefferson' - given_name: 'Thomas' - family_name: 'Jefferson' - number: 2 - pin: 7782 - - username: 'madison' - given_name: 'James' - family_name: 'Madison' - number: 3 - pin: 2691 - - username: 'monroe' - given_name: 'James' - family_name: 'Monroe' - number: 4 - pin: 6133 - - username: 'quincyadams' - given_name: 'John Quincy' - family_name: 'Adams' - number: 5 - pin: 7558 - username: 'jackson' given_name: 'Andrew' family_name: 'Jackson' number: 6 pin: 8670 - - username: 'buren' - given_name: 'Martin' - family_name: 'Van Buren' - number: 7 - pin: 1559 - - username: 'harrison' - given_name: 'William Henry' - family_name: 'Harrison' - number: 8 - pin: 5404 - username: 'tyler' given_name: 'John' family_name: 'Tyler' diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 27f5543f11fc163dd146f4251d136750dda5a964..39427a4f441184d3483449ad42a042968b3a1ba1 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -353,8 +353,14 @@ input[type='text'], textarea { padding: 0.3em; display: block; width: 66%; - border-top: 1px solid #666666; - height: auto; } + border: 1px solid #cccccc; + height: auto; + border-radius: 5px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + box-shadow: 0 1px 2px white; + -moz-box-shadow: 0 1px 2px white; + -webkit-box-shadow: 0 1px 2px white; } #submit_block { text-align: right; @@ -392,10 +398,7 @@ label { width: 600px; height: 42px; margin-top: 0; - margin-bottom: 0; - box-shadow: 0 1px 2px white; - -moz-box-shadow: 0 1px 2px white; - -webkit-box-shadow: 0 1px 2px white; } + margin-bottom: 0; } #publisher .button { margin-left: 100px; } #publisher img { diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index a3873d4c85b58c037a334d0034b4b33b4e7590f9..225c5ca84e070b58aaa003d553eace8028abb14d 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -474,9 +474,17 @@ input[type='text'], textarea :padding 0.3em :display block :width 66% - :border-top 1px solid #666 + :border 1px solid #ccc :height auto + :border-radius 5px + :-webkit-border-radius 5px + :-moz-border-radius 5px + + :box-shadow 0 1px 2px #fff + :-moz-box-shadow 0 1px 2px #fff + :-webkit-box-shadow 0 1px 2px #fff + #submit_block :text :align right @@ -526,10 +534,6 @@ label :top 0 :bottom 0 - :box-shadow 0 1px 2px #fff - :-moz-box-shadow 0 1px 2px #fff - :-webkit-box-shadow 0 1px 2px #fff - .button :margin-left 100px diff --git a/script/server b/script/server index 3804ccad981047ff73319ff5edd34cf49003ef8b..da43895fdc8a28a4eb8cbe538d882c91dd8b3da9 100755 --- a/script/server +++ b/script/server @@ -7,6 +7,9 @@ then echo "Mongod not started" else mkdir -p -v log/thin/ + #force AGPL + tar cf ../_source.tar -X .gitignore * + mv ../_source.tar public/source.tar bundle exec ruby ./script/websocket_server.rb& bundle exec thin start $@ fi