mercury-rails 0.7.0 → 0.7.1

data/app/assets/javascripts/mercury/mercury.js.coffee

@@ -34,7 +34,7 @@
 #
 @Mercury ||= {}
 jQuery.extend @Mercury,
-  version: '0.7.0'
+  version: '0.7.1'
 
   # Mercury object namespaces
   Regions: Mercury.Regions || {}

data/app/assets/javascripts/mercury/page_editor.js.coffee

@@ -148,6 +148,7 @@ class @Mercury.PageEditor
       @statusbar.hide()
       Mercury.trigger('mode', {mode: 'preview'}) unless @previewing
       @previewing = true
+      @resize()
     else
       @visible = true
       @iframe.animate({top: @toolbar.height(true)}, 200, 'easeInOutSine', => @resize())
@@ -155,7 +156,6 @@ class @Mercury.PageEditor
       @statusbar.show()
       Mercury.trigger('mode', {mode: 'preview'})
       @previewing = false
-    @resize()
 
 
   resize: ->

data/app/assets/stylesheets/mercury/modal.css

@@ -147,14 +147,15 @@
 /* table */
 #mercury_table #table_display {
   float: left;
-  width: 225px;
-  height: 259px;
-  padding: 10px;
   margin-right: 13px;
   overflow: auto;
+  padding: 0;
 }
 #mercury_table #table_display .controls {
   margin: 0;
+  width: 225px;
+  height: 259px;
+  padding: 10px;
 }
 #mercury_table #table_display table {
   width: 100%;

data/features/loading/loading.feature

@@ -21,5 +21,5 @@ Feature:
   # Latest selenium webdriver seems to consider the lightview hidden
   @use_hidden_elements
   Scenario: A user can expect to see the status bar
-    Then I should see "Mercury Editor v0.7.0" within the statusbar
+    Then I should see "Mercury Editor v0.7.1" within the statusbar
 

data/lib/mercury/version.rb

@@ -1,3 +1,3 @@
 module Mercury
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mercury-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -517,7 +517,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1994431124283081759
+      hash: -1857149294402445734
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -526,7 +526,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1994431124283081759
+      hash: -1857149294402445734
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.21