Updates

diff --git a/_posts/2015-12-08-st.md b/_drafts/2015-12-08-st.md
similarity index 100%
rename from _posts/2015-12-08-st.md
rename to _drafts/2015-12-08-st.md

diff --git a/_posts/2015-12-25-tri.md b/_drafts/2015-12-25-tri.md
similarity index 100%
rename from _posts/2015-12-25-tri.md
rename to _drafts/2015-12-25-tri.md

diff --git a/_drafts/soup-logo.md b/_drafts/soup-logo.md
new file mode 100644 (file)
index 0000000..85f8362
--- /dev/null
+++ b/_drafts/soup-logo.md
@@ -0,0 +1,11 @@
+---\r
+layout: post\r
+date: 2013-01-20\r
+title: Fem Freq Logo\r
+categories: design commercial\r
+---\r
+\r
+![]({{site.baseurl}}/m/femfreq/ff01.png)\r
+\r
+logotype spec\r
+\r

diff --git a/_includes/nav.html b/_includes/nav.html
index 8b027ebceaca83784bd6ff71e30dd1cc5ff16ea8..9b2bd1e5f4a2e3ac7aac11ed0aece0a4351a6614 100644 (file)
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -1,19 +1,42 @@
 <div class="nav">
   
+  <h2><a href="{{site.baseurl}}/">{{site.name}}</a></h2>
+
   <ul>
-    <li><a href="{{site.baseurl}}/">{{site.name}}</a></li>
+    <li></li>
     <li><a href="{{ site.baseurl }}/about/">about</a></li>
 
-    <li>&nbsp;</li>
 
     {% for category in site.categories %}
+      <li>&nbsp;</li>
+      <li><h3 class="header"><a href="/{{ category[0] }}/">{{ category[0] }}</a></h3></li>
+      {% for posts in category %}
+        {% for post in posts %}
+          <li class="indent"><a href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a></li>
+        {% endfor %}
+      {% endfor %}      
+    {% endfor %}  
+
+<!-- 
+
+{% for category in site.categories %}
+  <h3 class="date">{{ category | first }}</h3>  
+  <ul class="posts">
+    {% for posts in category %}
+      {% for post in posts %}
+        <li><h2><a href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a></h2></li>
+      {% endfor %}
+    {% endfor %}
+  </ul>  
+{% endfor %}
+
+  <h3 class="date">∞</h3>
   <li>
-    <a href="{{ site.baseurl }}/{{ category[0] }}/">
-      {{ category[0] }}
-    </a>
+  <h2><a href="/past/">PAST WORK</a></h2>
   </li>
 
-      {% endfor %}  
+ -->
+
   
     <li>&nbsp;</li>
     
@@ -30,7 +53,7 @@
     <label for="mce-EMAIL">email announce list</label><br />
     <input type="email" value="" name="EMAIL" class="email" id="mce-EMAIL" placeholder="email address" required>
       <div style="position: absolute; left: -5000px;"><input type="text" name="b_5f627417bdb5e6d2fe0b56ae3_ce46411f5e" tabindex="-1" value=""></div>
-      <div class="clear"><input type="submit" value="Subscribe" name="subscribe" id="mc-embedded-subscribe" class="button"></div>
+      <div class="clear" style="margin-top:0.5em"> <input type="submit" value="Subscribe" name="subscribe" id="mc-embedded-subscribe" class="button"></div>
       </div>
   </form>
   </div>

diff --git a/_layouts/default.html b/_layouts/default.html
index 158038bc6df04e3a5d756130339fcc497fd171a8..ebc39e02c60f4eaed1a1a04ffb7a107f068f3b9b 100644 (file)
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -5,6 +5,9 @@
       <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
       <title>{{ site.name }} - {{ page.title }}</title>
       <meta name="viewport" content="width=device-width">
+
+      <link href="https://fonts.googleapis.com/css?family=Nanum+Gothic+Coding" rel="stylesheet">
+
       <link rel="stylesheet" href="{{ site.baseurl }}/css/syntax.css">
       <link rel="stylesheet" href="{{ site.baseurl }}/css/marx.css">
       <link rel="stylesheet" href="{{ site.baseurl }}/css/main.css">

diff --git a/_layouts/post.html b/_layouts/post.html
index ea191920dbf21a82fa30c860d33a02c6ef82246e..84142a84df64e340e7782fec98ace00ffc45e5be 100644 (file)
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -2,8 +2,8 @@
 layout: default
 ---
 
-<h1>{{ page.title }}</h1>
-<h2>{{ page.date | date: "%Y" }}</h2>
+<h2><a href="/{{ page.categories[0] }}">{{ page.categories[0] }}</a> > {{ page.title }}</h2>
+<h3>{{ page.date | date: "%Y" }}</h3>
 
 <div class="post">
 {{ content }}

diff --git a/css/letter_gothic-bold.ttf b/css/letter_gothic-bold.ttf
new file mode 100755 (executable)
index 0000000..e3319c7
Binary files /dev/null and b/css/letter_gothic-bold.ttf differ

diff --git a/css/main.css b/css/main.css
index 61ae4412d4041d1d4f2ba91b628ed46e7cddf462..25dbcac56e27c8a38f8db4002fdb2b52257dafc3 100755 (executable)
--- a/css/main.css
+++ b/css/main.css
@@ -3,6 +3,11 @@
   font-family: lettergothic;
   src: url(letter_gothic.ttf);
 }
+@font-face
+{
+  font-family: lettergothic-bold;
+  src: url(letter_gothic-bold.ttf);
+}
 
 body {
   font-size:12px;
@@ -13,7 +18,7 @@ h1, h2, h3 {
   text-transform: uppercase;
 }
 h1, h2, h3, h4, h5, h6 {
-  font-family:lettergothic;
+  font-family:lettergothic-bold;
   /*font-size: 1em;*/
   color:#000;
   font-weight:bold;
@@ -38,6 +43,9 @@ h2 {
 {
   /*content:" ---- ";*/
 }
+.site > h1 {
+  margin:0.105em 0;
+}
 .site > h2 {
   margin:2em 0;
 }
@@ -82,15 +90,32 @@ header {
   left: 1em;
 }
 
-.thumbs, .thumbs li {
+ul.thumbs {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+ul.thumbs, ul.thumbs li {
   margin:0;
   list-style-type:none;
   padding:0;
 }
+ul.thumbs li {
+  width:200px;  
+  margin:1em;
+}
+ul.thumbs .img {
+  background:#444;
+  min-width:100px;
+  min-height:100px;
+  display:inline-block;
+  line-height:0;
+  padding:0;
+  margin:0;
+}
+/*
 .thumbs li {
-  /*display:inline-block;*/
-  margin:2em 0 4em 0;
-  max-width:460px;
+  display:inline-block;
 }
 .thumbs li > a {
   display:block;
@@ -112,6 +137,7 @@ header {
   min-height:100px;
   background:#aaa;
 }
+*/
 
 
 .posts {
@@ -167,7 +193,7 @@ ul.index li {
 /*****************************************************************************/
 
 .site {
-  margin: 0em 0 3em 18em;
+  margin: 0em 0 5em 22em;
   padding: 0 0 0 0em;
   max-width: 800px;
   position:absolute;
@@ -203,18 +229,31 @@ ul.index li {
   left:1em;
   display:block;
   height:2em;
+  font-size:1.0em;
+  font-weight:bold;
 }
 .nav ul {
   text-transform: uppercase;
-  font-family:lettergothic;
-  font-size:1.25em;
+  font-family:lettergothic-bold;
   line-height:1.4em;
 }
-.nav ul, .nav ul li {
+.nav ul, .nav li {
   margin:0;
   padding:0;
   list-style-type:none;
 }
+.nav h2 {
+  margin-bottom:0.1em;
+}
+.nav h3.header {
+  font-size:.8em;
+}
+.nav a {
+  
+}
+.nav .indent {
+  padding-left:0.5em;
+}
 
 
 
@@ -222,7 +261,6 @@ ul.index li {
 
 /* Posts */
 .post {
-  margin-top:2em;
   padding-bottom:3em;
   margin-bottom:3em;
 }

diff --git a/design.md b/design.md
index bd2b9644f014984e0f6fd00db126ee81ff2057b0..62c06f14cb503fe079e3eb097165a0fd3f19aafd 100644 (file)
--- a/design.md
+++ b/design.md
@@ -3,16 +3,16 @@ layout: default
 title: Projects
 ---
 
-<ul class="index thumbs">
+<ul class="thumbs">
   
 {% for post in site.categories.design %}
 {% if post.url %}
   
   <li>
   <a href="{{ site.baseurl }}{{ post.url }}">
-    <div class="img"><img src="{{ post.thumb }}" /></div>
-    <br />
-    {{ post.title }}
+    <span class="img"><img src="{{ post.thumb }}" /></span>
+<!--     <br />
+    {{ post.title }} -->
   </a>
   </li>    
   

diff --git a/projects.md b/projects.md
index eb078350a17035212e4da79f633c235ebdef216e..918739f11cbf900d29e096c34043ab8271e3c40a 100644 (file)
--- a/projects.md
+++ b/projects.md
@@ -3,7 +3,7 @@ layout: default
 title: Projects
 ---
 
-<ul class="index thumbs">
+<ul class="thumbs">
   
 {% for post in site.categories.projects %}
 {% if post.url %}
@@ -11,8 +11,8 @@ title: Projects
   <li>
   <a href="{{ site.baseurl }}{{ post.url }}">
     <div class="img"><img src="{{ post.thumb }}" /></div>
-    <br />
-    {{ post.title }}
+<!--     <br />
+    {{ post.title }} -->
   </a>
   </li>    
   

diff --git a/works.html b/works.html
index ee3036a9e5499c9c5ffd54337635b07a405e3994..60a9d3b9366a6e0fb5ee1cbabf12f58c6431b6b6 100644 (file)
--- a/works.html
+++ b/works.html
@@ -3,16 +3,16 @@ layout: default
 title: Works
 ---
 
-<ul class="index thumbs">
+<ul class="thumbs">
   
 {% for post in site.categories.works %}
 {% if post.url %}
   
   <li>
   <a href="{{ site.baseurl }}{{ post.url }}">
-    <div class="img"><img src="{{ post.thumb }}" /></div>
-    <br />
-    {{ post.title }}
+    <span class="img"><img src="{{ post.thumb }}" /></span>
+<!--     <br />
+    {{ post.title }} -->
   </a>
   </li>