woople-theme 0.2.47 → 0.2.48

data/app/assets/stylesheets/woople-theme/content-item.css.less

@@ -144,6 +144,10 @@
     }
 
     .content-item-content {
+      float: none;
+      margin-left: 0;
+      width: auto;
+
       h2 {
         margin-left:@phoneOffset;
         margin-right:@phoneMargin;
@@ -155,8 +159,10 @@
       margin-left: @phoneOffset;
 
       > div {
-        float:left;
-        margin-right:@phoneMargin;
+        float: left;
+        margin-left: 0;
+        margin-right: @phoneMargin;
+        width: auto;
       }
     }
   }

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

@@ -102,7 +102,9 @@
     }
 
     .search-query {
+      .border-radius(14px);
       padding-left:30px;
+      padding-right: 14px;
     }
   }
 }

data/app/assets/stylesheets/woople-theme/search-results.css.less

@@ -1,16 +1,21 @@
 @import "woople-theme/variables.css.less";
 @import "woople-theme/colours.css.less";
 
-h2.results-header {
-  .content-title();
-  background-color:@highlight;
-  color: #fff;
-  display: inline-block;
-  margin-right: 10px;
-  padding: 0.5em 20px;
-  text-shadow:0 1px 0 rgba(0,0,0,0.5);
+.results-header {
+  .title {
+    display: inline-block;
+    margin-right: 8px;
+    padding: 8px 20px;
+    background-color: @highlight;
+
+    .content-title();
+    margin-bottom: 0;
+
+    color: white;
+    text-shadow: 0 1px rgba(0, 0, 0, 0.5);
+  }
 }
 
-.content-item + h2 {
-  margin-top: 40px;
+.content-item + .results-header {
+  margin-top: 30px;
 }

data/app/helpers/theme_helper.rb

@@ -44,11 +44,8 @@ module ThemeHelper
     render 'woople-theme/menu', menu: model
   end
 
-  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, class: 'loading_indicator') unless path.nil?
-    output.html_safe
+  def results_header title, path
+    render partial: 'woople-theme/results_header', locals: { title: title, path: path }
   end
 
   def assessment_form assessment_form
@@ -66,4 +63,4 @@ module ThemeHelper
 
     render 'woople-theme/impersonation_banner', impersonation: model
   end
-end
+end

data/app/views/woople-theme/_results_header.html.erb

@@ -0,0 +1,3 @@
+<div class="results-header">
+  <span class="title"><%= title %></span> <%= link_to t('woople_theme.search_results_more'), path, class: 'loading_indicator' %>
+</div>

data/lib/woople-theme/version.rb

@@ -1,3 +1,3 @@
 module WoopleTheme
-  VERSION = "0.2.47"
+  VERSION = "0.2.48"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: woople-theme
 version: !ruby/object:Gem::Version
-  version: 0.2.47
+  version: 0.2.48
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70166974359260 !ruby/object:Gem::Requirement
+  requirement: &70213194972100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *70166974359260
+  version_requirements: *70213194972100
 - !ruby/object:Gem::Dependency
   name: less-rails-bootstrap
-  requirement: &70166974358740 !ruby/object:Gem::Requirement
+  requirement: &70213194971560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.13
   type: :runtime
   prerelease: false
-  version_requirements: *70166974358740
+  version_requirements: *70213194971560
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &70166974358360 !ruby/object:Gem::Requirement
+  requirement: &70213194971180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70166974358360
+  version_requirements: *70213194971180
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70166974357880 !ruby/object:Gem::Requirement
+  requirement: &70213194970700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166974357880
+  version_requirements: *70213194970700
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70166974357460 !ruby/object:Gem::Requirement
+  requirement: &70213194970100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166974357460
+  version_requirements: *70213194970100
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70166974356960 !ruby/object:Gem::Requirement
+  requirement: &70213194969460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70166974356960
+  version_requirements: *70213194969460
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70166974356540 !ruby/object:Gem::Requirement
+  requirement: &70213194968900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166974356540
+  version_requirements: *70213194968900
 description: All Front-End all the Time
 email:
 - developers@bigbangtechnology.com
@@ -183,6 +183,7 @@ files:
 - app/views/woople-theme/_outline_videos.html.erb
 - app/views/woople-theme/_page_header.html.erb
 - app/views/woople-theme/_profile.html.erb
+- app/views/woople-theme/_results_header.html.erb
 - app/views/woople-theme/_video_modal.html.erb
 - config/locales/en.yml
 - config/routes.rb
@@ -221,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Our Front-End CSS Framework/Theme