hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

reduce height on draggable-top and only render it on macos (#942)

Browse Source 
* reduce height on draggable-top and only render it on macos

* move drag bar out of app and into bootstrap

Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton 2020-09-23 08:57:34 -04:00 committed by GitHub
parent 7f6ae6e8c3
commit 2f53e76060
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/renderer/bootstrap.tsx
View File

@ -31,7 +31,10 @@ export async function bootstrap(App: AppComponent) {
if (App.init) { if (App.init) {
await App.init(); await App.init();
} }
render(<App/>, rootElem); render(<>
{isMac && <div id="draggable-top" />}
<App />
</>, rootElem);
} }
// run // run

3
src/renderer/components/app.scss
View File

@ -13,6 +13,7 @@
:root { :root {
--mainBackground: #1e2124; --mainBackground: #1e2124;
--main-layout-header: 40px; --main-layout-header: 40px;
--drag-region-height: 22px
} }
::selection { ::selection {
@ -47,7 +48,7 @@ html, body {
left: 0; left: 0;
top: 0; top: 0;
width: 100%; width: 100%;
height: var(--main-layout-header); height: var(--drag-region-height);
z-index: 1000; z-index: 1000;
pointer-events: none; pointer-events: none;
} }

22
src/renderer/components/cluster-manager/cluster-manager.tsx
View File

@ -14,6 +14,7 @@ import { ClusterSettings, clusterSettingsRoute } from "../+cluster-settings";
import { clusterViewRoute, clusterViewURL, getMatchedCluster, getMatchedClusterId } from "./cluster-view.route"; import { clusterViewRoute, clusterViewURL, getMatchedCluster, getMatchedClusterId } from "./cluster-view.route";
import { clusterStore } from "../../../common/cluster-store"; import { clusterStore } from "../../../common/cluster-store";
import { hasLoadedView, initView, lensViews, refreshViews } from "./lens-views"; import { hasLoadedView, initView, lensViews, refreshViews } from "./lens-views";
import { isMac } from "../../../common/vars";
@observer @observer
export class ClusterManager extends React.Component { export class ClusterManager extends React.Component {
@ -53,21 +54,20 @@ export class ClusterManager extends React.Component {
render() { render() {
return ( return (
<div className="ClusterManager"> <div className="ClusterManager">
<div id="draggable-top"/>
<main> <main>
<div id="lens-views"/> <div id="lens-views" />
<Switch> <Switch>
<Route component={LandingPage} {...landingRoute}/> <Route component={LandingPage} {...landingRoute} />
<Route component={Preferences} {...preferencesRoute}/> <Route component={Preferences} {...preferencesRoute} />
<Route component={Workspaces} {...workspacesRoute}/> <Route component={Workspaces} {...workspacesRoute} />
<Route component={AddCluster} {...addClusterRoute}/> <Route component={AddCluster} {...addClusterRoute} />
<Route component={ClusterView} {...clusterViewRoute}/> <Route component={ClusterView} {...clusterViewRoute} />
<Route component={ClusterSettings} {...clusterSettingsRoute}/> <Route component={ClusterSettings} {...clusterSettingsRoute} />
<Redirect exact to={this.startUrl}/> <Redirect exact to={this.startUrl} />
</Switch> </Switch>
</main> </main>
<ClustersMenu/> <ClustersMenu />
<BottomBar/> <BottomBar />
</div> </div>
) )
} }