ama_layout 4.5.1 → 4.6.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/stylesheets/ama_layout/_settings.scss +1 -1
- data/app/assets/stylesheets/ama_layout/application.scss +1 -2
- data/app/assets/stylesheets/ama_layout/layout_components/features.scss +104 -0
- data/app/assets/stylesheets/ama_layout/layout_components/hero.scss +41 -0
- data/app/assets/stylesheets/ama_layout/layout_components/index.scss +3 -1
- data/app/assets/stylesheets/ama_layout/layout_components/siteheader.scss +21 -1
- data/app/assets/stylesheets/ama_layout/webfonts/ama-icon-font.scss +0 -1
- data/app/assets/stylesheets/ama_layout/webfonts/fonts/Wisdom-Script.woff +0 -0
- data/app/assets/stylesheets/ama_layout/webfonts/index.scss +3 -0
- data/app/assets/stylesheets/ama_layout/webfonts/wisdom-font.scss +11 -0
- data/app/views/ama_layout/_siteheader.html.erb +2 -0
- data/app/views/application/_account_toggle.html.erb +0 -0
- data/lib/ama_layout/decorators/navigation_decorator.rb +4 -0
- data/lib/ama_layout/version.rb +1 -1
- data/spec/ama_layout/decorators/navigation_decorator_spec.rb +8 -0
- metadata +9 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 9b7d55a4cca87c12448862050977ccccb8ebc58c
|
|
4
|
+
data.tar.gz: 78398d87b57b7579f9dcf3249c5d52976818fd64
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 90d2bb0e93d996af144876d9676c493b1c71cd703d0413478cd3cb512cbb4d4ad7e6a42d452ec6e766560790de35188a0423938736d67dac25499013dd97bf7b
|
|
7
|
+
data.tar.gz: de941035dfb511b3a72de710b8f4243af5b7c1d76ed0b4c3891311808d94f850c9d21dbd396e6c6741b286011530990b7b47f87ed736caf9b8768332bb3fe287
|
|
@@ -378,7 +378,7 @@ $mediaobject-image-width-stacked: 100%;
|
|
|
378
378
|
|
|
379
379
|
$menu-margin: 0;
|
|
380
380
|
$menu-margin-nested: 1rem;
|
|
381
|
-
$menu-item-padding: 1.2rem
|
|
381
|
+
$menu-item-padding: 1.2rem 2rem;
|
|
382
382
|
$menu-item-color-active: $cerulean;
|
|
383
383
|
$menu-item-background-active: map-get($foundation-palette, primary);
|
|
384
384
|
$menu-icon-spacing: 0.25rem;
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
.feature{
|
|
2
|
+
&__container{
|
|
3
|
+
background: $white;
|
|
4
|
+
}
|
|
5
|
+
|
|
6
|
+
&__section-title{
|
|
7
|
+
@extend .wisdom-script;
|
|
8
|
+
text-align: center;
|
|
9
|
+
font-size: $base-font-size*2.857;
|
|
10
|
+
|
|
11
|
+
@include breakpoint(medium down){
|
|
12
|
+
margin-top: $base-margin*2;
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
&__item{
|
|
17
|
+
padding: $base-padding*2 0;
|
|
18
|
+
text-align: center;
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
&__image{
|
|
22
|
+
margin: 0 auto $base-margin auto;
|
|
23
|
+
width: 415px;
|
|
24
|
+
height: 219px;
|
|
25
|
+
background-repeat: no-repeat;
|
|
26
|
+
background-size: contain;
|
|
27
|
+
max-width: 100%;
|
|
28
|
+
background-position: center;
|
|
29
|
+
|
|
30
|
+
@include breakpoint(small only){
|
|
31
|
+
max-width: 90%;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
&__content{
|
|
36
|
+
@include breakpoint(large){
|
|
37
|
+
width: 80%;
|
|
38
|
+
margin: 0 auto;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
#feature__image{
|
|
44
|
+
&--devices{
|
|
45
|
+
background-image: asset-url(devices);
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
&--membership{
|
|
49
|
+
background-image: asset-url(membership);
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
&--vrar{
|
|
53
|
+
background-image: asset-url(vrar);
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
&--automotive{
|
|
57
|
+
background-image: asset-url(automotive);
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
&--rewards{
|
|
61
|
+
background-image: asset-url(rewards);
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
&--subscriptions{
|
|
65
|
+
background-image: asset-url(subscriptions);
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
&--gift-cards{
|
|
69
|
+
background-image: asset-url(gift-card);
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
@media (-webkit-min-device-pixel-ratio: 2),
|
|
74
|
+
(min-resolution: 192dpi){
|
|
75
|
+
#feature__image{
|
|
76
|
+
&--devices{
|
|
77
|
+
background-image: asset-url(devices2x);
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
&--feature--membership{
|
|
81
|
+
background-image: asset-url(membership2x);
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
&--vrar{
|
|
85
|
+
background-image: asset-url(vrar2x);
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
&--automotive{
|
|
89
|
+
background-image: asset-url(automotive2x);
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
&--rewards{
|
|
93
|
+
background-image: asset-url(rewards2x);
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
&--subscriptions{
|
|
97
|
+
background-image: asset-url(subscriptions2x);
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
&--gift-cards{
|
|
101
|
+
background-image: asset-url(gift-card2x);
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
.hero{
|
|
2
|
+
&--grey{
|
|
3
|
+
margin: 100px auto;
|
|
4
|
+
|
|
5
|
+
@include breakpoint(medium down){
|
|
6
|
+
margin-top: $base-margin;
|
|
7
|
+
}
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
&--cerulean{
|
|
11
|
+
background: $cerulean;
|
|
12
|
+
width: 100%;
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
&__heading{
|
|
16
|
+
color: $white;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
&__image{
|
|
20
|
+
margin: $base-margin*2 0;
|
|
21
|
+
width: 540px;
|
|
22
|
+
height: 193px;
|
|
23
|
+
background-repeat: no-repeat;
|
|
24
|
+
background-size: contain;
|
|
25
|
+
max-width: 100%;
|
|
26
|
+
background-position: center;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
.row-fluid{
|
|
31
|
+
@include grid-row;
|
|
32
|
+
width: 80%;
|
|
33
|
+
margin: 0 auto;
|
|
34
|
+
padding: 100px 0;
|
|
35
|
+
|
|
36
|
+
@include breakpoint(medium down){
|
|
37
|
+
width: 100%;
|
|
38
|
+
margin: 0;
|
|
39
|
+
padding: $base-padding 0;
|
|
40
|
+
}
|
|
41
|
+
}
|
|
@@ -8,10 +8,12 @@
|
|
|
8
8
|
@import "cart";
|
|
9
9
|
@import "comparison-radios";
|
|
10
10
|
@import "content-toggle";
|
|
11
|
-
@import "error-page
|
|
11
|
+
@import "error-page";
|
|
12
|
+
@import "features";
|
|
12
13
|
@import "footer";
|
|
13
14
|
@import "forms";
|
|
14
15
|
@import "graph";
|
|
16
|
+
@import "hero";
|
|
15
17
|
@import "icon-group";
|
|
16
18
|
@import "link-list";
|
|
17
19
|
@import "links";
|
|
@@ -2,6 +2,10 @@
|
|
|
2
2
|
.logo{
|
|
3
3
|
width: 131px;
|
|
4
4
|
padding: $base-padding*.75 0;
|
|
5
|
+
|
|
6
|
+
@include breakpoint(large){
|
|
7
|
+
padding: $base-padding*.75 0 $base-padding*.75 $base-padding;
|
|
8
|
+
}
|
|
5
9
|
}
|
|
6
10
|
|
|
7
11
|
.header{
|
|
@@ -13,7 +17,6 @@
|
|
|
13
17
|
|
|
14
18
|
.top-bar{
|
|
15
19
|
@extend .show-for-large;
|
|
16
|
-
padding: 0 $base-padding;
|
|
17
20
|
height: $top-bar-height;
|
|
18
21
|
background: $white;
|
|
19
22
|
|
|
@@ -21,6 +24,23 @@
|
|
|
21
24
|
@extend .logo;
|
|
22
25
|
}
|
|
23
26
|
|
|
27
|
+
&__item{
|
|
28
|
+
@include breakpoint(large){
|
|
29
|
+
height: $top-bar-height;
|
|
30
|
+
|
|
31
|
+
&--highlighted{
|
|
32
|
+
@extend .top-bar__item;
|
|
33
|
+
background: $brand-blue-light;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
&__link--highlighted{
|
|
39
|
+
@include breakpoint(large){
|
|
40
|
+
color: $white;
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
|
|
24
44
|
.submenu{
|
|
25
45
|
border: none;
|
|
26
46
|
|
|
@@ -7,7 +7,6 @@
|
|
|
7
7
|
asset-url("ama_layout/webfonts/fonts/ama-icon-font.woff") format("woff"),
|
|
8
8
|
asset-url("ama_layout/webfonts/fonts/ama-icon-font.ttf") format("truetype"),
|
|
9
9
|
asset-url("ama_layout/webfonts/fonts/ama-icon-font.svg#ama-icon-font") format("svg");
|
|
10
|
-
font-weight: normal;
|
|
11
10
|
font-style: normal;
|
|
12
11
|
}
|
|
13
12
|
|
|
Binary file
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
@font-face{
|
|
2
|
+
font-family: "wisdom-script";
|
|
3
|
+
src: asset-url("ama_layout/webfonts/fonts/Wisdom-Script.woff") format('woff');
|
|
4
|
+
font-weight: normal;
|
|
5
|
+
font-style: normal;
|
|
6
|
+
}
|
|
7
|
+
|
|
8
|
+
.wisdom-script{
|
|
9
|
+
font-family: "wisdom-script", "Open Sans", Helvetica, Arial, sans-serif;
|
|
10
|
+
font-weight: 100;
|
|
11
|
+
}
|
|
@@ -15,6 +15,7 @@
|
|
|
15
15
|
<li>
|
|
16
16
|
<a href="<%= Rails.configuration.amaabca_site %>/membership/contact-us--centre-locations-hours-and-contact-information">Contact Us</a>
|
|
17
17
|
</li>
|
|
18
|
+
<%= navigation.account_toggle %>
|
|
18
19
|
<%= navigation.top_nav %>
|
|
19
20
|
</ul>
|
|
20
21
|
</div>
|
|
@@ -24,6 +25,7 @@
|
|
|
24
25
|
<h2 class="side-nav__header">Online Account</h2>
|
|
25
26
|
<div class="side-nav__content">
|
|
26
27
|
<ul class="side-nav__list">
|
|
28
|
+
<%= navigation.account_toggle %>
|
|
27
29
|
<%= render partial: "ama_layout/main_nav_item", collection: navigation.items, as: :nav_item %>
|
|
28
30
|
<li class="side-nav__item">
|
|
29
31
|
<a class="side-nav__link" href="<%= Rails.configuration.amaabca_site %>">AMA Website</a>
|
|
File without changes
|
data/lib/ama_layout/version.rb
CHANGED
|
@@ -119,4 +119,12 @@ describe AmaLayout::NavigationDecorator do
|
|
|
119
119
|
end
|
|
120
120
|
end
|
|
121
121
|
end
|
|
122
|
+
|
|
123
|
+
context "account toggle" do
|
|
124
|
+
it "in ama_layout it renders a blank partial" do
|
|
125
|
+
allow_any_instance_of(AmaLayout::Navigation).to receive(:user).and_return(OpenStruct.new(navigation: "member"))
|
|
126
|
+
allow_any_instance_of(Draper::HelperProxy).to receive(:render).and_return "render"
|
|
127
|
+
expect(navigation_presenter.account_toggle).to eq "render"
|
|
128
|
+
end
|
|
129
|
+
end
|
|
122
130
|
end
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: ama_layout
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 4.
|
|
4
|
+
version: 4.6.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Michael van den Beuken
|
|
@@ -18,7 +18,7 @@ authors:
|
|
|
18
18
|
autorequire:
|
|
19
19
|
bindir: bin
|
|
20
20
|
cert_chain: []
|
|
21
|
-
date: 2016-10-
|
|
21
|
+
date: 2016-10-27 00:00:00.000000000 Z
|
|
22
22
|
dependencies:
|
|
23
23
|
- !ruby/object:Gem::Dependency
|
|
24
24
|
name: foundation-rails
|
|
@@ -298,9 +298,11 @@ files:
|
|
|
298
298
|
- app/assets/stylesheets/ama_layout/layout_components/comparison-radios.scss
|
|
299
299
|
- app/assets/stylesheets/ama_layout/layout_components/content-toggle.scss
|
|
300
300
|
- app/assets/stylesheets/ama_layout/layout_components/error-page.scss
|
|
301
|
+
- app/assets/stylesheets/ama_layout/layout_components/features.scss
|
|
301
302
|
- app/assets/stylesheets/ama_layout/layout_components/footer.scss
|
|
302
303
|
- app/assets/stylesheets/ama_layout/layout_components/forms.scss
|
|
303
304
|
- app/assets/stylesheets/ama_layout/layout_components/graph.scss
|
|
305
|
+
- app/assets/stylesheets/ama_layout/layout_components/hero.scss
|
|
304
306
|
- app/assets/stylesheets/ama_layout/layout_components/icon-group.scss
|
|
305
307
|
- app/assets/stylesheets/ama_layout/layout_components/index.scss
|
|
306
308
|
- app/assets/stylesheets/ama_layout/layout_components/link-list.scss
|
|
@@ -321,15 +323,18 @@ files:
|
|
|
321
323
|
- app/assets/stylesheets/ama_layout/media_queries/mobile.scss
|
|
322
324
|
- app/assets/stylesheets/ama_layout/media_queries/tablet.scss
|
|
323
325
|
- app/assets/stylesheets/ama_layout/webfonts/ama-icon-font.scss
|
|
326
|
+
- app/assets/stylesheets/ama_layout/webfonts/fonts/Wisdom-Script.woff
|
|
324
327
|
- app/assets/stylesheets/ama_layout/webfonts/fonts/ama-icon-font.eot
|
|
325
328
|
- app/assets/stylesheets/ama_layout/webfonts/fonts/ama-icon-font.svg
|
|
326
329
|
- app/assets/stylesheets/ama_layout/webfonts/fonts/ama-icon-font.ttf
|
|
327
330
|
- app/assets/stylesheets/ama_layout/webfonts/fonts/ama-icon-font.woff
|
|
331
|
+
- app/assets/stylesheets/ama_layout/webfonts/index.scss
|
|
328
332
|
- app/assets/stylesheets/ama_layout/webfonts/ss-symbolicons-block.eot
|
|
329
333
|
- app/assets/stylesheets/ama_layout/webfonts/ss-symbolicons-block.scss
|
|
330
334
|
- app/assets/stylesheets/ama_layout/webfonts/ss-symbolicons-block.svg
|
|
331
335
|
- app/assets/stylesheets/ama_layout/webfonts/ss-symbolicons-block.ttf
|
|
332
336
|
- app/assets/stylesheets/ama_layout/webfonts/ss-symbolicons-block.woff
|
|
337
|
+
- app/assets/stylesheets/ama_layout/webfonts/wisdom-font.scss
|
|
333
338
|
- app/config/locales/en.yml
|
|
334
339
|
- app/helpers/ama_layout_breadcrumb_helper.rb
|
|
335
340
|
- app/helpers/ama_layout_content_helper.rb
|
|
@@ -351,6 +356,7 @@ files:
|
|
|
351
356
|
- app/views/ama_layout/_top_nav.html.erb
|
|
352
357
|
- app/views/ama_layout/_top_sub_nav.html.erb
|
|
353
358
|
- app/views/ama_layout/_top_sub_nav_item.html.erb
|
|
359
|
+
- app/views/application/_account_toggle.html.erb
|
|
354
360
|
- lib/ama_layout.rb
|
|
355
361
|
- lib/ama_layout/breadcrumb_builder.rb
|
|
356
362
|
- lib/ama_layout/controllers/action_controller.rb
|
|
@@ -406,7 +412,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
406
412
|
version: '0'
|
|
407
413
|
requirements: []
|
|
408
414
|
rubyforge_project:
|
|
409
|
-
rubygems_version: 2.
|
|
415
|
+
rubygems_version: 2.2.2
|
|
410
416
|
signing_key:
|
|
411
417
|
specification_version: 4
|
|
412
418
|
summary: ".ama.ab.ca site layouts"
|