mirror of
https://github.com/zulip/zulip-desktop.git
synced 2025-11-04 22:13:13 +00:00
Compare commits
7 Commits
custom-css
...
webview-fl
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
da1e64e832 | ||
|
|
f1f0d2815a | ||
|
|
6fd9744d56 | ||
|
|
ffd2ee36fa | ||
|
|
c11fa93642 | ||
|
|
a90dc0c82f | ||
|
|
028bc02d0a |
@@ -28,6 +28,7 @@ body {
|
|||||||
-webkit-app-region: drag;
|
-webkit-app-region: drag;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
transition: all 0.5s ease;
|
transition: all 0.5s ease;
|
||||||
|
z-index: 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
.toggle-sidebar div {
|
.toggle-sidebar div {
|
||||||
@@ -86,7 +87,6 @@ body {
|
|||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
position: fixed;
|
position: fixed;
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
width: inherit;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.action-button {
|
.action-button {
|
||||||
@@ -249,28 +249,34 @@ body {
|
|||||||
}
|
}
|
||||||
|
|
||||||
webview {
|
webview {
|
||||||
opacity: 1;
|
|
||||||
/* transition: opacity 0.3s ease-in; */
|
/* transition: opacity 0.3s ease-in; */
|
||||||
flex-grow: 1;
|
flex-grow: 1;
|
||||||
|
position: absolute;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
flex-grow: 1;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
}
|
}
|
||||||
|
|
||||||
webview.onload {
|
webview.onload {
|
||||||
transition: opacity 1s cubic-bezier(0.95, 0.05, 0.795, 0.035);
|
transition: opacity 1s cubic-bezier(0.95, 0.05, 0.795, 0.035);
|
||||||
}
|
}
|
||||||
|
|
||||||
webview.disabled {
|
webview.active {
|
||||||
flex: 0 1;
|
opacity: 1;
|
||||||
height: 0;
|
z-index: 1;
|
||||||
width: 0;
|
visibility: visible;
|
||||||
opacity: 0;
|
|
||||||
transition: opacity 0.3s ease-out;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
webview:focus {
|
webview.disabled {
|
||||||
|
opacity: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
webview.focus {
|
||||||
outline: 0px solid transparent;
|
outline: 0px solid transparent;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* Tooltip styling */
|
/* Tooltip styling */
|
||||||
|
|
||||||
#back-tooltip,
|
#back-tooltip,
|
||||||
@@ -278,7 +284,7 @@ webview:focus {
|
|||||||
#setting-tooltip {
|
#setting-tooltip {
|
||||||
font-family: sans-serif;
|
font-family: sans-serif;
|
||||||
background: #222c31;
|
background: #222c31;
|
||||||
margin-left: 68px;
|
margin-left: 45px;
|
||||||
padding: 6px 8px;
|
padding: 6px 8px;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
margin-top: 0px;
|
margin-top: 0px;
|
||||||
|
|||||||
@@ -130,6 +130,7 @@ class WebView extends BaseComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.$el.classList.remove('disabled');
|
this.$el.classList.remove('disabled');
|
||||||
|
this.$el.classList.add('active');
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
if (this.props.role === 'server') {
|
if (this.props.role === 'server') {
|
||||||
this.$el.classList.remove('onload');
|
this.$el.classList.remove('onload');
|
||||||
@@ -168,6 +169,7 @@ class WebView extends BaseComponent {
|
|||||||
|
|
||||||
hide() {
|
hide() {
|
||||||
this.$el.classList.add('disabled');
|
this.$el.classList.add('disabled');
|
||||||
|
this.$el.classList.remove('active');
|
||||||
}
|
}
|
||||||
|
|
||||||
load() {
|
load() {
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
"url": "https://github.com/zulip/zulip-electron/issues"
|
"url": "https://github.com/zulip/zulip-electron/issues"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=8.0.0"
|
"node": ">=6.0.0"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "electron app --disable-http-cache --no-electron-connect",
|
"start": "electron app --disable-http-cache --no-electron-connect",
|
||||||
|
|||||||
Reference in New Issue
Block a user