Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fix

  • Loading branch information...
commit 4d7bf0a32a82ea4ae125c3381d610f174b1a64a8 1 parent ab32a1a
@dmorley dmorley authored
View
2  app/assets/javascripts/app/views/post-viewer/interactions.js
@@ -54,4 +54,4 @@ app.views.PostViewerInteractions = app.views.Base.extend({
this.togglePane()
}
}
-});
+});
View
16 app/assets/stylesheets/new_styles/_base.scss
@@ -1,5 +1,5 @@
body {
- background-image : image_url("pattern.png");
+ //background-image : image_url("pattern.png");
padding : none;
}
@@ -123,15 +123,15 @@ a { color : rgb(42,156,235) }
article { //mood posts
//default frame show styles
- $big-text-size : 2.5em;
- $medium-text-size : 1.5em;
+ $big-text-size : 1em;
+ $medium-text-size : 1em;
$small-text-size: 1em;
width: 960px;
margin: 0 auto;
img {
max-height: 70%;
- border : 10px solid #fff;
+ //border : 10px solid #fff;
}
.photo_viewer {
@@ -152,7 +152,7 @@ article { //mood posts
//big text
@include media-text();
font-size: $big-text-size;
- line-height: 1.5em;
+ line-height: 1em;
}
section.body{
@@ -203,8 +203,8 @@ article { //mood posts
.body p {
@include newspaper-type();
- font-size: 1.2em;
- line-height: 1.7em;
+ font-size: 1em;
+ line-height: 1em;
margin-bottom: 1.2em;
}
}
@@ -471,4 +471,4 @@ div[data-template=flow] {
body {
padding : 0;
}
-}
+}
View
7 app/assets/stylesheets/new_styles/_interactions.scss
@@ -2,15 +2,16 @@
#post-interactions {
position: fixed;
- width: 100%;
+ //width: 100%;
bottom: 0;
left: 0;
text-align: center;
+ opacity: .85;
}
#post-reactions {
height: 80%;
- max-height: 350px;
+ max-height: 100%;
overflow: auto;
margin-top: 5px;
}
@@ -307,4 +308,4 @@
position: absolute;
right: 8px;
top: 8px;
-}
+}
View
4 app/assets/stylesheets/new_styles/_new_mixins.scss
@@ -1,5 +1,5 @@
$light-grey: #999;
-$pane-width: 420px;
+$pane-width: 520px;
$night-background-color : #333;
$night-text-color : #999;
@@ -47,7 +47,7 @@ $night-text-color : #999;
@include border-radius(3px, 0px);
@include pane-width();
- display: inline-block;
+ display: block;
position: relative;
border-right: 1px solid #444;
View
14 app/assets/stylesheets/new_styles/_profile.scss
@@ -46,8 +46,8 @@
}
.profile-image-container {
- border-radius: 140px;
- border : 3px solid #fff;
+ //border-radius: 140px;
+ border : 1px solid #fff;
box-shadow : 0 0 2px rgba(0,0,0,0.5), 0 0 10px rgba(0,0,0,0.6), inset 0 0 15px rgba(0,0,0,0.5), inset 0 -2px 4px rgba(255,255,255,0.3);
background-size: cover;
@@ -63,15 +63,15 @@
margin-bottom : 5px;
&.small {
- height : 40px;
- width : 40px;
- border : 2px solid #fff;
+ height : 50px;
+ width : 50px;
+ border : 1px solid #fff;
}
&.micro {
height : 24px;
width : 24px;
- border : 2px solid #fff;
+ border : 1px solid #fff;
}
}
@@ -236,4 +236,4 @@
.edit-control {
display : none;
}
-}
+}
View
4 config/unicorn.rb
@@ -4,12 +4,12 @@
#user = 'diaspora'
#group = 'diaspora'
stderr_path "/home/dmm/diaspora/log/unicorn.stderr.log"
-#stdout_path "/home/dmm/diaspora/log/unicorn.stdout.log"
+stdout_path "/home/dmm/diaspora/log/unicorn.stdout.log"
worker_processes 8
## Load the app before spawning workers
-preload_app false
+preload_app true
# How long to wait before killing an unresponsive worker
timeout 30
View
6 script/diaspora.god
@@ -16,7 +16,7 @@ num_resqueworkers = 21
num_resqueworkers.times do |num|
God.watch do |w|
w.dir = "#{rails_root}"
- w.name = "resque"
+ w.name = "resque-#{num}"
w.group = 'diaspora'
w.interval = 190.seconds
w.env = {"QUEUE"=>"photos,receive_local,receive_salmon,receive,mail,socket_webfinger,delete_account,dispatch,http,http_service", "RAILS_ENV"=>rails_env}
@@ -70,7 +70,7 @@ end
God.watch do |w|
w.name = "unicorn"
- w.group = 'diaspora'
+ #w.group = 'diaspora'
w.interval = 200.seconds # default
# unicorn needs to be run from the rails root
@@ -80,7 +80,7 @@ God.watch do |w|
w.stop = "kill -QUIT `cat #{rails_root}/tmp/pids/unicorn.pid`"
# USR2 causes the master to re-create itself and spawn a new worker pool
- w.restart = "kill -HUP `cat #{rails_root}/tmp/pids/unicorn.pid`"
+ w.restart = "kill -USR2 `cat #{rails_root}/tmp/pids/unicorn.pid`"
w.start_grace = 10.seconds
w.restart_grace = 10.seconds
View
14 script/update
@@ -66,13 +66,13 @@ done
# esac
#done
-#echo "kill old $OP unicorn cluster?"
-#select yn in "Yes" "No"; do
-# case $yn in
-# Yes ) kill $OP; break;;
-# No ) break;;
-# esac
-#done
+echo "kill old $OP unicorn cluster?"
+select yn in "Yes" "No"; do
+ case $yn in
+ Yes ) kill $OP; break;;
+ No ) break;;
+ esac
+done
echo "notify poduptime?"
select yn in "Yes" "No"; do
Please sign in to comment.
Something went wrong with that request. Please try again.