steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

websites.concatenative: move container div to page.xml.

flac
John Benediktsson 2020-02-27 15:11:55 -08:00 committed by Steve Ayerhart
parent 7b28dc28a9
commit c2c6febce3
No known key found for this signature in database
GPG Key ID: 5BFD39C5359E967D
9 changed files with 90 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
extra/webapps/pastebin/pastebin-common.xml
View File

@ -6,31 +6,28 @@
<t:style t:include="resource:extra/webapps/pastebin/pastebin.css" />
<div id="container">
<div class="navbar">
<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: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 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>
<div style="float: right;">
<a href="//factorcode.org"><b>factorcode.org</b></a>
</div>
<t:button t:action="$login-realm/logout" t:aside="begin" class="link-button link">Logout</t:button>
</t:if>
<div style="float: right;">
<a href="//factorcode.org"><b>factorcode.org</b></a>
</div>
<div class="page">
<h1><t:write-title /></h1>
<t:call-next-template />
</div>
</div>
<div class="page">
<h1><t:write-title /></h1>
<t:call-next-template />
</div>
</t:chloe>

8
extra/webapps/pastebin/pastebin.css
View File

@ -1,11 +1,3 @@
body {
margin: 0;
}
#container {
max-width: 1000px;
}
.page {
padding-left: 15px;
padding-right: 15px;

3
extra/webapps/planet/planet-common.xml
View File

@ -4,8 +4,6 @@
<t:style t:include="resource:extra/webapps/planet/planet.css" />
<div id="container">
<div class="navbar">
<t:a t:href="$planet">Front Page</t:a>
<t:a t:href="$planet/feed.xml">Atom Feed</t:a>
@ -29,5 +27,4 @@
<t:call-next-template />
</div>
</div>
</t:chloe>

8
extra/webapps/planet/planet.css
View File

@ -1,11 +1,3 @@
body {
margin: 0;
}
#container {
max-width: 1000px;
}
.page {
padding-left: 15px;
padding-right: 15px;

110
extra/webapps/wiki/wiki-common.xml
View File

@ -8,68 +8,64 @@
<t:style t:include="resource:extra/webapps/wiki/wiki.css" />
<div id="container">
<div id="left">
<div id="left">
<t:if t:value="contents">
<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>
<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>
<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>
</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>
</t:chloe>

4
extra/webapps/wiki/wiki-contents.css
View File

@ -1,10 +1,10 @@
#left {
float: left;
width: 180px;
width: 200px;
border-right: 1px solid #ccc;
background: #f3f2ea;
}
#right {
margin-left: 180px;
margin-left: 200px;
}

16
extra/webapps/wiki/wiki.css
View File

@ -1,18 +1,9 @@
body {
margin: 0;
}
#container {
margin: 0 auto;
width: 100%;
}
#left {
width: 0;
}
#right {
max-width: 800px;
width: 800px;
}
.comparison th {
@ -56,18 +47,17 @@ body {
}
.contents {
font-size: smaller;
font-size: 90%;
margin: 0;
padding: 0;
padding-left: 10px;
padding-right: 10px;
line-height: 125%;
}
.contents ul {
list-style-type: none;
margin: 0;
padding-left: 10px;
padding-left: 20px;
}
.page {

8
extra/websites/concatenative/page.css
View File

@ -6,6 +6,10 @@ html {
box-sizing: inherit;
}
body {
margin: 0;
}
body, button {
font-size: 12pt;
font-family: sans-serif;
@ -31,6 +35,10 @@ a, .link { color: #104e8b; }
a:link, a:visited, a:active, .link { text-decoration: none; }
a:hover, .link:hover { text-decoration: underline; }
#container {
max-width: 1000px;
}
.error { color: #a00; }
.errors li { color: #a00; }

8
extra/websites/concatenative/page.xml
View File

@ -16,8 +16,12 @@
<t:write-atom />
</head>
<body>
<t:call-next-template />
<body>
<div id="container">
<t:call-next-template />
</div>
</body>
</t:chloe>