Merge branch 'dev' into live

[dylansserver.git] / includes / style.css

diff --git a/includes/style.css b/includes/style.css
index 019bc0c..7f2e6cd 100644 (file)
--- a/includes/style.css
+++ b/includes/style.css
@@ -1,3 +1,25 @@
+@font-face {
+    font-family: 'InconsolataMedium';
+    src: url('/font/inconsolata-webfont.eot');
+    src: url('/font/inconsolata-webfont.eot?#iefix') format('embedded-opentype'),
+         url('/font/inconsolata-webfont.woff') format('woff'),
+         url('/font/inconsolata-webfont.ttf') format('truetype'),
+         url('/font/inconsolata-webfont.svg#InconsolataMedium') format('svg');
+    font-weight: normal;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: 'MuseoSlab500';
+    src: url('/font/museo_slab_500-webfont.eot');
+    src: url('/font/museo_slab_500-webfont.eot?#iefix') format('embedded-opentype'),
+         url('/font/museo_slab_500-webfont.woff') format('woff'),
+         url('/font/museo_slab_500-webfont.ttf') format('truetype'),
+         url('/font/museo_slab_500-webfont.svg#MuseoSlab500') format('svg');
+    font-weight: normal;
+    font-style: normal;
+}
+
 * {
        padding: 0;
        margin: 0;
@@ -6,11 +28,12 @@
 h3 {
        margin-top:15px;
        font-family:sans-serif;
+    font-family:'MuseoSlab500';
 }
 
 h1, h2 {
-    font-family:sans-serif;
     font-size:150%;
+    font-family:'MuseoSlab500';
 }
 
 a {
@@ -47,7 +70,7 @@ li {
 }
 
 #portfolio {
-       float:right;
+       float:left;
        width:350px;
 }
 
@@ -58,6 +81,7 @@ li {
 #exhibit {
        float:right;
        margin-left:17px;
+    font-family:'InconsolataMedium';
 }
 
 #exhibit h1 {
@@ -66,7 +90,7 @@ li {
 
 .exhibit {
        width:300px;
-       min-height:600px;
+       min-height:475px;
        border:1px solid black;
        padding:10px;
        display:none;
@@ -84,65 +108,38 @@ li {
        clear:both;
 }
 
-/* reprap */
-#reprap_entry {
-       font: 1.5em georgia, times;
-       text-decoration: none;
-       display: block;
-}
-
-/* peepshow */
-#peepshow_ {
-       font-style:italic;
-}
-#peepshow_title_1 {
-       font-style:italic;
-       margin-top:0px;
-}
-
-#peephow_title_2 {
-       font-size:3em;
-}
-
-#peepshow_entry {
-       font:1.4em "lucida console";
-}
-
-#peepshow_entry {
-       font:1.4em "lucida console";
-}
-
 /* drawcss */
 #drawcss_title {
-       font:1.6em "lucida console";
+       font-size:1.6em;
 }
 
 #drawcss_entry {
-       font:1.6em "lucida console";
+       font-size:1.6em;
  }
 
 /* youtube_backup */
 #youtube_backup_title {
-       font:1.6em "lucida console";
+       font-size:1.6em;
 }
 
 #youtube_backup_entry {
-       font:1.4em "lucida console";
+       font-size:1.4em;
 }
 
 /* i_like_pandora */
 #i_like_pandora_title {
-       font:1.6em "lucida console";
+       font-size:1.6em;
 }
 
 #i_like_pandora_entry {
-       font:1.4em "lucida console";
+       font-size:1.4em;
 }
 
 /* notes */
 #notes, #note {
        text-align:left;
        margin-top:20px;
+    font-family:'InconsolataMedium';
 }
 
 #notes h1 {
@@ -160,6 +157,7 @@ li {
 
 .note {
        margin-bottom:40px;
+    font-family:'InconsolataMedium';
 }
 
 p {
@@ -169,6 +167,8 @@ p {
 pre {
        margin-top:20px;
        margin-bottom:20px;
+    width:100%;
+    overflow:auto;
 }
 
 #navigation {
@@ -177,6 +177,7 @@ pre {
 }
 
 #comments {
+    margin-top:30px;
        border-left:1px solid black;
        padding-left:15px;
 }
@@ -194,10 +195,12 @@ pre {
 
 #comment input {
        border:1px solid grey;
+    font-family:'InconsolataMedium';
 }
 
 #comment textarea {
        border:1px solid grey;
+    font-family:'InconsolataMedium';
 }
 
 #comment .submit {
@@ -218,12 +221,20 @@ pre {
        position:absolute;
        top:0px;
        right:0px;
+    float:left;
+    position:relative;
+    width:100px;
 }
 
 #recaptcha_widget {
        display:none;
 }
 
+.recaptcha_help {
+    font-family:'MuseoSlab500';
+    font-size:80%;
+}
+
 #not_human {
     display:none;
     font-weight:bold;
@@ -233,7 +244,8 @@ pre {
     margin-bottom:15px;
 }
 
-#blank_comment { display:none;
+#blank_comment {
+    display:none;
     font-weight:bold;
     font-family:sans-serif;
     color:red;