Skip to content

Commit 83f02c9

Browse files
alexkaufman06alexkaufman06
committed
merge changes
1 parent 1b0b3a4 commit 83f02c9

26 files changed

Lines changed: 1013 additions & 197 deletions

‎.git.swp‎

12 KB
Binary file not shown.

‎app/assets/fonts/FontAwesome.otf‎

91.7 KB
Binary file not shown.

‎app/assets/fonts/fontawesome-webfont.eot‎

59.3 KB
Binary file not shown.

‎app/assets/fonts/fontawesome-webfont.svg‎

Lines changed: 565 additions & 0 deletions
Loading

‎app/assets/fonts/fontawesome-webfont.ttf‎

119 KB
Binary file not shown.

‎app/assets/fonts/fontawesome-webfont.woff‎

69.8 KB
Binary file not shown.

‎app/assets/fonts/fontawesome-webfont.woff2‎

55.4 KB
Binary file not shown.

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,37 @@
1212
*
1313
*= require_self
1414
*= require bootstrap_and_customization
15+
*= require font-awesome
1516
*/
1617

18+
.social-links a {
19+
text-align: center;
20+
display: inline-block;
21+
width: 36px;
22+
height: 36px;
23+
border: 1px solid white;
24+
border-radius: 100%;
25+
margin-right: 7px; /*space between*/
26+
}
27+
28+
.social-links a i {
29+
font-size: 20px;
30+
line-height: 38px;
31+
color: white;
32+
}
33+
34+
#facebook {
35+
background: #3B5998;
36+
}
37+
38+
#twitter {
39+
background: #6CDFEA;
40+
}
41+
42+
#instagram {
43+
background: #e74c3c;
44+
}
45+
1746
.video-container {
1847
position: relative;
1948
padding-bottom: 56.25%;

‎app/assets/stylesheets/font-awesome.min.css‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/controllers/pages_controller.rb‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ def about
55
def events
66
end
77

8-
def team
9-
end
10-
118
def donate
129
end
1310

@@ -23,9 +20,27 @@ def contact
2320
def codeschools
2421
end
2522

26-
def faq
23+
def contributors
24+
end
25+
26+
def faqs
2727
end
2828

2929
def learn
3030
end
31+
32+
def media
33+
end
34+
35+
def mission
36+
end
37+
38+
def press
39+
end
40+
41+
def speakerrequest
42+
end
43+
44+
def team
45+
end
3146
end

0 commit comments

Comments
 (0)