Skip to content

Commit

Permalink
Release version 2.2
Browse files Browse the repository at this point in the history 
Updated Apple touch icons
Updated to Bootstrap 2.3.1
Fixed some errors in Joomla styles
Updated to jQuery 1.9.1
  • Loading branch information
@ivanramosnet
ivanramosnet committed Mar 7, 2013
1 parent 4f1525f commit 714de38
Show file tree
Hide file tree
Showing 14 changed files with 60 additions and 52 deletions.
Binary file modified apple-touch-icon-114x114-precomposed.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified apple-touch-icon-144x144-precomposed.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified apple-touch-icon-57x57-precomposed.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified apple-touch-icon-72x72-precomposed.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified apple-touch-icon-precomposed.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified apple-touch-icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions css/bootstrap-responsive.min.css
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions css/bootstrap.min.css
View file

Large diffs are not rendered by default.

25 changes: 12 additions & 13 deletions css/style.css
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/* CSS Document for Joomla styles 1.6.x / 1.7.x / 2.5.x */
/* CSS Document for Joomla styles 2.5 */

/* ==================================================================================
AUTHORS
The default Joomla CSS template was originally developed by Barrie North.
This document adjusted for Joomla 1.6 by C.R. van Oudheusden, Joomla-CSS.
For more information go to www.joomla-css.nl.
For more information go to www.joom-css.nl.
DISCLAIMER
While Joomla-CSS has taken the greatest care in preparing this document. No
Expand Down Expand Up @@ -45,7 +45,6 @@ ul.actions li.print-icon a:hover img {}
/* Email button */
ul.actions li.email-icon {}
ul.actions li.email-ico a {}
ul.actions li.email-ico a
ul.actions li.email-ico a img {}

/* Editor button */
Expand Down Expand Up @@ -615,14 +614,15 @@ div.contact div.contact-miscinfo div.jicons-icons img {}
div.contact div.contact-miscinfo div.jicons-icons div.contact-misc {}
div.contact div.contact-miscinfo div.jicons-icons div.contact-misc p {}


/* -------------
User profile
---------------- */

/* Login screen user */
div.login {}
div.login h1 {}
div.login form {}>
div.login form {}
div.login form fieldset {}
div.login form fieldset div.login-fields {}
div.login form fieldset div.login-fields label#username-lbl.required {}
Expand All @@ -631,7 +631,7 @@ div.login form fieldset div.login-fields input#username.validate-username.requir
div.login form fieldset div.login-fields label#password-lbl.required {}
div.login form fieldset div.login-fields label#password-lbl.required span.star {}
div.login form fieldset div.login-fields input#password.validate-password.required {}
div.login form fieldset div.login-fields button.button {}
div.login form fieldset button.button {}

/* Show User profile after logged in */
div.profile {}
Expand Down Expand Up @@ -724,7 +724,6 @@ div.profile-edit form#member-profile div a {}
User registration
-------------------- */
div.registration {}

div.registration form#member-registration {}
div.registration form#member-registration fieldset {}
div.registration form#member-registration fieldset legend {}
Expand Down Expand Up @@ -768,7 +767,7 @@ div.reset form#user-registration.form-validate fieldset {}
div.reset form#user-registration.form-validate fieldset dl {}
div.reset form#user-registration.form-validate fieldset dl dt {}
div.reset form#user-registration.form-validate fieldset dl dt label#jform_email-lbl.hasTip.required {}
div.reset form#user-registration.form-validate fieldset dl dt label#jform_email-lbl.hasTip.required span.star
div.reset form#user-registration.form-validate fieldset dl dt label#jform_email-lbl.hasTip.required span.star {}
div.reset form#user-registration.form-validate fieldset dl dt dd {}
div.reset form#user-registration.form-validate fieldset dl dt dd input#jform_email.validate-username.required {}
div.reset form#user-registration.form-validate div {}
Expand Down Expand Up @@ -816,7 +815,7 @@ div.newsfeed-category form#adminForm {}
div.newsfeed-category form#adminForm fieldset.filters legend.hidelabeltxt {}
div.newsfeed-category form#adminForm fieldset.filters div.display-limit {}
div.newsfeed-category form#adminForm fieldset.filters div.display-limit select#limit.inputbox {}
div.newsfeed-category form#adminForm fieldset.filters div.display-limit select#limit.inputbox option
div.newsfeed-category form#adminForm fieldset.filters div.display-limit select#limit.inputbox option {}

/* Table */
div.newsfeed-category form#adminForm table.category {}
Expand Down Expand Up @@ -928,7 +927,7 @@ div.weblink-category form#adminForm table.category {}
/* Table head */
div.weblink-category form#adminForm table.category thead {}
div.weblink-category form#adminForm table.category thead tr {}
div.weblink-category form#adminForm table.category thead tr th.title
div.weblink-category form#adminForm table.category thead tr th.title {}
div.weblink-category form#adminForm table.category thead tr th.title a {}

/* Table body */
Expand All @@ -952,8 +951,8 @@ div.contentpane iframe {}


/* ====================
Components & Modules
===================== */
Modules
======================= */

/* ---------------------------------------------------------
Breadcrumbs moduleclass suffix = _breadcrumbs
Expand Down Expand Up @@ -1024,7 +1023,7 @@ div.search form#searchForm fieldset.phrases div.ordering-box select#ordering opt

div.search form#searchForm fieldset.only {}
div.search form#searchForm fieldset.only legend {}
div.search form#searchForm fieldset.only label
div.search form#searchForm fieldset.only label {}
div.search form#searchForm fieldset.only input#area-categories {}
div.search form#searchForm fieldset.only input#area-contacts {}
div.search form#searchForm fieldset.only input#area-content {}
Expand Down Expand Up @@ -1183,7 +1182,7 @@ div.moduletable_banner div.bannergroup_banner div.bannerfooter {}

/* ----------------------------------------------------------
Module Archived articles moduleclass suffix = _archivelist
---------------------------------------------------------- */
------------------------------------------------------------ */
div.moduletable_archivelist {}
div.moduletable_archivelist h3 {}
div.moduletable_archivelist ul.archive-module_archivelist {}
Expand Down
Binary file modified favicon.ico
View file
Binary file not shown.
66 changes: 35 additions & 31 deletions index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* @package Joomla.Site
* @subpackage Templates.h5bptb
* @copyright Copyright (C) 2011 - 2012 Iván Ramos Jiménez. All rights reserved.
* @copyright Copyright (C) 2011 - 2013 Iván Ramos Jiménez. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*
*/
Expand Down Expand Up @@ -71,38 +71,42 @@
</header>
<div class="container">

<div class="row-fluid">
<div class="row">

<div class="span12" id="breadcrumbs">
<jdoc:include type="modules" name="position-2" style="none"/>
</div>
<div class="span12">

<div id="breadcrumbs">
<jdoc:include type="modules" name="position-2" style="none"/>
</div>

<div class="row-fluid">
<?php if($showLeftColumn) : ?>
<aside class="span3">
<jdoc:include type="modules" name="position-7" style="xhtml"/>
<jdoc:include type="modules" name="position-4" style="xhtml"/>
<jdoc:include type="modules" name="position-5" style="xhtml"/>
</aside>
<?php endif; ?>
<section class="<?php echo ($showNoColumns ? 'span12' : (($showLeftColumn==0 or $showRightColumn==0) ? 'span9':'span6')); ?>">
<?php if ($this->countModules('position-12')): ?>
<div id="top">
<jdoc:include type="modules" name="position-12"/>
<div class="row">
<?php if($showLeftColumn) : ?>
<aside class="span3">
<jdoc:include type="modules" name="position-7" style="xhtml"/>
<jdoc:include type="modules" name="position-4" style="xhtml"/>
<jdoc:include type="modules" name="position-5" style="xhtml"/>
</aside>
<?php endif; ?>
<section class="<?php echo ($showNoColumns ? 'span12' : (($showLeftColumn==0 or $showRightColumn==0) ? 'span9':'span6')); ?>">
<?php if ($this->countModules('position-12')): ?>
<div id="top">
<jdoc:include type="modules" name="position-12"/>
</div>
<?php endif; ?>
<div>
<jdoc:include type="message" />
<jdoc:include type="component" />
</div>
</section>
<?php if($showRightColumn) : ?>
<aside class="span3">
<jdoc:include type="modules" name="position-6" style="xhtml"/>
<jdoc:include type="modules" name="position-8" style="xhtml"/>
<jdoc:include type="modules" name="position-3" style="xhtml"/>
</aside>
<?php endif; ?>
<div>
<jdoc:include type="message" />
<jdoc:include type="component" />
</div>
</section>
<?php if($showRightColumn) : ?>
<aside class="span3">
<jdoc:include type="modules" name="position-6" style="xhtml"/>
<jdoc:include type="modules" name="position-8" style="xhtml"/>
<jdoc:include type="modules" name="position-3" style="xhtml"/>
</aside>
<?php endif; ?>
</div>

</div>

</div>
Expand Down Expand Up @@ -140,8 +144,8 @@

<jdoc:include type="modules" name="debug" />

<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="<?php echo $this->baseurl ?>/templates/<?php echo $this->template ?>/js/libs/jquery-1.8.3.min.js"><\/script>')</script>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="<?php echo $this->baseurl ?>/templates/<?php echo $this->template ?>/js/libs/jquery-1.9.1.min.js"><\/script>')</script>

<script src="<?php echo $this->baseurl ?>/templates/<?php echo $this->template ?>/js/libs/bootstrap/bootstrap.min.js"></script>

Expand Down
2 changes: 1 addition & 1 deletion js/libs/bootstrap/bootstrap.min.js
View file

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions js/libs/jquery-1.9.1.min.js
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions templateDetails.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<!DOCTYPE install PUBLIC "-//Joomla! 2.5//DTD template 1.0//EN" "http://www.joomla.org/xml/dtd/1.6/template-install.dtd">
<extension version="2.5" type="template" client="site">
<name>H5BPTB</name>
<creationDate>28 November 2012</creationDate>
<creationDate>7 March 2013</creationDate>
<author>Iván Ramos Jiménez</author>
<authorEmail>info@ivan.ramos.name</authorEmail>
<authorUrl>http://ivan.ramos.name</authorUrl>
<copyright>Copyright (C) 2012 Iván Ramos Jiménez. All rights reserved.</copyright>
<copyright>Copyright (C) 2013 Iván Ramos Jiménez. All rights reserved.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
<version>2.1</version>
<version>2.2</version>
<description>TPL_H5BPTB_XML_DESCRIPTION</description>

<files>
Expand Down

0 comments on commit 714de38

Please sign in to comment.