]> gitweb.factorcode.org Git - factor.git/commitdiff
projects / factor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b49f44e)
help.html: couldn't resist tweaking the design a bit more
authorJohn Benediktsson <mrjbq7@gmail.com>
Wed, 12 Jan 2022 06:22:46 +0000 (22:22 -0800)
committerJohn Benediktsson <mrjbq7@gmail.com>
Wed, 12 Jan 2022 06:23:08 +0000 (22:23 -0800)
basis/help/html/html.factor patch | blob | history
basis/help/html/stylesheet.css patch | blob | history
extra/webapps/help/help.xml patch | blob | history

diff --git a/basis/help/html/html.factor b/basis/help/html/html.factor
index c02c1d277c39f05715d986d1bbfc5f1cda565ff1..f2cd406089af187087b0ea4133637892eee6ecac 100644 (file)
--- a/basis/help/html/html.factor
+++ b/basis/help/html/html.factor
@@ -82,13 +82,17 @@ M: pathname url-of
     "conventions" >link topic>filename
     [XML
         <div class="navbar">
-        <a href="/">Handbook</a>
-        <a href=<->>Glossary</a>
-        <form method="get" action="/search" style="float: right;">
-            <input placeholder="Search" name="search" type="text"/>
-            <input type="submit" value="Go"/>
-            <a href="https://factorcode.org">factorcode.org</a>
-        </form>
+            <div class="navrow">
+                <a href="https://factorcode.org">
+                <img src="favicon.ico" width="24" height="24" />
+                </a>
+                <a href="/">Handbook</a>
+                <a href=<->>Glossary</a>
+                <form method="get" action="/search" style="float: right;">
+                    <input placeholder="Search" name="search" type="text"/>
+                    <input type="submit" value="Go"/>
+                </form>
+            </div>
         </div>
      XML] ;
 
@@ -199,8 +203,9 @@ M: pathname url-of
     [
         [ print-topic ] with-html-writer
         css-styles-to-classes cache-images
+        "resource:extra/websites/factorcode/favicon.ico" dup file-name ?copy-file
         [ help-stylesheet help-meta prepend help-navbar ] dip help-footer
-        [XML <div id="container"><-><div class="page"><-><-></div></div> XML]
+        [XML <-><div class="page"><-><-></div> XML]
     ] bi simple-page ;
 
 : generate-help-file ( topic -- )
diff --git a/basis/help/html/stylesheet.css b/basis/help/html/stylesheet.css
index b9c866a1a928cf18dcf02ac46ae0b2a4667695e7..1b74546c88f63d736bb0384830d2d4c67e5bf3d4 100644 (file)
--- a/basis/help/html/stylesheet.css
+++ b/basis/help/html/stylesheet.css
@@ -41,31 +41,27 @@ tr:hover {
 }
 
 .navbar {
-    margin: 0;
-    padding: 15px;
-    padding-top: 10px;
-    padding-bottom: 10px;
-    line-height: 150%;
     border-bottom: 1px solid #ccc;
     background-color: #f5f5f5;
 }
 
-.navbar a {
-    margin-right: 10px;
-}
-
-.navbar form a {
-    margin-left: 10px;
-    font-size: 1.0em;
-    font-weight: bold;
+.navrow {
+    max-width: 800px;
+    position: relative;
+    left: calc(max(-400px,-50%) + 50%);
+    margin: 0;
+    padding: 10px 15px 10px 15px;
 }
 
-#container {
-    max-width: 800px;
+.navbar a {
+    margin-right: 10px;
 }
 
 .page {
-    margin: 15px;
+    max-width: 800px;
+    position: relative;
+    left: calc(max(-400px,-50%) + 50%);
+    padding: 15px;
 }
 
 .page img {
@@ -93,7 +89,4 @@ tr:hover {
 
 @media screen and (max-width: 600px) {
 
-    .navbar form a {
-        display: none;
-    }
 }
diff --git a/extra/webapps/help/help.xml b/extra/webapps/help/help.xml
index 8b3cc443a4a9ef3cb5d201db56d0c1e752f4033e..49b62152dda37ac4056f47cf2f944f9b3714aa4c 100644 (file)
--- a/extra/webapps/help/help.xml
+++ b/extra/webapps/help/help.xml
@@ -22,9 +22,7 @@
 
         <body>
 
-            <div id="container">
             <t:call-next-template />
-            </div>
 
         </body>
 
Factor programming language