Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 2 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
Showing with 49 additions and 46 deletions.
  1. +1 −1 Gemfile
  2. +43 −43 Gemfile.lock
  3. +1 −1 app/assets/stylesheets/RonRonnement.css.scss
  4. +4 −1 app/assets/stylesheets/common/markitup.css.scss
View
2 Gemfile
@@ -1,6 +1,6 @@
source :rubygems
-gem "rails", "~>3.2.7"
+gem "rails", "~>3.2.8"
gem "acts_as_list", "~>0.1.6"
gem "albino", "~>1.3"
View
86 Gemfile.lock
@@ -1,12 +1,12 @@
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.2.7)
- actionpack (= 3.2.7)
+ actionmailer (3.2.8)
+ actionpack (= 3.2.8)
mail (~> 2.4.4)
- actionpack (3.2.7)
- activemodel (= 3.2.7)
- activesupport (= 3.2.7)
+ actionpack (3.2.8)
+ activemodel (= 3.2.8)
+ activesupport (= 3.2.8)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
@@ -14,22 +14,22 @@ GEM
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.1.3)
- activemodel (3.2.7)
- activesupport (= 3.2.7)
+ activemodel (3.2.8)
+ activesupport (= 3.2.8)
builder (~> 3.0.0)
- activerecord (3.2.7)
- activemodel (= 3.2.7)
- activesupport (= 3.2.7)
+ activerecord (3.2.8)
+ activemodel (= 3.2.8)
+ activesupport (= 3.2.8)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.7)
- activemodel (= 3.2.7)
- activesupport (= 3.2.7)
- activesupport (3.2.7)
+ activeresource (3.2.8)
+ activemodel (= 3.2.8)
+ activesupport (= 3.2.8)
+ activesupport (3.2.8)
i18n (~> 0.6)
multi_json (~> 1.0)
- acts_as_list (0.1.7)
- addressable (2.2.8)
+ acts_as_list (0.1.8)
+ addressable (2.3.2)
albino (1.3.3)
posix-spawn (>= 0.3.6)
annotate (2.5.0)
@@ -40,7 +40,7 @@ GEM
bitfields (0.4.1)
builder (3.0.0)
canable (0.3.0)
- capistrano (2.12.0)
+ capistrano (2.13.0)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
@@ -58,7 +58,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.3.3)
- daemons (1.1.8)
+ daemons (1.1.9)
database_cleaner (0.8.0)
devise (2.1.2)
bcrypt-ruby (~> 3.0)
@@ -78,17 +78,17 @@ GEM
railties (>= 3.0.0)
faker (0.9.5)
i18n (~> 0.4)
- faraday (0.8.1)
+ faraday (0.8.4)
multipart-post (~> 1.1)
ffi (1.0.11)
french_rails (0.2.7)
rails (~> 3.0)
- friendly_id (4.0.7)
+ friendly_id (4.0.8)
fuubar (1.0.0)
rspec (~> 2.0)
rspec-instafail (~> 0.2.0)
ruby-progressbar (~> 0.0.10)
- haml (3.1.6)
+ haml (3.1.7)
haml-rails (0.3.4)
actionpack (~> 3.0)
activesupport (~> 3.0)
@@ -116,7 +116,7 @@ GEM
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
- json (1.7.4)
+ json (1.7.5)
jwt (0.1.5)
multi_json (>= 1.0)
kaminari (0.13.0)
@@ -124,8 +124,8 @@ GEM
activesupport (>= 3.0.0)
railties (>= 3.0.0)
kgio (2.7.4)
- launchy (2.1.0)
- addressable (~> 2.2.6)
+ launchy (2.1.2)
+ addressable (~> 2.3)
letter_opener (0.0.2)
launchy
libv8 (3.3.10.4)
@@ -162,8 +162,8 @@ GEM
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.3.1)
- pry-rails (0.1.6)
- pry
+ pry-rails (0.2.1)
+ pry (>= 0.9.10)
quiet_assets (1.0.1)
railties (~> 3.1)
rack (1.4.1)
@@ -173,17 +173,17 @@ GEM
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.2.7)
- actionmailer (= 3.2.7)
- actionpack (= 3.2.7)
- activerecord (= 3.2.7)
- activeresource (= 3.2.7)
- activesupport (= 3.2.7)
+ rails (3.2.8)
+ actionmailer (= 3.2.8)
+ actionpack (= 3.2.8)
+ activerecord (= 3.2.8)
+ activeresource (= 3.2.8)
+ activesupport (= 3.2.8)
bundler (~> 1.0)
- railties (= 3.2.7)
- railties (3.2.7)
- actionpack (= 3.2.7)
- activesupport (= 3.2.7)
+ railties (= 3.2.8)
+ railties (3.2.8)
+ actionpack (= 3.2.8)
+ activesupport (= 3.2.8)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -212,7 +212,7 @@ GEM
rspec-expectations (2.11.2)
diff-lcs (~> 1.1.3)
rspec-instafail (0.2.4)
- rspec-mocks (2.11.1)
+ rspec-mocks (2.11.2)
rspec-rails (2.11.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
@@ -221,7 +221,7 @@ GEM
ruby-progressbar (0.0.10)
sanitize (2.0.3)
nokogiri (>= 1.4.4, < 1.6)
- sass (3.1.20)
+ sass (3.2.1)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
@@ -230,20 +230,20 @@ GEM
sitemap_generator (2.2.1)
slop (3.3.2)
spork (0.9.2)
- springboard (0.19.4)
+ springboard (0.19.8)
sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
state_machine (1.1.2)
subexec (0.2.2)
- therubyracer (0.10.1)
+ therubyracer (0.10.2)
libv8 (~> 3.3.10)
thin (1.4.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
- thor (0.15.4)
+ thor (0.16.0)
tilt (1.3.3)
tire (0.4.2)
activemodel (>= 3.0)
@@ -255,7 +255,7 @@ GEM
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.33)
- uglifier (1.2.6)
+ uglifier (1.2.7)
execjs (>= 0.3.0)
multi_json (~> 1.3)
unicorn (4.3.1)
@@ -308,7 +308,7 @@ DEPENDENCIES
oauth2 (~> 0.6)
pry-rails
quiet_assets
- rails (~> 3.2.7)
+ rails (~> 3.2.8)
redcarpet (~> 2.1)
redis (~> 2.2)
redis-activesupport (~> 3.2)
View
2 app/assets/stylesheets/RonRonnement.css.scss
@@ -1435,7 +1435,7 @@ img {
margin: 12px 25px 0 0;
}
-@media screen and (max-width: 600px), handheld {
+@media screen and (max-width: 768px), handheld {
html, body {
margin: 0;
padding: 0;
View
5 app/assets/stylesheets/common/markitup.css.scss
@@ -23,7 +23,10 @@
/* clear: both */
display: block;
line-height: 18px;
- overflow: auto; }
+ overflow: auto;
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box; }
.markItUpFooter {
width: 100%;

No commit comments for this range

Something went wrong with that request. Please try again.