forever_style_guide 3.0.37 → 3.0.38

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 63bbb7a48bfb36be74fec1c41ea93a2c5bc43fa3
4
- data.tar.gz: 37f990965e7f5afc212fb1486b652c9d8f2d2c3c
3
+ metadata.gz: 5b84d5592f0ffa81c8638e524250b3d98503e2f1
4
+ data.tar.gz: 118bad57870803d525ad2adb9b39d30a4b96aaad
5
5
  SHA512:
6
- metadata.gz: 473a8ad9ee09d4372b0fc0f6705bcd38a6acb334dc01b5277e8af36da1da3184e0ca851969d37a5dedecd3cf33a95fbcff946f675ba519011fcbadc4c280dbbb
7
- data.tar.gz: a62136245bdf00b484f425d8c07084702a362bf1ddfde5a8f9b04285c7fa5583af62470b83ec1a969bc164741c493e54a514ef5dacb3ce5c6b2299132787275f
6
+ metadata.gz: 1f3f48d8282f7fb70cc8c232a3a638fbc3581750a6377e5dcb029253283901b6b225e178a2e8dc9e296c83d6e0f4dfc900d9746ffc33310d082dff44b79190ff
7
+ data.tar.gz: 5773171943192ce079a10989198a1db51c7da649658b38e407ead7c075e109ec077e22b274bafe582c9a120aabcddf5a4c1d9dd5c4b96303c107566f1b25ffd0
@@ -1,6 +1,7 @@
1
1
  .dropdown-menu-account {
2
2
  width: 100%;
3
3
  right: 0;
4
+ padding-top: 15px;
4
5
  border-bottom-right-radius: $border-radius-large;
5
6
  border-bottom-left-radius: $border-radius-large;
6
7
 
@@ -19,8 +20,8 @@
19
20
  overflow: hidden;
20
21
 
21
22
  @media (min-width: $grid-float-breakpoint) {
22
- padding-top: 5px;
23
- padding-bottom: 5px;
23
+ padding-top: 0;
24
+ padding-bottom: $padding-small-vertical;
24
25
  }
25
26
  }
26
27
  .dropdown-menu-account-divider {
@@ -32,6 +33,10 @@
32
33
  border-color: color('gray-600');
33
34
  }
34
35
  }
36
+ .dropdown-menu-account-divider-thin {
37
+ margin-top: 0;
38
+ border-color: color('gray-600');
39
+ }
35
40
  .dropdown-menu-account-user {
36
41
  overflow: hidden;
37
42
  }
@@ -52,7 +57,6 @@
52
57
  }
53
58
  }
54
59
  .dropdown-menu-account-storage {
55
- @media (max-width: $grid-float-breakpoint-max) {
56
- font-size: $font-size-default;
57
- }
60
+ margin-bottom: 0;
61
+ font-size: $font-size-200;
58
62
  }
@@ -129,6 +129,9 @@ a.dropdown-menu-nav-link {
129
129
  margin-top: 15px;
130
130
  }
131
131
  }
132
+ &.dropdown-menu-nav-link-sm {
133
+ font-size: $font-size-default;
134
+ }
132
135
  .fa {
133
136
  margin-right: 10px;
134
137
  }
@@ -126,10 +126,19 @@ module ForeverStyleGuide
126
126
  web_app_url('/')
127
127
  end
128
128
 
129
+ # User settings links (store and web app)
129
130
  def user_settings_url
130
131
  web_app_url('/#/settings')
131
132
  end
132
133
 
134
+ def user_order_history_url
135
+ www_url('/settings/orders')
136
+ end
137
+
138
+ def user_downloads_url
139
+ www_url('/settings/downloads')
140
+ end
141
+
133
142
  def ambassador_settings_url
134
143
  www_url('/settings/my_ambassador')
135
144
  end
@@ -1,6 +1,6 @@
1
1
  <div class='container-fluid'>
2
2
  <div class='row'>
3
- <div class='col-xs-12 l-padded-thin'>
3
+ <div class='col-xs-12'>
4
4
 
5
5
  <ul class="list-unstyled">
6
6
  <li class="dropdown-menu-account-item">
@@ -16,27 +16,27 @@
16
16
  </div>
17
17
  </li>
18
18
 
19
- <li class="dropdown-menu-account-divider"></li>
20
-
21
19
  <% if current_user.superadmin? %>
22
20
  <li class="dropdown-menu-account-item">
23
- <%= link_to store_admin_url, class: 'dropdown-menu-nav-link dropdown-menu-nav-link-no_margin', title: 'Administer The Forever Store' do %>
21
+ <%= link_to store_admin_url, class: 'dropdown-menu-nav-link dropdown-menu-nav-link-sm dropdown-menu-nav-link-no_margin', title: 'Administer The Forever Store' do %>
24
22
  <i class='fa fa-shopping-basket fa-fw'></i>Store Admin
25
23
  <% end %>
26
24
  </li>
27
25
 
28
26
  <li class="dropdown-menu-account-item">
29
- <%= link_to web_app_admin_url, class: 'dropdown-menu-nav-link dropdown-menu-nav-link-no_margin', title: 'Administer The Forever Web App' do %>
27
+ <%= link_to web_app_admin_url, class: 'dropdown-menu-nav-link dropdown-menu-nav-link-sm dropdown-menu-nav-link-no_margin', title: 'Administer The Forever Web App' do %>
30
28
  <i class='fa fa-magic fa-fw'></i>Web App Admin
31
29
  <% end %>
32
30
  </li>
31
+
32
+ <li class="dropdown-menu-account-divider dropdown-menu-account-divider-thin hidden-xs hidden-sm"></li>
33
33
  <% end %>
34
34
 
35
35
  <li class="dropdown-menu-account-item <%= 'hide' if current_user.superadmin? %>">
36
- <p class="color-gray-300">
36
+ <p class="dropdown-menu-account-storage color-gray-300">
37
37
 
38
- <span class="dropdown-menu-account-storage"><%= storage_ratio_percent %> of <%= capacity_readable %></span>
39
- <%= link_to "Upgrade", upgrade_url, class: 'small', title: "Upgrade your Forever Guaranteed Permanent Storage" %>
38
+ <%= storage_ratio_percent %> of <%= capacity_readable %>
39
+ <%= link_to "Upgrade", upgrade_url, title: "Upgrade your Forever Guaranteed Permanent Storage" %>
40
40
  </p>
41
41
 
42
42
  <div class="progress progress-thin color_block-gray-400">
@@ -44,27 +44,44 @@
44
44
  </div>
45
45
  </li>
46
46
 
47
- <li class="dropdown-menu-account-divider"></li>
48
-
49
- <li class="dropdown-menu-account-item">
50
- <%= link_to user_settings_url, class: 'dropdown-menu-nav-link dropdown-menu-nav-link-no_margin', title: 'View User Settings' do %>
51
- <i class='fa fa-cog fa-fw'></i>Settings
52
- <% end %>
53
- </li>
54
-
55
47
  <% if current_user.linked_ambassador.try(:active?) %>
56
48
  <li class="dropdown-menu-account-item">
57
- <%= link_to back_office_url, class: 'dropdown-menu-nav-link dropdown-menu-nav-link-no_margin', title: 'Ambassador Back Office Reports' do %>
49
+ <%= link_to back_office_url, class: 'dropdown-menu-nav-link dropdown-menu-nav-link-sm dropdown-menu-nav-link-no_margin', title: 'Ambassador Back Office Reports' do %>
58
50
  <i class='fa fa-suitcase fa-fw'></i>My Back Office
59
51
  <% end %>
60
52
  </li>
53
+ <li class="dropdown-menu-account-divider dropdown-menu-account-divider-thin hidden-xs hidden-sm"></li>
61
54
  <% end %>
62
55
 
63
- <li class="dropdown-menu-account-divider hidden-xs hidden-sm"></li>
56
+ <li class="dropdown-menu-account-item">
57
+ <%= link_to user_settings_url, class: 'dropdown-menu-nav-link dropdown-menu-nav-link-sm dropdown-menu-nav-link-no_margin', title: 'View User Settings' do %>
58
+ <i class='fa fa-cog fa-fw'></i>Account Settings
59
+ <% end %>
60
+ </li>
61
+
62
+ <li class="dropdown-menu-account-item">
63
+ <%= link_to user_order_history_url, class: 'dropdown-menu-nav-link dropdown-menu-nav-link-sm dropdown-menu-nav-link-no_margin', title: 'View Order History' do %>
64
+ <i class='fa fa-credit-card fa-fw'></i>Order History
65
+ <% end %>
66
+ </li>
67
+
68
+ <li class="dropdown-menu-account-item">
69
+ <%= link_to user_downloads_url, class: 'dropdown-menu-nav-link dropdown-menu-nav-link-sm dropdown-menu-nav-link-no_margin', title: 'View Downloads' do %>
70
+ <i class='fa fa-cloud-download fa-fw'></i>Downloads
71
+ <% end %>
72
+ </li>
73
+
74
+ <li class="dropdown-menu-account-item">
75
+ <%= link_to projects_url, class: 'dropdown-menu-nav-link dropdown-menu-nav-link-sm dropdown-menu-nav-link-no_margin', title: 'View Print Projects' do %>
76
+ <i class='fa fa-paint-brush fa-fw'></i>Print Projects
77
+ <% end %>
78
+ </li>
79
+
80
+ <li class="dropdown-menu-account-divider dropdown-menu-account-divider-thin hidden-xs hidden-sm"></li>
64
81
 
65
82
  <li class="dropdown-menu-account-item">
66
83
 
67
- <%= link_to current_admin ? stop_impersonating_url : log_out_url, class: 'dropdown-menu-nav-link dropdown-menu-nav-link-no_margin', title: 'Log Out of Forever' do %>
84
+ <%= link_to current_admin ? stop_impersonating_url : log_out_url, class: 'dropdown-menu-nav-link dropdown-menu-nav-link-sm dropdown-menu-nav-link-no_margin', title: 'Log Out of Forever' do %>
68
85
  <i class='fa fa-share fa-fw'></i>Log Out
69
86
  <% end %>
70
87
  </li>
@@ -1,3 +1,3 @@
1
1
  module ForeverStyleGuide
2
- VERSION = "3.0.37"
2
+ VERSION = "3.0.38"
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.37
4
+ version: 3.0.38
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-11-28 00:00:00.000000000 Z
11
+ date: 2016-12-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails