Merge lp:~sushkov/ubuntu-website/light-planet-theme-v2 into lp:~canonical-isd-hackers/ubuntu-website/light-planet-theme

[Stas Sușcov]

As promised, synced the theme with the WordPress work.
Also added styles for code/pre, and cleaned unused css.
http://i.imgur.com/oYhac.png

[lp:~sushkov/ubuntu-website/light-planet-theme-v2]

23. By Stas Sușcov on 2010-11-26

Better gotchis, dialog bubbled, with hover zoom, all pure css

[Stas Sușcov (sushkov)]

Revision 23 also brings a solution to current gotchis issue.
Adds zoom and better styling for it.
http://i.imgur.com/Vmozg.png

[lp:~sushkov/ubuntu-website/light-planet-theme-v2]

24. By Stas Sușcov on 2010-11-26

Duplicated comment removed

25. By Stas Sușcov on 2010-11-26

Removed the test img tag

26. By Stas Sușcov on 2011-01-02

Added Ubuntu Web Font

Unmerged revisions

26. By Stas Sușcov on 2011-01-02

Added Ubuntu Web Font

25. By Stas Sușcov on 2010-11-26

Removed the test img tag

24. By Stas Sușcov on 2010-11-26

Duplicated comment removed

23. By Stas Sușcov on 2010-11-26

Better gotchis, dialog bubbled, with hover zoom, all pure css

22. By Stas Sușcov on 2010-11-23

Updated templates to the latest guidelines. Code cleanup

21. By Matthew Nuzum on 2010-11-16

correcting the favicon

=== modified file 'images/header-bg.png'
Binary files images/header-bg.png	2010-06-24 14:54:52 +0000 and images/header-bg.png	2011-01-02 17:27:12 +0000 differ
=== modified file 'index.html.tmpl'
--- index.html.tmpl	2010-11-19 19:13:59 +0000
+++ index.html.tmpl	2011-01-02 17:27:12 +0000
@@ -48,7 +48,14 @@
 				</TMPL_IF>
 			
 				<div class="hentry post">
-    				<h2 class="entry-title"><a href="<TMPL_VAR link ESCAPE="HTML">" title="<TMPL_VAR channel_title_plain ESCAPE="HTML">" style="background-image: url(heads/<TMPL_VAR channel_face ESCAPE="HTML">);"><TMPL_VAR channel_name> &mdash; <TMPL_VAR title></a></h2>
+    				<h2 class="entry-title">
+					<span class="hackergotchi">
+						<img src="heads/<TMPL_VAR channel_face ESCAPE="HTML">" alt="<TMPL_VAR channel_name>" />
+					</span>
+					<a href="<TMPL_VAR link ESCAPE="HTML">" title="<TMPL_VAR channel_title_plain ESCAPE="HTML">" >
+						<TMPL_VAR channel_name> &mdash; <TMPL_VAR title>
+					</a>
+				</h2>
     					<div class="entry-content">
 							<TMPL_VAR content>
 						</div>
@@ -80,7 +87,7 @@
 					<p>If you are an Ubuntu Member, and would like your blog aggregated here, please see the <a href="http://wiki.ubuntu.com/PlanetUbuntu">PlanetUbuntu</a> wiki page.</p>
 <p>Updated on <TMPL_VAR date> UTC. Entries are normalised to UTC time.</p>
 					<h3>Ubuntu World Wide</h3> 
-					<p class="ubuntuWorldWide"><a href="https://wiki.ubuntu.com/UbuntuWorldWide"><img src="UbuntuWorldWideSmall.jpg" alt=""></a></p>
+					<p class="ubuntuWorldWide"><a href="https://wiki.ubuntu.com/UbuntuWorldWide"><img src="UbuntuWorldWideSmall.jpg" alt="" /></a></p>
 				</li>
 				<li class="widgetcontainer widget_extended-categories">
 				<h3 class="widgettitle">Ubuntu Solar System</h3>

=== modified file 'style.css'
--- style.css	2010-11-16 23:32:48 +0000
+++ style.css	2011-01-02 17:27:12 +0000
@@ -2,7 +2,7 @@
 Theme Name: Ubuntu Loco Light Theme
 Theme URI: http://launchpad.net/ubuntu-website
 Description: A child theme for Ubuntu Loco websites. Planet Venus port.
-Version: 0.1
+Version: 0.2
 Author: Stas Sușcov
 Author URI: http://stas.nerd.ro/
 .
@@ -25,6 +25,9 @@
 /* Apply basic image styles */  
 @import url('css/images.css');  
 
+/* Import Ubuntu Web Font */
+@import url('http://fonts.googleapis.com/css?family=Ubuntu');
+
 /*
 Real stuff starts here
 */
@@ -33,34 +36,20 @@
 Layout
 */
 body { background: transparent url("images/dotted-bg.png") top; }
-#wrapper { background: transparent url("images/header-bg.png") repeat-x top; }
-#header { width: 980px; height: 72px; margin: 0 auto; overflow: hidden; }
-#branding { width: 120px; height: 70px; float: right; overflow: hidden; }
-#blog-title { background: transparent url("images/ubuntu-logo.png") no-repeat 0 15px; width: 120px; height: 45px; }
-#blog-title span { display: none; }
-#access { width: 860px; height: 70px; overflow: hidden; margin: 0; padding: 0; }
+#header { width: 980px; height: 62px; margin: 0 auto; overflow: hidden; background: #DD4814 url("images/header-bg.png") repeat-x top; border: 1px solid #CCC; border-top: none; }
+#branding { width: 130px; height: 62px; float: right; overflow: hidden; }
+#blog-title span a { display: block; background: transparent url("images/ubuntu-logo.png") no-repeat 0 15px; width: 120px; height: 50px; text-indent: -1000px; }
+#access { width: 850px; height: 62px; overflow: hidden; margin: 0; padding: 0; }
 #primary-header-menu { margin: 0; list-style: none;  }
-#primary-header-menu li { margin: 0; padding: 0; height: 70px; }
+#primary-header-menu li { margin: 0; padding: 0; height: 62px; border-right: 1px solid #DD4814; }
 #primary-header-menu ul { margin: 0; padding: 0; }
-#primary-header-menu ul li { border-left: 1px solid #EF7149; height: 70px; float: left; margin: 0; padding: 0 15px; list-style: none; }
+#loco-header-menu { margin-right: -1px; }
+#primary-header-menu ul li { height: 62px; float: left; margin: 0; padding: 0 10px; list-style: none; }
 #primary-header-menu ul li:hover,
 #primary-header-menu ul li.current-menu-item,
 #primary-header-menu ul li.current-page-ancestor { background: transparent url("images/header-bg-hover.png") repeat-x top; }
 #primary-header-menu ul li a { display: block; }
-#secondary-header { width: 980px; height: 45px; margin: 0 auto; overflow: hidden; background-color: #FFF;}
-#secondary-access { margin:0 20px; background-color: #F7F7F7; padding: 0 15px 0 0; height: 40px; overflow: hidden; }
-#loco-search-form { float: right; margin-top: 5px; }
-#secondary-header-menu { width: 720px; margin: 0; padding: 0; list-style: none; }
-#secondary-header-menu li { float: left; padding: 0 15px; height: 40px; list-style: none; }
-#secondary-header-menu li:hover,
-#secondary-header-menu li.current_page_item { background-color: #EEE; }
-#secondary-header-menu li ul { display: none; }
-#secondary-header-menu li a { height: 40px; display: block; }
-#main,
-#page-top { width: 980px; margin: 0 auto; background-color: #FFF; overflow: hidden; }
-#page-top ul { margin: 0 20px; list-style: none; }
-#secondary-header,
-#page-top,
+#main { width: 980px; margin: 0 auto; background-color: #FFF; overflow: hidden; }
 #main { border-left: 1px solid #CCC; border-right: 1px solid #CCC; }
 #primary,
 #secondary { float: right; clear: right; width: 250px; margin: 15px 10px; padding: 15px 10px; overflow: hidden; background-color: #F7F7F7; }
@@ -68,25 +57,25 @@
 #primary > ul,
 #secondary > ul { margin: 0; list-style: none;}
 #container { width: 940px; margin: 10px; }
-#content { width: 940px; padding-bottom: 5px; }
-body.blog #container,
-body.single #container,
-body.archive #container,
-body.search #container,
-body.four04 #container { width: 650px; margin: 10px; }
-body.blog #content,
-body.single #content,
-body.archive #content,
-body.search #content,
-body.four04 #content { width: 650px; }
+#content { width: 940px; margin-top: 5px; padding-bottom: 5px;}
+#content .page,
+#content .post { padding: 10px 10px 5px; margin-bottom: 20px; background-color: #F7F7F7; }
+#content .page { margin-bottom: 10px; }
+body.blog #container { width: 650px; margin: 10px; }
+body.blog #content { width: 650px; }
 #content .entry-title,
-#content .page-title { border-bottom: 1px solid #F7F7F7; margin-bottom: 0; }
-body.home .entry-title { display: none; }
-#content .entry-meta { display: inline; float: right; clear: both; background-color: #F7F7F7; border-top: 0; padding: 2px 5px; margin-top: -1px; }
-#content .entry-content { margin: 10px 0 0; border-bottom: 1px dotted #CCC; }
-#content .entry-content .page-link { background-color: #F7F7F7; display: inline; padding: 3px 5px; }
-body.four04 #content .entry-content { border: 0; }
-#content .entry-utility { margin: 0 0 40px; border-bottom: 1px dotted #CCC; }
+#content .page-title { border-bottom: 1px solid #EDEDED; margin-bottom: 0; }
+body.blog .entry-title { display: block; }
+#content .entry-meta { clear: both; padding-top: 2px; border-top: 1px solid #FFF; }
+#content .entry-content { margin: 10px 0 0; border-bottom: 1px solid #EDEDED; }
+#content .entry-content .page-link { border: 1px solid #EDEDED; border-bottom: 0; display: inline; padding: 3px 5px; }
+#content .page .entry-content,
+#content .entry-utility { border-top: 1px solid #FFF; }
+#content .entry-utility div { padding: 1px 2px; }
+#content .entry-utility div ul { display: inline; margin: 0; }
+#content .entry-utility div ul li { display: inline; background-color: #EEE; border: 1px solid #DDD; margin-right: 3px; padding: 2px; }
+#content .entry-utility div.cat-links li { border: 1px solid #CACACA; }
+#content .entry-utility div ul li:hover { background-color: #DDD; }
 #content .more-link { padding: 3px 5px; margin: 0; }
 body.blog #content #nav-above.navigation { display: none; }
 #content .navigation { padding: 10px 0 40px; }
@@ -94,101 +83,53 @@
 #content .navigation .nav-next { width: 320px; }
 #content .navigation .nav-previous { float: left; text-align: left; border-right: 1px dotted #CCC; padding-right: 4px; }
 #content .navigation .nav-next { float: right; text-align: right; }
-#respond { background-color: #F7F7F7; margin: 10px 0 30px; padding: 10px 20px; }
-#respond input,
-#respond textarea { padding: 1px; }
-#respond h3 { margin-bottom: 0; }
-#respond #cancel-comment-reply { float: left; }
-#respond .form-label { width: 85px; float: left; margin-right: 15px; padding-top: 2px; }
-#respond .form-textarea textarea { width: 70%; }
-#respond #form-allowed-tags { width: 71%; margin: 5px 0 20px 100px; }
-#respond #form-allowed-tags p { padding: 5px; }
-#comments-list div.comment-reply-link { height: 30px; }
-#respond .form-submit { text-align: right; }
-#comments-list,
-#trackbacks-list { border: 1px dotted #CCC; padding: 10px; }
-#comments-list ol,
-#trackbacks-list ol { list-style: none; margin-left: 0; }
-#comments-list ol .children { list-style: none; margin-left: 0; }
-#comments-list ol li,
-#trackbacks-list ol li { border: 1px dotted #CCC; padding: 10px 10px 5px; margin-bottom: 10px; }
-#trackbacks-list .comment-author { border-bottom: 1px solid #F7F7F7; }
-#comments-list .comment-author img { width: 30px; height: 30px; float: left; margin-right: 5px; }
-#comments-list .comment-author { display: inline;  }
-#comments-list .comment-author span { display: block; line-height: 16px; }
-#comments-list .comment-meta { float: left; margin-bottom: 5px; }
-#comments-list .comment-content { clear: both; border-top: 1px solid #F7F7F7; }
-#comments-list .comment-content p { margin-bottom: 0; }
-#comments-list a.comment-reply-link { margin-right: 0; }
-#page-bottom { width: 940px; margin: 0 20px 30px 0; background-color: #F7F7F7; float: right; }
-#page-bottom ul { margin: 0; padding: 20px; }
-#page-bottom > ul > li { float: left; list-style: none; width: 15%; padding: 0 15px 15px 0; }
 #footer { padding: 20px 0; width: 100%; background: #EEECEA url("images/footer-bg.png") repeat-x top; }
 #subsidiary .aside { width: 15%; }
 #subsidiary a { display: block; margin-bottom: 2px; }
+#subsidiary .textwidget a { display: inline; margin-bottom: 0px; }
 #first { padding-left: 0; }
 #second { margin-right: 0; }
 #first ul, #second ul, #third ul { margin: 0; list-style: none; }
 #siteinfo { padding: 30px 0 10px; }
-.edit-link { clear: both; }
 .widgettitle { margin-bottom: 0; }
 .widgetcontainer { margin-bottom: 10px; }
 .widgetcontainer ul { list-style: none; margin-left: 10px; }
 .main-aside h3 { margin-bottom: 10px; }
 
-
 /*
 Typography
 */
 body { font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Verdana, Tahoma, sans-serif; }
-body { color: #444; font-size: 80%; line-height: 1.5; }
-h1, h2, h3, h4, h5, h6 { font-weight: normal; color: #DD4814; }
+body { color: #333; font-size: 80%; line-height: 1.5; }
+h1, h2, h3, h4, h5, h6 { font-weight: normal; color: #772953; }
 h1 { font-size: 180%; margin-bottom: 10px; }
 h2 { font-size: 160%; margin-bottom: 10px; font-weight: bold; }
 h3 { font-size: 140%; margin-bottom: 10px; }
 h4 { font-size: 120%; margin-bottom: 10px; }
 h5 { font-size: 110%; font-weight: bold; margin-bottom: 10px; }
 h6 { font-size: 110%; font-weight: bold; }
-a, a:active { color: #DD4814; }
+a, a:active { color: #772953; }
 a:hover { color: #DD4814; }
 a:visited { color: #777777; }
-#blog-description { font-size: 90%; color: #FFF; }
+#blog-description { font-size: 90%; color: #FFF; line-height: 80%; display: none; }
 #primary-header-menu ul { font-size: 110%; }
-#primary-header-menu ul li a { line-height: 72px; color: #FFF; text-decoration: none; }
-#secondary-header-menu li a { line-height: 35px; color: #333; text-decoration: none; }
-#secondary-header-menu li:hover a { color: #DD4814; }
-#secondary-header-menu,
-#page-bottom > ul > li,
+#primary-header-menu ul li a { line-height: 62px; color: #FFF; text-decoration: none; }
 #subsidiary { font-size: 85%; }
 #content { font-size: 90%; }
 #content .entry-title,
-#content .entry-title a  { font-weight: normal; text-decoration: none; font-size: 120%; font-weight: bold; color: #DD4814; }
-body.single #content .entry-title { font-weight: normal; text-decoration: none; font-size: 140%; font-weight: bold; color: #DD4814; }
-#content .entry-content .page-link { font-size: 85%; }
+#content .entry-title a { font-weight: normal; text-decoration: none; font-size: 120%; font-weight: normal; color: #DD4814; }
+#content .entry-title a:hover { text-decoration: underline; }
 #content .entry-meta,
-#content .entry-utility { font-size: 80%; text-align: right; }
+#content .entry-utility { font-size: 80%; }
 #content .entry-meta a,
 #content .entry-utility a { text-decoration: none; }
-#content .more-link { font-size: 80%; }
-#content .navigation,
-#content .navigation a { text-decoration: none; font-size: 85%; }
-#respond h3 { border-bottom: 1px dotted #CCC; color: #DD4814; text-transform: uppercase; }
-#respond #login { text-align: right; font-size: 85%; }
-#respond #cancel-comment-reply { font-size: 85%; }
-#respond #comment-notes { font-size: 85%; text-align: right; }
-#respond #form-allowed-tags { background-color: #FFF; font-size: 85%; }
-#respond .form-label { color: #DD4814; text-transform: uppercase; border-bottom: 1px dotted #CCC; }
-#comments-list h3,
-#trackbacks-list h3 { text-align: right; border-bottom: 1px dotted #CCC; text-transform: uppercase; color: #DD4814; }
-#trackbacks-list .comment-author { font-size: 85%; }
-#trackbacks-list .comment-author a { text-decoration: none; }
-#comments-list .bypostauthor { border: 1px dotted #DD4814; }
-#comments-list .comment-author span,
-#comments-list .comment-author span a { font-size: 100%; color: #DD4814; text-decoration: none; }
-#comments-list .comment-meta { font-size: 90%; }
-#comments-list div.comment-reply-link { text-align:right; }
-#comments-list a.comment-reply-link { font-size: 80%; }
+#content .entry-utility div.cat-links,
+#content .entry-utility div.tag-links,
+#content .entry-utility div.comments-link { font-weight: bold; font-size: 100%; }
+#content .entry-utility div ul li { font-weight: normal; line-height: 20px; font-size: 90%; }
+#content .entry-utility div.tag-links ul li:before { content: '• '; color: #CCC; font-size: 100%; font-weight: bolder; white-space: nowrap; }
 #subsidiary a { text-decoration: none; color: #444; border-bottom: 1px dotted #444; }
+#subsidiary .textwidget a { text-decoration: underline; color: #444; border-bottom: none; }
 #subsidiary a:hover { color: #DD4814; }
 #siteinfo { font-size: 85%; color: #999; }
 .main-aside h3 { font-size: 120%; color: #DD4814; border-bottom: 1px dotted #DD4814; }
@@ -196,6 +137,17 @@
 .widgettitle { font-size: 120%; }
 
 /*
+Ubuntu Font
+*/
+#access,
+#blog-description,
+h1,
+h2,
+h3,
+h4,
+h5 { font-family: 'Ubuntu', sans-serif; }
+
+/*
 Additional Styles
 */
 blockquote { color:#666; font-style:italic; }
@@ -203,24 +155,21 @@
 caption { text-align:left; }
 tr { border-bottom:1px solid #ccc; }
 th, td { padding: 5px; }
-hr { background-color:#ccc; border:0; color:#ccc; height:1px; margin-bottom:22px; }
+hr { background-color:#ccc; border:0; color:#CCC; height:1px; margin-bottom:22px; }
 p { margin-bottom: 10px; }
 .clearall { clear: both; height: 1px; }
+input[type="text"], textarea { border: 2px solid #CCC; border-right: 1px solid #DDD; border-bottom: 1px solid #DDD; padding: 1px 3px; }
+.clean { list-style: none; }
+.inline, .clean { margin: 5px 0; }
+.inline li { display: inline; }
 
 /*
 CSS3
 */
 #primary-header-menu ul li a { text-shadow: #333 1px 1px 1px; }
-#secondary-access,
 #primary,
 #secondary,
-#page-bottom,
-#content .entry-title,
-#content .entry-meta,
-#respond,
-#respond #form-allowed-tags,
-.loco-columns { -webkit-box-shadow: 0px 1px 1px #CCC; -moz-box-shadow:0 1px 1px #CCC; }
-.main-aside { -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; }
+#content .post { -webkit-box-shadow: 0px 1px 1px #CCC; -moz-box-shadow:0 1px 1px #CCC; }
 
 /*
 Fancyness
@@ -249,32 +198,15 @@
 .awesome:active { top: 1px; }
 .awesome,
 .awesome:visited { color: #fff; background-color: #ff5c00; }
-#content .navigation .awesome,
-#comments-list a.comment-reply-link { background-color: #F7F7F7; color: #444; }
-
-/*
-Slider customization
-    Arrows
-    Captipon
-*/
-.nivo-directionNav a { display:block; width:32px; height:34px; background:url("images/slider-arrows.png") no-repeat; text-indent:-9999px; border:0; }
-a.nivo-nextNav { background-position:-32px 0; right:10px; }
-a.nivo-prevNav { left:10px; }
-a.nivo-nextNav:hover { background-position:-32px -34px; right:10px; }
-a.nivo-prevNav:hover { background-position:0px -34px; left:10px; }
-.nivo-caption, .nivo-caption p { background: #FFF !important; color: #DD4814; font-weight: bold; }
-
-/*
-Special blocks
-*/
-.loco-columns { clear: both; background-color: #F7F7F7; padding: 5px; margin-bottom: -3px; }
-.loco-columns h2 { color: #444; font-weight: normal; border-bottom: 1px dotted #444; }
-.loco-columns ul { list-style: none; margin: 0; }
-.loco-columns ul li { width: 23%; float: left; padding-left: 10px; }
-.loco-columns ul li h3,
-.loco-columns ul li h3 a { color: #DD4814; text-decoration: none; }
-.loco-columns ul li h3 a:hover { text-decoration: underline; }
-.loco-columns ul li img { padding: 10px 0 5px; }
+
+/*
+Rounded corners
+*/
+.awesome,
+.post,
+.main-aside,
+.post code, .post pre,
+.hackergotchi img { -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; }
 
 /*
 Ubuntu World Wide
@@ -287,10 +219,51 @@
 h2.entry-title a, h3.widgettitle { text-shadow: #ddd 1px 1px 1px; }
 
 /*
+Fancy codeblocks
+*/
+.post code, .post pre {
+    font-size: 11px;
+    white-space: nowrap;
+    background: #444;
+    background:rgba(0, 0, 0, 0.5) none repeat scroll 0 0;
+    color:#FFFFFF;
+    padding:2px 3px;
+    text-shadow:0 1px 1px rgba(0, 0, 0, 0.75);
+    font-weight: bold;
+}
+.post pre { width: 600px; padding: 5px; white-space: pre; overflow: auto; }
+
+/*
 Gotchis
 */
-h2.entry-title a { background-position: -135px -35px; background-repeat: no-repeat; display: block; }
-h2.entry-title a:only-child { background-position: left center; background-size: 25px auto; -moz-background-size: 25px auto; -webkit-background-size: 25px auto; -o-background-size: 25px auto; padding-left: 30px; display: block; }
+#content .entry-title a { margin-left: 45px; }
+.hackergotchi:hover img { width: 80px; }
+.hackergotchi img {
+    width: 40px;
+    border: 1px solid #CACACA;
+    position: absolute;
+    z-index: 10;
+    padding: 1px;
+    background-color: #FFF;
+}
+.hackergotchi {
+    display: block;
+    width: 40px;
+    position: absolute;
+    margin-left: -25px;
+    margin-top: -20px;
+    position: absolute;
+}
+.hackergotchi:after {
+    border-color: #CACACA transparent;
+    border-style: solid;
+    border-width: 0 45px 30px 0;
+    content: '';
+    position: absolute;
+    right: -25px;
+    top: 5px;
+    z-index: 5;
+}
 
 /*
 addthis config