Skip to content

Commit 9e2b425

Browse files
author
Dave Newman
committed
add dismissable banner to link to Assembly
1 parent 77c949f commit 9e2b425

File tree

6 files changed

+127
-14
lines changed

6 files changed

+127
-14
lines changed

‎Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ gem 'uglifier', '>= 1.0.3'
1414
gem 'autoprefixer-rails'
1515
gem 'jquery-rails', '= 2.0.3'
1616
gem 'rails-assets-font-awesome'
17+
gem 'rails-assets-jquery-cookie', '1.4.0'
1718
gem 'rails-assets-jquery-dropdown'
1819

1920
# Two Client-side JS frameworks. Yep, first one to refactor out the other wins.

‎Gemfile.lock

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,3 @@
1-
GIT
2-
remote: git://github.com/emberjs/ember-rails.git
3-
revision: 5e5a398f3c67c3a3b84b7513b93b22bf81055cc9
4-
specs:
5-
ember-rails (0.15.0)
6-
active_model_serializers
7-
barber (>= 0.4.1)
8-
ember-data-source (>= 1.0.0.beta.5)
9-
ember-source (>= 1.1.0)
10-
execjs (>= 1.2)
11-
handlebars-source (> 1.0.0)
12-
jquery-rails (>= 1.0.17)
13-
railties (>= 3.1)
14-
151
GIT
162
remote: git://github.com/nixme/jazz_hands.git
173
revision: 5e4b48f145883ecb14b55bf04eacc28ac9662676
@@ -38,6 +24,20 @@ GIT
3824
mime-types (>= 1.25, < 3.0)
3925
rest-client (~> 1.4)
4026

27+
GIT
28+
remote: git://github.com/emberjs/ember-rails.git
29+
revision: 5e5a398f3c67c3a3b84b7513b93b22bf81055cc9
30+
specs:
31+
ember-rails (0.15.0)
32+
active_model_serializers
33+
barber (>= 0.4.1)
34+
ember-data-source (>= 1.0.0.beta.5)
35+
ember-source (>= 1.1.0)
36+
execjs (>= 1.2)
37+
handlebars-source (> 1.0.0)
38+
jquery-rails (>= 1.0.17)
39+
railties (>= 3.1)
40+
4141
GEM
4242
remote: https://rubygems.org/
4343
remote: https://rails-assets.org/
@@ -492,6 +492,8 @@ GEM
492492
railties (= 3.2.19)
493493
rails-assets-font-awesome (4.1.0)
494494
rails-assets-jquery (1.8.3.1)
495+
rails-assets-jquery-cookie (1.4.0)
496+
rails-assets-jquery (>= 1.2)
495497
rails-assets-jquery-dropdown (1.0.5)
496498
rails-assets-jquery (~> 1.8.0)
497499
rails-erd (1.1.0)
@@ -777,6 +779,7 @@ DEPENDENCIES
777779
quiet_assets
778780
rails (~> 3.2)
779781
rails-assets-font-awesome
782+
rails-assets-jquery-cookie (= 1.4.0)
780783
rails-assets-jquery-dropdown
781784
rails-erd
782785
rails_12factor

‎app/assets/javascripts/dismissable.js.coffee

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#= require jquery-cookie
2+
3+
$ ->
4+
$('[data-dismissable]').each ->
5+
$el = $(@)
6+
key = "dismissed-#{$el.data('dismissable')}"
7+
8+
if $.cookie(key) == "true"
9+
$el.hide()
10+
else
11+
$el.fadeIn()
12+
13+
$('.js-dismiss', $el).click (e)->
14+
e.preventDefault()
15+
$.cookie(key, "true")
16+
$el.fadeOut()

‎app/assets/stylesheets/backgrounds.css.scss

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
// Stolen from Bootsrap 3
2+
.container:before, .container:after {
3+
content: " ";
4+
display: table;
5+
}
6+
7+
.container {
8+
margin-right: auto;
9+
margin-left: auto;
10+
padding-left: 15px;
11+
padding-right: 15px;
12+
width: 1170px;
13+
}
14+
15+
.row {
16+
margin-right: -15px;
17+
margin-left: -15px;
18+
}
19+
20+
.row:before, .row:after {
21+
content: " ";
22+
display: table;
23+
}
24+
.row:after {
25+
clear: both;
26+
}
27+
28+
.col-md-12 {
29+
width: 100%;
30+
float: left;
31+
position: relative;
32+
min-height: 1px;
33+
padding-right: 15px;
34+
padding-left: 15px;
35+
}
36+
37+
.bg-primary {
38+
background-color: #428bca;
39+
color: #fff;
40+
}
41+
42+
.text-center {
43+
text-align: center;
44+
}
45+
46+
.announcement {
47+
.asm-brand {
48+
opacity: 0.3;
49+
width: 30px;
50+
height: 26px;
51+
position: absolute;
52+
margin-left: -36px;
53+
margin-top: 6px;
54+
}
55+
56+
.close {
57+
opacity: 0.4;
58+
&:hover {
59+
opacity: 1.0;
60+
}
61+
text-decoration: none;
62+
63+
padding-left: 15px;
64+
}
65+
66+
p {
67+
line-height: 40px;
68+
69+
a {
70+
color: #fff;
71+
text-decoration: underline;
72+
}
73+
}
74+
}

‎app/views/application/_nav_bar.slim

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,4 @@ header#masthead
2424
li = link_to(t('sign_in'), signin_path, class: signin_nav_class)
2525
li = link_to(t('register'), signin_path, class: signup_nav_class)
2626

27+
= render partial: 'shared/assembly_banner'

‎app/views/shared/_assembly_banner.html.erb

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<div class="bg-primary" data-dismissable="announcement" style="display:none">
2+
<div class="container">
3+
<div class="row">
4+
<div class="announcement col-md-12">
5+
<p class="text-center">
6+
<img src="https://treasure.assembly.com/assets/brand/inverse@2x.png" class="asm-brand">
7+
Coderwall is an open project on Assembly so you can help build it!
8+
<a href="https://assembly.com/coderwall/chat"> Jump in and get started.</a>
9+
<a class="js-dismiss close" href="#close">x</a>
10+
</p>
11+
</div>
12+
</div>
13+
</div>
14+
</div>
15+
16+
<% content_for :javascript do %>
17+
<%= javascript_include_tag 'dismissable' %>
18+
<% end %>

0 commit comments

Comments
 (0)