New design. Credit to Manoj Gautam

elena · Mar 17, 2017 · f9a0b93 · f9a0b93
1 parent 6f11a97
commit f9a0b93
Show file tree

Hide file tree

Showing 14 changed files with 2,777 additions and 144 deletions.
diff --git a/404.md b/404.md
@@ -0,0 +1,6 @@
+---
+layout: page
+title: 404
+---
+
+This page doesn't exist.
diff --git a/_config.yml b/_config.yml
@@ -1,18 +1,29 @@
 # Site settings
-title: Greg Jolley -- Amp project
+title: The design, simulation and characterisation of a class-B audio power amplifier
 email: [email protected]
-description: > # this means to ignore newlines until "baseurl:"
-  Projects by Greg Jolley. It will appear in your document head meta (for
-  Google search results) and in your feed.xml site description.
-
+description: >
+  In this report I describe the design, simulation and characterisation of a novel,
+  high performance, medium power (approx 50 W) class-B audio amplifier. Following a
+  general discussion of amplifier characteristics and design goals, the amplifier
+  schematic is presented and described in detail. SPICE simulation results verify the
+  design and provide further understanding of circuit behaviour. A brief discussion on
+  the methodologies of good PCB design is followed by a presentation of the key
+  experimental characteristics of the amplifier along with a comparison to the characteristics
+  derived by simulation. An amplifier control board which responds to thermal and short-circuit
+  faults and adds radio and alarm clock features is briefly discussed. The final chapter
+  `recommendations for future work' is a reflection upon the strengths and weaknesses of the
+  amplifier design and suggest possible means of improvement.
 baseurl: "" # the subpath of your site, e.g. /blog
 url: "http://gregjolley.github.io" # the base hostname & protocol for your site
 github_username:  gregjolley
+timezone: Australia/Sydney
+theme: jekyll-theme-tactile
+
 
 # Build settings
 markdown: kramdown
 gems:
   - jekyll-feed
 exclude:
   - Gemfile
-  - Gemfile.lock
+  - Gemfile.lock
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -6,8 +6,12 @@
     <title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
     <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
 
-    <link rel="stylesheet" href="{{ "/stylesheets/styles.css" | prepend: site.baseurl }}">
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+    <link rel="stylesheet" href="{{ "/stylesheets/font-awesome.min.css" | prepend: site.baseurl }}">
     <link rel="stylesheet" href="{{ "/stylesheets/pygment_trac.css" | prepend: site.baseurl }}">
+    <link rel="stylesheet" href="{{ "/stylesheets/styles.css" | prepend: site.baseurl }}">
+
+
     <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" />
     <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
 
@@ -26,28 +30,36 @@
   </head>
 
   <body>
-    <div class="wrapper">
-      <header>
-        <h1>Amplifier</h1>
 
-        <div><a class="page-link" href="{{ index | prepend: site.baseurl }}">Home</a></div>
-        {% for page in site.pages %}
-          {% if page.title %}
-        <div><a class="page-link" href="{{ page.url | prepend: site.baseurl }}">{{ page.title }}</a></div>
-          {% endif %}
-        {% endfor %}
-        </p>
+    <div class="wrapper">
+    <header>
+      <div class="container">
+        <div class="row">
+          <div class="col-md-6 col-md-offset-3 header">
+            <h1 class="site-name">{{site.author}}</h1>
+            <p class="site-tagline">Greg Jolley</p>
+          </div>
+        </div>
+      </div>
+    </header>
 
-      </header>
-      <section>
+    <section>
+      {{ content }}
+    </section>
 
-{{ content }}
+    </div>
 
-      </section>
       <footer>
-      <p><small>This project is maintained by <a href="mailto:[email protected]">Greg Jolley</a></small></p>
+      <p><small>Author: <a href="mailto:{{ site.email }}">Greg Jolley</a></small></p>
+
+          <ul class="nav-icon">
+            <li><a href="/" class="site-title">{{site.title}}</a></li>
+            <li><a href="/feed.xml" title="Feed" class="hint-top-middle"><i class="fa fa-feed"></i></a></li>
+            <li><a href="https://github.com/{{site.github}}" title="Github" data-hint="Github"  title="Github"><i class="fa fa-github"></i></a></li>
+          </ul>
       </footer>
     </div>
 
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
   </body>
 </html>
diff --git a/_layouts/page.html b/_layouts/page.html
@@ -1,12 +1,10 @@
 ---
 layout: default
 ---
-<section>
-<div class="post">
-
-    <h1 class="post-title">{{ page.title }}</h1>
-
-    {{ content }}
 
+<div class="container">
+  <div class="row">
+      <hr>
+      {{content}}
+  </div>
 </div>
-</section>
diff --git a/_layouts/post.html b/_layouts/post.html
@@ -1,11 +1,30 @@
 ---
 layout: default
 ---
-<div class="post">
+<!-- This page specific styling -->
+<style>
+  .center{
+    margin-top: 20px;
+    text-align: justify;
+  }
 
-  <h1 class="post-title">{{ page.title }}</h1>
-  <p class="post-meta">{{ page.date | date: "%b %-d, %Y" }}{% if page.author %} • {{ page.author }}{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</p>
-
-    {{ content }}
+  .page-title{
+    margin-top: 5px;
+    font-weight: 300;
+    font-size: 200%;
+  }
 
+</style>
+<div class="row">
+  <div class="col-md-6 col-md-offset-3">
+    <hr>
+    <br>
+    <h1 class="text-center page-title">{{page.title}}</h1>
+    <p class="text-center"><time>{{ page.date | date: '%B %-d, %Y' }}</time></p>
+    <div class="center">
+      {{content}}
+    </div>
+  </div>
 </div>
+<!-- Back button -->
+<p class="text-center"><a class="home" href="{{site.baseurl}}/" title="Back to Homepage">Home</a></p>
diff --git a/fonts/FontAwesome.otf b/fonts/FontAwesome.otf
diff --git a/fonts/fontawesome-webfont.eot b/fonts/fontawesome-webfont.eot