Skip to content

General Tasks #3 #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

General Tasks #3 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
de36fab
Changed Prize value, Made sponsors blank
Coro29 Jan 19, 2021
04d6e67
Added DSC JIIT logo
Coro29 Jan 19, 2021
43d999f
Update index.html
Coro29 Jan 19, 2021
4a66a8f
Update index.html
Coro29 Jan 19, 2021
9329b3c
removed other clubs added DSC JIIT club
Coro29 Jan 20, 2021
d433b0e
Merge remote-tracking branch 'upstream/main' into main
Coro29 Jan 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions css/fonts.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,14 @@
content: "\e00d";
}

.DSC-JIIT-text {
font-size: 1.25rem;
font-family: "Roboto", "Helvetica", "Arial", sans-serif;
font-weight: 500;
line-height: 1.6;
letter-spacing: 0.0075em;
}




Expand Down
15 changes: 13 additions & 2 deletions css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,10 @@ section.hero .inner-hero {
padding: 5px 0;
text-transform: none;
}
.logo-default {
padding: 0px;
vertical-align: center;
}
.mobile-but {
display: inline-block;
height: 24px;
Expand Down Expand Up @@ -894,12 +898,19 @@ select.error {


/* End sponsors section*/
.block-club {
display: flex;
align-items: center;
height: 10em;
justify-content: center;
}
.block-club img {

height:85%;
height: inherit;
opacity: 1.0;

width: 85%;
/*width: 85%;*/
padding: 0px 8px 0px 0px;
}
.block-club-1 img{
height:2048;
Expand Down
Binary file added img/logo/logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
96 changes: 10 additions & 86 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<link href="css/fonts.css" rel="stylesheet" type="text/css" media="all" />
<link href="https://fonts.googleapis.com/css?family=Work+Sans:300,400,500,600,700" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,700" rel="stylesheet">
<link rel="icon" href="img/logo/MHACKS_logo.png">
<link rel="icon" href="img/logo/logo.png">
</head>

<body>
Expand Down Expand Up @@ -56,7 +56,7 @@
<div class="row">
<div class="col-md-2">
<a class="scroll logo" href="#wrapper">
<img class="logo-default" src="img/logo/MHACKS_logo.png" height="120" width="35" alt="logo" />
<img class="logo-default" src="img/logo/logo.png" height="120" width="35" alt="logo" />
</a>
</div>
<div class="col-md-10 text-right">
Expand Down Expand Up @@ -622,7 +622,7 @@ <h1 class="title">EVENT SHEDULE</h1>
<div class="row">
<div class="col-sm-8 col-sm-offset-2 mb-130 text-center">
<h1 class="title">Event Prizes</h1>
<p class="title-lead mt-10">We have a Total Prize Pool of 30,000 Rupees.<br> Come join the world’s influencers and get answers. </p>
<p class="title-lead mt-10">We have a Total Prize Pool of 50,000 Rupees.<br> Come join the world’s influencers and get answers. </p>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update the 1st and 2nd prize to 25,000Rs and 10,000Rs respectively.

</div>
</div>
<!--End row-->
Expand Down Expand Up @@ -723,80 +723,16 @@ <h1 class="title">Our Sponsors </h1>
<!--Container-->
<div id="sponsors" class="container">
<!--Row-->
<!--Template for individual sponsor
<div class="row">
<div class="vertical-center">
<div class="block-sponsor">
<a href="https://github.com"><img src="img/GitHub_Logo_White.png" alt=""></a>
<span><strong>Title Sponsor</strong></span>
</div>
<div class="block-sponsor">
<img src="img/tink_new.png" height="200" width="410" alt="">
</div>

<div class="block-sponsor">
<img src="img/edccek.jpg" height="200" width="410" alt="">
</div>
<div class="block-sponsor">
<img src="img/jb.svg" height="1000" width="410" alt="">
</div>
</div>
</div>
<div id="sponsors2" class="container">
<div class="row">
<div class="vertical-center">
<div class="block-sponsor">
<img src="img/devfolio.png" height="1000" width="410" alt="">
</div>
<div class="block-sponsor">
<img src="img/cblogo.png" height="600" width="300" alt="">
<span><strong>Coding Partner</strong></span>
</div>
<div class="block-sponsor">
<img src="https://media.balsamiq.com/files/company/balsamiq-logo-noborder-screen.png" alt="">
</div>
<div class="block-sponsor">
<img src="img/cflo.jpg" alt="">
</div>

</div>
</div>
<div class="row">
<div class="vertical-center">
<div class="block-sponsor">
<img src="img/stickermule.png" alt="stickermule">
<span><strong>Sticker Partner</strong></span>
</div>
<div class="block-sponsor">
<img src="img/sketch.png" alt="Sketch">
</div>
<div class="block-sponsor">
<img src="img/yepdesk.png" alt="Yepdesk">
<span><strong>Platform Sponsor</strong></span>
</div>
<div class="block-sponsor">
<img src="img/Gatsby_Monogram.png" height="150" width="150" alt=""><br/>
<span><strong>&nbsp;&nbsp;&nbsp;Workshop Partner</strong></span>
</div>
</div>
</div>
<div class="row">
<div class="vertical-center">
<div class="block-sponsor">

</div>
<div class="block-sponsor">

</div>
<div class="block-sponsor">
<img src="img/msg91.png" alt="MSG91">
<span><strong>Messaging partner</strong></span>
</div>
<div class="block-sponsor">

</div>
<img >
</div>
</div>
</div>
-->
</div>
<!--End container-->
</section>
<!--End sponser section-->
Expand Down Expand Up @@ -833,22 +769,10 @@ <h1 class="title">Our Clubs </h1>
<!--Row-->
<div class="row">
<div class="col-sm-12 text-center">
<div class="col-md-2 col-sm-2 ">
<div class="block-club">
<img src="img/osc.png" alt="">
<div class="col-md-4 col-sm-4 block-club">
<img src="img/logo/logo.png" alt="">
<span class="DSC-JIIT-text">DSC JIIT</span>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not getting reflected, please add the banner of our developer society DSC JIIT and link it to our website.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, do you have access to the banner or how you want the banner to look?

</div>
</div>
<div class="col-md-2 col-sm-2">
<div class="block-club-1 ">
<img src="img/CEK.png" height="200" width="410" alt="">

</div>
</div>
<div class="col-md-2 col-sm-2">
<div class="block-club">
<img src="img/Infin.png" height="200" width="410" alt="">
</div>
</div>
<!-- <div class="col-md-2 col-sm-2">
<div class="block-sponsor">
<img src="img/logo/2.png" alt="">
Expand Down