[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: www/sites/discover
From: Sebastian Kügler <sebas () kde ! nl>
Date: 2007-11-26 21:29:38
Message-ID: 1196112578.728500.13651.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 741985 by sebas:
Remove lots of unneeded functions from css.php file. Clean up other bits as well, \
some tweaking of the CSS.
D content.php
M +26 -128 css-kde.php
M +1 -0 include/footer.php
M +11 -1 include/header.php
M +0 -2 learn.php
M +1 -0 menu.php
--- trunk/www/sites/discover/css-kde.php #741984:741985
@@ -23,11 +23,9 @@
body {
margin: 0;
padding: 0;
- text-align: left;
font-size: 0.8em;
font-family: "Bitstream Vera Sans", "Lucida Grande", "Trebuchet MS", sans-serif;
- <?php color ( $white )?>
- <?php background ( $white )?>
+ color: <?php print $white; ?>;
}
@@ -40,9 +38,9 @@
padding: 0;
text-align: left;
font-weight: bold;
- <?php color ( $white )?>
- <?php background ('transparent')?>
+ color: <?php print $white; ?>;
}
+
h1 {
margin: 0 0.4em 0.3em 0.4em;
font-size: 2em;
@@ -73,13 +71,13 @@
color: <?php print $white ?>;
padding-bottom: 0;
text-decoration: none;
- <?php linkcolor ( $white )?>
+ color: <?php print $white; ?>;
}
a:visited {
padding-bottom: 0;
text-decoration: none;
- <?php linkcolor ( $grey_d )?>
+ color: <?php print $grey_d; ?>;
}
@@ -90,7 +88,7 @@
hr {
margin: 0.3em 1em 0.3em 1em;
height: 1px;
- <?php border ( $grey_d, 'dashed')?>
+ border: <?php print $grey_d; ?> dashed;
border-width: 0 0 1px 0;
}
@@ -99,10 +97,9 @@
margin: 0.5em 0 0.5em 0;
padding: 0.3em;
font-size: 0.8em;
- <?php color ( $white)?>
- <?php background ( $dark_grey )?>
- <?php border( $white, 'dashed' )?>
- border-width: 1px;
+ color: <?php print $white; ?>;
+ background: <?php print $dark_grey; ?>;
+ border: 1px <?php print $white?> dashed;
overflow: auto;
line-height: 1.1em;
}
@@ -110,15 +107,14 @@
input, textarea, select {
margin: 0.2em;
padding: 0.1em;
- <?php color ( $mid_grey )?>
- <?php background ( $white )?>
+ color: <?php print $mid_grey; ?>;
+ background: <?php print $white; ?>;
border: 1px solid;
}
blockquote {
margin: 0.3em;
padding-left: 2.5em;
- <?php background ('transparent')?>
}
p {
@@ -127,7 +123,7 @@
text-align: justify;
}
fieldset {
- <?php border ( $grey_c, '1px solid')?>
+ border: <?php print $grey_c;?> 1px solid;
}
li {
@@ -148,9 +144,9 @@
hr {
height: 1px;
- <?php border ( $mid_grey, '1px solid')?>
- <?php background ( $mid_grey )?>
- margin: 0.5em 0 0.5em 0 ;
+ border: <?php print $mid_grey; ?> 1px solid;
+ background: <?php print $mid_grey; ?>;
+ margin: 0.5em 0 0.5em 0;
}
img {
@@ -170,25 +166,16 @@
th {
text-align: left;
padding-right: 1em;
- <?php border ( $grey_c, 'solid')?>
+ border: <?php print $grey_c; ?> solid;
border-width: 0 0 3px 0;
}
-
-
/*
** Content
*/
-
-/*Start of our Overrides or whatnot */
-
-/*
-** Content
-*/
body {
background: <?php print $dark_blue; ?>;
- /*url(images/gradient.png) top left #76B652 repeat-x;*/
}
#body_wrapper {
@@ -196,7 +183,7 @@
padding: 1em 0 5em 0;
}
#content {
- <?php width ('100%')?>
+ width: 100%;
}
#mainTop div {
@@ -227,14 +214,13 @@
margin: 0 0 0 0;
background: url(/images/mainMiddle.png)center repeat-y;
min-height: 600px;
- /*max-height: 400px;*/
}
-#mainBottom div{
- margin-right: 40px ;
- padding-top: 5px;
+#mainBottom div {
+ margin-right: 40px;
+ padding-top: 15px;
text-align: right;
- font-size: 1.9em;
+ font-size: 1.2em;
font-weight: bold;
}
@@ -243,8 +229,7 @@
height: 73px;
}
-#main
-{
+#main {
text-align: center;
margin: 0 auto;
position: absolute;
@@ -252,8 +237,7 @@
top: 4px;
}
-#main div.main
-{
+#main div.main {
text-align: left;
color: white;
margin: 0 auto;
@@ -269,15 +253,10 @@
padding-left: 10px;
padding-right: 10px;
}
-#leftarrow, #rightarrow {
- position: relative;
- width: 55px;
- height: 83px;
- top: 15px;
-}
-/* MenuNav Bar Section */
+/* MenuBar Section */
+
#menuBar {
position: absolute;
left: 0px;
@@ -299,11 +278,7 @@
a.menuitem:hover {
text-decoration: none;
}
-/*
-tr.menuitem {
- background: <?php print $dark_grey; ?>;
-}
-*/
+
td.menuitem {
text-align: left;
}
@@ -326,80 +301,3 @@
padding: 10px;
}
-
-<?php
-
-if (isset ($_GET ['css-inc']) && file_exists ($_SERVER ['DOCUMENT_ROOT'].$_GET \
['css-inc'].'/css.inc'))
- include $_SERVER ['DOCUMENT_ROOT'].$_GET ['css-inc'].'/css.inc';
-
-function color ($color) {
- if (! isset ($_GET ['color']))
- echo "color: ".$color.";\n";
- elseif ($_GET ['color'])
- echo "color: ".$_GET ['color'].";\n";
- else
- echo "color: WindowText;\n";
-}
-
-function background ($background, $color = false) {
- if (! isset ($_GET ['background'])) {
- echo "background: ".$background.";\n";
- if ($color)
- echo "background-color: ".$color.";\n";
- }
- elseif ($_GET ['background'])
- echo "background-color: ".$_GET ['background'].";\n";
- else
- echo "background: Window;\n";
-}
-
-function border ($color, $other = '') {
- if (! isset ($_GET ['color']))
- echo "border: ".$color." ".$other.";\n";
- else
- echo "border: ".$_GET ['color']." ".$other.";\n";
-}
-
-function linkcolor ($color) {
- if (! isset ($_GET ['link']))
- echo "color: ".$color.";\n";
- elseif ($_GET ['link'])
- echo "color: ".$_GET ['link'].";\n";
-}
-
-function noprint () {
- if (isset ($_GET ['mode']) && $_GET ['mode'] == "print")
- echo "display: none;\n";
-}
-
-function noflat () {
- if (isset ($_GET ['mode']) && $_GET ['mode'] == "flat")
- echo "display: none;\n";
-}
-
-function float ($float) {
- if (! isset ($_GET ['mode']) || $_GET ['mode'] != "flat")
- echo "float: ".$float.";\n";
-}
-
-function width ($width) {
- if (! isset ($_GET ['mode']) || $_GET ['mode'] == "normal")
- echo "width: ".$width.";\n";
-}
-
-function minWidth ($minwidth) {
- if (! isset ($_GET ['mode']) || $_GET ['mode'] == "normal")
- echo "min-width: ".$minwidth.";\n";
-}
-
-function maxWidth ($maxwidth) {
- if (! isset ($_GET ['mode']) || $_GET ['mode'] == "normal")
- echo "max-width: ".$maxwidth.";\n";
-}
-
-function minHeight ($minHeight) {
- if (! isset ($_GET ['mode']) || $_GET ['mode'] == "normal")
- echo "min-height: ".$minHeight.";\n";
-}
-
-?>
--- trunk/www/sites/discover/include/footer.php #741984:741985
@@ -1,3 +1,4 @@
+<br /><br /><br />
</div>
</div>
<div class="main" id="mainBottom">
--- trunk/www/sites/discover/include/header.php #741984:741985
@@ -45,7 +45,17 @@
</div>
<div id="main">
<div class="main" id="mainTop">
- <div id="<?php print $category ?>" style="position: relative; left: 50px; top: \
40px; width: 600px; height: 10px; border: 0px solid <?php print $white; ?>; \
background: <?php print $c[$category]; ?>;z-index: 110; text-align: right;" > \
+ <div id="<?php print $category ?>" + style="position: relative;
+ left: 50px;
+ top: 40px;
+ width: 600px;
+ height: 10px;
+ margin-right: 0px;
+ border: 0px solid <?php print $white; ?>;
+ background: <?php print $c[$category]; ?>;
+ z-index: 110;
+ text-align: right;" >
<?php print icon($category, 48); ?>
</div>
</div>
--- trunk/www/sites/discover/learn.php #741984:741985
@@ -18,8 +18,6 @@
-->
<h2>Learn and educate</h2>
-
-<img src="images/learn.png" style="float:right;" />
<p>
KDE has plenty of applications that make it the perfect software package for \
computers in schools and computers that are used for learning and training various \
skills.
--- trunk/www/sites/discover/menu.php #741984:741985
@@ -1,5 +1,6 @@
<?php
require_once('include/colors.php');
+require_once('include/functions.php');
function menuItem($name, $url, $icon=false) {
if ($icons) {
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic