1
0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00

Unify scrollbars/paddings across supported OS (#367)

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
This commit is contained in:
Jari Kolehmainen 2020-06-01 15:42:34 +03:00 committed by GitHub
parent ac32a3686e
commit 50dfd4fa63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 4 deletions

View File

@ -65,6 +65,19 @@ pre {
width: 100%; width: 100%;
} }
::-webkit-scrollbar {
width: 12px;
}
::-webkit-scrollbar-track {
box-shadow: inset 0 0 12px $lens-pane-bg;
}
::-webkit-scrollbar-thumb {
box-shadow: inset 0 0 12px $lens-pane-bg;
}
h1, h2, h3, h4, h5, h6{ h1, h2, h3, h4, h5, h6{
color: #fff; color: #fff;
font-size: 20.8px; font-size: 20.8px;

View File

@ -1,5 +1,5 @@
<template> <template>
<div class="main-menu"> <div :style="{ paddingTop: computedPaddingTop }" class="main-menu">
<draggable v-model="clusters"> <draggable v-model="clusters">
<ClusterMenuItem <ClusterMenuItem
v-for="cluster in clusters" :key="cluster.id" v-for="cluster in clusters" :key="cluster.id"
@ -23,6 +23,7 @@ import ClusterMenuItem from "@/components/MainMenu/ClusterMenuItem";
import AddClusterMenuItem from "@/components/MainMenu/AddClusterMenuItem"; import AddClusterMenuItem from "@/components/MainMenu/AddClusterMenuItem";
import draggable from 'vuedraggable' import draggable from 'vuedraggable'
import { clusterStore } from "@/../common/cluster-store"; import { clusterStore } from "@/../common/cluster-store";
import * as os from "os";
const { remote } = require('electron') const { remote } = require('electron')
const { Menu, MenuItem } = remote const { Menu, MenuItem } = remote
@ -36,6 +37,7 @@ export default {
}, },
data(){ data(){
return { return {
computedPaddingTop: "15px"
} }
}, },
computed : { computed : {
@ -64,6 +66,11 @@ export default {
}, },
}).catch(err => {}) }).catch(err => {})
} }
},
mounted: function() {
if (os.platform() == "darwin") {
this.computedPaddingTop = "25px";
}
} }
} }
</script> </script>
@ -75,7 +82,7 @@ export default {
top: 0; top: 0;
bottom: 20px; bottom: 20px;
width: 70px; width: 70px;
padding-top: 25px; padding-top: 15px;
background: #252729; background: #252729;
overflow: hidden; overflow: hidden;
z-index: 1000; z-index: 1000;

View File

@ -227,7 +227,6 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
#app > .main-view > .content { #app > .main-view > .content {
left: 70px; left: 70px;
right: 70px;
} }
.lens-preferences { .lens-preferences {
height: 100%; height: 100%;

View File

@ -25,7 +25,7 @@ export default {
div.close-page-button { div.close-page-button {
position: absolute; position: absolute;
top: 20px; top: 20px;
right: 10px; right: 25px;
z-index: 1100; z-index: 1100;
a { a {
position: relative; position: relative;