Skip to content
Snippets Groups Projects
Commit 58cb683f authored by ands's avatar ands
Browse files

css aufgeteeilt und widget_light für listen und h1-überschriften angepasst

parent 9272c873
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
webroot/css/marvin.css 0 → 100644
+ 6
− 0
View file @ 58cb683f
body
{
background-color:#261C13;
font-family:Lucida Grande, Lucida Sans Unicode, Calibri, Arial, Helvetica, Sans, FreeSans, Jamrul, Garuda, Kalimati;
font-size:15pt;
}
webroot/css/widget.css
+ 1
− 66
View file @ 58cb683f
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 { .widget, .widget td, .widget div {
font-family:Lucida Grande, Lucida Sans Unicode, Calibri, Arial, Helvetica, Sans, FreeSans, Jamrul, Garuda, Kalimati; font-family: inherit;
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;
color:#000000; 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;
}
webroot/css/widget_dark.css 0 → 100644
+ 17
− 0
View file @ 58cb683f
.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;
}
webroot/css/widget_light.css 0 → 100644
+ 44
− 0
View file @ 58cb683f
.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;
}
webroot/index.php
+ 3
− 0
View file @ 58cb683f
<head> <head>
<title>Warpzone's Marvin</title> <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.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/jquery-1.4.4.js" type="text/javascript"></script>
<script src="js/marvin.js" type="text/javascript"></script> <script src="js/marvin.js" type="text/javascript"></script>
</head> </head>
......
webroot/widgets/TwitterWall/TwitterWall.php
+ 2
− 1
View file @ 58cb683f
...@@ -12,7 +12,8 @@ class TwitterWall implements iWidget ...@@ -12,7 +12,8 @@ class TwitterWall implements iWidget
public function giveOutput() public function giveOutput()
{ {
$widgetOutput = ' $widgetOutput = '<h1>#warpzone on Twitter:</h1>'."\n";
$widgetOutput .= '
<script src="widgets/TwitterWall/jquery.tweet.js" type="text/javascript"></script> <script src="widgets/TwitterWall/jquery.tweet.js" type="text/javascript"></script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment