Skip to content

Commit d7a3f14

Browse files
author
Michael Currie
authored
Merge pull request #109 from geekSiddharth/patch-1
Embedded TEDx talks in Media. "See OpenWorm" and TEDx links added on homepage
2 parents 80c989c + 1e92485 commit d7a3f14

File tree

3 files changed

+705
-558
lines changed

3 files changed

+705
-558
lines changed

war/css/main.css

Lines changed: 33 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -268,21 +268,21 @@
268268
height: 70px;
269269
cursor: pointer;
270270
margin: 0 auto;
271-
filter: grayscale(100%);
271+
/*filter: grayscale(100%);*/
272272
}
273273
#tedx:hover {
274-
filter: grayscale(0%);
274+
/*filter: grayscale(0%);*/
275275
}
276276

277277
@media all and (-webkit-min-device-pixel-ratio: 1.5) {
278278
#tedx {
279279
background-image: url("../img/[email protected]");
280280
background-size: 213px 70px;
281281
margin: 0 auto;
282-
filter: grayscale(100%);
282+
/*filter: grayscale(100%);*/
283283
}
284284
#tedx:hover {
285-
filter: grayscale(0%);
285+
/*filter: grayscale(0%);*/
286286
}
287287
}
288288

@@ -316,15 +316,7 @@
316316
float: left;
317317
}
318318

319-
@media all and (-webkit-min-device-pixel-ratio: 1.5) {
320-
#atlantic {
321-
background-image: url("../img/theatlantic2x.png");
322-
background-size: 236px 163px;
323-
margin: 0 auto;
324-
cursor: pointer;
325-
float: left;
326-
}
327-
}
319+
328320

329321
#nbc {
330322
background-image: url("../img/nbc.png");
@@ -335,6 +327,24 @@
335327
float: left;
336328
}
337329

330+
#tedxb {
331+
background-image: url("../img/tedxb.png");
332+
width: 170px;
333+
height: 163px;
334+
margin: 0 auto;
335+
cursor: pointer;
336+
float: left;
337+
}
338+
339+
#tedxv {
340+
background-image: url("../img/tedxv.png");
341+
width: 170px;
342+
height: 163px;
343+
margin: 0 auto;
344+
cursor: pointer;
345+
float: left;
346+
}
347+
338348
@media all and (-webkit-min-device-pixel-ratio: 1.5) {
339349
#nbc {
340350
background-image: url("../img/nbc2x.png");
@@ -621,7 +631,8 @@ dd {
621631
color: #5a5a5a;
622632
}
623633

624-
.hero {style="margin-left: 10px;"
634+
.hero {
635+
margin-left: 10px;
625636
}
626637

627638
.authors {
@@ -768,3 +779,11 @@ dd {
768779
.clearer {
769780
clear: both;
770781
}
782+
783+
.ted {
784+
font-family: Helvetica, Arial, sans-serif;
785+
color: rgb(230, 43, 30);
786+
letter-spacing: 0;
787+
/*font-kerning: auto;*/
788+
font-weight: 800;
789+
}

0 commit comments

Comments
 (0)