forever_style_guide 3.0.37 → 3.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63bbb7a48bfb36be74fec1c41ea93a2c5bc43fa3
-  data.tar.gz: 37f990965e7f5afc212fb1486b652c9d8f2d2c3c
+  metadata.gz: 5b84d5592f0ffa81c8638e524250b3d98503e2f1
+  data.tar.gz: 118bad57870803d525ad2adb9b39d30a4b96aaad
 SHA512:
-  metadata.gz: 473a8ad9ee09d4372b0fc0f6705bcd38a6acb334dc01b5277e8af36da1da3184e0ca851969d37a5dedecd3cf33a95fbcff946f675ba519011fcbadc4c280dbbb
-  data.tar.gz: a62136245bdf00b484f425d8c07084702a362bf1ddfde5a8f9b04285c7fa5583af62470b83ec1a969bc164741c493e54a514ef5dacb3ce5c6b2299132787275f
+  metadata.gz: 1f3f48d8282f7fb70cc8c232a3a638fbc3581750a6377e5dcb029253283901b6b225e178a2e8dc9e296c83d6e0f4dfc900d9746ffc33310d082dff44b79190ff
+  data.tar.gz: 5773171943192ce079a10989198a1db51c7da649658b38e407ead7c075e109ec077e22b274bafe582c9a120aabcddf5a4c1d9dd5c4b96303c107566f1b25ffd0

data/app/assets/stylesheets/forever_style_guide/modules/_nav-dropdowns-account.scss

@@ -1,6 +1,7 @@
 .dropdown-menu-account {
   width: 100%;
   right: 0;
+  padding-top: 15px;
   border-bottom-right-radius: $border-radius-large;
   border-bottom-left-radius: $border-radius-large;
 
@@ -19,8 +20,8 @@
   overflow: hidden;
 
   @media (min-width: $grid-float-breakpoint) {
-    padding-top: 5px;
-    padding-bottom: 5px;
+    padding-top: 0;
+    padding-bottom: $padding-small-vertical;
   }
 }
 .dropdown-menu-account-divider {
@@ -32,6 +33,10 @@
     border-color: color('gray-600');
   }
 }
+.dropdown-menu-account-divider-thin {
+  margin-top: 0;
+  border-color: color('gray-600');
+}
 .dropdown-menu-account-user {
   overflow: hidden;
 }
@@ -52,7 +57,6 @@
   }
 }
 .dropdown-menu-account-storage {
-  @media (max-width: $grid-float-breakpoint-max) {
-    font-size: $font-size-default;
-  }
+  margin-bottom: 0;
+  font-size: $font-size-200;
 }

data/app/assets/stylesheets/forever_style_guide/modules/_nav-dropdowns.scss

@@ -129,6 +129,9 @@ a.dropdown-menu-nav-link {
       margin-top: 15px;
     }
   }
+  &.dropdown-menu-nav-link-sm {
+    font-size: $font-size-default;
+  }
   .fa {
     margin-right: 10px;
   }

data/app/helpers/forever_style_guide/application_helper.rb

@@ -126,10 +126,19 @@ module ForeverStyleGuide
       web_app_url('/')
     end
 
+    # User settings links (store and web app)
     def user_settings_url
       web_app_url('/#/settings')
     end
 
+    def user_order_history_url
+      www_url('/settings/orders')
+    end
+
+    def user_downloads_url
+      www_url('/settings/downloads')
+    end
+
     def ambassador_settings_url
       www_url('/settings/my_ambassador')
     end

data/app/views/forever_style_guide/sections/components/navigation/_nav_account_dropdown_menu.erb

@@ -1,6 +1,6 @@
 <div class='container-fluid'>
   <div class='row'>
-    <div class='col-xs-12 l-padded-thin'>
+    <div class='col-xs-12'>
 
       <ul class="list-unstyled">
         <li class="dropdown-menu-account-item">
@@ -16,27 +16,27 @@
           </div>
         </li>
 
-        <li class="dropdown-menu-account-divider"></li>
-
         <% if current_user.superadmin? %>
           <li class="dropdown-menu-account-item">
-            <%= link_to store_admin_url, class: 'dropdown-menu-nav-link dropdown-menu-nav-link-no_margin', title: 'Administer The Forever Store' do %>
+            <%= 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 %>
               <i class='fa fa-shopping-basket fa-fw'></i>Store Admin
             <% end %>
           </li>
 
           <li class="dropdown-menu-account-item">
-            <%= link_to web_app_admin_url, class: 'dropdown-menu-nav-link dropdown-menu-nav-link-no_margin', title: 'Administer The Forever Web App' do %>
+            <%= 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 %>
               <i class='fa fa-magic fa-fw'></i>Web App Admin
             <% end %>
           </li>
+
+          <li class="dropdown-menu-account-divider dropdown-menu-account-divider-thin hidden-xs hidden-sm"></li>
         <% end %>
 
         <li class="dropdown-menu-account-item <%= 'hide' if current_user.superadmin? %>">
-          <p class="color-gray-300">
+          <p class="dropdown-menu-account-storage color-gray-300">
 
-            <span class="dropdown-menu-account-storage"><%= storage_ratio_percent %> of <%= capacity_readable %></span>
-            <%= link_to "Upgrade", upgrade_url, class: 'small', title: "Upgrade your Forever Guaranteed Permanent Storage" %>
+            <%= storage_ratio_percent %> of <%= capacity_readable %>
+            <%= link_to "Upgrade", upgrade_url, title: "Upgrade your Forever Guaranteed Permanent Storage" %>
           </p>
 
           <div class="progress progress-thin color_block-gray-400">
@@ -44,27 +44,44 @@
           </div>
         </li>
 
-        <li class="dropdown-menu-account-divider"></li>
-
-        <li class="dropdown-menu-account-item">
-          <%= link_to user_settings_url, class: 'dropdown-menu-nav-link dropdown-menu-nav-link-no_margin', title: 'View User Settings' do %>
-            <i class='fa fa-cog fa-fw'></i>Settings
-          <% end %>
-        </li>
-
         <% if current_user.linked_ambassador.try(:active?) %>
           <li class="dropdown-menu-account-item">
-            <%= link_to back_office_url, class: 'dropdown-menu-nav-link dropdown-menu-nav-link-no_margin', title: 'Ambassador Back Office Reports' do %>
+            <%= 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 %>
               <i class='fa fa-suitcase fa-fw'></i>My Back Office
             <% end %>
           </li>
+          <li class="dropdown-menu-account-divider dropdown-menu-account-divider-thin hidden-xs hidden-sm"></li>
         <% end %>
 
-        <li class="dropdown-menu-account-divider hidden-xs hidden-sm"></li>
+        <li class="dropdown-menu-account-item">
+          <%= 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 %>
+            <i class='fa fa-cog fa-fw'></i>Account Settings
+          <% end %>
+        </li>
+
+        <li class="dropdown-menu-account-item">
+          <%= 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 %>
+            <i class='fa fa-credit-card fa-fw'></i>Order History
+          <% end %>
+        </li>
+
+        <li class="dropdown-menu-account-item">
+          <%= 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 %>
+            <i class='fa fa-cloud-download fa-fw'></i>Downloads
+          <% end %>
+        </li>
+
+        <li class="dropdown-menu-account-item">
+          <%= 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 %>
+            <i class='fa fa-paint-brush fa-fw'></i>Print Projects
+          <% end %>
+        </li>
+
+        <li class="dropdown-menu-account-divider dropdown-menu-account-divider-thin hidden-xs hidden-sm"></li>
 
         <li class="dropdown-menu-account-item">
 
-          <%= 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 %>
+          <%= 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 %>
             <i class='fa fa-share fa-fw'></i>Log Out
           <% end %>
         </li>

data/lib/forever_style_guide/version.rb

@@ -1,3 +1,3 @@
 module ForeverStyleGuide
-  VERSION = "3.0.37"
+  VERSION = "3.0.38"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forever_style_guide
 version: !ruby/object:Gem::Version
-  version: 3.0.37
+  version: 3.0.38
 platform: ruby
 authors:
 - Nicholas McClay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2016-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails