anyproto/anytype-ts
1
0
Fork 0
mirror of https://github.com/anyproto/anytype-ts.git synced 2025-06-08 05:57:02 +09:00
Code Activity

removed header styles for macos 10

Browse source
This commit is contained in:
Andrew Simachev 2021-10-27 14:49:44 +03:00
parent 8f68cdeeef
commit c36d3d0140
12 changed files with 14 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

8
electron.js
View file

@ -208,13 +208,7 @@ function createWindow () {
if (process.platform == 'darwin') {
app.dock.setIcon(image);
param.icon = path.join(__dirname, '/electron/icon.icns');
const a = systemVersion.split('.');
if (a.length && (a[0] >= 11)) {
param.trafficLightPosition = { x: 20, y: 18 };
} else {
param.trafficLightPosition = { x: 20, y: 10 };
};
param.trafficLightPosition = { x: 20, y: 18 };
};
if (process.platform == 'win32') {

6
src/scss/common.scss
View file

@ -33,7 +33,7 @@ select:-webkit-autofill:hover,
select:-webkit-autofill:focus { transition: background-color 5000s ease-in-out 0s; }
input, textarea, select { font-family: 'Inter'; }
#drag { -webkit-app-region: drag; position: fixed; top: 0px; left: 0px; width: 100%; height: 38px; z-index: -1; user-select: none; pointer-events: all; }
#drag { -webkit-app-region: drag; position: fixed; top: 0px; left: 0px; width: 100%; height: 52px; z-index: -1; user-select: none; pointer-events: all; }
#drag {
.sides { display: none; }
}
@ -45,10 +45,6 @@ input, textarea, select { font-family: 'Inter'; }
}
}
html.platformMac.headerBig {
#drag { height: 52px; }
}
html.platformWindows {
#drag { height: 30px; background: $colorBlack; z-index: 1000; display: block; }
#drag {

7
src/scss/component/header.scss
View file

@ -154,15 +154,10 @@
}
html.platformMac {
.header {
.side.left { left: 88px; }
}
}
html.platformMac.headerBig {
.header { height: 52px !important; line-height: 28px; }
.header {
.side { top: 12px; }
.side.left { left: 88px; }
.side .item { vertical-align: middle; display: inline-block; }
}
}

6
src/scss/page/main/edit.scss
View file

@ -1,10 +1,6 @@
@import "~scss/_vars";
.pageMainEdit {
.wrapper { padding: 38px 0px 0px 0px; }
.wrapper { padding: 52px 0px 0px 0px; }
.wrapper > .loaderWrapper { position: fixed; left: 0px; top: 0px; width: 100%; height: 100%; }
}
html.platformMac.headerBig {
.pageMainEdit .wrapper { padding-top: 52px; }
}

6
src/scss/page/main/history.scss
View file

@ -3,7 +3,7 @@
.pageMainHistory * { user-select: none; }
.pageMainHistory {
#body { overflow: hidden; }
.wrapper { padding: 38px 0px 80px 0px; width: calc(100% - 254px); overflow: auto; position: relative; }
.wrapper { padding: 52px 0px 80px 0px; width: calc(100% - 254px); overflow: auto; position: relative; }
.loaderWrapper { position: fixed; left: 0px; top: 0px; width: 100%; height: 100%; }
.list { width: 254px; border-left: 1px solid $colorLightGrey; z-index: 10; position: relative; background: #fff; overflow: auto; }
@ -38,8 +38,4 @@
}
.blockLast { height: 100px; }
}
html.platformMac.headerBig {
.pageMainHistory .wrapper { padding-top: 52px; }
}

4
src/scss/page/main/index.scss
View file

@ -191,8 +191,4 @@
.tabs { border-radius: 0px; }
}
}
}
html.platformMac.headerBig {
.pageMainIndex .blocks { padding-top: 104px; }
}

8
src/scss/page/main/media.scss
View file

@ -2,7 +2,7 @@
.pageMainMedia {
.blocks { margin: 0px auto; padding: 60px 0px; display: flex; }
.blocks { margin: 0px auto; padding: 74px 0px 60px 0px; display: flex; }
.blocks {
.side.right { padding-top: 25px; }
}
@ -73,8 +73,4 @@
}
}
.pageMainMedia > .loaderWrapper { position: fixed; left: 0px; top: 0px; width: 100%; height: 100%; }
html.platformMac.headerBig {
.pageMainMedia .blocks { padding-top: 74px; }
}
.pageMainMedia > .loaderWrapper { position: fixed; left: 0px; top: 0px; width: 100%; height: 100%; }

8
src/scss/page/main/relation.scss
View file

@ -2,7 +2,7 @@
.pageMainRelation { user-select: none; }
.pageMainRelation {
.wrapper { width: 704px; margin: 0px auto; padding: 128px 0px 80px 0px; }
.wrapper { width: 704px; margin: 0px auto; padding: 144px 0px 80px 0px; }
.wrapper {
.head { display: flex; margin-bottom: 35px; }
.head {
@ -76,8 +76,4 @@
}
}
.pageMainRelation > .loaderWrapper { position: fixed; left: 0px; top: 0px; width: 100%; height: 100%; }
html.platformMac.headerBig {
.pageMainRelation .wrapper { padding-top: 144px; }
}
.pageMainRelation > .loaderWrapper { position: fixed; left: 0px; top: 0px; width: 100%; height: 100%; }

8
src/scss/page/main/type.scss
View file

@ -1,7 +1,7 @@
@import "~scss/_vars";
.pageMainType {
.wrapper { width: 704px; margin: 0px auto; padding: 128px 0px 80px 0px; user-select: none; }
.wrapper { width: 704px; margin: 0px auto; padding: 144px 0px 80px 0px; user-select: none; }
.wrapper {
.block {
@ -119,8 +119,4 @@
}
}
.pageMainType > .loaderWrapper { position: fixed; left: 0px; top: 0px; width: 100%; height: 100%; }
html.platformMac.headerBig {
.pageMainType .wrapper { padding-top: 144px; }
}
.pageMainType > .loaderWrapper { position: fixed; left: 0px; top: 0px; width: 100%; height: 100%; }

13
src/scss/popup/search.scss
View file

@ -6,11 +6,11 @@
.content { height: 432px; overflow: visible; transition: none; transform: translate3d(0px,0px,0px); }
.wrap { height: 100%; }
.innerWrap { top: 38px; width: 40%; margin-left: -20%; transform: scale3d(1,1,1); transition: none; overflow: visible; border-radius: 6px; }
.innerWrap { top: 52px; width: 40%; margin-left: -20%; transform: scale3d(1,1,1); transition: none; overflow: visible; border-radius: 6px; }
.dimmer { transition: none; }
.head {
height: 28px; position: fixed; top: -33px; left: 50%; background: #fff; width: 100%; border-radius: 6px;
height: 28px; position: fixed; top: -40px; left: 50%; background: #fff; width: 100%; border-radius: 6px;
transform: translateX(-50%); padding: 4px 8px; -webkit-app-region: no-drag;
}
.head {
@ -70,13 +70,4 @@ html.platformWindows {
.popups {
.popup.popupSearch .innerWrap { top: 68px; }
}
}
html.platformMac.headerBig {
.popups {
.popup.popupSearch {
.innerWrap { top: 52px; }
.head { top: -40px; }
}
}
}

6
src/ts/component/page/index.tsx
View file

@ -275,17 +275,11 @@ class Page extends React.Component<Props, {}> {
const { isPopup } = this.props;
const { config } = commonStore;
const platform = Util.getPlatform();
const version = process.getSystemVersion();
const cn = [
this.getClass('body'),
Util.toCamelCase([ 'platform', platform ].join('-')),
];
const obj = $(isPopup ? '#popupPage #wrap' : 'html');
const a = version.split('.');
if (a.length && a[0] >= 11) {
cn.push('headerBig');
};
if (config.debug.ui) {
cn.push('debug');

10
src/ts/lib/util.tsx
View file

@ -948,18 +948,10 @@ class Util {
sizeHeader (): number {
const platform = this.getPlatform();
const version = process.getSystemVersion();
let a = version.split('.');
let v = a.length ? a[0] : '';
let s = 38;
let s = 52;
if (platform == I.Platform.Windows) {
s = 68;
};
if ((platform == I.Platform.Mac) && (v >= 11)) {
s = 52;
};
return s;
};