ama_layout 2.4.3 → 2.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99f784baf31ce238f19832006b3f2c3555144529
-  data.tar.gz: 9b8b74c9bdd554ca20ae3d5e5e19a90995517a6d
+  metadata.gz: f431f8dd1567edc9f5b00620eb8615ec6cd4726b
+  data.tar.gz: fe4c6d5b3cb76e6b0ae3e9397ca9b6b1d8dcef0e
 SHA512:
-  metadata.gz: 9173d0e4133b4932798a470f4005a478dec8a5ffbcb7d1b77d9178cb57578f512db0f9223624926989895fe1c57445cb55541a1c0cfa0af835cfccb83d40dcc3
-  data.tar.gz: 0be0140edf483e7b514ba0de5fd0f9554225b787c9ed3f8be9dd083baa1084fedd7dff9966332a2352b4f1f7c886c950d16bf2f99d3968b098115a4372a62279
+  metadata.gz: 1dac24a3f96b080aab4fd9cf81bd8e1c39a00113e73a6400fc8bb194fa14814b5ab9a7549968fb016025a7810cd5e89d2a8be753ac6e902b13eaf962736d6f4e
+  data.tar.gz: 894481afc4b3c8b8abbb16db5fada9ee4c3ad8e24afa67a7cdede1ff87a92f959f152d64491fc50a5fa34229ad7461596a680d5b2343488f9ced80cbc61b0924

data/.gitignore

@@ -14,3 +14,4 @@
 *.o
 *.a
 mkmf.log
+*.gem

data/app/assets/images/AMA-Logo.svg

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 228 58.2" style="enable-background:new 0 0 228 58.2;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:#FFFFFF;stroke:#FFFFFF;stroke-miterlimit:10;}
+	.st2{fill:#FFFFFF;stroke:#FFFFFF;stroke-width:0.3594;}
+	.st3{fill:#01549C;}
+	.st4{fill:#D92E27;}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:#D92E27;}
+</style>
+<g>
+	<g>
+		<g>
+			<path class="st0" d="M105.8,4.1h21.8l11,34.6h0.1l11.5-34.6h21v52h-13.6l0.2-40H158l-13.3,40h-12.7l-12.7-40h-0.2l0.3,40h-13.6
+				V4.1z M69.2,4.1h17l20.1,52H91L87.2,45H67.6l-4.1,11.1H49.4L69.2,4.1z M77.7,14.8h-0.2l-6.7,20.4h13L77.7,14.8z M190.9,4.1h17
+				l20.1,52h-15.2L208.9,45h-19.5l-4.1,11.1h-14.1L190.9,4.1z M199.4,14.8h-0.1l-6.7,20.4h13.1L199.4,14.8z"/>
+		</g>
+	</g>
+	<path class="st1" d="M0.6,23.6C0.5,11.3,15.1,1.3,33.3,1.3c18.2,0,33,10,33.1,22.4C66.5,36,51.9,46,33.7,46
+		C15.5,46,0.7,36,0.6,23.6z"/>
+	<path class="st2" d="M62,14.1c3.5,4.3,4.3,11.2,1.6,16.1c-6.2,10.7-17.8,13.9-29.4,14.5C22,44.8,10.3,41.3,3.5,30.9
+		c-2.6-4.6-2.1-11.6,1.1-15.8C13.7,3.2,28.8,1,43.2,3.4C50.2,5.1,57,7.8,62,14.1L62,14.1z"/>
+	<path class="st3" d="M62,14.1c3.5,4.3,4.3,11.2,1.6,16.1c-6.2,10.7-17.8,13.9-29.4,14.5C22,44.8,10.3,41.3,3.5,30.9
+		c-2.6-4.6-2.1-11.6,1.1-15.8C13.7,3.2,28.8,1,43.2,3.4C50.2,5.1,57,7.8,62,14.1L62,14.1z"/>
+	<path class="st0" d="M58.3,17.3c1.8,2.5,2.6,6,1.7,9.1c-3.2,8.8-12.7,12.1-21.1,13.2c-10.5,1.2-21.3-0.5-28.8-7.7
+		c-2.9-3.1-4.3-7.7-2.7-11.7C11.7,11,21.7,8.3,30.9,7.3C41.6,7,51.6,9,58.3,17.3L58.3,17.3z"/>
+	<path class="st4" d="M41.2,22.1l0.5,1.4c-0.8,2.7-1.6,5.5-2.4,8.3l5.1-0.1l2.1,4.7L40.6,38c-1-2.6-1.9-5.3-2.8-8l-9.7,0
+		c-0.9,2.5-1.6,5-2.3,7.6c-1.9-0.2-3.9-0.8-5.8-1.1c0.3-1.3,0.9-2.7,1.3-4c2.8-1.3,5.1-4.4,5-7.6l-2.4-0.1l5.5-16.3
+		c2.4,0,4.4-0.1,6.7-0.1L41.2,22.1L41.2,22.1z"/>
+	<path class="st4" d="M56.7,31.1l-4.6,0c-0.3-1.1-0.6-2.2-1-3.4l-5.6-0.1c-0.3,1.1-0.5,2.3-0.8,3.4l-4.7,0L45.5,13l5.3,0L56.7,31.1
+		L56.7,31.1z"/>
+	<path class="st4" d="M24.4,16.3c0.6,0.9,0.9,1.9,0.9,3.1l-4.5,0c-0.1-0.7-0.2-1.4-0.8-1.8c-0.7-0.6-1.8-0.7-2.6-0.4
+		c-2.7,1.4-2.5,4.7-2.3,7.5c0.3,1.4,0.8,3.2,2.4,3.7c0.9,0,1.7,0,2.3-0.5c0.6-0.7,0.9-1.5,1.1-2.3h4.6c-0.3,3.1-2.7,5.8-5.7,6.6
+		c-2.7,0.5-5.4-0.2-7.2-2.3c-2.8-3.2-3.1-8.1-1.3-11.9c1.2-2.5,3.7-4.4,6.4-4.7C20.4,13.1,22.7,14.1,24.4,16.3L24.4,16.3z"/>
+	<path class="st0" d="M36.1,25.2h-6.5l3.1-10.4C33.8,18.3,35,21.7,36.1,25.2L36.1,25.2z"/>
+	<path class="st0" d="M46.6,23.7c0.4-1.8,0.9-3.8,1.4-5.6l1.7,5.6H46.6L46.6,23.7z"/>
+	<path class="st5" d="M57.4,27.9c0.6,0,1.1-0.4,1.1-1.1c0-0.6-0.5-1-1.1-1c-0.6,0-1.1,0.4-1.1,1C56.3,27.4,56.8,27.9,57.4,27.9
+		L57.4,27.9z M56.5,26.8c0-0.5,0.4-0.9,0.9-0.9c0.5,0,0.9,0.4,0.9,0.9c0,0.5-0.4,0.9-0.9,0.9C56.9,27.7,56.5,27.3,56.5,26.8
+		L56.5,26.8z M57.2,26.9h0.2l0.3,0.5h0.2l-0.3-0.5c0.2,0,0.3-0.1,0.3-0.3c0-0.2-0.1-0.3-0.4-0.3H57v1.2h0.2V26.9L57.2,26.9z
+		 M57.2,26.7v-0.4h0.3c0.1,0,0.3,0,0.3,0.2c0,0.2-0.1,0.2-0.3,0.2H57.2L57.2,26.7z"/>
+</g>
+</svg>

data/app/assets/stylesheets/ama_layout/layout_components/sidebar.scss

@@ -7,8 +7,10 @@
   padding: $base-padding*3;
 }
 
-.dashboard-title:first-child{
-  @extend .mt0;
+.dashboard-title{
+  &:first-child{
+    @extend .mt0;
+  }
 }
 
 .dashboard-nav{
@@ -70,10 +72,13 @@
     }
   }
 
-  .inner-nav li:hover,
-  .inner-nav li:active{
-    text-decoration: underline;
-  }
+  .inner-nav{
+    li:hover,
+    li:active{
+      text-decoration: underline;
+    }
+  } 
+    
 
   span{
     display: block;
@@ -135,12 +140,19 @@ span.activepage{
   @extend .row;
 }
 
-.title-area li.name img{
-  padding-top: $base-padding*2;
+.title-area{
+  li.name{
+    img{
+      padding-top: $base-padding*2;
+      height: 35px;
+    }
+  }
 }
 
-.top-bar a{
-  text-decoration: none;
+.top-bar{
+  a{
+    text-decoration: none;
+  }
 }
 
 .dropdown-open-link{
@@ -171,11 +183,14 @@ ul.dropdown:not(.nested){
     }
   }
 
-  .title.back a{
-    font-weight: bold;
+  .title.back{
+    a{
+      font-weight: bold;
+    }
   }
 }
 
-.sub-nav {
+
+.sub-nav{
   margin-left: -14px;
 }

data/app/views/ama_layout/_siteheader.html.erb

@@ -2,7 +2,7 @@
   <nav class="top-bar" data-topbar data-options="mobile_show_parent_link: false" role="navigation">
     <ul class="title-area">
       <li class="name">
-        <%= link_to(image_tag("AMA-Logo.png"), "https://www.ama.ab.ca") %>
+        <%= link_to(image_tag("AMA-Logo.svg"), "https://www.ama.ab.ca") %>
       </li>
       <li class="toggle-topbar menu-icon"><a href="#"><span></span></a></li>
     </ul>

data/lib/ama_layout/version.rb

@@ -1,3 +1,3 @@
 module AmaLayout
-  VERSION = '2.4.3'
+  VERSION = '2.4.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ama_layout
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.4.4
 platform: ruby
 authors:
 - Michael van den Beuken
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foundation-rails
@@ -242,7 +242,7 @@ files:
 - README.md
 - Rakefile
 - ama_layout.gemspec
-- app/assets/images/AMA-Logo.png
+- app/assets/images/AMA-Logo.svg
 - app/assets/images/alberta-blur.jpg
 - app/assets/images/footer-racetrack-big.png
 - app/assets/javascripts/ama_layout/ama_layout_namespace.js.coffee