Shilpi Saini / startup_jalsa_frontend

Download as
Browse Code ยป

Commit a00813ee909b43358062024e4ab88c83a4030fb5

Authored by Palak Handa
1 parent 031c4d31c7
Exists in master and in 1 other branch paytm

minor change

Showing 4 changed files with 41 additions and 70 deletions   Show diff stats
... ... @@ -1382,9 +1382,15 @@ table {
1382 1382 .stage-shadow{
1383 1383 background:transparent;
1384 1384 }
1385   -
1386   -
1387   -
  1385 +.logojalsa{
  1386 + width:250px;position:relative;margin-bottom: 5%;
  1387 +}
  1388 +.jalsaheadr{
  1389 + position: relative;font-size: 40px;margin-left: 1%;color: rgb(25, 104, 157);
  1390 +}
  1391 +.PitchYourPower{
  1392 + position: relative;color: rgb(25, 104, 157);margin-top: -3%;
  1393 +}
1388 1394  
1389 1395  
1390 1396  
... ... @@ -1410,7 +1416,7 @@ table {
1410 1416 font-size:2.8rem;
1411 1417 }
1412 1418 .happen-city{
1413   - margin-left: -13px;
  1419 + margin-left: -25px;
1414 1420  
1415 1421 }
1416 1422 .card-color-confirm{
... ... @@ -1436,6 +1442,12 @@ table {
1436 1442 position:fixed;
1437 1443 top:0;
1438 1444 }
  1445 + .logojalsa{
  1446 + width:250px;position:relative;margin-bottom: 18%;
  1447 + }
  1448 + .PitchYourPower{
  1449 + position: relative;color: rgb(25, 104, 157);margin-top: -15%;
  1450 + }
1439 1451  
1440 1452 }
1441 1453  
... ... @@ -1443,5 +1455,12 @@ table {
1443 1455 .rotate-card{
1444 1456 width: 100%;
1445 1457 }
  1458 +
1446 1459  
  1460 +}
  1461 +
  1462 +@media (min-width:768px) and (max-width:991px){
  1463 + .logojalsa{
  1464 + width:250px;position:relative;margin-bottom: 8%;
  1465 + }
1447 1466 }
1448 1467 \ No newline at end of file
... ...
1 1 <div class="header" >
2 2 <div>
3   - <img src="images/SartupJalsa_Logo.png" style="width:200px;position:relative;">
4   - <!-- <h1 class="startup-jalsa">STARTUP JALSA 2018</h1> -->
5   - <h4 style="position: relative;color: rgb(25, 104, 157);">#PitchYourPower</h4>
  3 + <img src="images/SartupJalsa_Logo.png" class="logojalsa"><span class="jalsaheadr" style="">2018</span>
  4 + <!-- <h1 class="startup-jalsa">2018</h1> -->
  5 + <h4 class="PitchYourPower">#PitchYourPower</h4>
6 6 </div>
7 7  
8 8 <div class="clearfix"></div>
... ...
pages/caricatures.html
Diff comments   View file @a00813e
... ... @@ -46,7 +46,7 @@
46 46 </label>
47 47 <div class="clearfix"></div>
48 48 <div class="card-text2">
49   - <button class="btn btn-info apply-act" style="margin-bottom: 4%;float: right;padding: 3px 10px 3px 10px;margin-right: 7%;border-radius: 12px;" data-toggle="collapse" ng-click="watch('Chennai')" >Apply</button>
  49 + <button class="btn btn-info apply-act" style="margin-bottom: 4%;float: right;padding: 3px 10px 3px 10px;margin-right: 7%;border-radius: 12px;" data-toggle="collapse" ng-click="watch('Chennai')" >Select</button>
50 50 </div>
51 51 </div>
52 52 </div>
... ... @@ -70,7 +70,7 @@
70 70 </label>
71 71 <div class="clearfix"></div>
72 72 <div class="card-text2">
73   - <button class="btn btn-info apply-act" style="margin-bottom: 4%;float: right;padding: 3px 10px 3px 10px;margin-right: 7%;border-radius: 12px;" data-toggle="collapse" ng-click="watch('Hyderabad')" >Apply</button>
  73 + <button class="btn btn-info apply-act" style="margin-bottom: 4%;float: right;padding: 3px 10px 3px 10px;margin-right: 7%;border-radius: 12px;" data-toggle="collapse" ng-click="watch('Hyderabad')" >Select</button>
74 74 </div>
75 75 </div>
76 76 </div>
... ... @@ -94,7 +94,7 @@
94 94 </label>
95 95 <div class="clearfix"></div>
96 96 <div class="card-text2">
97   - <button class="btn btn-info apply-act" style="margin-bottom: 4%;float: right;padding: 3px 10px 3px 10px;margin-right: 7%;border-radius: 12px;" data-toggle="collapse" ng-click="watch('Mumbai')" >Apply</button>
  97 + <button class="btn btn-info apply-act" style="margin-bottom: 4%;float: right;padding: 3px 10px 3px 10px;margin-right: 7%;border-radius: 12px;" data-toggle="collapse" ng-click="watch('Mumbai')">Select</button>
98 98 </div>
99 99 </div>
100 100 </div>
... ... @@ -118,7 +118,7 @@
118 118 </label>
119 119 <div class="clearfix"></div>
120 120 <div class="card-text2">
121   - <button class="btn btn-info apply-act" style="margin-bottom: 4%;float: right;padding: 3px 10px 3px 10px;margin-right: 7%;border-radius: 12px;" data-toggle="collapse" ng-click="watch('Kolkata')" >Apply</button>
  121 + <button class="btn btn-info apply-act" style="margin-bottom: 4%;float: right;padding: 3px 10px 3px 10px;margin-right: 7%;border-radius: 12px;" data-toggle="collapse" ng-click="watch('Kolkata')" >Select</button>
122 122 </div>
123 123 </div>
124 124 </div>
... ... @@ -127,54 +127,6 @@
127 127 <div class="clearfix"></div>
128 128 <div class="stages card-align">
129 129 <div class="row">
130   - <!-- <div class="col-md-3 col-sm-6" style="margin-top: 2%;">
131   - <div class="card" style="width:100%;border-radius: 6px;">
132   - <label style="padding: 0;" class="thumbnail radius-border stage-thumbnail cursor rotate-card">
133   - <img class="card-img-top" src="images/guwahati.png" style="width:100%">
134   - <div class="card-block">
135   - <div class="pull-left">
136   - <label class="card-title">Guwahati</label><br>
137   - <label class="card-sub-title">Saturday</label>
138   - </div>
139   - <div class="pull-right">
140   - <label class="card-sub-title"><i class="material-icons">location_on</i>
141   - <span style="position: relative;top: -3px;font-size: 17px;">IIT-Guwahati</span>
142   - </label>
143   - </div>
144   - <div class="clearfix"></div>
145   - <label class="card-sub-title">Sept 29, 2018</label>
146   - </div>
147   - </label>
148   - <div class="clearfix"></div>
149   - <div class="card-text2">
150   - <button class="btn btn-info apply-act" style="margin-bottom: 4%;float: right;padding: 3px 10px 3px 10px;margin-right: 7%;border-radius: 12px;" data-toggle="collapse" ng-click="watch('Guwahati')" >Apply</button>
151   - </div>
152   - </div>
153   - </div> -->
154   - <!-- <div class="col-md-3 col-sm-6" style="margin-top: 2%;">
155   - <div class="card" style="width:100%;border-radius: 6px;">
156   - <label style="padding: 0;" class="thumbnail radius-border stage-thumbnail cursor rotate-card">
157   - <img class="card-img-top" src="images/kolkata.png" style="width:100%">
158   - <div class="card-block">
159   - <div class="pull-left">
160   - <label class="card-title">Kolkata</label><br>
161   - <label class="card-sub-title">Wednesday</label>
162   - </div>
163   - <div class="pull-right">
164   - <label class="card-sub-title"><i class="material-icons">location_on</i>
165   - <span style="position: relative;top: -3px;font-size: 17px;">IIM-Calcutta</span>
166   - </label>
167   - </div>
168   - <div class="clearfix"></div>
169   - <label class="card-sub-title">Oct 3, 2018</label>
170   - </div>
171   - </label>
172   - <div class="clearfix"></div>
173   - <div class="card-text2">
174   - <button class="btn btn-info apply-act" style="margin-bottom: 4%;float: right;padding: 3px 10px 3px 10px;margin-right: 7%;border-radius: 12px;" data-toggle="collapse" ng-click="watch('Kolkata')" >Apply</button>
175   - </div>
176   - </div>
177   - </div> -->
178 130 <div class="col-md-3 col-sm-6" style="margin-top: 2%;">
179 131 <div class="card" style="width:100%;border-radius: 6px;">
180 132 <label style="padding: 0;" class="thumbnail radius-border stage-thumbnail cursor rotate-card">
... ... @@ -195,7 +147,7 @@
195 147 </label>
196 148 <div class="clearfix"></div>
197 149 <div class="card-text2">
198   - <button class="btn btn-info apply-act" style="margin-bottom: 4%;float: right;padding: 3px 10px 3px 10px;margin-right: 7%;border-radius: 12px;" data-toggle="collapse" ng-click="watch('Jaipur')" >Apply</button>
  150 + <button class="btn btn-info apply-act" style="margin-bottom: 4%;float: right;padding: 3px 10px 3px 10px;margin-right: 7%;border-radius: 12px;" data-toggle="collapse" ng-click="watch('Jaipur')" >Select</button>
199 151 </div>
200 152 </div>
201 153 </div>
... ... @@ -219,7 +171,7 @@
219 171 </label>
220 172 <div class="clearfix"></div>
221 173 <div class="card-text2">
222   - <button class="btn btn-info apply-act" style="margin-bottom: 4%;float: right;padding: 3px 10px 3px 10px;margin-right: 7%;border-radius: 12px;" data-toggle="collapse" ng-click="watch('Delhi')" >Apply</button>
  174 + <button class="btn btn-info apply-act" style="margin-bottom: 4%;float: right;padding: 3px 10px 3px 10px;margin-right: 7%;border-radius: 12px;" data-toggle="collapse" ng-click="watch('Delhi')" >Select</button>
223 175 </div>
224 176 </div>
225 177 </div>
... ... @@ -243,7 +195,7 @@
243 195 </label>
244 196 <div class="clearfix"></div>
245 197 <div class="card-text2">
246   - <button class="btn btn-info apply-act" style="margin-bottom: 4%;float: right;padding: 3px 10px 3px 10px;margin-right: 7%;border-radius: 12px;" data-toggle="collapse" ng-click="watch('Kanpur')" >Apply</button>
  198 + <button class="btn btn-info apply-act" style="margin-bottom: 4%;float: right;padding: 3px 10px 3px 10px;margin-right: 7%;border-radius: 12px;" data-toggle="collapse" ng-click="watch('Kanpur')" >Select</button>
247 199 </div>
248 200 </div>
249 201 </div>
... ... @@ -267,7 +219,7 @@
267 219 </label>
268 220 <div class="clearfix"></div>
269 221 <div class="card-text2">
270   - <button class="btn btn-info apply-act" style="margin-bottom: 4%;float: right;padding: 3px 10px 3px 10px;margin-right: 7%;border-radius: 12px;" data-toggle="collapse" ng-click="watch('Ahmedabad')" >Apply</button>
  222 + <button class="btn btn-info apply-act" style="margin-bottom: 4%;float: right;padding: 3px 10px 3px 10px;margin-right: 7%;border-radius: 12px;" data-toggle="collapse" ng-click="watch('Ahmedabad')" >Select</button>
271 223 </div>
272 224 </div>
273 225 </div>
... ... @@ -296,17 +248,17 @@
296 248 </label>
297 249 <div class="clearfix"></div>
298 250 <div class="card-text2">
299   - <button class="btn btn-info apply-act" style="margin-bottom: 4%;float: right;padding: 3px 10px 3px 10px;margin-right: 7%;border-radius: 12px;" data-toggle="collapse" ng-click="watch('Bangalore')" >Apply</button>
  251 + <button class="btn btn-info apply-act" style="margin-bottom: 4%;float: right;padding: 3px 10px 3px 10px;margin-right: 7%;border-radius: 12px;" data-toggle="collapse" ng-click="watch('Bangalore')" >Select</button>
300 252 </div>
301 253 </div>
302 254 </div>
303 255 <!-- <div class="col-md-3 col-sm-6" style="margin-top: 2%;">
304 256 <div class="card" style="width:100%;border-radius: 6px;">
305 257 <label style="padding: 0;" class="thumbnail radius-border stage-thumbnail cursor rotate-card">
306   - <img class="card-img-top" src="images/indore.png" style="width:100%">
  258 + <img class="card-img-top" src="images/dharamshala_1.png" style="width:100%">
307 259 <div class="card-block">
308 260 <div class="pull-left">
309   - <h4 class="card-title">Indore</h4>
  261 + <label class="card-title">Bangalore</label><br>
310 262 <label class="card-sub-title">Monday</label>
311 263 </div>
312 264 <div class="pull-right">
... ... @@ -320,11 +272,11 @@
320 272 </label>
321 273 <div class="clearfix"></div>
322 274 <div class="card-text2">
323   - <button class="btn btn-info apply-act" style="margin-bottom: 4%;float: right;padding: 3px 10px 3px 10px;margin-right: 7%;border-radius: 12px;" data-toggle="collapse" ng-click="watch('https://docs.google.com/forms/d/e/1FAIpQLSeNa28Kz-1669UfPKpHrWLXhFJVu27vvzxM7s1jLOTadrVDyA/viewform')" >Apply</button>
  275 + <button class="btn btn-info apply-act" style="margin-bottom: 4%;float: right;padding: 3px 10px 3px 10px;margin-right: 7%;border-radius: 12px;" data-toggle="collapse" ng-click="watch('Dharamshala')" >Select</button>
324 276 </div>
325 277 </div>
326   - </div>
327   - <div class="col-md-3 col-sm-6" style="margin-top: 2%;">
  278 + </div> -->
  279 + <!-- <div class="col-md-3 col-sm-6" style="margin-top: 2%;">
328 280 <div class="card" style="width:100%;border-radius: 6px;">
329 281 <label style="padding: 0;" class="thumbnail radius-border stage-thumbnail cursor rotate-card">
330 282 <img class="card-img-top" src="images/roorkee.png" style="width:100%">
... ...
pages/registration.html
Diff comments   View file @a00813e
... ... @@ -160,7 +160,7 @@
160 160 </div>
161 161 <div class="col-xs-12 col-md-12 f-family line-adjust">
162 162 <strong>Coupon Code.</strong>
163   - <p class="line-space" >It's applicable.</p>
  163 + <p class="line-space" >If applicable.</p>
164 164 </div>
165 165 <div class="col-xs-12 input-wrapper">
166 166 <div class="referel-icon" style="z-index: 999;">
... ...