Skip to content

Commit 01135dc

Browse files
nikhitanikhita
authored
Merge pull request #37 from vaibhavsingh97/develop
footer template added
2 parents a8e94c3 + 3ccd0d9 commit 01135dc

File tree

4 files changed

+118
-107
lines changed

4 files changed

+118
-107
lines changed

‎oshc/main/static/main/css/app.css

Lines changed: 79 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,172 +1,178 @@
11
/* GLOBAL DEFINATIONS STARTS */
2-
* {
3-
padding:0;
4-
margin:0;
5-
box-sizing:border-box;
6-
-webkit-box-sizing:border-box;
7-
-moz-box-sizing:border-box;
8-
transition:opacity 0.7s ease-in-out;
9-
font-family:"Montserrat",sans-serif
2+
3+
* {
4+
padding: 0;
5+
margin: 0;
6+
box-sizing: border-box;
7+
-webkit-box-sizing: border-box;
8+
-moz-box-sizing: border-box;
9+
transition: opacity 0.7s ease-in-out;
10+
font-family: "Montserrat", sans-serif
1011
}
1112

1213
body {
13-
overflow-x:hidden;
14+
overflow-x: hidden;
1415
}
1516

1617
a {
17-
cursor: pointer;
18-
color: #0275d8;
19-
text-decoration: none;
18+
cursor: pointer;
19+
color: #0275d8;
20+
text-decoration: none;
2021
}
2122

2223
.line-gap-10px {
23-
height: 10px;
24+
height: 10px;
2425
}
2526

2627

2728
/* NAVBAR CSS STARTS */
29+
2830
.navbar {
29-
margin-bottom: 0;
31+
margin-bottom: 0;
3032
}
3133

3234
.navbar-inverse .navbar-brand {
33-
color: #eee;
35+
color: #eee;
3436
}
3537

3638
.navbar-inverse {
37-
background-color: #24292e;
39+
background-color: #24292e;
3840
}
3941

4042
.navbar-inverse {
41-
border-color: #24292e;
43+
border-color: #24292e;
4244
}
4345

4446

4547
/* SECTION ONE STARTS */
48+
4649
.main-section {
47-
min-height: 70vh;
48-
height: auto;
49-
padding-top: 40px;
50-
background: white;
51-
background-color: white;
50+
min-height: 70vh;
51+
height: auto;
52+
padding-top: 40px;
53+
background: white;
54+
background-color: white;
5255
}
5356

5457
.logo-image {
55-
width: 200px;
56-
display: block;
57-
margin-left: auto;
58-
margin-right: auto
58+
width: 200px;
59+
display: block;
60+
margin-left: auto;
61+
margin-right: auto
5962
}
6063

6164
.jumbotron {
62-
background-color: white;
65+
background-color: white;
6366
}
6467

6568
.jumbotron h1 {
66-
font-size: 60px;
67-
color: #0275d8;
69+
font-size: 60px;
70+
color: #0275d8;
6871
}
6972

7073
.jumbotron h4 {
71-
color: #999;
72-
font-size: 18px;
73-
padding-top: 20px;
74+
color: #999;
75+
font-size: 18px;
76+
padding-top: 20px;
7477
}
7578

7679

7780
/* SECTION TWO START */
81+
7882
.section-two {
79-
height: auto;
80-
padding: 70px 0;
81-
background-color: #eee;
83+
height: auto;
84+
padding: 70px 0;
85+
background-color: #eee;
8286
}
8387

8488
.section-two h3 {
85-
font-size: 30px;
86-
color: #444444;
89+
font-size: 30px;
90+
color: #444444;
8791
}
8892

8993
.bi {
90-
text-align: center;
91-
font-style: italic;
92-
padding: 10px 0;
93-
font-size: 15px;
94+
text-align: center;
95+
font-style: italic;
96+
padding: 10px 0;
97+
font-size: 15px;
9498
}
9599

96100
.section-two .intro {
97-
color: #666666;
98-
font-size: 18px;
99-
line-height: 35px;
101+
color: #666666;
102+
font-size: 18px;
103+
line-height: 35px;
100104
}
101105

102106

103107
/* SECTION THREE START */
108+
104109
.section-three {
105-
height: auto;
106-
min-height: 500px;
107-
padding: 40px 0;
110+
height: auto;
111+
min-height: 500px;
112+
padding: 40px 0;
108113
}
109114

110115
.left-session-info {
111-
padding: 30px 50px;
116+
padding: 30px 50px;
112117
}
113118

114119
.sRegister {
115-
color: white;
116-
font-size: 15px;
117-
background-color: #0275d8;
118-
border-color: #0275d8;
120+
color: white;
121+
font-size: 15px;
122+
background-color: #0275d8;
123+
border-color: #0275d8;
119124
}
120125

121126
.sRegister a {
122-
color: white;
123-
text-decoration: none;
127+
color: white;
128+
text-decoration: none;
124129
}
125130

126131
.left-social-section {
127-
padding: 0 50px;
132+
padding: 0 50px;
128133
}
129134

130135

131136
/* FOOTER CSS STARTS */
137+
132138
footer {
133-
height: auto;
134-
min-height: 120px;
135-
padding-top: 10px;
136-
background-color: #24292e;
139+
height: auto;
140+
min-height: 120px;
141+
padding-top: 10px;
142+
background-color: #24292e;
137143
}
138144

139145
footer .container {
140-
width: 70%;
146+
width: 70%;
141147
}
142148

143149
.rectangle {
144-
height: 30px;
145-
line-height: 30px;
146-
margin-top: 15px;
150+
height: 30px;
151+
line-height: 30px;
152+
margin-top: 15px;
147153
}
148154

149155
.rectangle ul {
150-
list-style: none;
156+
list-style: none;
151157
}
152158

153159
.rectangle ul li {
154-
width: 40px;
155-
height: 30px;
156-
color: #eee;
157-
font-size: 22px;
158-
display: inline-block;
160+
width: 40px;
161+
height: 30px;
162+
color: #eee;
163+
font-size: 22px;
164+
display: inline-block;
159165
}
160166

161167
.backToTop {
162-
float: right;
163-
color: #999;
168+
float: right;
169+
color: #999;
164170
}
165171

166172
.backToTop a {
167-
text-decoration: none;
173+
text-decoration: none;
168174
}
169175

170176
.copyright {
171-
color: #eee;
177+
color: #eee;
172178
}

‎oshc/main/static/main/js/script.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
$(document).ready(function() {
2-
3-
$("#toTop").click(function () {
4-
$("html, body").animate({scrollTop: 0}, 1000);
5-
});
2+
3+
$("#toTop").click(function() {
4+
$("html, body").animate({
5+
scrollTop: 0
6+
}, 1000);
7+
});
68
});

‎oshc/main/templates/base.html

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{% if site.title %}<title>{% if title %}{{ title }} &ndash; {% endif %}{{ site.title }}{% if not title and site.subtitle %} &ndash; {{ site.subtitle }}{% endif %}</title>{% endif %}
88
</head>
99
<body>
10-
<nav class="navbar navbar-inverse navbar-static-top">
10+
<nav class="navbar navbar-inverse navbar-static-top navbar-fixed-top">
1111
<div class="container">
1212
<div class="navbar-header">
1313
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
@@ -31,6 +31,36 @@
3131

3232
<div id="content">
3333
{% block content %}{% endblock %}
34+
{% block footer %}
35+
<footer>
36+
<div class="container">
37+
<div class="rectangle">
38+
<ul>
39+
<li>
40+
<a href="https://www.facebook.com/opensourcehelpcommunity/"><i class="fa fa-facebook" aria-hidden="true"></i></a>
41+
</li>
42+
<li>
43+
<a href="https://twitter.com/oshelpcommunity"><i class="fa fa-twitter" aria-hidden="true"></i></a>
44+
</li>
45+
<li>
46+
<a href="https://github.com/OpenSourceHelpCommunity"><i class="fa fa-github" aria-hidden="true"></i></a>
47+
</li>
48+
<li>
49+
<a href="https://www.youtube.com/channel/UC1_IAby-9me3iICtxuiDL5Q"><i class="fa fa-youtube-play" aria-hidden="true"></i></a>
50+
</li>
51+
<span class="backToTop">
52+
<a id="toTop" name="Back to top!">Back to top</a>
53+
</span>
54+
</ul>
55+
</div>
56+
<div class="rectangle">
57+
<span class="copyright">
58+
&copy; 2017 Open Source Help Community
59+
</span>
60+
</div>
61+
</div>
62+
</footer>
63+
{% endblock %}
3464
</div>
3565

3666
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>

‎oshc/main/templates/index.html

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -71,36 +71,9 @@ <h3 class="panel-title">Open Source Contributor's Chat Session with Joannah Nanj
7171
<script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
7272
</div>
7373
</div>
74-
</div>
74+
</div>
7575
</div>
7676
</section>
7777

78-
<footer>
79-
<div class="container">
80-
<div class="rectangle">
81-
<ul>
82-
<li>
83-
<a href="https://www.facebook.com/opensourcehelpcommunity/"><i class="fa fa-facebook" aria-hidden="true"></i></a>
84-
</li>
85-
<li>
86-
<a href="https://twitter.com/oshelpcommunity"><i class="fa fa-twitter" aria-hidden="true"></i></a>
87-
</li>
88-
<li>
89-
<a href="https://github.com/OpenSourceHelpCommunity"><i class="fa fa-github" aria-hidden="true"></i></a>
90-
</li>
91-
<li>
92-
<a href="https://www.youtube.com/channel/UC1_IAby-9me3iICtxuiDL5Q"><i class="fa fa-youtube-play" aria-hidden="true"></i></a>
93-
</li>
94-
<span class="backToTop">
95-
<a id="toTop" name="Back to top!">Back to top</a>
96-
</span>
97-
</ul>
98-
</div>
99-
<div class="rectangle">
100-
<span class="copyright">
101-
&copy; 2017 Open Source Help Community
102-
</span>
103-
</div>
104-
</div>
105-
</footer>
78+
10679
{% endblock %}

0 commit comments

Comments
 (0)