websites.concatenative: cleanup css a bit.

diff --git a/extra/webapps/blogs/blogs-common.xml b/extra/webapps/blogs/blogs-common.xml
index e809c0e7f5bba6c5f438e108a50783d15d61dfe4..8d13075864df683c20e4783a5b8dbe3a5220ccf9 100644 (file)
--- a/extra/webapps/blogs/blogs-common.xml
+++ b/extra/webapps/blogs/blogs-common.xml
@@ -8,17 +8,17 @@
 
        <div class="navbar">
 
-                 <t:a t:href="$blogs/">All Posts</t:a>
-               | <t:a t:href="$blogs/by">My Posts</t:a>
-               | <t:a t:href="$blogs/new-post">New Post</t:a>
+               <t:a t:href="$blogs/">All Posts</t:a>
+               <t:a t:href="$blogs/by">My Posts</t:a>
+               <t:a t:href="$blogs/new-post">New Post</t:a>
 
                <t:if t:code="furnace.auth:logged-in?">
 
                        <t:if t:code="furnace.auth.features.edit-profile:allow-edit-profile?">
-                               | <t:a t:href="$realm/edit-profile" t:aside="begin">Edit Profile</t:a>
+                               <t:a t:href="$realm/edit-profile" t:aside="begin">Edit Profile</t:a>
                        </t:if>
 
-                       | <t:button t:action="$login-realm/logout" t:aside="begin" class="link-button link">Logout</t:button>
+                       <t:button t:action="$login-realm/logout" t:aside="begin" class="link-button link">Logout</t:button>
 
                </t:if>
 

diff --git a/extra/webapps/pastebin/pastebin-common.xml b/extra/webapps/pastebin/pastebin-common.xml
index 6d524ad86fa34cd3c0013c8a309fedc06d82972f..cadecc39c7a85822da648756dffb478812a9b012 100644 (file)
--- a/extra/webapps/pastebin/pastebin-common.xml
+++ b/extra/webapps/pastebin/pastebin-common.xml
@@ -8,16 +8,16 @@
 
        <div class="navbar">
 
-                 <t:a t:href="$pastebin">Pastes</t:a>
-               | <t:a t:href="$pastebin/new-paste">New Paste</t:a>
+               <t:a t:href="$pastebin">Pastes</t:a>
+               <t:a t:href="$pastebin/new-paste">New Paste</t:a>
 
                <t:if t:code="furnace.auth:logged-in?">
 
                        <t:if t:code="furnace.auth.features.edit-profile:allow-edit-profile?">
-                               | <t:a t:href="$realm/edit-profile" t:aside="begin">Edit Profile</t:a>
+                               <t:a t:href="$realm/edit-profile" t:aside="begin">Edit Profile</t:a>
                        </t:if>
 
-                       | <t:button t:action="$login-realm/logout" t:aside="begin" class="link-button link">Logout</t:button>
+                       <t:button t:action="$login-realm/logout" t:aside="begin" class="link-button link">Logout</t:button>
 
                </t:if>
 

diff --git a/extra/webapps/planet/planet-common.xml b/extra/webapps/planet/planet-common.xml
index 486d5cc1ed92f6ccd5e57fee74d0d8df1980bbe1..239c9571a501a572d791285a1ec9d55df426ef1b 100644 (file)
--- a/extra/webapps/planet/planet-common.xml
+++ b/extra/webapps/planet/planet-common.xml
@@ -5,16 +5,16 @@
        <t:style t:include="resource:extra/webapps/planet/planet.css" />
 
        <div class="navbar">
-                 <t:a t:href="$planet">Front Page</t:a>
-               | <t:a t:href="$planet/feed.xml">Atom Feed</t:a>
-               | <t:a t:href="$planet/admin">Admin</t:a>
+               <t:a t:href="$planet">Front Page</t:a>
+               <t:a t:href="$planet/feed.xml">Atom Feed</t:a>
+               <t:a t:href="$planet/admin">Admin</t:a>
 
                <t:if t:code="furnace.auth:logged-in?">
                        <t:if t:code="furnace.auth.features.edit-profile:allow-edit-profile?">
-                               | <t:a t:href="$realm/edit-profile" t:aside="begin">Edit Profile</t:a>
+                               <t:a t:href="$realm/edit-profile" t:aside="begin">Edit Profile</t:a>
                        </t:if>
        
-                       | <t:button t:action="$login-realm/logout" t:aside="begin" class="link-button link">Logout</t:button>
+                       <t:button t:action="$login-realm/logout" t:aside="begin" class="link-button link">Logout</t:button>
                </t:if>
        </div>
 

diff --git a/extra/webapps/todo/todo.xml b/extra/webapps/todo/todo.xml
index 146e8258ff9288b3eca29404f909ba90e9eb9017..0630cf79c7e5d30245e939acdb9d14085fd482f2 100644 (file)
--- a/extra/webapps/todo/todo.xml
+++ b/extra/webapps/todo/todo.xml
@@ -11,14 +11,14 @@
     <body>
 
        <div class="navbar">
-                 <t:a t:href="$todo-list/list">List Items</t:a>
-               | <t:a t:href="$todo-list/new">Add Item</t:a>
+               <t:a t:href="$todo-list/list">List Items</t:a>
+               <t:a t:href="$todo-list/new">Add Item</t:a>
 
                <t:if t:code="furnace.auth.features.edit-profile:allow-edit-profile?">
-                       | <t:a t:href="$realm/edit-profile" t:aside="begin">Edit Profile</t:a>
+                       <t:a t:href="$realm/edit-profile" t:aside="begin">Edit Profile</t:a>
                </t:if>
 
-               | <t:button t:action="$login-realm/logout" t:aside="begin" class="link-button link">Logout</t:button>
+               <t:button t:action="$login-realm/logout" t:aside="begin" class="link-button link">Logout</t:button>
        </div>
 
        <h1><t:write-title /></h1>

diff --git a/extra/webapps/user-admin/user-admin.xml b/extra/webapps/user-admin/user-admin.xml
index 2141fdc1d90bc8dc2d76b5f1cac1facd7792c89b..1144f8eec64d2b42b7e0ecad8a0583e913a4b7c0 100644 (file)
--- a/extra/webapps/user-admin/user-admin.xml
+++ b/extra/webapps/user-admin/user-admin.xml
@@ -3,14 +3,14 @@
 <t:chloe xmlns:t="http://factorcode.org/chloe/1.0">
 
        <div class="navbar">
-                 <t:a t:href="$user-admin">List Users</t:a>
-               | <t:a t:href="$user-admin/new">Add User</t:a>
+               <t:a t:href="$user-admin">List Users</t:a>
+               <t:a t:href="$user-admin/new">Add User</t:a>
 
                <t:if t:code="furnace.auth.features.edit-profile:allow-edit-profile?">
-                       | <t:a t:href="$realm/edit-profile" t:aside="begin">Edit Profile</t:a>
+                       <t:a t:href="$realm/edit-profile" t:aside="begin">Edit Profile</t:a>
                </t:if>
 
-               | <t:button t:action="$login-realm/logout" t:aside="begin" class="link-button link">Logout</t:button>
+               <t:button t:action="$login-realm/logout" t:aside="begin" class="link-button link">Logout</t:button>
        </div>
 
        <h1><t:write-title /></h1>

diff --git a/extra/webapps/wiki/page-common.xml b/extra/webapps/wiki/page-common.xml
index 299e480534820985e44ff62e30c2c6092710bbb2..a5de8477713063af3b8aa442d4396fd0d5929b3f 100644 (file)
--- a/extra/webapps/wiki/page-common.xml
+++ b/extra/webapps/wiki/page-common.xml
@@ -10,9 +10,9 @@
 
        <div class="navbar">
                <t:a t:href="$wiki/view" t:rest="title">Latest</t:a>
-               | <t:a t:href="$wiki/revisions" t:rest="title">Revisions</t:a>
-               | <t:a t:href="$wiki/edit" t:rest="title" rel="nofollow">Edit</t:a>
-               | <t:button t:action="$wiki/delete" t:for="title" class="link-button link">Delete</t:button>
+               <t:a t:href="$wiki/revisions" t:rest="title">Revisions</t:a>
+               <t:a t:href="$wiki/edit" t:rest="title" rel="nofollow">Edit</t:a>
+               <t:button t:action="$wiki/delete" t:for="title" class="link-button link">Delete</t:button>
        </div>
 
 </t:chloe>

diff --git a/extra/webapps/wiki/wiki-common.xml b/extra/webapps/wiki/wiki-common.xml
index bd2b897c0e9c4504c1eb3f605e3d2deafbea7cc4..03f5f7bc30751ac6230dc8669ecfa6f7f5b38cb9 100644 (file)
--- a/extra/webapps/wiki/wiki-common.xml
+++ b/extra/webapps/wiki/wiki-common.xml
@@ -8,61 +8,68 @@
 
        <t:style t:include="resource:extra/webapps/wiki/wiki.css" />
 
-       <table width="100%">
-               <tr>
-                       <t:if t:value="contents">
-                               <td valign="top" style="width: 210px;">
-                                       <div class="contents">
-                                               <t:bind t:name="contents">
-                                                       <h2>
-                                                               <t:a t:href="$wiki/view" t:rest="title">
-                                                                       <t:label t:name="title" />
-                                                               </t:a>
-                                                       </h2>
-
-                                                       <t:farkup t:name="content" />
-                                               </t:bind>
-                                       </div>
-                               </td>
-                       </t:if>
-
-                       <td valign="top">
-
-                               <div class="navbar">
-
-                                       <t:a t:href="$wiki">Front Page</t:a>
-                                       | <t:a t:href="$wiki/articles">All Articles</t:a>
-                                       | <t:a t:href="$wiki/changes">Recent Changes</t:a>
-                                       | <t:a t:href="$wiki/random">Random Article</t:a>
-
-                                       <t:if t:code="furnace.auth:logged-in?">
-
-                                               <t:if t:code="furnace.auth.features.edit-profile:allow-edit-profile?">
-                                                       | <t:a t:href="$realm/edit-profile" t:aside="begin">Edit Profile</t:a>
-                                               </t:if>
-
-                                               | <t:button t:action="$login-realm/logout" t:aside="begin" class="link-button link">Logout</t:button>
-
-                                       </t:if>
-
-                               </div>
-
-                               <h1><t:write-title /></h1>
-
-                               <t:call-next-template />
-
-                       </td>
-               </tr>
-
-               <t:if t:value="footer">
-                       <tr>
-                               <td colspan="2" class="footer">
-                                       <t:bind t:name="footer">
-                                               <t:farkup t:name="content" />
-                                       </t:bind>
-                               </td>
-                       </tr>
-               </t:if>
-       </table>
+    <div id="container">
+
+        <div id="left">
+
+            <t:if t:value="contents">
+
+                <t:style t:include="resource:extra/webapps/wiki/wiki-contents.css" />
+                <div class="contents">
+                    <t:bind t:name="contents">
+                        <h2>
+                            <t:a t:href="$wiki/view" t:rest="title">
+                                <t:label t:name="title" />
+                            </t:a>
+                        </h2>
+
+                        <t:farkup t:name="content" />
+                    </t:bind>
+                </div>
+            </t:if>
+
+        </div>
+
+        <div id="right">
+
+            <div class="navbar">
+
+                <t:a t:href="$wiki">Front Page</t:a>
+                <t:a t:href="$wiki/articles">All Articles</t:a>
+                <t:a t:href="$wiki/changes">Recent Changes</t:a>
+                <t:a t:href="$wiki/random">Random Article</t:a>
+
+                <t:if t:code="furnace.auth:logged-in?">
+
+                    <t:if t:code="furnace.auth.features.edit-profile:allow-edit-profile?">
+                        <t:a t:href="$realm/edit-profile" t:aside="begin">Edit Profile</t:a>
+                    </t:if>
+
+                    <t:button t:action="$login-realm/logout" t:aside="begin" class="link-button link">Logout</t:button>
+
+                </t:if>
+
+            </div>
+
+            <div class="page">
+                <h1><t:write-title /></h1>
+
+                <t:call-next-template />
+
+            </div>
+
+            <t:if t:value="footer">
+                <div class="footer">
+                    <t:bind t:name="footer">
+                        <t:farkup t:name="content" />
+                    </t:bind>
+                </div>
+            </t:if>
+
+        </div>
+
+        <span style="display:none"></span>
+
+    </div>
 
 </t:chloe>

diff --git a/extra/webapps/wiki/wiki.css b/extra/webapps/wiki/wiki.css
index 4ecc6e52821b29203d61d9cb82bae5ee1be911c5..4ed03ce3bee8471964add7eab5aff72a307ee292 100644 (file)
--- a/extra/webapps/wiki/wiki.css
+++ b/extra/webapps/wiki/wiki.css
@@ -1,3 +1,20 @@
+body {
+    margin: 0;
+}
+
+#container {
+    margin: 0 auto;
+    width: 100%;
+}
+
+#left {
+    width: 0;
+}
+
+#right {
+    max-width: 800px;
+}
+
 .comparison th {
     border-width: 1px;
     border-color: #666;
@@ -39,13 +56,36 @@
 }
 
 .contents {
-    padding: 4px;
-    margin: 4px;
-    border: 1px dashed gray;
-    background: #f5f1fd;
-    width: 200px;
+    font-size: smaller;
+    margin: 0;
+    padding: 0;
+    padding-left: 10px;
+    padding-right: 10px;
+    line-height: 125%;
+}
+
+.contents ul {
+    list-style-type: none;
+    margin: 0;
+    padding-left: 10px;
+}
+
+.page {
+    padding-left: 15px;
+    padding-right: 15px;
+    padding-bottom: 15px;
+}
+
+.page .navbar {
+    margin-left: -15px;
+    margin-right: -15px;
+    margin-bottom: -15px;
+    border-top: 1px solid #ccc;
+    border-bottom: none;
 }
 
 .footer {
-    font-size: 75%;
+    border-top: 1px solid #ccc;
+    padding-left: 15px;
+    font-size: smaller;
 }

diff --git a/extra/websites/concatenative/page.css b/extra/websites/concatenative/page.css
index dc0c57b7d5ca6417bce4d7a0432813a70af96fe7..9eb41b0f512906a3c1b86de054a5074377c8dbb7 100644 (file)
--- a/extra/websites/concatenative/page.css
+++ b/extra/websites/concatenative/page.css
@@ -1,63 +1,78 @@
+html {
+    box-sizing: border-box;
+}
+
+*, *:before, *:after {
+    box-sizing: inherit;
+}
+
 body, button {
-       font:9pt "Lucida Grande", "Lucida Sans Unicode", verdana, geneva, sans-serif;
-       color:#444;
+    font-size: 12pt;
+    font-family: sans-serif;
+    line-height: 140%;
 }
 
-.link-button {
-       padding: 0px;
-       background: none;
-       border: none;
+textarea {
+    font-size: 12pt;
 }
 
-a:link, a:visited, .link {
-       color: #222;
-       border-bottom:1px dotted #666;
-       text-decoration:none;
+table {
+    border-spacing: 0;
+    border-collapse: collapse;
 }
 
-a:hover, .link:hover {
-       border-bottom:1px solid #66a;
+.link-button {
+    padding: 0;
+    background: none;
+    border: none;
 }
 
+a, .link { color: #104e8b; }
+a:link, a:visited, a:active, .link { text-decoration: none; }
+a:hover, .link:hover { text-decoration: underline; }
+
 .error { color: #a00; }
 
 .errors li { color: #a00; }
 
 .field-label {
-       text-align: right;
+    text-align: right;
 }
 
 .inline {
-       display: inline;
+    display: inline;
 }
 
 .navbar {
-       background-color: #eeeee0;
-       padding: 5px;
-       border: 1px solid #ccc;
+    margin: 0;
+    padding: 15px;
+    border-bottom: 1px solid #ccc;
 }
 
-.big-field-label {
-       vertical-align: top;
+.navbar a, .navbar .link {
+    margin-right: 10px;
 }
 
-.description {
-       padding: 5px;
-       color: #000;
+.big-field-label {
+    vertical-align: top;
 }
 
 .description pre {
-       border: 1px dashed #ccc;
-       background-color: #f5f5f5;
+    padding: 5px;
+    border: 1px dashed #ccc;
+    background-color: #f5f5f5;
+    overflow: auto;
+    font-size: smaller;
 }
 
-.description p:first-child {
-       margin-top: 0px;
-}
+.description h1 { font-size: 1.5em; }
+.description h2 { font-size: 1.17em; }
+.description h3 { font-size: 1.0em; }
+.description h4 { font-size: 0.83em; }
+.description h5 { font-size: 0.67em; }
 
-.description p:last-child {
-       margin-bottom: 0px;
-}
+.description p:first-child { margin-top: 0px; }
+.description p:last-child { margin-bottom: 0px; }
 
 .description table, .description td {
     border-color: #666;
@@ -75,4 +90,3 @@ a:hover, .link:hover {
     padding: 4px;
     border-width: 1px 1px 0 0;
 }
-