diff --git a/baser/vendors/js/admin/adjust_scroll.js b/baser/vendors/js/admin/adjust_scroll.js index 71e3d97312..38d6a8e8cd 100644 --- a/baser/vendors/js/admin/adjust_scroll.js +++ b/baser/vendors/js/admin/adjust_scroll.js @@ -1,7 +1,10 @@ //高さを調整する $(function(){ - $("html,body").height( $(this).height() - $("#ToolBar").outerHeight()*1); - $(window).resize(function(){ - $("html,body").height( $(this).height() - $("#ToolBar").outerHeight()*1); - }); -}); \ No newline at end of file + resizeAdminPage(); + $(window).resize(resizeAdminPage); + function resizeAdminPage(){ + var adminH = $(this).height() - $("#ToolBar").outerHeight()*1; + if (adminH < 600) adminH = 600; + $("html,body").height(adminH); + } +}); diff --git a/baser/views/elements/admin/credit.php b/baser/views/elements/admin/credit.php index a0ba2fd56b..25687926ca 100644 --- a/baser/views/elements/admin/credit.php +++ b/baser/views/elements/admin/credit.php @@ -21,7 +21,7 @@ @@ -126,7 +126,7 @@ function resizeScroll() {
- +

Special Thanks Credit

@@ -136,7 +136,7 @@ function resizeScroll() {
  • Misuzu Nakamura (clipdesign)
  • - +

    Publishers

    -

    baserCMS Users Community

    - +
    diff --git a/baser/views/users/admin/login.php b/baser/views/users/admin/login.php index b44e2d224f..044a3c372d 100644 --- a/baser/views/users/admin/login.php +++ b/baser/views/users/admin/login.php @@ -40,15 +40,15 @@ ); ?> - +js('admin/adjust_scroll',false) ?>