From 6fbf4e36ea39d8d8b33f40758fc34f766ef12df8 Mon Sep 17 00:00:00 2001 From: Miguel Guinada Date: Fri, 3 Aug 2012 20:59:38 +0100 Subject: [PATCH] Confirmation button layout fix. --- Gemfile | 2 +- Gemfile.lock | 38 +++++++++++++++++++------------------- public/css/styles.css | 5 ++++- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/Gemfile b/Gemfile index 36fcf5d..283f92b 100644 --- a/Gemfile +++ b/Gemfile @@ -8,9 +8,9 @@ gem 'mongoid', '~> 3.0.0' gem 'bson_ext', '~> 1.6.0' gem 'bcrypt-ruby', '~> 3.0.0', require: 'bcrypt' gem 'haml', '~> 3.1.0' -gem 'tux' gem 'rack-conneg', '~> 0.1.0' gem 'escape_utils', '~> 0.2.0' +gem 'tux' group :development do gem 'shotgun' diff --git a/Gemfile.lock b/Gemfile.lock index 03ae008..0024523 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,19 +1,19 @@ GEM remote: http://rubygems.org/ specs: - activemodel (3.2.7) - activesupport (= 3.2.7) + activemodel (3.2.8) + activesupport (= 3.2.8) builder (~> 3.0.0) - activesupport (3.2.7) + activesupport (3.2.8) i18n (~> 0.6) multi_json (~> 1.0) - addressable (2.2.8) + addressable (2.3.2) bcrypt-ruby (3.0.1) bond (0.4.2) bson (1.6.4) bson_ext (1.6.4) bson (~> 1.6.4) - builder (3.0.0) + builder (3.0.3) capybara (1.1.2) mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -21,27 +21,27 @@ GEM rack-test (>= 0.5.4) selenium-webdriver (~> 2.0) xpath (~> 0.1.4) - childprocess (0.3.4) + childprocess (0.3.5) ffi (~> 1.0, >= 1.0.6) diff-lcs (1.1.3) escape_utils (0.2.4) - ffi (1.1.0) - haml (3.1.6) - i18n (0.6.0) - launchy (2.1.0) - addressable (~> 2.2.6) + ffi (1.1.5) + haml (3.1.7) + i18n (0.6.1) + launchy (2.1.2) + addressable (~> 2.3) libwebsocket (0.1.5) addressable mime-types (1.19) - mongoid (3.0.2) + mongoid (3.0.5) activemodel (~> 3.1) - moped (~> 1.1.3) - origin (~> 1.0.3) + moped (~> 1.1) + origin (~> 1.0) tzinfo (~> 0.3.22) - moped (1.1.5) + moped (1.2.1) multi_json (1.3.6) nokogiri (1.5.5) - origin (1.0.4) + origin (1.0.8) rack (1.4.1) rack-conneg (0.1.5) rack (>= 1.0) @@ -65,9 +65,9 @@ GEM rspec-expectations (~> 2.11.0) rspec-mocks (~> 2.11.0) rspec-core (2.11.1) - rspec-expectations (2.11.2) + rspec-expectations (2.11.3) diff-lcs (~> 1.1.3) - rspec-mocks (2.11.1) + rspec-mocks (2.11.2) rubyzip (0.9.9) selenium-webdriver (2.24.0) childprocess (>= 0.2.5) @@ -76,7 +76,7 @@ GEM rubyzip shotgun (0.9) rack (>= 1.0) - sinatra (1.3.2) + sinatra (1.3.3) rack (~> 1.3, >= 1.3.6) rack-protection (~> 1.2) tilt (~> 1.3, >= 1.3.3) diff --git a/public/css/styles.css b/public/css/styles.css index f54bb10..4727848 100644 --- a/public/css/styles.css +++ b/public/css/styles.css @@ -106,6 +106,10 @@ ul { line-height: 1.5; } +.link li.confirm { + padding-bottom: 5px; +} + .link ol.buttons li { padding-right: 0.125em; display: inline; @@ -124,7 +128,6 @@ ul { -webkit-border-radius: 2px; -moz-border-radius: 2px; border-top-right: 2px; - } .link ol.buttons li.timestamp {