Compare commits

..

7 Commits

Author SHA1 Message Date
Akash Nimare
da1e64e832 webview: Update z-index for left-sidebar and webview. 2018-03-02 17:08:05 +05:30
Akash Nimare
f1f0d2815a webview: Add focus to webview. 2018-03-02 16:50:02 +05:30
Akash Nimare
6fd9744d56 webview: Fix webview flickering [WIP]. 2018-03-02 16:46:55 +05:30
Akash Nimare
ffd2ee36fa left-sidebar : Fix position of left-sidebar on toggel. 2018-03-01 21:36:13 +05:30
Akash Nimare
c11fa93642 left-sidebar: Fix tooltip not visible on hover.
Regression from c11089027c.
2018-03-01 21:12:07 +05:30
Akash Nimare
a90dc0c82f Custom css: Add a setting option for custom css.
This PR adds an option to inject custom CSS.
Fixes - #432.
2018-03-01 18:52:53 +05:30
Akash Nimare
028bc02d0a Downgrade node to 6.
Looks like the app can't be packaged on node > 8. This must be an issue with electron-builder.
Downgrading until the fix comes.
2018-03-01 04:37:00 +05:30
3 changed files with 20 additions and 12 deletions

View File

@@ -28,6 +28,7 @@ body {
-webkit-app-region: drag;
overflow: hidden;
transition: all 0.5s ease;
z-index: 2;
}
.toggle-sidebar div {
@@ -86,7 +87,6 @@ body {
flex-direction: column;
position: fixed;
bottom: 0;
width: inherit;
}
.action-button {
@@ -249,28 +249,34 @@ body {
}
webview {
opacity: 1;
/* transition: opacity 0.3s ease-in; */
flex-grow: 1;
position: absolute;
width: 100%;
height: 100%;
flex-grow: 1;
display: flex;
flex-direction: column;
}
webview.onload {
transition: opacity 1s cubic-bezier(0.95, 0.05, 0.795, 0.035);
}
webview.disabled {
flex: 0 1;
height: 0;
width: 0;
opacity: 0;
transition: opacity 0.3s ease-out;
webview.active {
opacity: 1;
z-index: 1;
visibility: visible;
}
webview:focus {
webview.disabled {
opacity: 0;
}
webview.focus {
outline: 0px solid transparent;
}
/* Tooltip styling */
#back-tooltip,
@@ -278,7 +284,7 @@ webview:focus {
#setting-tooltip {
font-family: sans-serif;
background: #222c31;
margin-left: 68px;
margin-left: 45px;
padding: 6px 8px;
position: absolute;
margin-top: 0px;

View File

@@ -130,6 +130,7 @@ class WebView extends BaseComponent {
}
this.$el.classList.remove('disabled');
this.$el.classList.add('active');
setTimeout(() => {
if (this.props.role === 'server') {
this.$el.classList.remove('onload');
@@ -168,6 +169,7 @@ class WebView extends BaseComponent {
hide() {
this.$el.classList.add('disabled');
this.$el.classList.remove('active');
}
load() {

View File

@@ -18,7 +18,7 @@
"url": "https://github.com/zulip/zulip-electron/issues"
},
"engines": {
"node": ">=8.0.0"
"node": ">=6.0.0"
},
"scripts": {
"start": "electron app --disable-http-cache --no-electron-connect",