mercury-rails 0.7.0 → 0.7.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. data/app/assets/javascripts/mercury/mercury.js.coffee +1 -1
  2. data/app/assets/javascripts/mercury/page_editor.js.coffee +1 -1
  3. data/app/assets/stylesheets/mercury/modal.css +4 -3
  4. data/features/loading/loading.feature +1 -1
  5. data/lib/mercury/version.rb +1 -1
  6. metadata +3 -3
data/app/assets/javascripts/mercury/mercury.js.coffee CHANGED
@@ -34,7 +34,7 @@
34
34
  #
35
35
  @Mercury ||= {}
36
36
  jQuery.extend @Mercury,
37
- version: '0.7.0'
37
+ version: '0.7.1'
38
38
 
39
39
  # Mercury object namespaces
40
40
  Regions: Mercury.Regions || {}
data/app/assets/javascripts/mercury/page_editor.js.coffee CHANGED
@@ -148,6 +148,7 @@ class @Mercury.PageEditor
148
148
  @statusbar.hide()
149
149
  Mercury.trigger('mode', {mode: 'preview'}) unless @previewing
150
150
  @previewing = true
151
+ @resize()
151
152
  else
152
153
  @visible = true
153
154
  @iframe.animate({top: @toolbar.height(true)}, 200, 'easeInOutSine', => @resize())
@@ -155,7 +156,6 @@ class @Mercury.PageEditor
155
156
  @statusbar.show()
156
157
  Mercury.trigger('mode', {mode: 'preview'})
157
158
  @previewing = false
158
- @resize()
159
159
 
160
160
 
161
161
  resize: ->
data/app/assets/stylesheets/mercury/modal.css CHANGED
@@ -147,14 +147,15 @@
147
147
  /* table */
148
148
  #mercury_table #table_display {
149
149
  float: left;
150
- width: 225px;
151
- height: 259px;
152
- padding: 10px;
153
150
  margin-right: 13px;
154
151
  overflow: auto;
152
+ padding: 0;
155
153
  }
156
154
  #mercury_table #table_display .controls {
157
155
  margin: 0;
156
+ width: 225px;
157
+ height: 259px;
158
+ padding: 10px;
158
159
  }
159
160
  #mercury_table #table_display table {
160
161
  width: 100%;
data/features/loading/loading.feature CHANGED
@@ -21,5 +21,5 @@ Feature:
21
21
  # Latest selenium webdriver seems to consider the lightview hidden
22
22
  @use_hidden_elements
23
23
  Scenario: A user can expect to see the status bar
24
- Then I should see "Mercury Editor v0.7.0" within the statusbar
24
+ Then I should see "Mercury Editor v0.7.1" within the statusbar
25
25
 
data/lib/mercury/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Mercury
2
- VERSION = '0.7.0'
2
+ VERSION = '0.7.1'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mercury-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.0
4
+ version: 0.7.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -517,7 +517,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
517
517
  version: '0'
518
518
  segments:
519
519
  - 0
520
- hash: 1994431124283081759
520
+ hash: -1857149294402445734
521
521
  required_rubygems_version: !ruby/object:Gem::Requirement
522
522
  none: false
523
523
  requirements:
@@ -526,7 +526,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
526
526
  version: '0'
527
527
  segments:
528
528
  - 0
529
- hash: 1994431124283081759
529
+ hash: -1857149294402445734
530
530
  requirements: []
531
531
  rubyforge_project:
532
532
  rubygems_version: 1.8.21