forever_style_guide 3.0.32 → 3.0.33

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 (14) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/forever_style_guide/modules/_all.scss +1 -0
  3. data/app/assets/stylesheets/forever_style_guide/modules/_nav-dropdowns-account.scss +4 -4
  4. data/app/assets/stylesheets/forever_style_guide/modules/_nav-dropdowns-ambassador.scss +10 -7
  5. data/app/assets/stylesheets/forever_style_guide/modules/_nav-dropdowns.scss +9 -9
  6. data/app/assets/stylesheets/forever_style_guide/modules/_nav-icons.scss +3 -3
  7. data/app/assets/stylesheets/forever_style_guide/modules/_nav-offcanvas.scss +3 -4
  8. data/app/assets/stylesheets/forever_style_guide/modules/_nav.scss +4 -4
  9. data/app/assets/stylesheets/forever_style_guide/modules/_responsive_utilities.scss +53 -0
  10. data/app/assets/stylesheets/forever_style_guide/modules/_shame.scss +1 -1
  11. data/app/helpers/forever_style_guide/application_helper.rb +14 -0
  12. data/app/views/forever_style_guide/sections/components/navigation/_nav_ambassador_dropdown.erb +9 -9
  13. data/lib/forever_style_guide/version.rb +1 -1
  14. metadata +4 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a8c8643a45e7b2be83063f9813171d77952e3560
4
- data.tar.gz: e70d7578cd21e5ecf76712de4495bac50f6e26c0
3
+ metadata.gz: 5c7b76cfdc38597a25f79292a357027baaa2121c
4
+ data.tar.gz: 1c7fe4bffadd2846ad134e449df36804e282744a
5
5
  SHA512:
6
- metadata.gz: f4137b73e41ba6be48f3ef1d2cf6f15f6cba0d771eb9f71244dcf4134b35e06f61662a9a441121285920d4182f27543c9c154f4d5196279a630047d6a71598dc
7
- data.tar.gz: df122cc4dece11261a2098eee765a8c27d2a7d9416075af3c29e03c52167b4626d0cf9946fa224a054e456f5ee612fe556534e803a47349dbd5d8dcf3137e0ee
6
+ metadata.gz: '0399857bf0410aaed29297d8260b2ca78b7b252bc6faa11e932e002e4875716fdfc17fbdae01bccf57e99273657dfd2ebe7f9234445ca62404bf7c34197ab6bb'
7
+ data.tar.gz: '0410934a5313a4c94e5c1663c0925ec5b77c3627b2da285f3b71832bc63fbff7841f522f79438102f308659c1e2110de276c84ee50c13a6b6c95f6aff00ea40a'
data/app/assets/stylesheets/forever_style_guide/modules/_all.scss CHANGED
@@ -24,6 +24,7 @@
24
24
  @import "popover";
25
25
  @import "progress";
26
26
  @import "promo_banner";
27
+ @import "responsive_utilities";
27
28
  @import "select";
28
29
  @import "shame";
29
30
  @import "hero_simple";
data/app/assets/stylesheets/forever_style_guide/modules/_nav-dropdowns-account.scss CHANGED
@@ -7,7 +7,7 @@
7
7
  .progress {
8
8
  margin-bottom: 10px;
9
9
  }
10
- @media (max-width: $grid-float-breakpoint) {
10
+ @media (max-width: $grid-float-breakpoint-max) {
11
11
  @include nav-border(bottom);
12
12
  }
13
13
  @media (min-width: $grid-float-breakpoint) {
@@ -28,7 +28,7 @@
28
28
  margin-bottom: 10px;
29
29
  @include nav-border(bottom);
30
30
 
31
- @media (max-width: $grid-float-breakpoint) {
31
+ @media (max-width: $grid-float-breakpoint-max) {
32
32
  border-color: color('gray-600');
33
33
  }
34
34
  }
@@ -45,14 +45,14 @@
45
45
  border: 0;
46
46
  box-shadow: none;
47
47
 
48
- @media (max-width: $grid-float-breakpoint) {
48
+ @media (max-width: $grid-float-breakpoint-max) {
49
49
  height: 40px; // avatar-xs
50
50
  width: 40px;
51
51
  margin-top: $padding-small-vertical;
52
52
  }
53
53
  }
54
54
  .dropdown-menu-account-storage {
55
- @media (max-width: $grid-float-breakpoint) {
55
+ @media (max-width: $grid-float-breakpoint-max) {
56
56
  font-size: $font-size-default;
57
57
  }
58
58
  }
data/app/assets/stylesheets/forever_style_guide/modules/_nav-dropdowns-ambassador.scss CHANGED
@@ -4,7 +4,7 @@ $your-ambassador-intro-text-width: 110px;
4
4
  .dropdown-toggle {
5
5
  padding: 0 10px;
6
6
 
7
- @media (max-width: $grid-float-breakpoint) {
7
+ @media (max-width: $grid-float-breakpoint-max) {
8
8
  padding: 0 0 0 $offcanvas-padding !important; // overriding .navbar .nav.navbar-nav > li > a
9
9
  }
10
10
  }
@@ -13,30 +13,30 @@ $your-ambassador-intro-text-width: 110px;
13
13
  margin-left: 10px;
14
14
  top: -10px;
15
15
 
16
- @media (max-width: $grid-float-breakpoint) {
16
+ @media (max-width: $grid-float-breakpoint-max) {
17
17
  top: $offcanvas-padding;
18
18
  }
19
19
  }
20
20
  &:last-child {
21
- @media (max-width: $grid-float-breakpoint) {
21
+ @media (max-width: $grid-float-breakpoint-max) {
22
22
  @include nav-border(bottom);
23
23
  border-color: color('gray-600');
24
24
  }
25
25
  }
26
26
  .dropdown-ambassador-container {
27
- @media (max-width: $grid-float-breakpoint) {
27
+ @media (max-width: $grid-float-breakpoint-max) {
28
28
  width: $offcanvas-width - $offcanvas-padding;
29
29
  padding-left: 15px;
30
30
  }
31
31
  }
32
32
  .dropdown-menu-nav {
33
- @media (max-width: $grid-float-breakpoint) {
33
+ @media (max-width: $grid-float-breakpoint-max) {
34
34
  box-shadow: none;
35
35
  }
36
36
  }
37
37
  .btn.btn-ambassador.btn-lg {
38
38
  //preferring redunant button styling to redundant mobile markup for this one instance
39
- @media (max-width: $grid-float-breakpoint) {
39
+ @media (max-width: $grid-float-breakpoint-max) {
40
40
  display: block;
41
41
  height: $btn-size;
42
42
  padding: $padding-default-vertical $btn-padding-default-horizontal;
@@ -58,7 +58,10 @@ $your-ambassador-intro-text-width: 110px;
58
58
  }
59
59
  .dropdown-ambassador-edit_btn {
60
60
  display: block;
61
- margin-top: -30px;
61
+
62
+ @media (min-width: $grid-float-breakpoint) {
63
+ margin-top: -30px;
64
+ }
62
65
  }
63
66
  .dropdown-ambassador-basic_info {
64
67
  overflow: hidden;
data/app/assets/stylesheets/forever_style_guide/modules/_nav-dropdowns.scss CHANGED
@@ -12,7 +12,7 @@ $nav-icon-width: 60px;
12
12
  @media (min-width: $grid-float-breakpoint) {
13
13
  box-shadow: inset 0 3px 0 0 $color;
14
14
  }
15
- @media (max-width: $grid-float-breakpoint) {
15
+ @media (max-width: $grid-float-breakpoint-max) {
16
16
  box-shadow: inset 3px 0 0 0 $color;
17
17
  }
18
18
  }
@@ -43,14 +43,14 @@ $nav-icon-width: 60px;
43
43
  }
44
44
  }
45
45
  .dropdown-menu-nav {
46
- @media (max-width: $grid-float-breakpoint) {
46
+ @media (max-width: $grid-float-breakpoint-max) {
47
47
  padding-bottom: 20px;
48
48
  }
49
49
  }
50
50
  }
51
51
 
52
52
  // Override bootstrap default to show dropdowns at custom breakpoint
53
- @media (max-width: $grid-float-breakpoint) {
53
+ @media (max-width: $grid-float-breakpoint-max) {
54
54
  .navbar-nav .open .dropdown-menu {
55
55
  position: static;
56
56
  }
@@ -74,7 +74,7 @@ $nav-icon-width: 60px;
74
74
  color: color('gray-400');
75
75
  background-color: $nav-bg-color;
76
76
 
77
- @media (max-width: $grid-float-breakpoint) {
77
+ @media (max-width: $grid-float-breakpoint-max) {
78
78
  &.dropdown-toggle-my_forever {
79
79
  @include mobile-active-dropdown-bg($color-primary);
80
80
  }
@@ -101,7 +101,7 @@ $nav-icon-width: 60px;
101
101
  border-radius: 0;
102
102
  @extend %card-shadow;
103
103
 
104
- @media (max-width: $grid-float-breakpoint) {
104
+ @media (max-width: $grid-float-breakpoint-max) {
105
105
  padding-left: 5px;
106
106
  }
107
107
 
@@ -113,7 +113,7 @@ $nav-icon-width: 60px;
113
113
  }
114
114
 
115
115
  .dropdown-menu-nav-extra_column {
116
- @media (max-width: $grid-float-breakpoint) {
116
+ @media (max-width: $grid-float-breakpoint-max) {
117
117
  margin-top: -10px; // compensate for l-padded-thin
118
118
  padding-top: 0;
119
119
  }
@@ -138,7 +138,7 @@ a.dropdown-menu-nav-link {
138
138
  }
139
139
  .dropdown-menu-account-item {
140
140
  .dropdown-menu-nav-link {
141
- @media (max-width: $grid-float-breakpoint) {
141
+ @media (max-width: $grid-float-breakpoint-max) {
142
142
  margin-top: $padding-small-vertical;
143
143
  }
144
144
  }
@@ -151,7 +151,7 @@ a.dropdown-menu-nav-link {
151
151
  font-size: $font-size-200;
152
152
  }
153
153
  .dropdown-menu-nav-bullets {
154
- @media (max-width: $grid-float-breakpoint) {
154
+ @media (max-width: $grid-float-breakpoint-max) {
155
155
  margin-left: 10px;
156
156
  }
157
157
  a.dropdown-menu-nav-link {
@@ -161,7 +161,7 @@ a.dropdown-menu-nav-link {
161
161
  .dropdown-menu-nav-description {
162
162
  @include dropdown-content-style;
163
163
 
164
- @media (max-width: $grid-float-breakpoint) {
164
+ @media (max-width: $grid-float-breakpoint-max) {
165
165
  font-size: $font-size-300;
166
166
  }
167
167
  }
data/app/assets/stylesheets/forever_style_guide/modules/_nav-icons.scss CHANGED
@@ -30,7 +30,7 @@ $cart-count-width: 20px;
30
30
  }
31
31
 
32
32
  // Style offcanvas account icons consistent w/ product dropdowns
33
- @media (max-width: $grid-float-breakpoint) {
33
+ @media (max-width: $grid-float-breakpoint-max) {
34
34
  .navbar-account_item .nav-icon-stack {
35
35
  width: auto;
36
36
  padding: 15px !important; // override .navbar .nav.navbar-nav > li > a
@@ -55,7 +55,7 @@ $cart-count-width: 20px;
55
55
  font-size: 9px;
56
56
  @include transition(transform 0.2s ease-in-out);
57
57
 
58
- @media(max-width: $grid-float-breakpoint) {
58
+ @media(max-width: $grid-float-breakpoint-max) {
59
59
  @include chevron-style;
60
60
  }
61
61
  }
@@ -102,7 +102,7 @@ a.cart-icon {
102
102
  }
103
103
  }
104
104
  a.cart-icon {
105
- @media (max-width: $grid-float-breakpoint) {
105
+ @media (max-width: $grid-float-breakpoint-max) {
106
106
  position: absolute;
107
107
  right: 0;
108
108
  @include nav-border(left);
data/app/assets/stylesheets/forever_style_guide/modules/_nav-offcanvas.scss CHANGED
@@ -1,9 +1,8 @@
1
1
  // https://github.com/iamphill/Bootstrap-Offcanvas
2
2
  $offcanvas-width: 270px !default;
3
3
  $offcanvas-animation-time: .15s !default;
4
- $offcanvas-media: $grid-float-breakpoint!default;
5
4
 
6
- @media (max-width: $offcanvas-media) {
5
+ @media (max-width: $grid-float-breakpoint-max) {
7
6
  .offcanvas-stop-scrolling {
8
7
  height: 100%;
9
8
  overflow: hidden;
@@ -47,7 +46,7 @@ $offcanvas-media: $grid-float-breakpoint!default;
47
46
  @media (min-width: $grid-float-breakpoint) {
48
47
  display: none !important;
49
48
  }
50
- @media (max-width: $grid-float-breakpoint) {
49
+ @media (max-width: $grid-float-breakpoint-max) {
51
50
  display: block !important;
52
51
  }
53
52
  }
@@ -55,7 +54,7 @@ $offcanvas-media: $grid-float-breakpoint!default;
55
54
  @media (min-width: $grid-float-breakpoint) {
56
55
  display: block !important;
57
56
  }
58
- @media (max-width: $grid-float-breakpoint) {
57
+ @media (max-width: $grid-float-breakpoint-max) {
59
58
  display: none !important;
60
59
  }
61
60
  }
data/app/assets/stylesheets/forever_style_guide/modules/_nav.scss CHANGED
@@ -10,7 +10,7 @@ $nav-bg-color: color('gray-700');
10
10
 
11
11
  // Basic styles - A lot of overriding Bootstrap defaults
12
12
  .navbar-toggle {
13
- @media (max-width: $grid-float-breakpoint) {
13
+ @media (max-width: $grid-float-breakpoint-max) {
14
14
  display: block;
15
15
  }
16
16
  }
@@ -49,7 +49,7 @@ $nav-bg-color: color('gray-700');
49
49
  margin-top: 0;
50
50
  margin-bottom: 0;
51
51
 
52
- @media (max-width: $grid-float-breakpoint) {
52
+ @media (max-width: $grid-float-breakpoint-max) {
53
53
  margin-left: 0;
54
54
  margin-right: 0;
55
55
  }
@@ -59,7 +59,7 @@ $nav-bg-color: color('gray-700');
59
59
  color: color('gray-400');
60
60
  font-size: $font-size-500;
61
61
 
62
- @media (max-width: $grid-float-breakpoint) {
62
+ @media (max-width: $grid-float-breakpoint-max) {
63
63
  padding-top: $offcanvas-padding;
64
64
  @include nav-border(top);
65
65
  border-color: color('gray-600')
@@ -88,7 +88,7 @@ $nav-bg-color: color('gray-700');
88
88
 
89
89
  &:hover,
90
90
  &:focus {
91
- @media (max-width: $grid-float-breakpoint) {
91
+ @media (max-width: $grid-float-breakpoint-max) {
92
92
  color: color('gray-400');
93
93
  }
94
94
  }
data/app/assets/stylesheets/forever_style_guide/modules/_responsive_utilities.scss ADDED
@@ -0,0 +1,53 @@
1
+ // TODO - this could be more dynamic w/ an @each, but I was having trouble w/ the syntax
2
+
3
+ .pull-right-xs {
4
+ @media (max-width: $screen-xs-max) {
5
+ float: right !important;
6
+ }
7
+ }
8
+ .pull-right-sm {
9
+ @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
10
+ float: right !important;
11
+ }
12
+ }
13
+ .pull-right-md {
14
+ @media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
15
+ float: right !important;
16
+ }
17
+ }
18
+ .pull-right-lg {
19
+ @media (min-width: $screen-lg-min) {
20
+ float: right !important;
21
+ }
22
+ }
23
+ .pull-right-grid-float-breakpoint {
24
+ @media (min-width: $grid-float-breakpoint) {
25
+ float: right !important;
26
+ }
27
+ }
28
+
29
+ .pull-left-xs {
30
+ @media (max-width: $screen-xs-max) {
31
+ float: left !important;
32
+ }
33
+ }
34
+ .pull-left-sm {
35
+ @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
36
+ float: left !important;
37
+ }
38
+ }
39
+ .pull-left-md {
40
+ @media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
41
+ float: left !important;
42
+ }
43
+ }
44
+ .pull-left-lg {
45
+ @media (min-width: $screen-lg-min) {
46
+ float: left !important;
47
+ }
48
+ }
49
+ .pull-left-grid-float-breakpoint {
50
+ @media (min-width: $grid-float-breakpoint) {
51
+ float: left !important;
52
+ }
53
+ }
data/app/assets/stylesheets/forever_style_guide/modules/_shame.scss CHANGED
@@ -1,5 +1,5 @@
1
1
  // overrides bootstraps collapse breakpoint
2
- @media (max-width: $grid-float-breakpoint) {
2
+ @media (max-width: $grid-float-breakpoint-max) {
3
3
  .navbar-header {
4
4
  float: none;
5
5
  }
data/app/helpers/forever_style_guide/application_helper.rb CHANGED
@@ -32,6 +32,16 @@ module ForeverStyleGuide
32
32
  url = URI.decode(url.to_s)
33
33
  end
34
34
 
35
+ def absolute_url(url_str)
36
+ return unless url_str.present?
37
+
38
+ url_str = url_str.strip
39
+
40
+ return url_str if url_str =~ /https?\:/i
41
+
42
+ "http://" + url_str
43
+ end
44
+
35
45
  def has_item_in_cart?
36
46
  defined?(current_order) && current_order.product_count > 0
37
47
  end
@@ -120,6 +130,10 @@ module ForeverStyleGuide
120
130
  web_app_url('/#/settings')
121
131
  end
122
132
 
133
+ def ambassador_settings_url
134
+ www_url('/settings/my_ambassador')
135
+ end
136
+
123
137
  # Combined Store/WWW Paths - now all available at www.forever.com
124
138
  def login_url
125
139
  www_url('/sign_in')
data/app/views/forever_style_guide/sections/components/navigation/_nav_ambassador_dropdown.erb CHANGED
@@ -20,7 +20,7 @@
20
20
 
21
21
  <% if has_ambassador? %>
22
22
 
23
- <%= link_to 'change', find_ambassador_url, title: 'Change Your Forever Ambassador', class: 'pull-right dropdown-ambassador-edit_btn' %>
23
+ <%= link_to 'Manage Ambassador', ambassador_settings_url, title: 'Manage Your Forever Ambassador', class: 'pull-right-grid-float-breakpoint dropdown-ambassador-edit_btn' %>
24
24
  <div class='dropdown-menu-account-divider'></div>
25
25
 
26
26
  <div>
@@ -56,33 +56,33 @@
56
56
  </div>
57
57
  <% end %>
58
58
 
59
- <% if current_ambassador.website %>
59
+ <% if current_ambassador.website.present? %>
60
60
  <div class="col-grid-float-6">
61
- <%= link_to '//' + current_ambassador.website, title: current_ambassador.website, class: 'btn btn-default btn-link btn-action dropdown-ambassador-contact_btn', target: '_blank' do %>
61
+ <%= link_to absolute_url(current_ambassador.website), title: absolute_url(current_ambassador.website), class: 'btn btn-default btn-link btn-action dropdown-ambassador-contact_btn', target: '_blank' do %>
62
62
  <i class="fa fa-fw fa-link btn-action-icon"></i><span class="btn-action-label">My Website</span>
63
63
  <% end %>
64
64
  </div>
65
65
  <% end %>
66
66
 
67
- <% if current_ambassador.facebook_url %>
67
+ <% if current_ambassador.facebook_url.present? %>
68
68
  <div class="col-grid-float-6">
69
- <%= link_to '//' + current_ambassador.facebook_url, title: current_ambassador.facebook_url, class: 'btn btn-default btn-link btn-action dropdown-ambassador-contact_btn', target: '_blank' do %>
69
+ <%= link_to absolute_url(current_ambassador.facebook_url), title: absolute_url(current_ambassador.facebook_url), class: 'btn btn-default btn-link btn-action dropdown-ambassador-contact_btn', target: '_blank' do %>
70
70
  <i class="fa fa-fw fa-facebook btn-action-icon"></i><span class="btn-action-label">My Facebook Page</span>
71
71
  <% end %>
72
72
  </div>
73
73
  <% end %>
74
74
 
75
- <% if current_ambassador.twitter_handle %>
75
+ <% if current_ambassador.twitter_handle.present? %>
76
76
  <div class="col-grid-float-6">
77
- <%= link_to '//' + current_ambassador.twitter_handle, title: current_ambassador.twitter_handle, class: 'btn btn-default btn-link btn-action dropdown-ambassador-contact_btn', target: '_blank' do %>
77
+ <%= link_to absolute_url(current_ambassador.twitter_handle), title: absolute_url(current_ambassador.twitter_handle), class: 'btn btn-default btn-link btn-action dropdown-ambassador-contact_btn', target: '_blank' do %>
78
78
  <i class="fa fa-fw fa-twitter btn-action-icon"></i><span class="btn-action-label">Follow me on Twitter</span>
79
79
  <% end %>
80
80
  </div>
81
81
  <% end %>
82
82
 
83
- <% if current_ambassador.instagram_url %>
83
+ <% if current_ambassador.instagram_url.present? %>
84
84
  <div class="col-grid-float-6">
85
- <%= link_to '//' + current_ambassador.instagram_url, title: current_ambassador.instagram_url, class: 'btn btn-default btn-link btn-action dropdown-ambassador-contact_btn', target: '_blank' do %>
85
+ <%= link_to absolute_url(current_ambassador.instagram_url), title: absolute_url(current_ambassador.instagram_url), class: 'btn btn-default btn-link btn-action dropdown-ambassador-contact_btn', target: '_blank' do %>
86
86
  <i class="fa fa-fw fa-instagram btn-action-icon"></i><span class="btn-action-label">Follow me on Instagram</span>
87
87
  <% end %>
88
88
  </div>
data/lib/forever_style_guide/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ForeverStyleGuide
2
- VERSION = "3.0.32"
2
+ VERSION = "3.0.33"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: forever_style_guide
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.32
4
+ version: 3.0.33
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nicholas McClay
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-10-31 00:00:00.000000000 Z
11
+ date: 2016-11-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -266,6 +266,7 @@ files:
266
266
  - app/assets/stylesheets/forever_style_guide/modules/_popover.scss
267
267
  - app/assets/stylesheets/forever_style_guide/modules/_progress.scss
268
268
  - app/assets/stylesheets/forever_style_guide/modules/_promo_banner.scss
269
+ - app/assets/stylesheets/forever_style_guide/modules/_responsive_utilities.scss
269
270
  - app/assets/stylesheets/forever_style_guide/modules/_select.scss
270
271
  - app/assets/stylesheets/forever_style_guide/modules/_shame.scss
271
272
  - app/assets/stylesheets/forever_style_guide/modules/_signin.scss
@@ -314,7 +315,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
314
315
  version: '0'
315
316
  requirements: []
316
317
  rubyforge_project:
317
- rubygems_version: 2.2.2
318
+ rubygems_version: 2.5.1
318
319
  signing_key:
319
320
  specification_version: 4
320
321
  summary: A live style guide and component API for the Forever brand