From c6c9f7d56b2c52b5349b8db0b9c8257bc32b0a9d Mon Sep 17 00:00:00 2001 From: Benjamin Kiessling Date: Mon, 10 Oct 2011 20:24:22 +0200 Subject: Move sublab.css to sublab-new.css to fix caching problems --- public/css/sublab-new.css | 282 ++++++++++++++++++++++++++++++++++++++++ public/css/sublab.css | 282 ---------------------------------------- template/template/template.html | 2 +- 3 files changed, 283 insertions(+), 283 deletions(-) create mode 100644 public/css/sublab-new.css delete mode 100644 public/css/sublab.css diff --git a/public/css/sublab-new.css b/public/css/sublab-new.css new file mode 100644 index 0000000..e4aa7d8 --- /dev/null +++ b/public/css/sublab-new.css @@ -0,0 +1,282 @@ +* { + padding: 0px; + margin: 0px; + 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; + } + +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; + float: left; + width: 100px; + min-height: 150px; + } + +div.content { + color: #fff; + border: 1px solid #444; + padding: 5px; + background-color: rgba(16, 16, 16, 0.5); + margin: 5px; + margin-top: 0px; + margin-left: 125px; + margin-right: 225px; + min-height: 120px; + } + +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; + min-height: 200px; + float: right; + } + +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; + } + +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; + } + +img.contentimage { + float: right; + width: 225px; + height: auto; + margin: 10px 15px 10px 10px; + border: 1px 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; + } + +ul#menu { + list-style: none; + margin: 5px; + } + +ul#menu a { + text-decoration: none; + font-weight: bold; + line-height: 15px; + border: 0px; + color: #ddd; + } + +ul#menu a:hover { + text-decoration: none; + font-weight: bold; + color: #fff; + } + +ul#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.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; + } + +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 { + border: 1px solid #222; + padding: 2px; + } diff --git a/public/css/sublab.css b/public/css/sublab.css deleted file mode 100644 index e4aa7d8..0000000 --- a/public/css/sublab.css +++ /dev/null @@ -1,282 +0,0 @@ -* { - padding: 0px; - margin: 0px; - 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; - } - -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; - float: left; - width: 100px; - min-height: 150px; - } - -div.content { - color: #fff; - border: 1px solid #444; - padding: 5px; - background-color: rgba(16, 16, 16, 0.5); - margin: 5px; - margin-top: 0px; - margin-left: 125px; - margin-right: 225px; - min-height: 120px; - } - -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; - min-height: 200px; - float: right; - } - -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; - } - -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; - } - -img.contentimage { - float: right; - width: 225px; - height: auto; - margin: 10px 15px 10px 10px; - border: 1px 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; - } - -ul#menu { - list-style: none; - margin: 5px; - } - -ul#menu a { - text-decoration: none; - font-weight: bold; - line-height: 15px; - border: 0px; - color: #ddd; - } - -ul#menu a:hover { - text-decoration: none; - font-weight: bold; - color: #fff; - } - -ul#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.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; - } - -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 { - border: 1px solid #222; - padding: 2px; - } diff --git a/template/template/template.html b/template/template/template.html index 2a0270c..ca24df8 100644 --- a/template/template/template.html +++ b/template/template/template.html @@ -17,7 +17,7 @@ - + -- cgit v1.2.1