Skip to content

Commit da0a9e8

Browse files
seurosseuros
committed
Fix footer and extract it style
1 parent 17e636c commit da0a9e8

File tree

3 files changed

+140
-121
lines changed

3 files changed

+140
-121
lines changed

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

+3-117
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
@import "base", "compass/css3", "fonts",
2-
"normailze", "tipTip", "new-new-home", "error";
2+
"normailze", "tipTip", "new-new-home", "error",
3+
"footer";
34

45
@import 'jquery-dropdown/jquery.dropdown.min';
56
@import 'backgrounds';
@@ -352,76 +353,6 @@ h4 {
352353
color: #fff;
353354
}
354355

355-
#footer {
356-
.inside-footer {
357-
max-width: 1180px;
358-
padding: 40px 20px 10px 20px;
359-
margin: 0 auto;
360-
#tweetbtn {
361-
float: right;
362-
width: 124px;
363-
margin-top: -7px;
364-
}
365-
#tweetbtn iframe{
366-
width: 124px !important;
367-
}
368-
#footer-nav {
369-
ul {
370-
}
371-
.footer-links {
372-
margin-bottom: 10px;
373-
width: 70%;
374-
li {
375-
float: left;
376-
margin-right: 20px;
377-
margin-bottom: 10px;
378-
&:first-child {
379-
}
380-
a {
381-
font-size: 1.4em;
382-
color: $mid-grey;
383-
&:hover {
384-
color: $light-blue;
385-
}
386-
}
387-
}
388-
.employers {
389-
a {
390-
background: $mid-blue-grey;
391-
color: #fff;
392-
padding: 4px 6px;
393-
@include border-radius(4px);
394-
&:hover {
395-
color: #fff;
396-
background: $blue-grey;
397-
}
398-
}
399-
}
400-
}
401-
.assembly-badge {
402-
margin: -10px 0 10px -20px;
403-
}
404-
.copyright {
405-
margin-bottom: 15px;
406-
li {
407-
font-size: 1.2em;
408-
color: $light-grey;
409-
}
410-
}
411-
.credits {
412-
margin-bottom: 15px;
413-
li {
414-
font-size: 1.2em;
415-
}
416-
a {
417-
color: $light-grey;
418-
}
419-
}
420-
.mixpanel {
421-
}
422-
}
423-
}
424-
}
425356

426357
@import "profile", "connections", "protip", "networks", "alerts";
427358
body#sign-in {
@@ -1531,15 +1462,6 @@ input[type=file].safari5-upload-hack {
15311462
* {
15321463
box-sizing: border-box;
15331464
}
1534-
#footer {
1535-
background: #fff;
1536-
min-width: 100%;
1537-
max-width: 1140px !important;
1538-
.inside-footer {
1539-
max-width: 100%;
1540-
padding: 7%;
1541-
}
1542-
}
15431465
.wrapper {
15441466
max-width: 1140px;
15451467
margin: 0 auto;
@@ -1802,26 +1724,7 @@ input[type=file].safari5-upload-hack {
18021724
}
18031725
}
18041726
}
1805-
#footer {
1806-
.inside-footer {
1807-
#tweetbtn {
1808-
float: none;
1809-
display: block;
1810-
margin-top: -7px;
1811-
margin-bottom: 15px;
1812-
}
1813-
#footer-nav {
1814-
padding-top: 30px;
1815-
.footer-links {
1816-
li {
1817-
margin: 0 15px 5px 0;
1818-
margin-left: 0;
1819-
}
1820-
}
1821-
}
1822-
}
1823-
}
1824-
/*footer-end*/
1727+
18251728
}
18261729
/*760 media query end*/
18271730
@media screen and (max-width: 400px) {
@@ -2017,23 +1920,6 @@ input[type=file].safari5-upload-hack {
20171920
}
20181921
}
20191922

2020-
@media screen and (max-width: 600px) {
2021-
#footer {
2022-
.inside-footer {
2023-
#tweetbtn {
2024-
float: none;
2025-
width: 124px;
2026-
margin-bottom: 10px;
2027-
}
2028-
#footer-nav {
2029-
.footer-links {
2030-
width: 100%;
2031-
}
2032-
}
2033-
}
2034-
}
2035-
}
2036-
20371923

20381924
.account-dropdown {
20391925
.avatar {

‎app/assets/stylesheets/footer.scss

+132
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
#footer {
2+
.inside-footer {
3+
max-width: 1180px;
4+
padding: 40px 20px 10px 20px;
5+
margin: 0 auto;
6+
nav{
7+
&#footer-nav {
8+
float: left;
9+
width: 80%;
10+
ul {
11+
}
12+
13+
.footer-links {
14+
margin-bottom: 10px;
15+
width: 70%;
16+
li {
17+
float: left;
18+
margin-right: 20px;
19+
margin-bottom: 10px;
20+
&:first-child {
21+
}
22+
a {
23+
font-size: 1.4em;
24+
color: $mid-grey;
25+
&:hover {
26+
color: $light-blue;
27+
}
28+
}
29+
}
30+
.employers {
31+
a {
32+
background: $mid-blue-grey;
33+
color: #fff;
34+
padding: 4px 6px;
35+
@include border-radius(4px);
36+
&:hover {
37+
color: #fff;
38+
background: $blue-grey;
39+
}
40+
}
41+
}
42+
}
43+
.assembly-badge {
44+
margin: -10px 0 10px -20px;
45+
}
46+
.copyright {
47+
margin-bottom: 15px;
48+
li {
49+
font-size: 1.2em;
50+
color: $light-grey;
51+
}
52+
}
53+
.credits {
54+
margin-bottom: 15px;
55+
li {
56+
font-size: 1.2em;
57+
}
58+
a {
59+
color: $light-grey;
60+
}
61+
}
62+
63+
}
64+
}
65+
.right_part {
66+
float: right;
67+
width: 20%;
68+
text-align: right;
69+
#tweetbtn {
70+
float: right;
71+
width: 124px;
72+
margin-top: -7px;
73+
iframe{
74+
width: 124px !important;
75+
}
76+
}
77+
78+
.mixpanel {
79+
}
80+
}
81+
}
82+
}
83+
84+
#new-home-template {
85+
#footer {
86+
background: #fff;
87+
min-width: 100%;
88+
max-width: 1140px !important;
89+
.inside-footer {
90+
max-width: 100%;
91+
padding: 7%;
92+
}
93+
}
94+
@media screen and (max-width: 768px) {
95+
#footer {
96+
.inside-footer {
97+
#tweetbtn {
98+
float: none;
99+
display: block;
100+
margin-top: -7px;
101+
margin-bottom: 15px;
102+
}
103+
#footer-nav {
104+
padding-top: 30px;
105+
.footer-links {
106+
li {
107+
margin: 0 15px 5px 0;
108+
margin-left: 0;
109+
}
110+
}
111+
}
112+
}
113+
}
114+
}
115+
}
116+
117+
@media screen and (max-width: 600px) {
118+
#footer {
119+
.inside-footer {
120+
#tweetbtn {
121+
float: none;
122+
width: 124px;
123+
margin-bottom: 10px;
124+
}
125+
#footer-nav {
126+
.footer-links {
127+
width: 100%;
128+
}
129+
}
130+
}
131+
}
132+
}

‎app/views/application/_footer.html.slim

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
footer#footer
22
.inside-footer.cf
3-
#tweetbtn
4-
a.twitter-follow-button data-show-count="false" data-width="300" href="https://twitter.com/coderwall" Follow @coderwall
5-
script src="https://platform.twitter.com/widgets.js" type="text/javascript"
63
nav#footer-nav
74
ul.footer-links.cf
85
li= link_to('Contact', contact_us_path)
@@ -18,12 +15,16 @@ footer#footer
1815
li Copyright © 2012-2015 Assembly Made, Inc. All rights reserved.
1916
ul.credits
2017
li= yield :credits
18+
19+
.right_part
20+
#tweetbtn
21+
a.twitter-follow-button data-show-count="false" data-width="300" href="https://twitter.com/coderwall" Follow @coderwall
22+
script src="https://platform.twitter.com/widgets.js" type="text/javascript"
2123
ul.mixpanel
2224
li
2325
a href="https://mixpanel.com/f/partner"
2426
img alt="Real Time Web Analytics" src="https://mixpanel.com/site_media/images/partner/badge_light.png"
2527

26-
2728
= javascript_include_tag 'application'
2829
= render 'shared/mixpanel_properties'
2930
= yield :javascript

0 commit comments

Comments
 (0)