Skip to content

Reposition the Assembly banner, change color, restore the New Relic prom... #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 3, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/assets/javascripts/dismissable.js.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@ $ ->

if $.cookie(key) == "true"
$el.hide()
$('.tee-ribbon').css("top", "0px")
else
$el.fadeIn()
$('.tee-ribbon').css("top", "40px")

$('.js-dismiss', $el).click (e)->
e.preventDefault()
$.cookie(key, "true")
$el.fadeOut()
$('.tee-ribbon').css("top", "0px")
2 changes: 1 addition & 1 deletion app/assets/stylesheets/backgrounds.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
}

.bg-primary {
background-color: #428bca;
background-color: #d95626;
color: #fff;
}

Expand Down
10 changes: 5 additions & 5 deletions app/views/application/_nav_bar.slim
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
= render partial: 'shared/assembly_banner'

header#masthead
.inside-masthead.cf
.mobile-panel.cf
Expand All @@ -7,13 +9,13 @@ header#masthead

- if ENV['NEW_RELIC_PROMOTION']
- unless mobile_device?
a.tee-ribbon.track href="https://coderwall.com/team/new-relic" data-action="clicked tee"
a.tee-ribbon.track href="http://newrelic.com/sp/coderwall?utm_source=CWAL&utm_medium=promotion&utm_content=coderwall&utm_campaign=coderwall&mpc=PM-CWAL-web-Signup-100-coderwall-shirtpromo" data-action="clicked tee"

nav#nav
ul
li = link_to(t('protips'), root_path)
li = link_to(t('awesome_jobs'), jobs_path, class: jobs_nav_class)
-if signed_in?
- if signed_in?
li
.account-dropdown
a href="#" data-dropdown="#dropdown-profile"
Expand All @@ -24,8 +26,6 @@ header#masthead
div = link_to(t('profile'), badge_path(username: current_user.username), class: mywall_nav_class)
div = link_to(t('settings'), settings_path, class: settings_nav_class)
div = link_to(t('sign_out'), sign_out_path)
-else
- else
li = link_to(t('sign_in'), signin_path, class: signin_nav_class)
li = link_to(t('register'), signin_path, class: signup_nav_class)

= render partial: 'shared/assembly_banner'
2 changes: 1 addition & 1 deletion app/views/notifier_mailer/welcome_email.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
Level up your wardrobe with this free limited edition Coderwall tee from our friends at New Relic.
%p{style: "#{paragraph}; text-align: center;"}
:erb
<a href="https://coderwall.com/team/new-relic"><img src="https://d3levm2kxut31z.cloudfront.net/assets/relic-tee-780a53200fbd09b7be640692b021b3a7.png" alt="free t-shirt"></a>
<a href="http://newrelic.com/sp/coderwall?utm_source=CWAL&utm_medium=promotion&utm_content=coderwall&utm_campaign=coderwall&mpc=PM-CWAL-web-Signup-100-coderwall-shirtpromo"><img src="https://d3levm2kxut31z.cloudfront.net/assets/relic-tee-780a53200fbd09b7be640692b021b3a7.png" alt="free t-shirt"></a>
%p{style: "#{paragraph}; text-align: center;"}
:erb
<a href="https://coderwall.com/team/new-relic" style="<%= anchor %>">Test drive New Relic for free and get a Coderwall tee</a>
Expand Down
2 changes: 1 addition & 1 deletion app/views/shared/_assembly_banner.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="announcement col-md-12">
<p class="text-center">
<img src="https://treasure.assembly.com/assets/brand/inverse@2x.png" class="asm-brand">
Coderwall is an open project on Assembly so now you can help build it!
Coderwall is an open product on Assembly so now you can help build it!
<a href="https://assembly.com/coderwall/chat" target="_blank"> Jump in and get started.</a>
<a class="js-dismiss close" href="#close">x</a>
</p>
Expand Down