From 58cb683ffd6a67212665a6e8d3541ff2f0a4ca98 Mon Sep 17 00:00:00 2001
From: ands <ands@andspad.(none)>
Date: Sun, 5 Dec 2010 23:40:30 +0100
Subject: [PATCH] =?UTF-8?q?css=20aufgeteeilt=20und=20widget=5Flight=20f?=
=?UTF-8?q?=C3=BCr=20listen=20und=20h1-=C3=BCberschriften=20angepasst?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
webroot/css/marvin.css | 6 ++
webroot/css/widget.css | 67 +--------------------
webroot/css/widget_dark.css | 17 ++++++
webroot/css/widget_light.css | 44 ++++++++++++++
webroot/index.php | 3 +
webroot/widgets/TwitterWall/TwitterWall.php | 3 +-
6 files changed, 73 insertions(+), 67 deletions(-)
create mode 100644 webroot/css/marvin.css
create mode 100644 webroot/css/widget_dark.css
create mode 100644 webroot/css/widget_light.css
diff --git a/webroot/css/marvin.css b/webroot/css/marvin.css
new file mode 100644
index 0000000..427ed5b
--- /dev/null
+++ b/webroot/css/marvin.css
@@ -0,0 +1,6 @@
+body
+{
+ background-color:#261C13;
+ font-family:Lucida Grande, Lucida Sans Unicode, Calibri, Arial, Helvetica, Sans, FreeSans, Jamrul, Garuda, Kalimati;
+ font-size:15pt;
+}
diff --git a/webroot/css/widget.css b/webroot/css/widget.css
index bad45fa..30d6cc1 100644
--- a/webroot/css/widget.css
+++ b/webroot/css/widget.css
@@ -1,69 +1,4 @@
-body { background-color:#261C13; }
-
-li {
- overflow-x: hidden;
- overflow-y: auto;
- padding: 0.5em;
-}
-a,a:hover,a:visited,a:active {
- text-decoration:none;
- font-family: inherit;
- font-size: 1em;
- font-style: normal;
- color: #aaaaaa;
-}
-img { vertical-align: middle; }
-
-/*.tweet, .query {
- color: #085258;
- font-family: Georgia,serif;
- font-size: 120%;
-}
-.tweet_list {
- background-color: #8ADEE2;
- list-style-type: none;
- margin: 0;
- padding: 0;
-}
-.tweet_even {
- background-color: #91E5E7;
-}
-.tweet_avatar {
- float: left;
- padding-right: 0.5em;
-}*/
-
-/* widget */
.widget, .widget td, .widget div {
- font-family:Lucida Grande, Lucida Sans Unicode, Calibri, Arial, Helvetica, Sans, FreeSans, Jamrul, Garuda, Kalimati;
- font-size:16pt;
- color:#000000;
-}
-
-/* widget_light */
-.widget_light {
- border: 1px solid #F2EFE5;
- background-color:#75695E;
- font-family:Lucida Grande, Lucida Sans Unicode, Calibri, Arial, Helvetica, Sans, FreeSans, Jamrul, Garuda, Kalimati;
- font-size:16pt;
- color:#000000;
-}
-.widget_light td, .widget_light div {
- font-family:Lucida Grande, Lucida Sans Unicode, Calibri, Arial, Helvetica, Sans, FreeSans, Jamrul, Garuda, Kalimati;
- font-size:16pt;
+ font-family: inherit;
color:#000000;
}
-
-/* widget_dark */
-.widget_dark {
- border: 1px dashed #75695E;
- background-color:#362C23;
- font-family:Lucida Grande, Lucida Sans Unicode, Calibri, Arial, Helvetica, Sans, FreeSans, Jamrul, Garuda, Kalimati;
- font-size:16pt;
- color:#ffffff;
-}
-.widget_dark td, .widget_dark div {
- font-family:Lucida Grande, Lucida Sans Unicode, Calibri, Arial, Helvetica, Sans, FreeSans, Jamrul, Garuda, Kalimati;
- font-size:16pt;
- color:#ffffff;
-}
diff --git a/webroot/css/widget_dark.css b/webroot/css/widget_dark.css
new file mode 100644
index 0000000..032f046
--- /dev/null
+++ b/webroot/css/widget_dark.css
@@ -0,0 +1,17 @@
+.widget_dark {
+ border: 1px dashed #75695E;
+ background-color:#362C23;
+ font-family: inherit;
+ color:#ffffff;
+}
+.widget_dark td, .widget_dark div {
+ font-family: inherit;
+ color:#ffffff;
+}
+.widget_dark a, .widget_dark a:hover, .widget_dark a:visited, .widget_dark a:active {
+ text-decoration:none;
+ font-family: inherit;
+ font-size: 1em;
+ font-style: normal;
+ color: #aaaaaa;
+}
diff --git a/webroot/css/widget_light.css b/webroot/css/widget_light.css
new file mode 100644
index 0000000..0436fb0
--- /dev/null
+++ b/webroot/css/widget_light.css
@@ -0,0 +1,44 @@
+.widget_light {
+ border: 1px solid #F2EFE5;
+ background-color:#75695E;
+ font-family: inherit;
+ color:#000000;
+}
+.widget_light td, .widget_light div {
+ font-family: inherit;
+ color:#000000;
+}
+.widget_light h1 {
+ margin: 10;
+ padding: 0;
+ font-family: inherit;
+ font-size: 1.0em;
+}
+.widget_light ul {
+ background-color:#95897E;
+ margin: 10;
+ padding: 0;
+ list-style: none;
+ border-top: 1px dashed #F2EFE5;
+}
+.widget_light li {
+ background-color:#95897E;
+ float: left;
+ border-bottom: 1px dashed #F2EFE5;
+ border-left: 1px dashed #F2EFE5;
+ border-right: 1px dashed #F2EFE5;
+}
+.widget_light li img {
+ padding: 4;
+}
+.widget_light a, .widget_light a:hover, .widget_light a:visited, .widget_light a:active {
+ text-decoration:none;
+ font-family: inherit;
+ font-size: 1em;
+ font-style: normal;
+ color: #333333;
+}
+.widget_light img
+{
+ float:left;
+}
diff --git a/webroot/index.php b/webroot/index.php
index cb192f0..f42c385 100644
--- a/webroot/index.php
+++ b/webroot/index.php
@@ -1,6 +1,9 @@
<head>
<title>Warpzone's Marvin</title>
+ <link rel="stylesheet" type="text/css" href="css/marvin.css" />
<link rel="stylesheet" type="text/css" href="css/widget.css" />
+ <link rel="stylesheet" type="text/css" href="css/widget_light.css" />
+ <link rel="stylesheet" type="text/css" href="css/widget_dark.css" />
<script src="js/jquery-1.4.4.js" type="text/javascript"></script>
<script src="js/marvin.js" type="text/javascript"></script>
</head>
diff --git a/webroot/widgets/TwitterWall/TwitterWall.php b/webroot/widgets/TwitterWall/TwitterWall.php
index 73de279..20f0ebc 100644
--- a/webroot/widgets/TwitterWall/TwitterWall.php
+++ b/webroot/widgets/TwitterWall/TwitterWall.php
@@ -12,7 +12,8 @@ class TwitterWall implements iWidget
public function giveOutput()
{
- $widgetOutput = '
+ $widgetOutput = '<h1>#warpzone on Twitter:</h1>'."\n";
+ $widgetOutput .= '
<script src="widgets/TwitterWall/jquery.tweet.js" type="text/javascript"></script>
<script type="text/javascript">
$(document).ready(function(){
--
GitLab