Skip to content

Commit 4284540

Browse files
author
Jurian Sluiman
committed
Merge branch 'feature/assets-cdn-version'
2 parents f0e0d25 + ce97592 commit 4284540

1 file changed

Lines changed: 4 additions & 6 deletions

File tree

view/layout/admin.phtml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,12 @@
88
<?php echo $this->headMeta()->appendName('viewport', 'width=device-width, initial-scale=1.0') ?>
99

1010
<!-- Le styles -->
11-
<?php echo $this->headLink(array('rel' => 'shortcut icon', 'type' => 'image/vnd.microsoft.icon', 'href' => $this->basePath() . '/images/favicon.ico'))
12-
->prependStylesheet($this->basePath() . '/css/bootstrap-responsive.min.css')
13-
->prependStylesheet($this->basePath() . '/css/style.css')
14-
->prependStylesheet($this->basePath() . '/css/bootstrap.min.css') ?>
11+
<?php echo $this->headLink()->prependStylesheet('//netdna.bootstrapcdn.com/twitter-bootstrap/2.1.1/css/bootstrap-combined.min.css') ?>
1512

1613
<!-- Scripts -->
17-
<?php echo $this->headScript()->prependFile($this->basePath() . '/js/html5.js', 'text/javascript', array('conditional' => 'lt IE 9',))
18-
->prependFile($this->basePath() . '/js/jquery-1.7.2.min.js') ?>
14+
<?php echo $this->headScript()->prependFile('//html5shiv.googlecode.com/svn/trunk/html5.js', 'text/javascript', array('conditional' => 'lt IE 9',))
15+
->prependFile('//code.jquery.com/jquery.min.js')
16+
->prependFile('//netdna.bootstrapcdn.com/twitter-bootstrap/2.1.1/js/bootstrap.min.js') ?>
1917

2018
</head>
2119

0 commit comments

Comments
 (0)