spree_frontend 3.5.0.rc1 → 3.5.0.rc2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/spree/frontend/frontend_bootstrap.css.scss +6 -4
  3. data/app/controllers/spree/checkout_controller.rb +1 -0
  4. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d69f005170eed1f41fcf00bb878c4320cf3a2be0
4
- data.tar.gz: 911ea2fe68f6c24efa01664f722b0ac178835edc
3
+ metadata.gz: 94a7dbfa7d5561e1c842cfb4fe03a810d11784fa
4
+ data.tar.gz: '0851053cf2c8ce4cae78aa7d01f401841218be8b'
5
5
  SHA512:
6
- metadata.gz: 7bac9eb68fa0a1e5eb3d518658fc250d2d76af3450893ff7ecc096eca0696c28dfa7e8329c9fbdf6e0cdb1644c82cca89447fd4a64c0a00a7b30bd2910eb0f06
7
- data.tar.gz: b0af5d6e4e9462bf811b07f9358e2d4b87cce827ee8c3b6ae9db5aa564fec9ad3c4bfa83860f9918d8e1484947099022bef4064a0d7dc6de9fdfd8fdf9d82d61
6
+ metadata.gz: 4ffd98be44c8119ed2c3a3e38798bd8b73c89afb29c9b5b40c1c76133ee075832e74571c3af0815fc7243fb5b27fc27962a14e3880c3e696e060c802fcc1dec5
7
+ data.tar.gz: f4b8c2c9fa787183f7e7fac6c3fcd8e54a0b7fd1e51234e64e3e070fa6cbd52e63b7c8ca91bd120942de4c2a616e1a4f561d21964e094bf16650cca8adecdfb8
data/app/assets/stylesheets/spree/frontend/frontend_bootstrap.css.scss CHANGED
@@ -24,10 +24,12 @@
24
24
  }
25
25
  }
26
26
 
27
- .navbar-nav > li > a {
28
- padding-top: 0;
29
- padding-bottom: 10px;
30
- line-height: $line-height-computed;
27
+ @media (max-width: 767px) {
28
+ .navbar-nav > li > a {
29
+ padding-top: 0;
30
+ padding-bottom: 10px;
31
+ line-height: $line-height-computed;
32
+ }
31
33
  }
32
34
 
33
35
  .nav a {
data/app/controllers/spree/checkout_controller.rb CHANGED
@@ -4,6 +4,7 @@ module Spree
4
4
  # checkout which has nothing to do with updating an order that this approach
5
5
  # is waranted.
6
6
  class CheckoutController < Spree::StoreController
7
+ before_action :expires_now, only: [:edit]
7
8
  before_action :load_order_with_lock
8
9
  before_action :ensure_valid_state_lock_version, only: [:update]
9
10
  before_action :set_state_if_present
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_frontend
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.5.0.rc1
4
+ version: 3.5.0.rc2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-04-24 00:00:00.000000000 Z
11
+ date: 2018-05-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: spree_api
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 3.5.0.rc1
19
+ version: 3.5.0.rc2
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 3.5.0.rc1
26
+ version: 3.5.0.rc2
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: spree_core
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 3.5.0.rc1
33
+ version: 3.5.0.rc2
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 3.5.0.rc1
40
+ version: 3.5.0.rc2
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: bootstrap-sass
43
43
  requirement: !ruby/object:Gem::Requirement