Skip to content

Commit

Permalink
implemented sanitization, localization, 5 things talk
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeff Griffiths committed Sep 7, 2011
1 parent f7b3297 commit 7190d82
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 24 deletions.
14 changes: 12 additions & 2 deletions 5things.html
Expand Up @@ -10,7 +10,17 @@

<section class='slides layout-regular template-default'>
<article>

<h1>5 Mozilla projects you should know about.</h1>

<p class="foo">Jeff Griffiths
<br/>September 7th, 2011</p>

</article>
<article>
<br/>
<br/>
<br/>

<h3>TL;DR: ( in order of can-I-use-this-now-or-what )</h3>

<ol>
Expand Down Expand Up @@ -78,7 +88,7 @@ <h3>WebAPI</h3>

<article>

<h3>ES5 aka 'Harmony'</h3>
<h3>Harmony</h3>

<ul>
<li>next version of JavaScript</li>
Expand Down
Binary file removed images/colorbar.png
Binary file not shown.
Binary file removed images/google-logo-small.png
Binary file not shown.
Binary file removed images/google-logo.png
Binary file not shown.
Binary file removed images/googleio-logo.png
Binary file not shown.
5 changes: 3 additions & 2 deletions slides.js
Expand Up @@ -556,7 +556,8 @@ function addGeneralStyle() {
var el = document.createElement('link');
el.rel = 'stylesheet';
el.type = 'text/css';
el.href = PERMANENT_URL_PREFIX + 'styles.css';
//el.href = PERMANENT_URL_PREFIX + 'styles.css';
el.href = 'styles.css';
document.body.appendChild(el);

var el = document.createElement('meta');
Expand Down Expand Up @@ -586,7 +587,7 @@ function handleDomLoaded() {

setupFrames();

addFontStyle();
//addFontStyle();
addGeneralStyle();
addPrettify();
addEventListeners();
Expand Down
33 changes: 13 additions & 20 deletions styles.css
Expand Up @@ -97,19 +97,11 @@ body {
}

.slides.template-default > article:not(.nobackground):not(.biglogo) {
background: url(images/google-logo-small.png) 710px 625px no-repeat;
background: url(images/moz_logo.png) 710px 625px no-repeat;

background-color: white;
}

.slides.template-io2011 > article:not(.nobackground):not(.biglogo) {
background: url(images/colorbar.png) 0 600px repeat-x,
url(images/googleio-logo.png) 640px 625px no-repeat;

background-size: 100%, 225px;

background-color: white;
}

.slides.layout-widescreen > article:not(.nobackground):not(.biglogo),
.slides.layout-faux-widescreen > article:not(.nobackground):not(.biglogo) {
background-position-x: 0, 840px;
Expand Down Expand Up @@ -254,8 +246,8 @@ body {
color: rgb(102, 102, 102);
text-shadow: 0 1px 1px rgba(0, 0, 0, .1);

font-size: 30px;
line-height: 36px;
font-size: 25px;
/*line-height: 36px;*/

letter-spacing: -1px;
}
Expand Down Expand Up @@ -364,7 +356,7 @@ article.fill h3 {
}

ul {
list-style: none;
/*list-style: none;*/
margin: 0;
padding: 0;

Expand All @@ -384,14 +376,15 @@ li {

margin-bottom: .5em;
}
li::before {
content: '·';

width: .75em;
margin-left: -.75em;

position: absolute;
}
/*ul li::before {*/
/* content: '·';*/
/**/
/* width: 1em;*/
/* margin-left: -.75em;*/
/**/
/* position: absolute;*/
/*}*/

pre {
font-family: 'Droid Sans Mono', 'Courier New', monospace;
Expand Down

0 comments on commit 7190d82

Please sign in to comment.