Skip to content

Commit eab8cb8

Browse files
tapaswenipathaktapaswenipathak
authored
Merge pull request #43 from OpenSourceHelpCommunity/develop
Merge master and develop
2 parents f968de7 + 72efc66 commit eab8cb8

File tree

11 files changed

+414
-143
lines changed

11 files changed

+414
-143
lines changed

‎CODE_OF_CONDUCT.md

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
6+
7+
## Our Standards
8+
9+
Examples of behavior that contributes to creating a positive environment include:
10+
11+
* Using welcoming and inclusive language
12+
* Being respectful of differing viewpoints and experiences
13+
* Gracefully accepting constructive criticism
14+
* Focusing on what is best for the community
15+
* Showing empathy towards other community members
16+
17+
Examples of unacceptable behavior by participants include:
18+
19+
* The use of sexualized language or imagery and unwelcome sexual attention or advances
20+
* Trolling, insulting/derogatory comments, and personal or political attacks
21+
* Public or private harassment
22+
* Publishing others' private information, such as a physical or electronic address, without explicit permission
23+
* Other conduct which could reasonably be considered inappropriate in a professional setting
24+
25+
## Our Responsibilities
26+
27+
Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
28+
29+
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
30+
31+
## Scope
32+
33+
This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
34+
35+
## Enforcement
36+
37+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
38+
39+
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
40+
41+
## Attribution
42+
43+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
44+
45+
[homepage]: http://contributor-covenant.org
46+
[version]: http://contributor-covenant.org/version/1/4/

‎Procfile

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
web: gunicorn --pythonpath oshc oshc.wsgi --log-file -

‎README.md

+2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ We are trying to create a medium where people who want to start with contributin
66

77
[Website](http://opensourcehelpcommunity.herokuapp.com/) [WIP]
88

9+
After every commit, the `develop` branch on github is automatically deployed to [opensourcehelpcommunity-dev.herokuapp.com](http://opensourcehelpcommunity-dev.herokuapp.com/) and the `master` branch is automatically deployed [to opensourcehelpcommunity.herokuapp.com](http://opensourcehelpcommunity.herokuapp.com/) . All the development is done on `develop` branch and once we're ready for a new release we merge the `develop` branch with the `master` branch. Please submit your pull request based on `develop` branch.
910

1011
This is using [Django(1.11)](https://www.djangoproject.com/) and [Bootstrap](http://getbootstrap.com/).
1112
Feel free to suggest a better design.
1213

14+
Please submit your pull request on develop branch, it will have the most recent changes.
1315

1416
## Installations
1517
Run

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

-12 KB
Binary file not shown.

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

+216-40
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,241 @@
1+
/* GLOBAL DEFINATIONS STARTS */
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
11+
}
12+
113
body {
2-
padding: 20px 0;
14+
overflow-x: hidden;
15+
padding-top: 50px;
316
}
417

5-
#logo {
6-
width: 180px;
7-
height: 180px;
18+
a {
19+
cursor: pointer;
20+
color: #0275d8;
21+
text-decoration: none;
822
}
923

10-
.navbar ul {
11-
margin-top: 5px;
24+
.line-gap-10px {
25+
height: 10px;
1226
}
1327

14-
.navbar .navbar-brand {
15-
color: #ED1B49;
16-
font-size: 175%;
17-
font-weight: 100;
28+
29+
/* NAVBAR CSS STARTS */
30+
31+
.navbar {
32+
margin-bottom: 0;
1833
}
1934

20-
footer {
21-
height:70px;
22-
background-color: #e7e7e7;
23-
text-align: center;
24-
border-radius: 7px;
25-
border-style: solid !important;
26-
border:1px;
27-
border-color: #bdbdbd;
28-
padding-top: 15px;
29-
padding-left: 5px;
35+
.navbar-inverse .navbar-brand {
36+
color: #eee;
3037
}
3138

32-
footer .col-sm-6 a{
33-
color: #777;
34-
padding: 10px;
39+
.navbar-inverse {
40+
background-color: #24292e;
3541
}
3642

37-
.navbar .navbar-brand:hover {
38-
color: rgb(255, 100, 100);
43+
.navbar-inverse {
44+
border-color: #24292e;
3945
}
4046

41-
#organizers {
42-
margin: 40px 0 40px;
43-
background: #f4f4f4;
44-
padding: 40px 20px 20px;
45-
border-radius: 12px;
4647

47-
}
48+
/* SECTION ONE STARTS */
4849

49-
#organizers h2 {
50-
font-weight: 100;
50+
.main-section {
51+
min-height: 70vh;
52+
height: auto;
53+
padding-top: 40px;
54+
background: white;
55+
background-color: white;
56+
position: relative;
57+
clear: both;
5158
}
5259

53-
#organizers .title h2 {
54-
font-size: 250%;
55-
top: 85px;
56-
color: #26A9E0;
60+
.logo-image {
61+
width: 200px;
62+
display: block;
63+
margin-left: auto;
64+
margin-right: auto
5765
}
5866

5967
.jumbotron {
60-
background-color:#ffffff;
61-
background-size:80px 50px;
68+
background-color: white;
69+
word-wrap: break-word;
70+
display: block;
6271
}
72+
6373
.jumbotron h1 {
64-
color: #26A9E0;
74+
font-size: 60px;
75+
color: #0275d8;
76+
}
77+
78+
.jumbotron h4 {
79+
color: #999;
80+
font-size: 18px;
81+
padding-top: 20px;
82+
}
83+
84+
85+
/* SECTION TWO START */
86+
87+
.section-two {
88+
height: auto;
89+
padding: 70px 0;
90+
background-color: #eee;
91+
word-wrap: break-word;
92+
display: block;
93+
}
94+
95+
.section-two h3 {
96+
font-size: 30px;
97+
color: #444444;
98+
}
99+
100+
.bi {
101+
text-align: center;
102+
font-style: italic;
103+
padding: 10px 0;
104+
font-size: 15px;
105+
}
106+
107+
.section-two .intro {
108+
color: #666666;
109+
font-size: 18px;
110+
line-height: 35px;
111+
text-align: justify;
112+
}
113+
114+
115+
/* SECTION THREE START */
116+
117+
.section-three {
118+
height: auto;
119+
min-height: 500px;
120+
padding: 40px 0;
121+
}
122+
123+
.left-session-info {
124+
padding: 30px 50px;
125+
}
126+
127+
.sRegister {
128+
color: white;
129+
font-size: 15px;
130+
background-color: #0275d8;
131+
border-color: #0275d8;
132+
}
133+
134+
.sRegister a {
135+
color: white;
136+
text-decoration: none;
137+
}
138+
139+
.left-social-section {
140+
padding: 0 50px;
141+
}
142+
143+
144+
/* FOOTER CSS STARTS */
145+
146+
footer {
147+
height: auto;
148+
min-height: 120px;
149+
padding-top: 10px;
150+
background-color: #24292e;
151+
}
152+
153+
footer .container {
154+
width: 70%;
155+
position: sticky;
156+
display: block;
157+
}
158+
159+
.rectangle {
160+
height: 30px;
161+
line-height: 30px;
162+
margin-top: 15px;
163+
}
164+
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 {
197+
list-style: none;
198+
}
199+
200+
.social ul li {
201+
width: 40px;
202+
height: 30px;
203+
color: #eee;
204+
font-size: 22px;
205+
display: inline-block;
206+
}
207+
208+
.social a {
209+
color: #fff;
210+
}
211+
212+
213+
/*Media queries*/
214+
215+
@media (max-width: 320px) {
216+
.jumbotron h1 {
217+
font-size: 30px;
218+
}
219+
}
220+
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+
}
65241
}

‎oshc/main/static/main/images/oshc-logo.png

-5.08 KB
Loading

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

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

0 commit comments

Comments
 (0)