diff --git a/packages/core.gbapp/services/GBDeployer.ts b/packages/core.gbapp/services/GBDeployer.ts index 84d68ede..b7573a5b 100644 --- a/packages/core.gbapp/services/GBDeployer.ts +++ b/packages/core.gbapp/services/GBDeployer.ts @@ -713,7 +713,7 @@ export class GBDeployer implements IGBDeployer { case '.gbtheme': // Updates server listeners to serve theme files in .gbtheme. - GBServer.globals.server.use(`/themes/${packageName}`, express.static(packageWorkFolder)); + GBServer.globals.server.use( '/' + urlJoin('themes', packageName), express.static(packageWorkFolder)); GBLogEx.verbose(min, `Theme (.gbtheme) assets accessible at: /themes/${packageName}.`); break; diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts index 4c2466b5..6e6c4204 100644 --- a/packages/core.gbapp/services/GBMinService.ts +++ b/packages/core.gbapp/services/GBMinService.ts @@ -298,9 +298,6 @@ export class GBMinService { await GBVMService.loadConnections(min); - // Serves individual URL for each bot conversational interface. - - await this.deployer['deployPackage2'](min, user, 'templates/default.gbai/default.gbtheme'); // Install per bot deployed packages. @@ -316,6 +313,10 @@ export class GBMinService { if (await GBUtil.exists(packagePath)) { await this.deployer['deployPackage2'](min, user, packagePath); } + else { + await this.deployer['deployPackage2'](min, user, path.join('work', 'default.gbai', 'default.gbtheme')); + } + packagePath = urlJoin(`work`, GBUtil.getGBAIPath(min.botId, `gblib`)); if (await GBUtil.exists(packagePath)) { await this.deployer['deployPackage2'](min, user, packagePath); diff --git a/packages/default.gbtheme/css/SidebarMenu.css b/packages/default.gbtheme/css/SidebarMenu.css index 66e1c411..1cb82998 100644 --- a/packages/default.gbtheme/css/SidebarMenu.css +++ b/packages/default.gbtheme/css/SidebarMenu.css @@ -38,7 +38,7 @@ html[dir="ltr"] .ms-Nav-compositeLink.is-selected a:after { left: 0; } - .tittleSideBarMenu { + .titleSideBarMenu { display: none; } @@ -70,7 +70,7 @@ html[dir="ltr"] .ms-Nav-compositeLink.is-selected a:after { } @media screen and (min-width: 520px) and (max-width:1000px) { - .tittleSideBarMenu { + .titleSideBarMenu { display: none; } .sidebar { @@ -115,7 +115,7 @@ html[dir="ltr"] .ms-Nav-compositeLink.is-selected a:after { top: 0; left: 0; } - .tittleSideBarMenu { + .titleSideBarMenu { display: none; } @@ -159,7 +159,7 @@ html[dir="ltr"] .ms-Nav-compositeLink.is-selected a:after { border-right: 14px solid #19baee !important; } - .tittleSideBarMenu { + .titleSideBarMenu { color: white; text-align: center; margin-top: 10px; @@ -193,7 +193,7 @@ html[dir="ltr"] .ms-Nav-compositeLink.is-selected a:after { } @media screen and (max-height: 684px) { - .tittleSideBarMenu { + .titleSideBarMenu { display: none; } } diff --git a/packages/default.gbui/public/index.html b/packages/default.gbui/public/index.html index f6e49ce3..d955a14a 100644 --- a/packages/default.gbui/public/index.html +++ b/packages/default.gbui/public/index.html @@ -61,7 +61,7 @@ -
+ diff --git a/packages/default.gbui/src/components/GBCss.js b/packages/default.gbui/src/components/GBCss.js index 5ea60b6c..721fd363 100644 --- a/packages/default.gbui/src/components/GBCss.js +++ b/packages/default.gbui/src/components/GBCss.js @@ -44,7 +44,7 @@ class GBCss extends React.Component { - + ); } else { diff --git a/packages/default.gbui/src/components/SidebarMenu.js b/packages/default.gbui/src/components/SidebarMenu.js index b76784d3..b3e26737 100644 --- a/packages/default.gbui/src/components/SidebarMenu.js +++ b/packages/default.gbui/src/components/SidebarMenu.js @@ -46,7 +46,7 @@ class SideBarMenu extends React.Component { render() { return (