Skip to content

Commit 72efc66

Browse files
Merge pull request #40 from vaibhavsingh97/develop
Screen Compatibility fix
2 parents 01135dc + 527c908 commit 72efc66

File tree

3 files changed

+100
-31
lines changed

3 files changed

+100
-31
lines changed

Diff for: oshc/main/static/main/css/app.css

+72-9
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
body {
1414
overflow-x: hidden;
15+
padding-top: 50px;
1516
}
1617

1718
a {
@@ -52,6 +53,8 @@ a {
5253
padding-top: 40px;
5354
background: white;
5455
background-color: white;
56+
position: relative;
57+
clear: both;
5558
}
5659

5760
.logo-image {
@@ -63,6 +66,8 @@ a {
6366

6467
.jumbotron {
6568
background-color: white;
69+
word-wrap: break-word;
70+
display: block;
6671
}
6772

6873
.jumbotron h1 {
@@ -83,6 +88,8 @@ a {
8388
height: auto;
8489
padding: 70px 0;
8590
background-color: #eee;
91+
word-wrap: break-word;
92+
display: block;
8693
}
8794

8895
.section-two h3 {
@@ -101,6 +108,7 @@ a {
101108
color: #666666;
102109
font-size: 18px;
103110
line-height: 35px;
111+
text-align: justify;
104112
}
105113

106114

@@ -144,6 +152,8 @@ footer {
144152

145153
footer .container {
146154
width: 70%;
155+
position: sticky;
156+
display: block;
147157
}
148158

149159
.rectangle {
@@ -152,27 +162,80 @@ footer .container {
152162
margin-top: 15px;
153163
}
154164

155-
.rectangle ul {
165+
.backToTop {
166+
float: right;
167+
color: #999;
168+
}
169+
170+
.backToTop a {
171+
text-decoration: none;
172+
}
173+
174+
.copyright {
175+
color: #fff;
176+
line-height: 30px;
177+
min-height: 30px;
178+
padding: 7px 0;
179+
}
180+
181+
.social {
182+
color: #fff;
183+
line-height: 30px;
184+
min-height: 30px;
185+
padding: 7px 0;
186+
}
187+
188+
.social .left-align {
189+
text-align: left;
190+
}
191+
192+
.social .right-align {
193+
text-align: right;
194+
}
195+
196+
.social ul {
156197
list-style: none;
157198
}
158199

159-
.rectangle ul li {
200+
.social ul li {
160201
width: 40px;
161202
height: 30px;
162203
color: #eee;
163204
font-size: 22px;
164205
display: inline-block;
165206
}
166207

167-
.backToTop {
168-
float: right;
169-
color: #999;
208+
.social a {
209+
color: #fff;
170210
}
171211

172-
.backToTop a {
173-
text-decoration: none;
212+
213+
/*Media queries*/
214+
215+
@media (max-width: 320px) {
216+
.jumbotron h1 {
217+
font-size: 30px;
218+
}
174219
}
175220

176-
.copyright {
177-
color: #eee;
221+
@media (min-width: 321px) and (max-width: 480px) {
222+
.jumbotron h1 {
223+
font-size: 38px;
224+
}
225+
}
226+
227+
@media (max-width: 768px) {
228+
.main-section {
229+
min-height: 50vh;
230+
height: auto;
231+
clear: both;
232+
}
233+
}
234+
235+
@media (min-width: 769px) and (max-width: 1024px) {
236+
.main-section {
237+
min-height: 50vh;
238+
height: auto;
239+
clear: both;
240+
}
178241
}

Diff for: oshc/main/templates/base.html

+27-21
Original file line numberDiff line numberDiff line change
@@ -34,29 +34,35 @@
3434
{% block footer %}
3535
<footer>
3636
<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>
37+
<div class="row">
38+
<div class="col-xs-12">
39+
<div class="social">
40+
<ul>
41+
<span class="col-sm-6 left-align">
42+
<li>
43+
<a href="https://www.facebook.com/opensourcehelpcommunity/"><i class="fa fa-facebook" aria-hidden="true"></i></a>
44+
</li>
45+
<li>
46+
<a href="https://twitter.com/oshelpcommunity"><i class="fa fa-twitter" aria-hidden="true"></i></a>
47+
</li>
48+
<li>
49+
<a href="https://github.com/OpenSourceHelpCommunity"><i class="fa fa-github" aria-hidden="true"></i></a>
50+
</li>
51+
<li>
52+
<a href="https://www.youtube.com/channel/UC1_IAby-9me3iICtxuiDL5Q"><i class="fa fa-youtube-play" aria-hidden="true"></i></a>
53+
</li>
54+
</span>
55+
<span class="col-sm-6 backToTop right-align">
56+
<a id="toTop" name="Back to top!">Back to top</a>
57+
</span>
58+
</ul>
59+
</div>
60+
</div>
5561
</div>
56-
<div class="rectangle">
57-
<span class="copyright">
62+
<div class="col-xs-12">
63+
<div class="copyright">
5864
&copy; 2017 Open Source Help Community
59-
</span>
65+
</div>
6066
</div>
6167
</div>
6268
</footer>

Diff for: oshc/main/templates/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<section class="main-section">
55
<div class="container">
66
<div class="jumbotron text-center">
7-
<img class="logo-image" src="{% static "main/images/oshc-logo.png"%}" alt="Open Source Help Community Logo"/>
7+
<img class="logo-image img-responsive" src="{% static "main/images/oshc-logo.png"%}" alt="Open Source Help Community Logo"/>
88
<h1>Open Source Help Community</h1>
99
<h4>A Virtual Platform To Help People To Start Contributing To Open Source Projects</h4>
1010
</div>

0 commit comments

Comments
 (0)