diff --git a/extra/webapps/blogs/blogs-common.xml b/extra/webapps/blogs/blogs-common.xml index e809c0e7f5..8d13075864 100644 --- a/extra/webapps/blogs/blogs-common.xml +++ b/extra/webapps/blogs/blogs-common.xml @@ -8,17 +8,17 @@
- All Posts - | My Posts - | New Post + All Posts + My Posts + New Post - | Edit Profile + Edit Profile - | Logout + Logout diff --git a/extra/webapps/pastebin/pastebin-common.xml b/extra/webapps/pastebin/pastebin-common.xml index 6d524ad86f..cadecc39c7 100644 --- a/extra/webapps/pastebin/pastebin-common.xml +++ b/extra/webapps/pastebin/pastebin-common.xml @@ -8,16 +8,16 @@
- Pastes - | New Paste + Pastes + New Paste - | Edit Profile + Edit Profile - | Logout + Logout diff --git a/extra/webapps/planet/planet-common.xml b/extra/webapps/planet/planet-common.xml index 486d5cc1ed..239c9571a5 100644 --- a/extra/webapps/planet/planet-common.xml +++ b/extra/webapps/planet/planet-common.xml @@ -5,16 +5,16 @@
- Front Page - | Atom Feed - | Admin + Front Page + Atom Feed + Admin - | Edit Profile + Edit Profile - | Logout + Logout
diff --git a/extra/webapps/todo/todo.xml b/extra/webapps/todo/todo.xml index 146e8258ff..0630cf79c7 100644 --- a/extra/webapps/todo/todo.xml +++ b/extra/webapps/todo/todo.xml @@ -11,14 +11,14 @@
- List Items - | Add Item + List Items + Add Item - | Edit Profile + Edit Profile - | Logout + Logout

diff --git a/extra/webapps/user-admin/user-admin.xml b/extra/webapps/user-admin/user-admin.xml index 2141fdc1d9..1144f8eec6 100644 --- a/extra/webapps/user-admin/user-admin.xml +++ b/extra/webapps/user-admin/user-admin.xml @@ -3,14 +3,14 @@
- List Users - | Add User + List Users + Add User - | Edit Profile + Edit Profile - | Logout + Logout

diff --git a/extra/webapps/wiki/page-common.xml b/extra/webapps/wiki/page-common.xml index 299e480534..a5de847771 100644 --- a/extra/webapps/wiki/page-common.xml +++ b/extra/webapps/wiki/page-common.xml @@ -10,9 +10,9 @@
Latest - | Revisions - | Edit - | Delete + Revisions + Edit + Delete
diff --git a/extra/webapps/wiki/wiki-common.xml b/extra/webapps/wiki/wiki-common.xml index bd2b897c0e..03f5f7bc30 100644 --- a/extra/webapps/wiki/wiki-common.xml +++ b/extra/webapps/wiki/wiki-common.xml @@ -8,61 +8,68 @@ - - - - - +
-
- + - - - - - -
-
- -

- - - -

+
- - -
-
+ -
+ +
+ +

+ + + +

- Front Page - | All Articles - | Recent Changes - | Random Article + + +
+ - +
- - | Edit Profile - +
- - - -
+
+ +
+

+ + + +
+ + +
+ + + +
+ + +
+ + + + diff --git a/extra/webapps/wiki/wiki.css b/extra/webapps/wiki/wiki.css index 4ecc6e5282..4ed03ce3be 100644 --- 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 dc0c57b7d5..9eb41b0f51 100644 --- 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%; +} + +textarea { + font-size: 12pt; +} + +table { + border-spacing: 0; + border-collapse: collapse; } .link-button { - padding: 0px; - background: none; - border: none; + padding: 0; + background: none; + border: none; } -a:link, a:visited, .link { - color: #222; - border-bottom:1px dotted #666; - text-decoration:none; -} - -a:hover, .link:hover { - border-bottom:1px solid #66a; -} +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; +} + +.navbar a, .navbar .link { + margin-right: 10px; } .big-field-label { - vertical-align: top; -} - -.description { - padding: 5px; - color: #000; + 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; } -