From: naoki hirata Date: Tue, 18 Mar 2014 02:01:26 +0000 (+0900) Subject: Bootstrap型テンプレート「bootstrap_yeti」修正。 X-Git-Tag: v2.8.11 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=refs%2Ftags%2Fv2.8.11;p=magic3%2Fmagic3.git Bootstrap型テンプレート「bootstrap_yeti」修正。 --- diff --git a/include/manager/pageManager.php b/include/manager/pageManager.php index 91473cc9..54068d95 100644 --- a/include/manager/pageManager.php +++ b/include/manager/pageManager.php @@ -3633,7 +3633,7 @@ class PageManager extends Core $moduleContent = ''; if ($style == self::WIDGET_STYLE_NAVMENU){ // ナビゲーションバーメニューはメニュータイプのウィジェットのみ実行 if ($widgetType == 'menu') $moduleContent = $render->getMenuContents($style, $widgetContent, $title, $attr, $params, $pageDefParam, $templateVer); - + // ナビゲーションバータイプで作成できないときはデフォルトの出力を取得 if (empty($moduleContent)) $moduleContent = $render->getModuleContents('xhtml', $widgetContent, $title, $attr, $params, $pageDefParam, $templateVer); } else { diff --git a/include/sql/update/2014030501_to_2014031001.sql b/include/sql/update/2014030501_to_2014031001.sql index e02f346d..45c3c6ad 100644 --- a/include/sql/update/2014030501_to_2014031001.sql +++ b/include/sql/update/2014030501_to_2014031001.sql @@ -44,7 +44,7 @@ ALTER TABLE _widgets ADD wd_type_option VARCHAR(10) DEFAULT '' DELETE FROM _templates WHERE tm_id = 'bootstrap_yeti'; INSERT INTO _templates (tm_id, tm_name, tm_type, tm_device_type, tm_mobile, tm_use_bootstrap, tm_available, tm_clean_type, tm_create_dt) VALUES -('bootstrap_yeti', 'bootstrap_sample1', 10, 0, false, true, true, 0, now()); +('bootstrap_yeti', 'bootstrap_yeti', 10, 0, false, true, true, 0, now()); -- *** システム標準テーブル *** diff --git a/templates/bootstrap_yeti/css/style.css b/templates/bootstrap_yeti/css/style.css index 94a426c2..cd00a217 100644 --- a/templates/bootstrap_yeti/css/style.css +++ b/templates/bootstrap_yeti/css/style.css @@ -1,15 +1,26 @@ /* メニューバー固定用 */ body { - padding-top: 85px; + padding-top: 75px; } .button { - margin:5px; -} -#pos-fixed { - position:fixed; + margin: 5px; } #pos-slide.affix { position: fixed; - top:80px; + top: 70px; +} +@media(min-width: 768px){ + #pos-fixed { + position: fixed; + } + + #pos-fixed, #pos-slide { + width: 160px; + } +} +@media(min-width: 992px){ + #pos-fixed, #pos-slide { + width: auto; + } } \ No newline at end of file diff --git a/templates/bootstrap_yeti/css/style_layout.css b/templates/bootstrap_yeti/css/style_layout.css index 54437218..832d4a36 100644 --- a/templates/bootstrap_yeti/css/style_layout.css +++ b/templates/bootstrap_yeti/css/style_layout.css @@ -2,3 +2,4 @@ #pos-fixed { position:relative; } + diff --git a/templates/bootstrap_yeti/html/modules.php b/templates/bootstrap_yeti/html/modules.php new file mode 100644 index 00000000..2cf368af --- /dev/null +++ b/templates/bootstrap_yeti/html/modules.php @@ -0,0 +1,14 @@ +content)) : ?> +
+ showtitle != 0) : ?> +

title; ?>

+ + content; ?> +
+ baseurl . '/templates/' . $document->template; $(function(){ $('.button').addClass('btn btn-default'); - $('#pos-slide').affix({ - offset: { - top: 100 - } - }); +isLayout()): ?> + if ($(window).width() >= 768){ + $('#pos-slide').affix({ + offset: { + top: $('#pos-slide').offset().top -70 + } + }); + } + }); //]]> @@ -49,20 +46,20 @@ $(function(){
countModules('left') || $document->countModules('left-fixed') || $document->countModules('left-hide') || $document->countModules('left-slide')): ?>
- countModules('left-fixed')): ?> - countModules('left')): ?>
- countModules('left-hide')): ?> - countModules('left-slide')): ?>
+ countModules('left-fixed')): ?> + countModules('left')): ?>
+ countModules('left-hide')): ?> + countModules('left-slide')): ?>
- countModules('banner')): ?>
-
- countModules('center-hide')): ?> + countModules('banner')): ?>
+
+ countModules('center-hide')): ?>
- countModules('banner')): ?>
-
- countModules('center-hide')): ?> + countModules('banner')): ?>
+
+ countModules('center-hide')): ?>