Merge branch 'master' of github.com:DigitalPublishingToolkit/hybrideditor

hybrid.html

@@ -10,9 +10,11 @@
   <div id="split">
     <div id="editor" class="left">
       <div class="header">
-                <span class="label">markdown</span>
+
+        <div class="header-center">
           <div id="openmenucontext">
-                    <button id="openbutton">open...</button>
+		  <span class="label">write markdown</span> / 		
+		  <button id="openbutton">import .docx</button>
             <div id="openmenu">
               <form id="dropzone" action="/cgi-bin/pandoc.cgi" class="dropzone">
                 <div class="fallback">
@@ -27,11 +29,14 @@
             </div>
 	  </div>
         </div>
-            <div id="editortext"></div>
+      </div>
+      <div id="editortext">
+      </div>
     </div>
     <div class="hdiv"></div>
     <div id="preview" class="right">
       <div class="header">
+        <div class="header-center">
           <form id="previewform" method="post" action="/cgi-bin/pandoc.cgi" target="previewiframe">
             <input type="hidden" name="text" id="previewformtext" />
             <input type="hidden" name="from" value="markdown" />
@@ -45,11 +50,15 @@
             <input type="submit" name="_submit" value="download"/>
           </form>
 	</div>
+      </div>
       <div class="iframe"><iframe name="previewiframe"></iframe></div>
     </div>
   </div>
 
-    <div id="footer"><a href="https://github.com/DigitalPublishingToolkit">Hybrid Publishing Editor</a> is <a href="http://www.gnu.org/copyleft/gpl.html">free software</a> based on <a href="http://daringfireball.net/projects/markdown/">markdown</a>, <a href="http://johnmacfarlane.net/pandoc/">pandoc</a> &amp; <a href="http://ace.c9.io/">ace</a>.</div>
+  <div id="footer"><a href="https://github.com/DigitalPublishingToolkit">Hybrid Publishing Editor</a> is <a href="http://www.gnu.org/copyleft/gpl.html">free software</a> based on <a href="http://daringfireball.net/projects/markdown/">markdown</a>, <a href="http://johnmacfarlane.net/pandoc/">pandoc</a> &amp; <a href="http://ace.c9.io/">ace</a>.
+    <a href="http://networkcultures.org/digitalpublishing/"><img src="imgs/logo_horiz.jpg" class="logo" alt="" ></a>
+
+  </div>
 
 </body>
 

hype.css

@@ -1,14 +1,85 @@
-body {}
+@font-face {
+    font-family: 'Ubuntu Mono Bold';
+    src: url('fonts/UbuntuMono-B.ttf');
+}
+
+@font-face {
+    font-family: 'Open Sans';
+    src: url('fonts/OpenSans-Light.ttf');
+    font-weight: 300;
+}
+
+@font-face {
+    font-family: 'Open Sans';
+    src: url('fonts/OpenSans-LightItalic.ttf');
+    font-weight: 300;
+    font-style: italic;
+}
+
+@font-face {
+    font-family: 'Open Sans';
+    src: url('fonts/OpenSans-Regular.ttf');
+    font-weight: 400;
+}
+@font-face {
+    font-family: 'Open Sans';
+    src: url('fonts/OpenSans-Italic.ttf');
+    font-weight: 400;
+    font-style: italic;
+}
+
+@font-face {
+    font-family: 'Open Sans';
+    src: url('fonts/OpenSans-Bold.ttf');
+    font-weight: 600;
+}
+
+@font-face {
+    font-family: 'Open Sans';
+    src: url('fonts/OpenSans-BoldItalic.ttf');
+    font-weight: 600;
+    font-style: italic;
+}
+
+
+body {
+    font-family: Open Sans;
+    font-size: 12pt;
+}
+
+h1, h2, h3, h4, h5, h6 {
+    font-family: 'Ubuntu Mono Bold', monospace;
+}
 
 a {
-    text-decoration: none;
-    color: green;
+    color: #000;
+    text-decoration: underline;
 }
 
 a:hover {
+    color: #0F0;
     text-decoration: underline;
 }
 
+
+div.header, select, button, input {
+    font-family: 'Ubuntu Mono Bold', monospace;
+}
+
+
+div.header {
+    padding: 10px;
+    font-size:1em;
+    text-align:center;
+}
+
+div.header-center {
+    display: inline-block;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+
 #split {
     position: absolute;
     left: 0; right: 0;
@@ -16,7 +87,7 @@ a:hover {
 }
 
 #editor {
-    border-right: 2px dotted gray;
+    border-right: 2px dotted  #0F0;
 }
 
 #editor textarea {
@@ -46,8 +117,7 @@ a:hover {
 }
 
 .label {
-    text-transform: uppercase;
-    font-size: smaller;
+    /*text-transform: uppercase;*/
 }
 
 #editortext {
@@ -68,9 +138,10 @@ a:hover {
     padding: 10px;
     position: absolute;
     left: 0; top: 32px;
-    background: #EEE;
+    background: #FFF;
     width: 360px;
     display: none;
+    border: 2px solid #0F0;
 }
 
 #footer {
@@ -149,3 +220,14 @@ a:hover {
     cursor: move;
 }
 
+img.logo{
+    position: fixed;
+    width:80px;
+    right:15px;
+    bottom:5px;
+}
+
+input, select, button{
+    background: #FFF;
+    border: 2px solid #0F0;
+}