Skip to content

Commit e735aa5

Browse files
1.1.1 Updates
1 parent 068b207 commit e735aa5

File tree

16 files changed

+9532
-566
lines changed

16 files changed

+9532
-566
lines changed

astroid/astroid-template-zero/component.php

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@
66
* @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
77
* @license GNU General Public License version 2 or later; see LICENSE.txt
88
*/
9-
109
defined('_JEXEC') or die;
1110

1211
/** @var JDocumentHtml $this */
13-
14-
$app = JFactory::getApplication();
12+
$app = JFactory::getApplication();
1513
$lang = JFactory::getLanguage();
1614

1715
// Output as HTML5
@@ -24,36 +22,27 @@
2422
JHtml::_('behavior.polyfill', array('filter'), 'lte IE 9');
2523

2624
// Add template js
27-
JHtml::_('script', 'template.js', array('version' => 'auto', 'relative' => true));
25+
JHtml::_('script', 'isis.js', array('version' => 'auto', 'relative' => true));
2826

2927
// Add html5 shiv
3028
JHtml::_('script', 'jui/html5.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
3129

3230
// Add Stylesheets
33-
JHtml::_('stylesheet', 'administrator/templates/isis/css/template' . ($this->direction === 'rtl' ? '-rtl' : '') . '.css', array('version' => 'auto'));
31+
JHtml::_('stylesheet', 'isis/isis.css', array('version' => 'auto', 'relative' => true));
3432

3533
// Load optional RTL Bootstrap CSS
3634
JHtml::_('bootstrap.loadCss', false, $this->direction);
3735

3836
// Load specific language related CSS
3937
JHtml::_('stylesheet', 'administrator/language/' . $lang->getTag() . '/' . $lang->getTag() . '.css', array('version' => 'auto'));
40-
41-
// Load custom.css
42-
JHtml::_('stylesheet', 'custom.css', array('version' => 'auto', 'relative' => true));
43-
44-
// Link color
45-
if ($this->params->get('linkColor'))
46-
{
47-
$this->addStyleDeclaration('a { color: ' . $this->params->get('linkColor') . '; }');
48-
}
4938
?>
5039
<!DOCTYPE html>
5140
<html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
52-
<head>
53-
<jdoc:include type="head" />
41+
<head>
42+
<jdoc:include type="head" />
5443
</head>
5544
<body class="contentpane component">
56-
<jdoc:include type="message" />
57-
<jdoc:include type="component" />
45+
<jdoc:include type="message" />
46+
<jdoc:include type="component" />
5847
</body>
5948
</html>

0 commit comments

Comments
 (0)