Skip to content

Commit 1745905

Browse files
just3wsjust3ws
committed
Merge pull request #159 from seuros/icons
Fix layouts
2 parents 485c67a + 056d59a commit 1745905

File tree

5 files changed

+29
-23
lines changed

5 files changed

+29
-23
lines changed

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ h4 {
111111
}
112112
}
113113
i {
114-
font-size: 1.4em;
115-
color: $level2;
116-
margin-right: 2px;
114+
font-size: 1.6em;
115+
color: $really-light-grey;
116+
margin-right: 4px;
117117
}
118118
a {
119119
font-size: 1.4em;
@@ -129,9 +129,6 @@ h4 {
129129
&:hover {
130130
color: $light-grey;
131131
}
132-
i {
133-
color: $level1;
134-
}
135132
}
136133
}
137134

‎app/views/layouts/admin.html.slim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ html.no-js lang=(I18n.locale)
77
= yield :head
88

99
body id='admin'
10-
= render 'layouts/navigation'
10+
= render 'navigation'
1111
#main-content
1212
- if main_content_wrapper(yield(:content_wrapper))
1313
- if flash[:notice] || flash[:error]

‎app/views/layouts/email.html.erb

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"http://www.w3.org/TR/html4/loose.dtd">
33

44
<html lang="en">
5-
<head style="margin-top: <%= Rails.env.development? ? 120 : 20 %>;margin-bottom: 0;margin-right: 0;margin-left: 0;padding-top: 0;padding-bottom: 0;padding-right: 0;padding-left: 0;background-color: #48494e;margin: 0;padding: 0;-webkit-text-size-adjust:none;">
5+
<head>
66
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
77
<title>A message from Coderwall</title>
8-
<style>
8+
<style type="text/css">
99
@media only screen and (max-device-width: 480px) {
1010
div[class="header"] {
1111
font-size: 16px !important;
@@ -74,7 +74,7 @@
7474
<tr>
7575
<td width="600" bgcolor="#48494e" class="logocell">
7676
<center>
77-
<img id='messageLogo' src="<%= image_path('email/email-logo.jpg') %>" height='auto' style="height: auto;line-height: 100%;outline: none;text-decoration: none;display: block;width: 211px;margin: 0 auto;"/>
77+
<img id='messageLogo' src="<%= image_path('email/email-logo.jpg') %>" height='auto' style="height: auto;line-height: 100%;outline: none;text-decoration: none;display: block;width: 211px;margin: 0 auto;" alt=""/>
7878
</center>
7979
</td>
8080
</tr>
@@ -99,13 +99,13 @@
9999
</td>
100100
</tr>
101101
</table>
102-
<img border="0" src="<%= image_path('email/spacer.gif') %>" width="1" height="15" class="divider"><br>
102+
<img border="0" src="<%= image_path('email/spacer.gif') %>" width="1" height="15" class="divider" alt=""><br>
103103

104104
<table width="100%" cellpadding="0" cellspacing="0" border="0" bgcolor="#48494e">
105105
<tr>
106106
<td>
107107
<center>
108-
<img border="0" src="<%= image_path('email/spacer.gif') %>" width="1" height="0"><br>
108+
<img border="0" src="<%= image_path('email/spacer.gif') %>" width="1" height="0" alt=""><br>
109109

110110
<table width="600" cellpadding="0" cellspacing="0" border="0" align="center" class="table">
111111
<tr>
@@ -115,26 +115,24 @@
115115
<tr>
116116
<td width="380" valign="top" class="footershow">
117117

118-
<img border="0" src="<%= image_path('email/spacer.gif') %>" width="1" height="8"><br>
118+
<img border="0" src="<%= image_path('email/spacer.gif') %>" width="1" height="8" alt=""><br>
119119

120120
<p style="color:#fff;font-size:12px;font-family:'Helvetica Neue','Helvetica','Arial','sans-serif';margin-top:0;margin-bottom:15px;padding-top:0;padding-bottom:0;line-height:18px;" class="reminder">You're
121121
receiving this email because you signed up for Coderwall. We hate spam and make an effort
122122
to keep notifications to a minimum.</p>
123123

124124
<p style="color:#c9c9c9;font-size:12px;font-family:'Helvetica Neue','Helvetica','Arial','sans-serif';">
125-
<preferences style="color:#3ca7dd;text-decoration:none;">
126-
<strong><a href='https://coderwall.com/settings#email' style="color:#3ca7dd;text-decoration:none;">Edit
127-
your subscription</a></strong></preferences>
125+
<strong style="color:#3ca7dd;text-decoration:none;"><a href='https://coderwall.com/settings#email' style="color:#3ca7dd;text-decoration:none;">Edit
126+
your subscription</a></strong>
128127
&nbsp;&nbsp;|&nbsp;&nbsp;
129-
<unsubscribe style="color:#3ca7dd;text-decoration:none;">
130-
<strong><a href='%unsubscribe_url%' style="color:#3ca7dd;text-decoration:none;">Unsubscribe
131-
instantly</a></strong></unsubscribe>
128+
<strong style="color:#3ca7dd;text-decoration:none;"><a href='%unsubscribe_url%' style="color:#3ca7dd;text-decoration:none;">Unsubscribe
129+
instantly</a></strong>
132130
</p>
133131
</td>
134132
</tr>
135133
</table>
136134
</center>
137-
<img border="0" src="<%= image_path('email/spacer.gif') %>" width="1" height="25"><br>
135+
<img border="0" src="<%= image_path('email/spacer.gif') %>" width="1" height="25" alt=""><br>
138136

139137
</center>
140138
</td>

‎app/views/layouts/jobs.html.haml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
= render partial: 'shared/mixpanel'
1313
= csrf_meta_tag
1414
= yield :head
15-
= render partial: 'layouts/navigation'
15+
= render partial: 'navigation'
1616
%body#jobs
17-
#main-content
18-
=yield
17+
#main-content
18+
=yield
1919
=render partial: 'shared/footer'

‎spec/controllers/opportunity_controlller_spec.rb

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
require 'spec_helper'
2+
3+
RSpec.describe OpportunitiesController, :type => :controller do
4+
5+
it 'render #index' do
6+
get :index
7+
expect(response.status).to eq(200)
8+
expect(response).to render_template(['opportunities/index', 'layouts/jobs'])
9+
end
10+
11+
end

0 commit comments

Comments
 (0)