Merge branch 'cyy_optimize' into 'master'

* Optimize page style for guide block.

See merge request easycorp/zentaopms!7093

module/block/view/guide.html.php

@@ -28,7 +28,6 @@
 .block-guide .tab-pane .app-client .tree-menu li .avatar img {padding: 6px;}
 .block-guide .tab-pane .app-client .client-desc {padding-top: 12px;}
 .block-guide .tab-pane .app-client .client-desc img {height: 195px;}
-.block-guide .tab-pane .app-qrcode {padding: 10px 20px;}
 .block-guide .tab-pane .app-qrcode .col-md-12 {padding-left: 0; padding-top: 10px;}
 .block-guide .tab-pane .app-qrcode .qrcode-down img {padding-top: 16px;}
 .block-guide .tab-pane .app-qrcode .qrcode-down .text-primary {padding-top: 10px;}

module/tutorial/js/index.js

@@ -414,7 +414,7 @@ $(function()
                     else
                     {
                         var $modulemenu = $$('#subNavbar');
-                        if(adminMenu) $modulemenu = $$('#navbar');
+                        if(task.nav.app == 'admin') $modulemenu = $$('#navbar');
                         var $modulemenuItem = $modulemenu.find('[data-id="' + task.nav.menu + '"]');
                         if($modulemenuItem.length && !$modulemenuItem.hasClass('active'))
                         {