Skip to content

Commit

Permalink
Apply changes made to the dejavu website to automaton one.
Browse files Browse the repository at this point in the history
  • Loading branch information
satazor committed Nov 30, 2012
1 parent b3736aa commit 0bd704d
Show file tree
Hide file tree
Showing 11 changed files with 373 additions and 85 deletions.
8 changes: 5 additions & 3 deletions .jshintrc
@@ -1,11 +1,13 @@
{
"predef": [
"console",
"require",
"define"
"$",
"google",
"hljs",
"siteVersion"
],

"node": true,
"browser": true,
"devel": true,

"bitwise": true,
Expand Down
31 changes: 7 additions & 24 deletions css/main.css
Expand Up @@ -140,7 +140,7 @@ a:hover {

#header {
position: relative;
width: 950px;
width: 1100px;
height: 346px;
margin: auto;
}
Expand Down Expand Up @@ -194,7 +194,7 @@ a:hover {
}

#content {
width: 950px;
width: 1100px;
margin: auto;
margin-top: 30px;
}
Expand All @@ -205,7 +205,7 @@ a:hover {

#content .left {
float: left;
width: 455px;
width: 525px;
}

.phone #content .left {
Expand All @@ -214,7 +214,7 @@ a:hover {

#content .right {
float: right;
width: 455px;
width: 525px;
}

ul, ol {
Expand All @@ -230,16 +230,14 @@ code {
background: #3b2426;
border: 1px solid #523637;
border-radius: 6px;
font-family: 'Source Sans Pro', sans-serif;
font-size: 14px;
font-family: 'Source Code Pro', sans-serif;
font-size: 12px;
font-weight: 300;
}

pre code {
font-family: 'Source Code Pro', sans-serif;
font-size: 12px;
font-weight: 100;
width: 439px;
width: 514px;
overflow: auto;
white-space: pre;
word-wrap: normal;
Expand All @@ -251,21 +249,6 @@ pre code {
width: 696px;
}

.chart {
position: relative;
left: -12px;
}

.benchmark {
width: 470px;
height: 515px;
}

.benchmark-mobile {
width: 470px;
height: 350px;
}

h1, h2, h3, h4 {
color: #f8bf00;
font-size: 40px;
Expand Down
38 changes: 12 additions & 26 deletions dist/compiled.css
Expand Up @@ -231,7 +231,7 @@ table {
pre code {
display: block; padding: 0.5em;
color: #DCCF8F;
background: url(./pojoaque.jpg) repeat scroll left top #181914;
background: url(./pojoaque.jpg?v=12) repeat scroll left top #181914;
}
pre .comment,
pre .template_comment,
Expand Down Expand Up @@ -385,7 +385,7 @@ a:hover {
}
#arrows {
height: 15px;
background-image: url('../img/triangle.png?v=11');
background-image: url('../img/triangle.png?v=12');
background-repeat: repeat-x;
position: absolute;
left: 0;
Expand All @@ -394,15 +394,15 @@ a:hover {
}
#header {
position: relative;
width: 950px;
width: 1100px;
height: 346px;
margin: auto;
}
.phone #header {
width: 710px;
}
#header .indigo {
background-image: url('../img/indigo_logo.png?v=11');
background-image: url('../img/indigo_logo.png?v=12');
width: 145px;
height: 50px;
position: absolute;
Expand All @@ -426,21 +426,21 @@ a:hover {
bottom: 0;
}
#header .logo {
background-image: url('../img/stamp.png?v=11');
background-image: url('../img/stamp.png?v=12');
width: 278px;
height: 277px;
position: relative;
top: 20px;
margin: auto;
}
#content-wrapper {
background-image: url('../img/pattern.png?v=11');
background-image: url('../img/pattern.png?v=12');
background-repeat: repeat;
min-height: 1500px;
overflow: hidden;
}
#content {
width: 950px;
width: 1100px;
margin: auto;
margin-top: 30px;
}
Expand All @@ -449,14 +449,14 @@ a:hover {
}
#content .left {
float: left;
width: 455px;
width: 525px;
}
.phone #content .left {
width: 710px;
}
#content .right {
float: right;
width: 455px;
width: 525px;
}
ul, ol {
padding: 0 0 0 15px;
Expand All @@ -469,15 +469,13 @@ code {
background: #3b2426;
border: 1px solid #523637;
border-radius: 6px;
font-family: 'Source Sans Pro', sans-serif;
font-size: 14px;
font-family: 'Source Code Pro', sans-serif;
font-size: 12px;
font-weight: 300;
}
pre code {
font-family: 'Source Code Pro', sans-serif;
font-size: 12px;
font-weight: 100;
width: 439px;
width: 514px;
overflow: auto;
white-space: pre;
word-wrap: normal;
Expand All @@ -487,18 +485,6 @@ pre code {
.phone pre code {
width: 696px;
}
.chart {
position: relative;
left: -12px;
}
.benchmark {
width: 470px;
height: 515px;
}
.benchmark-mobile {
width: 470px;
height: 350px;
}
h1, h2, h3, h4 {
color: #f8bf00;
font-size: 40px;
Expand Down

0 comments on commit 0bd704d

Please sign in to comment.