More work on bootstrap

mono · Oct 18, 2013 · 8acee24 · 8acee24
1 parent b8d2002
commit 8acee24
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 36 deletions.
diff --git a/bootstrap/.#entry-template b/bootstrap/.#entry-template
diff --git a/bootstrap/blog-template.standard b/bootstrap/blog-template.standard
@@ -13,7 +13,7 @@
       <script src="../../assets/js/html5shiv.js"></script>
       <script src="../../assets/js/respond.min.js"></script>
     <![endif]-->
-    <link rel='stylesheet' href='@BASEDIR@miguel-style.css' type='text/css' />
+    <link rel='stylesheet' href='@BASEDIR@miguel-style.css' type='text/css' media="screen"/>
     <link rel="alternate" type="application/rss+xml" title="RSS" href="@BLOGWEBDIR@@RSSFILENAME@.rss2" />
     <script src='@BASEDIR@prettyprint.js' type='text/javascript'></script>
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
@@ -63,7 +63,7 @@
 
     <div class="container">
       <div class="row">
-        <div class="col-md-8">
+        <div class="col-md-9">
 	  @BLOG_ENTRIES@
 
 	  @PAGE_NAVIGATION@
@@ -72,7 +72,7 @@
 	  </center>
 
         </div>
-	<aside class="col-md-4">
+	<aside class="col-md-3">
 
           <ul class="xoxo">
 	    <li class="widget-container">

diff --git a/bootstrap/entry-template b/bootstrap/entry-template
@@ -1,33 +1,46 @@
-@ENTRY_ANCHOR@
-<div class="post hentry">
-  <div class="navigation">
-    @ENTRY_NAVIGATION@
-  </div>
-
-  <p>
-  <div class='post hentry'>
-    <h1 class="entry-title"><a href="@BASEDIR@@ENTRY_PERMALINK@">@ENTRY_CAPTION@</a></h1>
-
-    <div class="entry-meta">
-      Posted on <a href="@ENTRY_URL_PERMALINK@">@ENTRY_DATECAPTION@</a> by  @COPYRIGHT@
-    </div> <!-- entry-meta -->
-
-    <div class="entry-content">
-      @ENTRY_BODY@
+<div class="row">
+  <aside class="col-md-2">
+    <h1>&nbsp;</h1>
+    <p>
+      <div class="entry-utility">
+        @COPYRIGHT@
+	<br>
+        <b>Posted on</b>
+	<br>
+	<a href="@ENTRY_URL_PERMALINK@">@ENTRY_DATECAPTION@</a> 
+        @ENTRY_SPECIFIC@
+      </div>
+  </aside>
+<div class="col-md-10">
+
+  @ENTRY_ANCHOR@
+  <div class="post hentry">
+    <div class="navigation">
+      @ENTRY_NAVIGATION@
     </div>
-
-    <div class="entry-utility">
-      Posted on <a href="@ENTRY_URL_PERMALINK@">@ENTRY_DATECAPTION@</a> by  @COPYRIGHT@
-      @ENTRY_SPECIFIC@
+
+    <p>
+    <div class='post hentry'>
+      <h1 class="entry-title"><a href="@BASEDIR@@ENTRY_PERMALINK@">@ENTRY_CAPTION@</a></h1>
+
+      <div class="entry-content">
+        @ENTRY_BODY@
+      </div>
+
+      <div class="entry-utility">
+        Posted on <a href="@ENTRY_URL_PERMALINK@">@ENTRY_DATECAPTION@</a> by  @COPYRIGHT@
+        @ENTRY_SPECIFIC@
+      </div>
+    </div><!-- post-->
+
+    <div class="navigation">
+      @ENTRY_NAVIGATION@
     </div>
-  </div><!-- post-->
-
-  <div class="navigation">
-    @ENTRY_NAVIGATION@
-  </div>
-
-  <div id="comments">
-    @COMMENTS@
-  </div>
-
-</div> <!--divpost-->
+
+    <div id="comments">
+      @COMMENTS@
+    </div>
+
+  </div> <!--divpost-->
+</div>
+</div>
diff --git a/bootstrap/miguel-style.css b/bootstrap/miguel-style.css
@@ -1,3 +1,20 @@
+.post {
+    font-family: "ff-tisa-web-pro";
+    font-size: 20px;
+    font-style: normal;
+    font-weight: 200;
+}
+
+.post p { margin-top: 0.5em; }
+
+
+.post h1, .post h2, .post h3, .post h4, .post h5 {
+	font-family: "krete", serif;
+/*	font-style: normal;
+	font-weight: 200; */
+}
+
+
 .code-xml, .code-csharp
 {
         margin: 1em 0;
@@ -10,11 +27,13 @@
 	overflow: auto;
 }
 
-.shell { 
+/*
+ .shell { 
 	border-style: solid; background: #554f55; color: #eee;
 	border-width: 1px; padding: 1em; 
 	margin:15px;
 }
+*/
 
 .separator {
 	border-bottom: 1px dotted #aaaaaa; padding-top: 1em; padding-bottom: 1em;