From f7915f13e21e83235b4edb9ec29cc2899850fbf3 Mon Sep 17 00:00:00 2001 From: Christian Franke Date: Sun, 14 Apr 2013 02:14:49 +0200 Subject: Update CSS for wiki --- public/css/sublab-2013031303.css | 444 -------------------------------------- public/css/sublab-2013041401.css | 449 +++++++++++++++++++++++++++++++++++++++ template/template/template.html | 2 +- 3 files changed, 450 insertions(+), 445 deletions(-) delete mode 100644 public/css/sublab-2013031303.css create mode 100644 public/css/sublab-2013041401.css diff --git a/public/css/sublab-2013031303.css b/public/css/sublab-2013031303.css deleted file mode 100644 index e45a435..0000000 --- a/public/css/sublab-2013031303.css +++ /dev/null @@ -1,444 +0,0 @@ -body { - font-family: Verdana, Helvetica, sans-serif; - font-size: 12px; - color: #ddd; - } - -iframe.youtube { - margin: 5px 15px 0px 15px; - width: 300px; - height: 235px; - border: 1px solid #444; - } - -iframe.osm { - margin: 5px 15px 0px 15px; - width: 500px; - height: 325px; - border: 1px solid #444; - scroll: no; - } - -body { - background: #000 url(../img/background.jpg) no-repeat fixed center center; - } - -div.frame { - border: 1px solid #aaa; - background-color: rgba(0, 0, 0, 0.75); - margin-left: auto; - margin-right: auto; - min-width: 700px; - max-width: 1500px; - position: relative; - } - -div.hiddenframe { - margin: 50px; - } - -div.logo { - float: left; - height: 150px; - width: 110px; - margin: 5px 5px 5px 5px; - border: 0px solid #222; - background: #000 url(../img/logo.png) no-repeat center center; - } - -div.image { - margin-top: 0px; - margin: 5px; - margin-left: 125px; - border: 1px solid #444; - height: 150px; - background: #000 url(../img/topimage.jpg) no-repeat left bottom; - } - -div.menu { - clear: both; - color: #fff; - border: 1px solid #444; - padding: 5px; - background-color: rgba(16, 16, 16, 0.5); - margin-left: 5px; - position: absolute; - top: 160px; - width: 100px; - min-height: 150px; - } - -div.content { - color: #fff; - border: 1px solid #444; - padding: 5px; - background-color: rgba(16, 16, 16, 0.5); - position: static; - margin: 0px 225px 5px 125px; - top: 160px; - min-height: 120px; - height: 100%; - } - -div.info { - color: #fff; - background-color: rgba(16, 16, 16, 0.5); - border: 1px solid #444; - padding: 5px; - margin-right: 5px; - margin-bottom: 5px; - width: 200px; - position: absolute; - right: 0px; - min-height: 200px; - } - -div.status { - width: 180px; - margin-left: 10px; - margin-right: 10px; - } - -div.footer { - clear: both; - background-color: rgba(16, 16, 16, 0.5); - color: #fff; - border: 1px solid #444; - padding: 5px; - margin: 5px; - text-align: center; - } - -.imagecontent { - clear: both; - float: right; - margin: 5px 10px 5px 10px; - width: 35%; - min-width: 150px; - } - -img { - border: 1px solid #444; - } - -img.webcam { - border: 1px solid #444; - width: 400px; - margin: 5px 5px 0px 15px; - } - -img.logo { - height: 140px; - width: auto; - border: 0px; - } - -img.webcamthumb { - margin: 10px; - border: 1px solid #444; - width: 180px; - height: auto; - } - -.contentimage { - width: 95%; - height: auto; - margin: 0px 5px 0px 5px; - border: 2px solid #444; - } - -img.bigimage { - width: 100%; - max-width: 640px; - margin-left: auto; - margin-right: auto; - display: block; - } - -.floatright { - float: right; - } - -.floatleft { - float: left; - } - -table { - width: 200px; - margin: auto; - } - -hr { - margin: 10px; - color: #ddd; - clear: both; - } - -#menu { - list-style: none; - margin: 5px; - padding: 0px; - } - -#menu a { - text-decoration: none; - font-weight: bold; - line-height: 15px; - border: 0px; - color: #ddd; - } - -#menu a:hover { - text-decoration: none; - font-weight: bold; - color: #fff; - } - -#menu a:active { - text-decoration: none; - font-weight: bold; - color: #bbb; - } - -h1 { - text-align: center; - visibility: hidden; - } - -h3 { - /*clear: both;*/ - font-size: 14px; - text-align: left; - color: #ddd; - line-height: 20px; - margin: 15px 10px 5px 10px; - } - -h4 { - line-height: 25px; - text-align: center; - color: #ddd; - margin-top: 5px; - } - -h2 { - font-size: 18px; - line-height: 40px; - margin-left: 10px; - color: #ddd; - } - -p { - margin: 5px 15px 5px 15px; - color: #ddd; - line-height: 20px; - } - -p.subtext { - color: #ddd; - line-height: 12px; - margin: 2px 5px 5px 15px; - } - -p.header { - text-align: right; - margin: 10px; - } - -span.header { - background-color: rgba(16, 16, 16, 0.75); - padding: 5px 10px 5px 10px; - } - -.statusinfo { - line-height: 20px; - } - -.status { - line-height: 20px; - margin-left: 10px; - margin-right: 10px; - } - -.member { - line-height: 20px; - font-weight: bold; - margin-left: 10px; - margin-right: 10px; - text-align: center; - } - -a { - text-decoration: none; - border-bottom: 1px dotted; - color: #ddd; - } - -a:hover { - text-decoration: none; - color: #fff; - } - -a:active { - text-decoration: none; - color: #bbb; - } - -a.img { - text-decoration: none; - border: 0px; - color: #ddd; - } - -a.img:hover { - text-decoration: none; - color: #bbb; - } - -a.img:active { - text-decoration: none; - color: #999; - } - -span.box { - border: 1px solid #222; - padding: 2px; - } - -.olFramedCloudPopupContent h2 { - color: #000000; - font-size: 14px; - } - -.olFramedCloudPopupContent p { - color: #000000; - font-size: 12px; - } - -.olFramedCloudPopupContent a { - color: #3333FF; - font-size: 14px; - } - -#mapdiv img { - border: 0px; - } - -/* These are for the wiki */ -div.page { - border: none; - margin: 0px; - margin-right: 1em; -} - -.actions ul { - text-align: right; - margin-top: -3px; -} -.actions li { - display: inline; - padding: 2px; - border-style: solid; - border-width: 1px; - border-top-width: 0px; - border-color: #444; - background-color: rgba(16,16,16,0.5); -} - -.actions a { - border-bottom: 0px; -} - -div.pageheader { - margin-left: 10px; -} - -div.pagedate { - text-align: right; -} - -span.title, span.parentlinks, .parentlinks a { - font-size: 18px; - font-weight: bold; - line-height: 40px; -} - -span.title:after { - content: " ]"; -} - -span.parentlinks:before { - content: "[ "; -} - -textarea, input, select { - background-color: #101010; -} - -div.recentchanges { - border-style: solid; - border-width: 1px; - overflow: auto; - width: auto; - clear: none; - background: #404040; -} -.recentchanges .metadata { - padding: 0px 0.5em; -} -.recentchanges .changelog { - font-style: italic; - clear: both; - display: block; - padding: 1px 2px; -} -.recentchanges .desc { - display: none; -} -.recentchanges .diff { - display: none; -} -.recentchanges .committer { - float: left; - margin: 0; - width: 40%; -} -.recentchanges .committype { - float: left; - margin: 0; - width: 5%; - font-size: small; -} -.recentchanges .changedate { - float: left; - margin: 0; - width: 35%; - font-size: small; -} -.recentchanges .pagelinks, -.recentchanges .revert { - float: right; - margin: 0; - width: 60%; -} - -li.menu { - padding: 0px; -} - -li { - padding: 5px; -} - -img.img { - clear: both; - float: right; - margin: 5px 10px 5px 10px; - width: 35%; - height: auto; - min-width: 150px; - } - -.pagefooter { - clear: both; -} diff --git a/public/css/sublab-2013041401.css b/public/css/sublab-2013041401.css new file mode 100644 index 0000000..2e8a190 --- /dev/null +++ b/public/css/sublab-2013041401.css @@ -0,0 +1,449 @@ +body { + font-family: Verdana, Helvetica, sans-serif; + font-size: 12px; + color: #ddd; + } + +iframe.youtube { + margin: 5px 15px 0px 15px; + width: 300px; + height: 235px; + border: 1px solid #444; + } + +iframe.osm { + margin: 5px 15px 0px 15px; + width: 500px; + height: 325px; + border: 1px solid #444; + scroll: no; + } + +body { + background: #000 url(../img/background.jpg) no-repeat fixed center center; + } + +div.frame { + border: 1px solid #aaa; + background-color: rgba(0, 0, 0, 0.75); + margin-left: auto; + margin-right: auto; + min-width: 700px; + max-width: 1500px; + position: relative; + } + +div.hiddenframe { + margin: 50px; + } + +div.logo { + float: left; + height: 150px; + width: 110px; + margin: 5px 5px 5px 5px; + border: 0px solid #222; + background: #000 url(../img/logo.png) no-repeat center center; + } + +div.image { + margin-top: 0px; + margin: 5px; + margin-left: 125px; + border: 1px solid #444; + height: 150px; + background: #000 url(../img/topimage.jpg) no-repeat left bottom; + } + +div.menu { + clear: both; + color: #fff; + border: 1px solid #444; + padding: 5px; + background-color: rgba(16, 16, 16, 0.5); + margin-left: 5px; + position: absolute; + top: 160px; + width: 100px; + min-height: 150px; + } + +div.content { + color: #fff; + border: 1px solid #444; + padding: 5px; + background-color: rgba(16, 16, 16, 0.5); + position: static; + margin: 0px 225px 5px 125px; + top: 160px; + min-height: 120px; + height: 100%; + } + +div.info { + color: #fff; + background-color: rgba(16, 16, 16, 0.5); + border: 1px solid #444; + padding: 5px; + margin-right: 5px; + margin-bottom: 5px; + width: 200px; + position: absolute; + right: 0px; + min-height: 200px; + } + +div.status { + width: 180px; + margin-left: 10px; + margin-right: 10px; + } + +div.footer { + clear: both; + background-color: rgba(16, 16, 16, 0.5); + color: #fff; + border: 1px solid #444; + padding: 5px; + margin: 5px; + text-align: center; + } + +.imagecontent { + clear: both; + float: right; + margin: 5px 10px 5px 10px; + width: 35%; + min-width: 150px; + } + +img { + border: 1px solid #444; + } + +img.webcam { + border: 1px solid #444; + width: 400px; + margin: 5px 5px 0px 15px; + } + +img.logo { + height: 140px; + width: auto; + border: 0px; + } + +img.webcamthumb { + margin: 10px; + border: 1px solid #444; + width: 180px; + height: auto; + } + +.contentimage { + width: 95%; + height: auto; + margin: 0px 5px 0px 5px; + border: 2px solid #444; + } + +img.bigimage { + width: 100%; + max-width: 640px; + margin-left: auto; + margin-right: auto; + display: block; + } + +.floatright { + float: right; + } + +.floatleft { + float: left; + } + +table { + width: 200px; + margin: auto; + } + +hr { + margin: 10px; + color: #ddd; + clear: both; + } + +#menu { + list-style: none; + margin: 5px; + padding: 0px; + } + +#menu a { + text-decoration: none; + font-weight: bold; + line-height: 15px; + border: 0px; + color: #ddd; + } + +#menu a:hover { + text-decoration: none; + font-weight: bold; + color: #fff; + } + +#menu a:active { + text-decoration: none; + font-weight: bold; + color: #bbb; + } + +h1 { + text-align: center; + visibility: hidden; + } + +h3 { + /*clear: both;*/ + font-size: 14px; + text-align: left; + color: #ddd; + line-height: 20px; + margin: 15px 10px 5px 10px; + } + +h4 { + line-height: 25px; + text-align: center; + color: #ddd; + margin-top: 5px; + } + +h2 { + font-size: 18px; + line-height: 40px; + margin-left: 10px; + color: #ddd; + } + +p { + margin: 5px 15px 5px 15px; + color: #ddd; + line-height: 20px; + } + +p.subtext { + color: #ddd; + line-height: 12px; + margin: 2px 5px 5px 15px; + } + +p.header { + text-align: right; + margin: 10px; + } + +span.header { + background-color: rgba(16, 16, 16, 0.75); + padding: 5px 10px 5px 10px; + } + +.statusinfo { + line-height: 20px; + } + +.status { + line-height: 20px; + margin-left: 10px; + margin-right: 10px; + } + +.member { + line-height: 20px; + font-weight: bold; + margin-left: 10px; + margin-right: 10px; + text-align: center; + } + +a { + text-decoration: none; + border-bottom: 1px dotted; + color: #ddd; + } + +a:hover { + text-decoration: none; + color: #fff; + } + +a:active { + text-decoration: none; + color: #bbb; + } + +a.img { + text-decoration: none; + border: 0px; + color: #ddd; + } + +a.img:hover { + text-decoration: none; + color: #bbb; + } + +a.img:active { + text-decoration: none; + color: #999; + } + +span.box { + border: 1px solid #222; + padding: 2px; + } + +.olFramedCloudPopupContent h2 { + color: #000000; + font-size: 14px; + } + +.olFramedCloudPopupContent p { + color: #000000; + font-size: 12px; + } + +.olFramedCloudPopupContent a { + color: #3333FF; + font-size: 14px; + } + +#mapdiv img { + border: 0px; + } + +/* These are for the wiki */ +div.page { + border: none; + margin: 0px; + margin-right: 1em; +} + +.actions ul { + text-align: right; + margin-top: -3px; +} +.actions li { + display: inline; + padding: 2px; + border-style: solid; + border-width: 1px; + border-top-width: 0px; + border-color: #444; + background-color: rgba(16,16,16,0.5); +} + +.actions a { + border-bottom: 0px; +} + +div.pageheader { + margin-left: 10px; +} + +div.pagedate { + text-align: right; +} + +span.title, span.parentlinks, .parentlinks a { + font-size: 18px; + font-weight: bold; + line-height: 40px; +} + +span.title:after { + content: " ]"; +} + +span.parentlinks:before { + content: "[ "; +} + +textarea, input, select { + background-color: #101010; + color: #eee; +} + +#editcontent { + width: 90%; +} + +div.recentchanges { + border-style: solid; + border-width: 1px; + overflow: auto; + width: auto; + clear: none; + background: #404040; +} +.recentchanges .metadata { + padding: 0px 0.5em; +} +.recentchanges .changelog { + font-style: italic; + clear: both; + display: block; + padding: 1px 2px; +} +.recentchanges .desc { + display: none; +} +.recentchanges .diff { + display: none; +} +.recentchanges .committer { + float: left; + margin: 0; + width: 40%; +} +.recentchanges .committype { + float: left; + margin: 0; + width: 5%; + font-size: small; +} +.recentchanges .changedate { + float: left; + margin: 0; + width: 35%; + font-size: small; +} +.recentchanges .pagelinks, +.recentchanges .revert { + float: right; + margin: 0; + width: 60%; +} + +li.menu { + padding: 0px; +} + +li { + padding: 5px; +} + +img.img { + clear: both; + float: right; + margin: 5px 10px 5px 10px; + width: 35%; + height: auto; + min-width: 150px; + } + +.pagefooter { + clear: both; +} diff --git a/template/template/template.html b/template/template/template.html index 350da80..d67cca5 100644 --- a/template/template/template.html +++ b/template/template/template.html @@ -15,7 +15,7 @@ - + -- cgit v1.2.1