1
0
mirror of https://github.com/Hutchy68/pivot.git synced 2024-11-21 18:09:03 +01:00

fixes for develop branch

This commit is contained in:
MW install maintain even with core development 2018-02-08 15:01:57 -05:00
parent db642cbb53
commit 25db636961
3 changed files with 7 additions and 4 deletions

View File

@ -35,8 +35,10 @@ class SkinPivot extends SkinTemplate {
} }
} }
$out->addModuleStyles('skins.pivot.styles'); $out->addModuleStyles('skins.pivot.styles');
$viewport_meta = 'width=device-width, user-scalable=yes, initial-scale=1.0';
$out->addMeta('viewport', $viewport_meta);
$out->addModuleScripts('skins.pivot.js'); $out->addModuleScripts('skins.pivot.js');
$out->addHeadItem('font', '<link rel="preload" href="/skins/pivot/assets/fonts/fontawesome-webfont.woff2?v=4.7.0" as="font" type="font/woff2" crossorigin="anonymous" />'); $out->addHeadItem('font', '<link rel="preload" href="/w/skins/pivot/assets/fonts/fontawesome-webfont.woff2?v=4.7.0" as="font" type="font/woff2" crossorigin="anonymous" />');
} }
@ -300,4 +302,4 @@ class pivotTemplate extends BaseTemplate {
foreach ($toolbox as $key => $tbitem) { echo $this->makeListItem($key, $tbitem); } foreach ($toolbox as $key => $tbitem) { echo $this->makeListItem($key, $tbitem); }
} }
} }
?> ?>

View File

@ -1,6 +1,7 @@
.side-nav li a:before, .side-nav li a:before,
#drop1 li a:before, #drop1 li a:before,
.right-off-canvas-menu li a:before { .right-off-canvas-menu li a:before,
.left-off-canvas-menu li a:before {
font: normal normal normal 14px/1 FontAwesome; font: normal normal normal 14px/1 FontAwesome;
font-size: inherit; font-size: inherit;
text-rendering: auto; text-rendering: auto;

View File

@ -25,7 +25,7 @@
"position": "top", "position": "top",
"styles": [ "styles": [
"assets/stylesheets/normalize.css", "assets/stylesheets/normalize.css",
"assets/stylesheets/font-awesome.min.css", "assets/stylesheets/font-awesome.css",
"assets/stylesheets/foundation.css", "assets/stylesheets/foundation.css",
"assets/stylesheets/pivot.css", "assets/stylesheets/pivot.css",
"assets/stylesheets/fontawsome.css", "assets/stylesheets/fontawsome.css",