websites.concatenative: cleanup css a bit.

flac
John Benediktsson 2020-02-27 12:49:22 -08:00 committed by Steve Ayerhart
parent 5ab131108a
commit a59a4fef02
No known key found for this signature in database
GPG Key ID: 5BFD39C5359E967D
9 changed files with 169 additions and 108 deletions

View File

@ -8,17 +8,17 @@
<div class="navbar"> <div class="navbar">
<t:a t:href="$blogs/">All Posts</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/by">My Posts</t:a>
| <t:a t:href="$blogs/new-post">New Post</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:logged-in?">
<t:if t:code="furnace.auth.features.edit-profile:allow-edit-profile?"> <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: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> </t:if>

View File

@ -8,16 +8,16 @@
<div class="navbar"> <div class="navbar">
<t:a t:href="$pastebin">Pastes</t:a> <t:a t:href="$pastebin">Pastes</t:a>
| <t:a t:href="$pastebin/new-paste">New Paste</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:logged-in?">
<t:if t:code="furnace.auth.features.edit-profile:allow-edit-profile?"> <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: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> </t:if>

View File

@ -5,16 +5,16 @@
<t:style t:include="resource:extra/webapps/planet/planet.css" /> <t:style t:include="resource:extra/webapps/planet/planet.css" />
<div class="navbar"> <div class="navbar">
<t:a t:href="$planet">Front Page</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/feed.xml">Atom Feed</t:a>
| <t:a t:href="$planet/admin">Admin</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:logged-in?">
<t:if t:code="furnace.auth.features.edit-profile:allow-edit-profile?"> <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: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> </t:if>
</div> </div>

View File

@ -11,14 +11,14 @@
<body> <body>
<div class="navbar"> <div class="navbar">
<t:a t:href="$todo-list/list">List Items</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:a t:href="$todo-list/new">Add Item</t:a>
<t:if t:code="furnace.auth.features.edit-profile:allow-edit-profile?"> <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: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> </div>
<h1><t:write-title /></h1> <h1><t:write-title /></h1>

View File

@ -3,14 +3,14 @@
<t:chloe xmlns:t="http://factorcode.org/chloe/1.0"> <t:chloe xmlns:t="http://factorcode.org/chloe/1.0">
<div class="navbar"> <div class="navbar">
<t:a t:href="$user-admin">List Users</t:a> <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/new">Add User</t:a>
<t:if t:code="furnace.auth.features.edit-profile:allow-edit-profile?"> <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: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> </div>
<h1><t:write-title /></h1> <h1><t:write-title /></h1>

View File

@ -10,9 +10,9 @@
<div class="navbar"> <div class="navbar">
<t:a t:href="$wiki/view" t:rest="title">Latest</t:a> <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/revisions" t:rest="title">Revisions</t:a>
| <t:a t:href="$wiki/edit" t:rest="title" rel="nofollow">Edit</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:button t:action="$wiki/delete" t:for="title" class="link-button link">Delete</t:button>
</div> </div>
</t:chloe> </t:chloe>

View File

@ -8,61 +8,68 @@
<t:style t:include="resource:extra/webapps/wiki/wiki.css" /> <t:style t:include="resource:extra/webapps/wiki/wiki.css" />
<table width="100%"> <div id="container">
<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" /> <div id="left">
</t:bind>
</div>
</td>
</t:if>
<td valign="top"> <t:if t:value="contents">
<div class="navbar"> <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:a t:href="$wiki">Front Page</t:a> <t:farkup t:name="content" />
| <t:a t:href="$wiki/articles">All Articles</t:a> </t:bind>
| <t:a t:href="$wiki/changes">Recent Changes</t:a> </div>
| <t:a t:href="$wiki/random">Random Article</t:a> </t:if>
<t:if t:code="furnace.auth:logged-in?"> </div>
<t:if t:code="furnace.auth.features.edit-profile:allow-edit-profile?"> <div id="right">
| <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> <div class="navbar">
</t:if> <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>
</div> <t:if t:code="furnace.auth:logged-in?">
<h1><t:write-title /></h1> <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:call-next-template /> <t:button t:action="$login-realm/logout" t:aside="begin" class="link-button link">Logout</t:button>
</td> </t:if>
</tr>
<t:if t:value="footer"> </div>
<tr>
<td colspan="2" class="footer"> <div class="page">
<t:bind t:name="footer"> <h1><t:write-title /></h1>
<t:farkup t:name="content" />
</t:bind> <t:call-next-template />
</td>
</tr> </div>
</t:if>
</table> <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> </t:chloe>

View File

@ -1,3 +1,20 @@
body {
margin: 0;
}
#container {
margin: 0 auto;
width: 100%;
}
#left {
width: 0;
}
#right {
max-width: 800px;
}
.comparison th { .comparison th {
border-width: 1px; border-width: 1px;
border-color: #666; border-color: #666;
@ -39,13 +56,36 @@
} }
.contents { .contents {
padding: 4px; font-size: smaller;
margin: 4px; margin: 0;
border: 1px dashed gray; padding: 0;
background: #f5f1fd; padding-left: 10px;
width: 200px; 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 { .footer {
font-size: 75%; border-top: 1px solid #ccc;
padding-left: 15px;
font-size: smaller;
} }

View File

@ -1,63 +1,78 @@
html {
box-sizing: border-box;
}
*, *:before, *:after {
box-sizing: inherit;
}
body, button { body, button {
font:9pt "Lucida Grande", "Lucida Sans Unicode", verdana, geneva, sans-serif; font-size: 12pt;
color:#444; font-family: sans-serif;
line-height: 140%;
}
textarea {
font-size: 12pt;
}
table {
border-spacing: 0;
border-collapse: collapse;
} }
.link-button { .link-button {
padding: 0px; padding: 0;
background: none; background: none;
border: none; border: none;
} }
a:link, a:visited, .link { a, .link { color: #104e8b; }
color: #222; a:link, a:visited, a:active, .link { text-decoration: none; }
border-bottom:1px dotted #666; a:hover, .link:hover { text-decoration: underline; }
text-decoration:none;
}
a:hover, .link:hover {
border-bottom:1px solid #66a;
}
.error { color: #a00; } .error { color: #a00; }
.errors li { color: #a00; } .errors li { color: #a00; }
.field-label { .field-label {
text-align: right; text-align: right;
} }
.inline { .inline {
display: inline; display: inline;
} }
.navbar { .navbar {
background-color: #eeeee0; margin: 0;
padding: 5px; padding: 15px;
border: 1px solid #ccc; border-bottom: 1px solid #ccc;
}
.navbar a, .navbar .link {
margin-right: 10px;
} }
.big-field-label { .big-field-label {
vertical-align: top; vertical-align: top;
}
.description {
padding: 5px;
color: #000;
} }
.description pre { .description pre {
border: 1px dashed #ccc; padding: 5px;
background-color: #f5f5f5; border: 1px dashed #ccc;
background-color: #f5f5f5;
overflow: auto;
font-size: smaller;
} }
.description p:first-child { .description h1 { font-size: 1.5em; }
margin-top: 0px; .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 { .description p:first-child { margin-top: 0px; }
margin-bottom: 0px; .description p:last-child { margin-bottom: 0px; }
}
.description table, .description td { .description table, .description td {
border-color: #666; border-color: #666;
@ -75,4 +90,3 @@ a:hover, .link:hover {
padding: 4px; padding: 4px;
border-width: 1px 1px 0 0; border-width: 1px 1px 0 0;
} }