Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

2021-03-18 08:27:13 +08:00
parent 68b8659197 048ecf6850
commit b4ea48a130
23 changed files with 97 additions and 101 deletions
@@ -1840,13 +1840,12 @@ class docModel extends model
    public function appendNavCSS()
    {
        $navCSS = '';
-        if($this->lang->navGroup->doc == 'doc')
+        if($this->app->openApp == 'doc')
        {
            $navCSS .= <<<EOF
 #subHeader {margin-top: -50px; background: rgba(0,0,0,0);}
 #pageActions .btn-link {color: #fff; font-size: 14px; line-height: 18px; border: #84a2e2 1px solid;}
 .header-btn {padding: 0;}
-.header-btn .btn{padding: 6px 12px;}
 EOF;
            if($this->app->rawMethod != 'index') $navCSS .= '.header-btn+.header-btn::after, .header-btn+.header-btn::before {top: -50px;}';
        }