Skip to content

Commit

Permalink
logo and styles
Browse files Browse the repository at this point in the history
  • Loading branch information
stevegraham committed Jan 29, 2012
1 parent 4c14a71 commit ea2ee46
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 22 deletions.
35 changes: 24 additions & 11 deletions app/index.html
Expand Up @@ -42,13 +42,13 @@
}

#logo {
margin: 25px 25px;
margin: 10px 25px;
}

#jpc #logo h1 {
background: url('/logo.png') no-repeat;
width: 370px;
height: 60px;
height: 146px;
text-indent: -9999px;
}

Expand All @@ -69,10 +69,6 @@
width: 370px;
}

#logo #rule {
border-left 185px solid #f00
}

#mhd {
width: 400px;
box-shadow: 0px 1px 1px #222;
Expand All @@ -82,6 +78,21 @@
-webkit-transform:rotate(350deg)
}

#sticker {
display: inline;
padding: 5px 20px;
border-radius: 10px;
background: #fff;
text-align: center;
background: #71ad1b;
color: #d3d13c;
position: absolute;
top: 380px;
left: 140px;
box-shadow: 0px 1px 1px #222;
-webkit-transform:rotate(3deg)
}

#bezel {
background: -webkit-linear-gradient(bottom, rgb(60,60,60) 0%, rgb(90,90,90) 100%);
padding: 15px;
Expand All @@ -91,8 +102,6 @@
}

#display {
width: 540px;
height: 80px;
background: #bdc6b3;
border: 2px solid #aaa;
padding: 15px;
Expand Down Expand Up @@ -147,8 +156,9 @@
font-size: 100%;
background: -webkit-linear-gradient(bottom, rgb(138,138,138) 0%, rgb(184,184,184) 100%);
color: #444;
box-shadow: 0 1px 2px #222;
border-width: 1px
box-shadow: 0 1px 2px #222, 0 -1px 1px #666;
border-width: 1px;
text-shadow: 0 1px 2px #fff;
}

#transport button:active {
Expand All @@ -161,9 +171,12 @@
</style>
<div id='jpc'>
<div id='bezel'>
<div id='display'></div>
<canvas height='80px' id='display' width='540px'></canvas>
</div>
<img id='mhd' src='mhd_logo.png' />
<div id='sticker'>
A Stevie Graham Joint
</div>
<div id='pads'>
<button class='pad' id='113'></button>
<button class='pad' id='119'></button>
Expand Down
Binary file modified app/logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 24 additions & 11 deletions haml/index.html.haml
Expand Up @@ -43,13 +43,13 @@
}

#logo {
margin: 25px 25px;
margin: 10px 25px;
}

#jpc #logo h1 {
background: url('/logo.png') no-repeat;
width: 370px;
height: 60px;
height: 146px;
text-indent: -9999px;
}

Expand All @@ -70,10 +70,6 @@
width: 370px;
}

#logo #rule {
border-left 185px solid #f00
}

#mhd {
width: 400px;
box-shadow: 0px 1px 1px #222;
Expand All @@ -83,6 +79,21 @@
-webkit-transform:rotate(350deg)
}

#sticker {
display: inline;
padding: 5px 20px;
border-radius: 10px;
background: #fff;
text-align: center;
background: #71ad1b;
color: #d3d13c;
position: absolute;
top: 380px;
left: 140px;
box-shadow: 0px 1px 1px #222;
-webkit-transform:rotate(3deg)
}

#bezel {
background: -webkit-linear-gradient(bottom, rgb(60,60,60) 0%, rgb(90,90,90) 100%);
padding: 15px;
Expand All @@ -92,8 +103,6 @@
}

#display {
width: 540px;
height: 80px;
background: #bdc6b3;
border: 2px solid #aaa;
padding: 15px;
Expand Down Expand Up @@ -148,8 +157,9 @@
font-size: 100%;
background: -webkit-linear-gradient(bottom, rgb(138,138,138) 0%, rgb(184,184,184) 100%);
color: #444;
box-shadow: 0 1px 2px #222;
border-width: 1px
box-shadow: 0 1px 2px #222, 0 -1px 1px #666;
border-width: 1px;
text-shadow: 0 1px 2px #fff;
}

#transport button:active {
Expand All @@ -161,10 +171,13 @@

#jpc
#bezel
#display
%canvas#display{ width: '540px', height: '80px' }

%img#mhd{ src: 'mhd_logo.png'}

#sticker
A Stevie Graham Joint

#pads
%button#113.pad
%button#119.pad
Expand Down

0 comments on commit ea2ee46

Please sign in to comment.