Skip to content
Browse files

Merge pull request #74 from edward/master

Cleanups in Media example
  • Loading branch information...
2 parents d4c6914 + a678fd2 commit 7df9dde61ff86a88a09df7804ca826c37b297196 @stubbornella committed Jun 7, 2011
View
BIN core/media/assets/crystal_project/16x16/actions/1day.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN core/media/assets/crystal_project/32x32/actions/player_play.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
10 core/media/assets/crystal_project/readme.txt
@@ -0,0 +1,10 @@
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+This copyright and license notice covers the images in this directory.
+************************************************************************
+
+TITLE: Crystal Project Icons
+AUTHOR: Everaldo Coelho
+SITE: http://www.everaldo.com
+CONTACT: everaldo@everaldo.com
+
+Copyright (c) 2006-2007 Everaldo Coelho.
View
39 core/media/media.html
@@ -1,67 +1,58 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Media Block</title>
-<link rel="stylesheet" type="text/css" media="all" href="../../all.css" />
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>Media Block</title>
+ <link rel="stylesheet" type="text/css" media="all" href="../../all.css" />
</head>
<body>
<div class="page">
- <div class="body">
- <h1>Media Block</h1>
+ <div class="body">
+ <h1>Media Block</h1>
<p>Use any sized image or flash for the right or left area. Any content in the body including nesting other media blocks.</p>
<div class="media">
- <a href="http://twitter.com/stubbornella" class="img icon"><img src="../../../../Pictures/icons/crystal_project/16x16/actions/1day.png" alt="img" /></a>
+ <a href="http://twitter.com/stubbornella" class="img icon"><img src="assets/crystal_project/16x16/actions/1day.png" width="16" height="16" alt="1day" /></a>
<div class="bd">event date</div>
</div>
-
- <div class="media attribution">
+ <div class="media attribution">
<a href="http://twitter.com/stubbornella" class="img"><img src="http://placehold.it/32x32" alt="img" height="32" width="32" /></a>
<div class="bd">
- <p class="ptn"><a href="http://twitter.com/stubbornella">@Stubbornella</a> <span class="detail">14 minutes ago</span></p>
+ <p class="ptn"><a href="http://twitter.com/stubbornella">@Stubbornella</a> <span class="detail">14 minutes ago</span></p>
</div>
</div>
-
-
<div class="media">
<a href="http://twitter.com/stubbornella" class="img"><img src="http://placehold.it/64x64" alt="img" width="64" height="64" /></a>
<a href="http://twitter.com/stubbornella" class="imgExt">X</a>
<div class="bd">
- <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+ <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
</div>
</div>
-
-
<div class="media">
<a href="http://twitter.com/stubbornella" class="img"><img src="http://placehold.it/128x128" alt="img" /></a>
<!--<a href="http://twitter.com/stubbornella" class="imgExt">X</a>-->
<div class="bd">
- <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
- <div class="media">
- <a href="http://twitter.com/stubbornella" class="img icon"><img src="../../../../Pictures/icons/crystal_project/16x16/actions/1day.png" alt="img" /></a>
+ <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+ <div class="media">
+ <a href="http://twitter.com/stubbornella" class="img icon"><img src="assets/crystal_project/16x16/actions/1day.png" width="16" height="16" alt="1day" /></a>
<div class="bd">event date</div>
</div>
</div>
</div>
-
-
-
<!-- TODO: make media player into a skin -->
<div class="media">
- <a href="http://twitter.com/stubbornella" class="img" style="background-image:url(http://placehold.it/510x290); width:510px; height:290px;"><img src="../../../../Pictures/icons/crystal_project/32x32/actions/player_play.png" alt="img" style="position:relative; top:50%; left:50%;margin-left: -32px; margin-top:-32px;opacity: .8;" height="64" width="64" /></a>
+ <a href="http://twitter.com/stubbornella" class="img" style="background-image:url(http://placehold.it/510x290); width:510px; height:290px;"><img src="assets/crystal_project/32x32/actions/player_play.png" alt="img" style="position:relative; top:50%; left:50%;margin-left: -32px; margin-top:-32px;opacity: .8;" height="64" width="64" /></a>
<div class="bd">
- <p>Last week I went to Yahoo! to give a talk about design performance for YUI theater.</p>
+ <p>Last week I went to Yahoo! to give a talk about design performance for YUI theater.</p>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
</div>
</div>
-
- </div>
+ </div>
</div>
</body>
</html>

0 comments on commit 7df9dde

Please sign in to comment.
Something went wrong with that request. Please try again.