Skip to content

Commit eed4b64

Browse files
committed
Merge pull request #64 from wizarddevelopment/copycopynav
New copy and things
2 parents 1baaf21 + 80302a8 commit eed4b64

File tree

7 files changed

+10
-238
lines changed

7 files changed

+10
-238
lines changed

app/assets/javascripts/app.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
var bindContactForm = require('./app/contact');
22
var bindToggleNav = require('./app/nav');
3-
var bindColorNav = require('./app/color_nav');
3+
var bindStickyNav = require('./app/sticky-nav');
44

55
$(function(){
66
bindToggleNav();
77
bindContactForm();
8-
bindColorNav();
8+
bindStickyNav();
99
});
1010

1111
// global react components

app/assets/javascripts/app/color_nav.js renamed to app/assets/javascripts/app/sticky-nav.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module.exports = function colorNav() {
1+
module.exports = function stickyNav() {
22
var $nav = $(".navigation");
33
var $selector = $(".thesis");
44
if (!$selector.get(0)){
@@ -20,4 +20,5 @@ module.exports = function colorNav() {
2020
}
2121
};
2222
$(window).on("scroll", toggleNavClass);
23+
toggleNavClass();
2324
};

app/views/home/_clients.html.erb

+3-7
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,8 @@
44
<h2>Featured Client</h2>
55
<%= render "winnower" %>
66
</div>
7-
<ul class="client-logos">
8-
<li><%= image_tag 'winnower_logo.png', class: 'logo winnower' %></li>
9-
<li><%= image_tag 'bakecycle-logo.png', class: 'logo bakecycle' %></li>
10-
<li><%= image_tag 'OM-BLK-LOGO-01.svg', class: 'logo' %></li>
11-
</ul>
12-
13-
<%= link_to "Client Profiles", clients_path, class: 'button orange' %>
7+
<div class="featured-client">
8+
<%= link_to "Client Profiles", clients_path, class: 'button orange' %>
9+
</div>
1410
</div>
1511
</section>

app/views/home/_tools.html.erb

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="tools-container">
33
<div class="tools-header">
44
<h2>Our Tools</h2>
5-
<p class="center">We choose the right tool for the right job.</p>
5+
<p class="center">The right selection of tools and services allow us to build you engaging sites quickly and reliably.</p>
66
</div>
77
<div class="tool-content">
88
<%= link_to "http://rubyonrails.org/", target: "_blank" do %>
@@ -15,14 +15,14 @@
1515
<%= link_to "http://facebook.github.io/react/", target: "_blank" do %>
1616
<h4>React</h4>
1717
<%= image_tag("reactjs-logo.png") %>
18-
<p>Allows to build performant interactive client side interfaces that engage users.</p>
18+
<p>Allows to build high performing interactive interfaces that engage users.</p>
1919
<% end %>
2020
</div>
2121
<div class="tool-content">
2222
<%= link_to "https://www.heroku.com/", target: "_blank" do %>
2323
<h4>Heroku</h4>
2424
<%= image_tag("heroku-logo.png") %>
25-
<p>A powerful platform for keeping our apps online, fast, and scalable with mimumum invetment. Wizard's open source heroku tools allow us to keep complex operations simple.</p>
25+
<p>A powerful platform for keeping our apps online, fast, and scalable with minimum investment. Wizard's <a href="https://github.com/wizarddevelopment/wizarddev-heroku">open source Heroku tools</a> allow us to keep complex operations simple.</p>
2626
<% end %>
2727
</div>
2828
</div>

docs/wizard_development_day_0/index.html

-220
This file was deleted.

docs/wizard_development_day_0/remark-0.6.0.min.js

-5
This file was deleted.
Binary file not shown.

0 commit comments

Comments
 (0)