kolab.org/www
Torsten Grote
grote at kolabsys.com
Mon Jul 30 17:50:00 CEST 2012
kolab.org/www/drupal-7.14/sites/all/themes/kolab/css/custom.css | 15 +-
kolab.org/www/drupal-7.14/sites/all/themes/kolab/html.tpl.php | 59 ----------
kolab.org/www/drupal-7.14/sites/all/themes/kolab/page.tpl.php | 4
3 files changed, 9 insertions(+), 69 deletions(-)
New commits:
commit c30f6d8dde53018cd66a7420cb788919cf2f0db5
Author: Torsten Grote <grote at kolabsys.com>
Date: Mon Jul 30 17:49:47 2012 +0200
fixed some theme upgrade issues
diff --git a/kolab.org/www/drupal-7.14/sites/all/themes/kolab/css/custom.css b/kolab.org/www/drupal-7.14/sites/all/themes/kolab/css/custom.css
index 31cb3a4..49876ca 100644
--- a/kolab.org/www/drupal-7.14/sites/all/themes/kolab/css/custom.css
+++ b/kolab.org/www/drupal-7.14/sites/all/themes/kolab/css/custom.css
@@ -2,8 +2,9 @@ html {
background: #E7E7E7;
}
-body#main-body {
+body {
background: #FFFFFF url(../images/body.jpg) repeat-x top left;
+ text-align:center;
}
#header-region {
@@ -202,10 +203,10 @@ pre, code, tt {
color: #939393;
}
-#block-blog-0,
+#block-blog-recent,
#block-views-tweets-block,
#block-views-e292f6bc64606ed15c348fcee13486f4,
-#block-views-tweets_new_view-block_1 {
+#block-views-tweets-new-view-block-1 {
width: 375px;
display: inline;
float: left;
@@ -213,15 +214,15 @@ pre, code, tt {
}
#block-views-tweets-block,
-#block-blog-0,
-#block-views-tweets_new_view-block_1 {
+#block-blog-recent,
+#block-views-tweets-new-view-block-1 {
padding-right: 20px;
}
-#block-blog-0 h2,
+#block-blog-recent h2,
#block-views-tweets-block h2,
#block-views-e292f6bc64606ed15c348fcee13486f4 h2,
-#block-views-tweets_new_view-block_1 h2 {
+#block-views-tweets-new-view-block-1 h2 {
font-size: 14px;
font-weight: bold;
margin: 0 0 3 0;
diff --git a/kolab.org/www/drupal-7.14/sites/all/themes/kolab/html.tpl.php b/kolab.org/www/drupal-7.14/sites/all/themes/kolab/html.tpl.php
deleted file mode 100644
index d0cc8ba..0000000
--- a/kolab.org/www/drupal-7.14/sites/all/themes/kolab/html.tpl.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/**
- * @file
- * Default theme implementation to display the basic html structure of a single
- * Drupal page.
- *
- * Variables:
- * - $css: An array of CSS files for the current page.
- * - $language: (object) The language the site is being displayed in.
- * $language->language contains its textual representation.
- * $language->dir contains the language direction. It will either be 'ltr' or 'rtl'.
- * - $rdf_namespaces: All the RDF namespace prefixes used in the HTML document.
- * - $grddl_profile: A GRDDL profile allowing agents to extract the RDF data.
- * - $head_title: A modified version of the page title, for use in the TITLE
- * tag.
- * - $head_title_array: (array) An associative array containing the string parts
- * that were used to generate the $head_title variable, already prepared to be
- * output as TITLE tag. The key/value pairs may contain one or more of the
- * following, depending on conditions:
- * - title: The title of the current page, if any.
- * - name: The name of the site.
- * - slogan: The slogan of the site, if any, and if there is no title.
- * - $head: Markup for the HEAD section (including meta tags, keyword tags, and
- * so on).
- * - $styles: Style tags necessary to import all CSS files for the page.
- * - $scripts: Script tags necessary to load the JavaScript files and settings
- * for the page.
- * - $page_top: Initial markup from any modules that have altered the
- * page. This variable should always be output first, before all other dynamic
- * content.
- * - $page: The rendered page content.
- * - $page_bottom: Final closing markup from any modules that have altered the
- * page. This variable should always be output last, after all other dynamic
- * content.
- * - $classes String of classes that can be used to style contextually through
- * CSS.
- *
- * @see template_preprocess()
- * @see template_preprocess_html()
- * @see template_process()
- */
-?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN"
- "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">
-<html xmlns:og="http://opengraphprotocol.org/schema/" xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php print $language->language; ?>" version="XHTML+RDFa 1.0" dir="<?php print $language->dir; ?>"<?php print $rdf_namespaces; ?>>
-
-<head profile="<?php print $grddl_profile; ?>">
- <?php print $head; ?>
- <title><?php print $head_title; ?></title>
- <?php print $styles; ?>
- <?php print $scripts; ?>
- <link href="http://fonts.googleapis.com/css?family=Yanone+Kaffeesatz" rel="stylesheet" type="text/css" />
-</head>
-<body id="main-body" class="<?php print $classes; ?>" <?php print $attributes;?>>
- <?php print $page_top; ?>
- <?php print $page; ?>
- <?php print $page_bottom; ?>
-</body>
-</html>
\ No newline at end of file
diff --git a/kolab.org/www/drupal-7.14/sites/all/themes/kolab/page.tpl.php b/kolab.org/www/drupal-7.14/sites/all/themes/kolab/page.tpl.php
index 754d4bf..7b777fc 100644
--- a/kolab.org/www/drupal-7.14/sites/all/themes/kolab/page.tpl.php
+++ b/kolab.org/www/drupal-7.14/sites/all/themes/kolab/page.tpl.php
@@ -35,12 +35,10 @@
'links' => $main_menu,
'attributes' => array(
'id' => 'navlist',
- 'class' => array('links', 'inline', 'clearfix'),
),
'heading' => array(
'text' => t('Main menu'),
'level' => 'h2',
- 'class' => array('element-invisible'),
),
)); ?>
<?php print theme('links__system_secondary_menu', array(
@@ -81,4 +79,4 @@
</div>
</div>
</div>
-</div>
\ No newline at end of file
+</div>
More information about the commits
mailing list