woople-theme 0.2.39 → 0.2.40

data/app/assets/javascripts/woople-theme/theme.js

@@ -29,7 +29,14 @@ function setLoading(selector, element, options) {
   new Spinner(options).spin(div[0]);
 }
 
-function paginationLoading(element, options) {
+function tinyLoadingIndicator(element) {
+  options = {
+    lines:  9,
+    radius: 2,
+    length: 2,
+    width:  2
+  };
+
   var spinner = new Spinner(options).spin();
   var el      = $(element);
   var span    = $('<span></span>').addClass('loading');
@@ -37,7 +44,6 @@ function paginationLoading(element, options) {
   span.css({ 'width': el.width() });
 
   el.html(span);
-  $( spinner.el ).css({'top': '50%', 'left': '50%' });
   span.append(spinner.el);
 }
 
@@ -51,36 +57,18 @@ function visitLocation(element, newWindow) {
   }
 }
 
-function nonMobileScreen() {
-  return ($(window).width() > 768);
-}
-
 function mobileSearchToggle() {
   var mobileSearch = $('<div></div>').addClass('mobile-search');
 
-  $(window).resize(function(e) {
-    if ( nonMobileScreen() ) {
-      $('#masthead').removeClass('mobile-search-visible');
-      $('.container .menu').removeClass('mobile-search-visible');
-      $('.mobile-search').empty();
-      $('.mobile-search').hide();
-    }
-  });
-
   $('a.search-page').on('click', function(e) {
     e.preventDefault();
-
-    if ( nonMobileScreen() ) {
-      return;
-    }
-
+    
     var masthead        = $('#masthead');
     var menu            = $('.container .menu');
     var form            = $('form.search');
     var profile         = $('.profile');
 
     var clonedForm      = form.clone(true);
-    var menuOffset      = menu.offset();
 
     masthead.toggleClass('mobile-search-visible');
     menu.toggleClass('mobile-search-visible');
@@ -131,12 +119,11 @@ $(document).ready(function() {
   });
 
   $('.pagination a').on('click', function() {
-    paginationLoading(this, {
-      lines:  9,
-      radius: 2,
-      length: 2,
-      width:  2
-    });
+    tinyLoadingIndicator(this);
+  });
+
+  $('a.loading_indicator').on('click', function() {
+    tinyLoadingIndicator(this);
   });
 
   mobileSearchToggle();

data/app/assets/stylesheets/woople-theme/base.css.less

@@ -99,3 +99,19 @@ a:hover {
   }
 }
 
+
+a.loading_indicator {
+  outline: none;
+  display: inline-block;
+
+  span {
+    display: inline;
+
+    .spinner {
+      display: inline-block;
+      position: relative;
+      padding-left: 0.6em;
+      top: -0.4em;
+    }
+  }
+}

data/app/assets/stylesheets/woople-theme/pagination.css.less

@@ -22,10 +22,20 @@
       display:none;
       padding:0;
     }
-    .loading {
+  }
+  
+  a {
+    outline: none;
+
+    span {
       vertical-align: middle;
       padding: 0;
       margin: 0 auto;
+
+      .spinner {
+        top: 50%;
+        left: 50%;
+      }
     }
   }
 

data/app/assets/stylesheets/woople-theme/profile.css.less

@@ -1,25 +1,21 @@
 @import "woople-theme/variables.css.less";
 @import "woople-theme/colours.css.less";
 
-#masthead.mobile-search-visible {
-  height: 72px;
-}
-
-.container .menu.mobile-search-visible {
-  top: 120px;
-}
-
 .mobile-search {
   display: none;
-  margin-left: 0.5em;
-  margin-right: 0.5em;
+  left: 0.5em;
+  right: 0.5em;
+  position: absolute;
   margin-top: 25px;
-  text-align: right;
 
   input {
-    -webkit-appearance: searchfield;
-    margin-bottom: 10px;
-    height: 28px;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    .border-radius(28px);
+    height: 38px;
+    margin-bottom: 20px;
+    width: 100%;
   }
 }
 
@@ -110,29 +106,34 @@
     }
   }
 }
-
-@media (min-width: 320px) {
-  .mobile-search {
-    input {
-      width: 278px;
-    }
+@media (min-width: 769px) {
+  #masthead.mobile-search-visible {
+    height: 24px;
   }
-}
-@media (min-width: 480px) {
-  .mobile-search {
-    input {
-      width: 438px;
-    }
+
+  .container .menu.mobile-search-visible {
+    top: 120px;
   }
-}
-@media (min-width: 768px) {
+
   .mobile-search {
+    display: none;
+    overflow: hidden;
+    height: 0;
+    
     input {
-      width: 682px;
+      display: none;
     }
   }
 }
 @media (max-width: 768px) {
+  #masthead.mobile-search-visible {
+    height: 72px;
+  }
+
+  .container .menu.mobile-search-visible {
+    top: 120px;
+  }
+
   .profile {
     right:5px;
     width:auto;

data/app/helpers/theme_helper.rb

@@ -47,7 +47,7 @@ module ThemeHelper
   def results_header(title, path = nil)
     output = ""
     output << content_tag(:h2, title, class: 'results-header')
-    output << content_tag(:a, I18n.t('woople_theme.search_results_more'), href: path) unless path.nil?
+    output << content_tag(:a, I18n.t('woople_theme.search_results_more'), href: path, class: 'loading_indicator') unless path.nil?
     output.html_safe
   end
 end

data/lib/woople-theme/version.rb

@@ -1,3 +1,3 @@
 module WoopleTheme
-  VERSION = "0.2.39"
+  VERSION = "0.2.40"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: woople-theme
 version: !ruby/object:Gem::Version
-  version: 0.2.39
+  version: 0.2.40
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000 Z
+date: 2012-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70158104128980 !ruby/object:Gem::Requirement
+  requirement: &70133003400120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *70158104128980
+  version_requirements: *70133003400120
 - !ruby/object:Gem::Dependency
   name: less-rails-bootstrap
-  requirement: &70158104128460 !ruby/object:Gem::Requirement
+  requirement: &70133003398840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *70158104128460
+  version_requirements: *70133003398840
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70158104128080 !ruby/object:Gem::Requirement
+  requirement: &70133003397160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70158104128080
+  version_requirements: *70133003397160
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70158104143960 !ruby/object:Gem::Requirement
+  requirement: &70133003411160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70158104143960
+  version_requirements: *70133003411160
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70158104143440 !ruby/object:Gem::Requirement
+  requirement: &70133003408820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70158104143440
+  version_requirements: *70133003408820
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70158104142980 !ruby/object:Gem::Requirement
+  requirement: &70133003407400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70158104142980
+  version_requirements: *70133003407400
 description: All Front-End all the Time
 email:
 - developers@bigbangtechnology.com