Home Explore Help
Sign In
thatsmydoing
/
blog
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Add header links, refactor things

Philip Cheang 12 years ago
parent
ea84c7e434
commit
8c2f4a1fd8
2 changed files with 40 additions and 43 deletions
Unified View Show Diff Stats
  1. 29 34
      themes/pleasant2/assets/css/theme.css
  2. 11 9
      themes/pleasant2/templates/base.tmpl

+ 29 - 34
themes/pleasant2/assets/css/theme.css
View File 

@@ -85,7 +85,7 @@ thead tr {
 
    clear: both;
 
    clear: both;
 
 }
 
 }
 
 
 
-.header {
 
+header {
 
 	background: #F0E5D8;
 
 	background: #F0E5D8;
 
 	text-align: center;
 
 	text-align: center;
 
 	padding: 20px 0;
 
 	padding: 20px 0;
 
@@ -93,23 +93,21 @@ thead tr {
 
 
 
 /* TODO: Fix this shit. */
 
 /* TODO: Fix this shit. */
 
 
 
-.header h1 {
 
-	/*float: left;*/
 
-	/*display: inline-block;*/
 
+header h1 {
 
 	font-size: 1.75em;
 
 	font-size: 1.75em;
 
-	margin: 0.125em auto;
 
+	margin: 0.125em auto 0 auto;
 
 	text-transform: lowercase;
 
 	text-transform: lowercase;
 
 	font-weight: 300;
 
 	font-weight: 300;
 
 }
 
 }
 
 
 
-.header img {
 
+header img {
 
 	width: 128px;
 
 	width: 128px;
 
 	height: 128px;
 
 	height: 128px;
 
 	border: 2px solid #534741;
 
 	border: 2px solid #534741;
 
 	border-radius: 50%;
 
 	border-radius: 50%;
 
 }
 
 }
 
 
 
-.header > a {
 
+header a {
 
 	font-family: "Museo";
 
 	font-family: "Museo";
 
 	color: #534741;
 
 	color: #534741;
 
 	display: inline-block;
 
 	display: inline-block;
 
@@ -117,36 +115,39 @@ thead tr {
 
 	transition: all 0.4s;
 
 	transition: all 0.4s;
 
 }
 
 }
 
 
 
-.header > a:hover {
 
+header a:hover {
 
 	text-decoration: none;
 
 	text-decoration: none;
 
 	border-bottom: 1px solid black;
 
 	border-bottom: 1px solid black;
 
 }
 
 }
 
 
 
-.header .twitter {
 
-	font-size: 1.25em;
 
-	font-weight: 100;
 
-}
 
-
 
 .nav {
 
 .nav {
 
-	float: right;
 
-	display: inline-block;
 
 	padding: 0px;
 
 	padding: 0px;
 
-	margin: 0px;
 
+	margin: 6px 0 0 0px;
 
 }
 
 }
 
 
 
 .nav li {
 
 .nav li {
 
 	list-style: none;
 
 	list-style: none;
 
 	margin: 0.5em 0.2em;
 
 	margin: 0.5em 0.2em;
 
 	display: inline;
 
 	display: inline;
 
-	font-size: 80%;
 
+	text-transform: lowercase;
 
+	font-weight: 300;
 
+}
 
+
 
+.nav .twitter {
 
+	font-size: 1.25em;
 
+	font-weight: 100;
 
 }
 
 }
 
 
 
 .container {
 
 .container {
 
-	max-width: 800px;
 
+	max-width: 840px;
 
 	margin: 0 auto;
 
 	margin: 0 auto;
 
 }
 
 }
 
 
 
-.footer {
 
+.content {
 
+	padding: 0 12px;
 
+}
 
+
 
+footer {
 
 	text-align: center;
 
 	text-align: center;
 
 }
 
 }
 
 
 
@@ -163,6 +164,7 @@ thead tr {
 
 
 
 .postbox .title h1 {
 
 .postbox .title h1 {
 
 	font-size: 1.9em;
 
 	font-size: 1.9em;
 
+	line-height: 1.4;
 
 }
 
 }
 
 
 
 .postbox .title h1 a {
 
 .postbox .title h1 a {
 
@@ -184,7 +186,7 @@ thead tr {
 
 	font-size: 50%;
 
 	font-size: 50%;
 
 	font-weight: normal;
 
 	font-weight: normal;
 
 	color: #808080;
 
 	color: #808080;
 
-	line-height: 4.1;
 
+	line-height: 3;
 
 }
 
 }
 
 
 
 .pager {
 
 .pager {
 
@@ -205,35 +207,28 @@ thead tr {
 
 	float: right;
 
 	float: right;
 
 }
 
 }
 
 
 
-@media (max-width: 768px) {
 
+@media (max-width: 767px) {
 
+
 
+	header {
 
+		font-size: 85%;
 
+	}
 
 
 
-	.header img {
 
+	header img {
 
 		width: 100px;
 
 		width: 100px;
 
 		height: 100px;
 
 		height: 100px;
 
 		border: 2px solid #534741;
 
 		border: 2px solid #534741;
 
 		border-radius: 50%;
 
 		border-radius: 50%;
 
 	}
 
 	}
 
 
 
-	.header > h1 {
 
+	header > h1 {
 
 		display: block;
 
 		display: block;
 
 		float: none;
 
 		float: none;
 
 		line-height: 1.1;
 
 		line-height: 1.1;
 
 	}
 
 	}
 
 
 
-	.nav {
 
-		display: block;
 
-		float: none;
 
-	}
 
-
 
-	.nav li {
 
-		display: block;
 
-		font-size: 100%;
 
-	}
 
-
 
 	.content {
 
 	.content {
 
 		-webkit-text-size-adjust: none;
 
 		-webkit-text-size-adjust: none;
 
 		font-size: 80%;
 
 		font-size: 80%;
 
-		padding: 0 12px;
 
 	}
 
 	}
 
 
 
 	.title {
 
 	.title {

+ 11 - 9
themes/pleasant2/templates/base.tmpl
View File 

@@ -11,18 +11,18 @@ ${set_locale(lang)}
 
     ${extra_head_data}
 
     ${extra_head_data}
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
-    <div class="header">
 
+    <header>
 
         ## TODO: fix this shit
 
         ## TODO: fix this shit
 
         <a href="${abs_link('/')}" title="${blog_title}">
 
         <a href="${abs_link('/')}" title="${blog_title}">
 
-            <img src="/assets/img/thomas.png" alt="pleasant thomas">
 
+            <img src="/assets/img/thomas.png" alt="${blog_title}">
 
             <h1 id="blog-title">
 
             <h1 id="blog-title">
 
                 ${blog_title}
 
                 ${blog_title}
 
             </h1>
 
             </h1>
 
         </a>
 
         </a>
 
-        <br />
 
-            ## ${html_sidebar_links()}
 
-        <a class="twitter" href="http://twitter.com/pleasantprog">@pleasantprog</a>
 
-
 
+        <ul class="nav">
 
+            <li class="twitter"><a href="http://twitter.com/pleasantprog">@pleasantprog</a></li>
 
+            ${html_sidebar_links()}
 
+        </ul>
 
         <%block name="belowtitle">
 
         <%block name="belowtitle">
 
             %if len(translations) > 1:
 
             %if len(translations) > 1:
 
             <small>
 
             <small>
 
@@ -31,14 +31,16 @@ ${set_locale(lang)}
 
             </small>
 
             </small>
 
             %endif
 
             %endif
 
         </%block>
 
         </%block>
 
-    </div>
 
+    </header>
 
     <div class="container">
 
     <div class="container">
 
         <div class="content">
 
         <div class="content">
 
             <%block name="content"></%block>
 
             <%block name="content"></%block>
 
         </div>
 
         </div>
 
-
 
-        <div class="footer"><small>${content_footer}</small></div>
 
     </div>
 
     </div>
 
+    <footer>
 
+        <small>${content_footer}</small>
 
+    </footer>
 
+
 
 
 
     %if add_this_buttons:
 
     %if add_this_buttons:
 
     <script type="text/javascript">var addthis_config={"ui_language":"${lang}"};</script>
 
     <script type="text/javascript">var addthis_config={"ui_language":"${lang}"};</script>