Skip to content

Commit fc0b635

Browse files
harlynkingmharlynkingm
committed
fixed mobile issues
1 parent 3e75dcd commit fc0b635

File tree

6 files changed

+146
-53
lines changed

6 files changed

+146
-53
lines changed

‎css/responsee.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ nav {
326326
.top-nav li a {
327327
border-top:1px solid #fff;
328328
color:#fff;
329-
background-color: #0d144a;
329+
background-color: #e32f33;
330330
display:block;
331331
padding:0.625em;
332332
text-decoration:none;

‎css/styles.css‎

Lines changed: 41 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,22 +50,13 @@ body{
5050
border: 2px solid #0d144a;
5151
}
5252

53-
.candidate-header:hover{
54-
border: 2px solid #0d144a;
55-
background-color: #fff;
56-
color: #0d144a;
57-
cursor: pointer;
58-
transition: .2s;
59-
}
60-
6153
.info-bullets{
6254
font-size: 16px;
6355
margin-top: 7px;
6456
margin-right: 5%;
6557
text-align: left;
6658
margin-left: 15px;
6759
line-height: 22px;
68-
display: none;
6960
}
7061

7162
.issue-header{
@@ -141,6 +132,34 @@ body{
141132
not supported by any browser */
142133
}
143134

135+
#clockdiv{
136+
color: #fff;
137+
display: inline-block;
138+
font-weight: 100;
139+
text-align: center;
140+
font-size: 30px;
141+
}
142+
143+
#clockdiv > div{
144+
padding: 10px;
145+
border-radius: 3px;
146+
background: #e32f33;
147+
display: inline-block;
148+
}
149+
150+
#clockdiv div > span{
151+
padding: 15px;
152+
border-radius: 3px;
153+
display: inline-block;
154+
color: #0d144a;
155+
background: #fff;
156+
}
157+
158+
.smalltext{
159+
padding-top: 7px;
160+
font-size: 16px;
161+
}
162+
144163
@media screen and (max-width: 1100px){
145164
.owl-carousel{
146165
height: 100%;
@@ -169,6 +188,7 @@ body{
169188
.platform-desc{
170189
font-size: 12px;
171190
}
191+
172192
}
173193

174194
@media screen and (max-width:680px) {
@@ -221,4 +241,16 @@ body{
221241
.platform-desc{
222242
font-size: 14px;
223243
}
244+
245+
#clockdiv{
246+
font-size: 20px;
247+
}
248+
249+
.smalltext{
250+
font-size: 10px;
251+
}
252+
253+
#clockdiv div > span{
254+
padding: 8px;
255+
}
224256
}

‎css/template-style.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ nav {
4343
border-bottom: .5px solid #0d144a;
4444
}
4545
.top-nav li a:hover, .top-nav li.active-item a, .top-nav .logo.active-item a:hover {
46-
background: none repeat scroll 0 0 #0d144a;
46+
background: none repeat scroll 0 0 #e32f33;
4747
color: #fff;
4848
}
4949
.top-nav li.logo a, .top-nav li.logo.active-item a, .top-nav .logo {

‎index.html‎

Lines changed: 57 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -145,40 +145,40 @@ <h1 style="margin-bottom:50px;margin-top:2em">PLATFORM</h1>
145145
<div class="margin">
146146
<div class="s-12 m-6 l-4">
147147
<div class="content-block margin-bottom">
148-
<i class="icon-user icon2x"></i>
149-
<h3>LGBTQ+ INITIATIVES</h3>
148+
<i class="icon-magnifying icon2x"></i>
149+
<h3>DIVERSITY</h3>
150150
<div class="platform-desc noselect">
151-
We will be working with the University, as well as the newly approved LGBTQ+ residence hall, to ensure fair and equal treatment of all LGBTQ+ students in the campus community.
151+
By creating a diversity-based activity, we will promote education and understanding between cultures at CMU.<br><br>
152+
Through this, we hope to increase cultural equality on campus.
152153
</div>
153154
</div>
154155
</div>
155156
<div class="s-12 m-6 l-4">
156157
<div class="content-block margin-bottom">
157-
<i class="icon-arrow_doubled_up icon2x"></i>
158-
<h3>USNWR RANKINGS</h3>
159-
<div class="platform-desc noselect">
160-
It is our goal to raise the US News and World Report ranking of Carnegie Mellon University.<br><br>
161-
We will do this by encouraging student giving and focusing on other low-ranking areas.
158+
<i class="icon-chart_alt icon2x"></i>
159+
<h3>STUDENT ORGANIZATIONS</h3>
160+
<div class="platform-desc noselect" style="margin-top:-13px">
161+
We hope to strengthen and create more successful student organizations to promote student involvement on campus. <br><br>
162+
We will become directly involved with young organizations and the training of new members.
162163
</div>
163164
</div>
164165
</div>
165166
<div class="s-12 m-6 l-4">
166167
<div class="content-block margin-bottom">
167-
<i class="icon-magnifying icon2x"></i>
168-
<h3>DIVERSITY</h3>
168+
<i class="icon-user icon2x"></i>
169+
<h3>LGBTQ+ INITIATIVES</h3>
169170
<div class="platform-desc noselect">
170-
By creating a diversity-based activity, we will promote education and understanding between cultures at CMU.<br><br>
171-
Through this, we hope to increase cultural equality on campus.
171+
We will be working with the University, as well as the newly approved LGBTQ+ residence hall, to ensure fair and equal treatment of all LGBTQ+ students in the campus community.
172172
</div>
173173
</div>
174174
</div>
175175
<div class="s-12 m-6 l-4">
176176
<div class="content-block margin-bottom">
177-
<i class="icon-chart_alt icon2x"></i>
178-
<h3>STUDENT ORGANIZATIONS</h3>
179-
<div class="platform-desc noselect" style="margin-top:-13px">
180-
We hope to strengthen and create more successful student organizations to promote student involvement on campus. <br><br>
181-
We will become directly involved with young organizations and the training of new members.
177+
<i class="icon-credit_card icon2x"></i>
178+
<h3>STUDENT DEBT AWARENESS</h3>
179+
<div class="platform-desc noselect">
180+
We hope to better prepare students to deal with their debt.<br><br>
181+
Workshops will be held to ensure students are educated and ready to deal with their savings, investments, and spending.
182182
</div>
183183
</div>
184184
</div>
@@ -194,31 +194,31 @@ <h3>SARVP<br>AWARENESS</h3>
194194
</div>
195195
<div class="s-12 m-6 l-4">
196196
<div class="content-block margin-bottom">
197-
<i class="icon-newspaper icon2x"></i>
198-
<h3>EDUCATION INNOVATION</h3>
197+
<i class="icon-arrow_doubled_up icon2x"></i>
198+
<h3>USNWR RANKINGS</h3>
199199
<div class="platform-desc noselect">
200-
We hope to promote on-campus education about intrapersonal skills on campus.<br><br>
201-
One of our focuses will be on professional communications, such as emails and resumes.
200+
It is our goal to raise the US News and World Report ranking of Carnegie Mellon University.<br><br>
201+
We will do this by encouraging student giving and focusing on other low-ranking areas.
202202
</div>
203203
</div>
204204
</div>
205-
<div class="s-12 m-6 l-4">
205+
<div class="s-12 m-6 l-4">
206206
<div class="content-block margin-bottom">
207-
<i class="icon-credit_card icon2x"></i>
208-
<h3>STUDENT DEBT AWARENESS</h3>
207+
<i class="icon-globe icon2x"></i>
208+
<h3>INTERNATIONAL STUDENTS</h3>
209209
<div class="platform-desc noselect">
210-
We hope to better prepare students to deal with their debt.<br><br>
211-
Workshops will be held to ensure students are educated and ready to deal with their savings, investments, and spending.
210+
We hope to strengthen the connection between international students and student government.<br><br>
211+
Our hope is to make CMU a more comfortable place for students of all nationalities and cultures.
212212
</div>
213213
</div>
214214
</div>
215-
<div class="s-12 m-6 l-4">
215+
<div class="s-12 m-6 l-4">
216216
<div class="content-block margin-bottom">
217-
<i class="icon-globe icon2x"></i>
218-
<h3>INTERNATIONAL STUDENTS</h3>
217+
<i class="icon-newspaper icon2x"></i>
218+
<h3>EDUCATION INNOVATION</h3>
219219
<div class="platform-desc noselect">
220-
We hope to strengthen the connection between international students and student government.<br><br>
221-
Our hope is to make CMU a more comfortable place for students of all nationalities and cultures.
220+
We hope to promote on-campus education about intrapersonal skills on campus.<br><br>
221+
One of our focuses will be on professional communications, such as emails and resumes.
222222
</div>
223223
</div>
224224
</div>
@@ -349,13 +349,13 @@ <h2>CHIEFS</h2>
349349
<div class="student-image margin-bottom">
350350
<img src="images/staff/yulissa%20cruz.jpg">
351351
</div>
352-
<div class="student-text">Yulissa Cruz<br>Chief Marketing Officer</div>
352+
<div class="student-text">Julissa Cruz<br>Chief Marketing Officer</div>
353353
</div>
354354
<div class="s-12 m-6 l-3">
355355
<div class="student-image margin-bottom">
356356
<img src="images/staff/emily%20mongillio.jpg">
357357
</div>
358-
<div class="student-text">Emily Mongillio<br>Chief Design Officer</div>
358+
<div class="student-text">Emily Mongilio<br>Chief Design Officer</div>
359359
</div>
360360
<div class="s-12 m-6 l-3">
361361
<div class="student-image margin-bottom">
@@ -389,12 +389,34 @@ <h1 style="margin-bottom:50px;margin-top:50px">TIMELINE</h1>
389389
VOTING CLOSES<br>
390390
</div>
391391
</div>
392+
<div class="line" style="margin-bottom:50px">
393+
<h1 style="margin-bottom:50px;margin-top:50px">COUNTDOWN TO VOTE</h1>
394+
<div id="clockdiv">
395+
<div>
396+
<span class="days"></span>
397+
<div class="smalltext">Days</div>
398+
</div>
399+
<div>
400+
<span class="hours"></span>
401+
<div class="smalltext">Hours</div>
402+
</div>
403+
<div>
404+
<span class="minutes"></span>
405+
<div class="smalltext">Minutes</div>
406+
</div>
407+
<div>
408+
<span class="seconds"></span>
409+
<div class="smalltext">Seconds</div>
410+
</div>
411+
</div>
412+
</div>
392413
<div class="line" style="height:10px;background-color:#0d144a;max-width:100%;padding:0"></div>
393414
<div class="line" id="contact">
394415
<h1 style="margin-bottom:50px;margin-top:2em">CONTACT US</h1>
395416
<h4 class="contact-text">
396-
EMAIL<br><a href="mailto:thadick@andrew.cmu.edu" target="_top" style="font-weight:900;color:#e32f33">thadick@andrew.cmu.edu</a> or <a href="mailto:msr@andrew.cmu.edu" target="_top" style="font-weight:900;color:#e32f33">msr@andrew.cmu.edu</a><br><br>
397-
FACEBOOK<br><a href="#" style="font-weight:900;color:#e32f33">facebook.com/HadickRabin2016</a><br><br>
417+
EMAIL<br><a href="mailto:thadick@andrew.cmu.edu" target="_top" style="font-weight:900;color:#e32f33">thadick@andrew.cmu.edu</a> or
418+
<a href="mailto:msr@andrew.cmu.edu" target="_top" style="font-weight:900;color:#e32f33">msr@andrew.cmu.edu</a><br><br>
419+
FACEBOOK<br><a href="https://www.facebook.com/HadickRabin2016/" style="font-weight:900;color:#e32f33" target="_blank">facebook.com/HadickRabin2016</a><br><br>
398420
<img src="images/snapchat.png" class="snap-pic">
399421
SNAPCHAT<br><span style="font-weight:900;color:#e32f33">@HadickRabin2016</span><br><br>
400422
</h4>

‎js/scripts.js‎

Lines changed: 45 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,13 @@ jQuery(document).ready(function($) {
1919
}
2020

2121
$("#owl").owlCarousel({
22-
slideSpeed: 1000,
22+
slideSpeed: 200,
2323
autoPlay: true,
2424
navigation: false,
25-
pagination: false,
25+
pagination: true,
2626
singleItem: true
2727
});
2828

29-
$(".candidate-header").click(function(){
30-
$(this).next().slideToggle();
31-
});
32-
3329
$(".content-block").data('fading', false);
3430

3531
$(".content-block").click(function(){
@@ -74,4 +70,47 @@ jQuery(document).ready(function($) {
7470
window.scrollTo(0, 0);
7571
});
7672

73+
function getTimeRemaining(endtime) {
74+
var t = Date.parse(endtime) - Date.parse(new Date());
75+
var seconds = Math.floor((t / 1000) % 60);
76+
var minutes = Math.floor((t / 1000 / 60) % 60);
77+
var hours = Math.floor((t / (1000 * 60 * 60)) % 24);
78+
var days = Math.floor(t / (1000 * 60 * 60 * 24));
79+
return {
80+
'total': t,
81+
'days': days,
82+
'hours': hours,
83+
'minutes': minutes,
84+
'seconds': seconds
85+
};
86+
}
87+
88+
function initializeClock(id, endtime) {
89+
var clock = $(id);
90+
var daysSpan = $(id + ' .days');
91+
console.log(daysSpan);
92+
var hoursSpan = $(id + ' .hours');
93+
var minutesSpan = $(id + ' .minutes');
94+
var secondsSpan = $(id + ' .seconds');
95+
96+
function updateClock() {
97+
var t = getTimeRemaining(endtime);
98+
99+
daysSpan.html(t.days);
100+
hoursSpan.html(('0' + t.hours).slice(-2));
101+
minutesSpan.html(('0' + t.minutes).slice(-2));
102+
secondsSpan.html(('0' + t.seconds).slice(-2));
103+
104+
if (t.total <= 0) {
105+
clearInterval(timeinterval);
106+
}
107+
}
108+
109+
updateClock();
110+
var timeinterval = setInterval(updateClock, 1000);
111+
}
112+
113+
var deadline = new Date("March 31, 2016 12:00:00");
114+
initializeClock('#clockdiv', deadline);
115+
77116
});

‎owl-carousel/owl.carousel.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ if ( typeof Object.create !== "function" ) {
105105
base.transitionTypes(base.options.transitionStyle);
106106
}
107107
if(base.options.autoPlay === true){
108-
base.options.autoPlay = 5000;
108+
base.options.autoPlay = 2500;
109109
}
110110
base.play();
111111

0 commit comments

Comments
 (0)