Skip to content

Commit 064544e

Browse files
committed
Fix #111
1 parent c3c38cf commit 064544e

File tree

3 files changed

+22
-7
lines changed

3 files changed

+22
-7
lines changed

app/css/index.css

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,21 @@ body{
77
background-color: #fff;
88
-webkit-overflow-scrolling: touch;
99
}
10+
#draggable-area{
11+
position: absolute;
12+
top: 0;
13+
height: 25px;
14+
width: 100%;
15+
z-index: 5000;
16+
-webkit-app-region: drag !important;
17+
}
1018
.loader-inner{
1119
position: absolute;
1220
top:50%;
1321
left:50%;
1422
z-index:1000;
1523
}
16-
.ball-scale-ripple-multiple > div {
24+
.ball-scale-ripple-multiple > div{
1725
background: #494E57;
1826
}
1927
.top-margin{
@@ -101,7 +109,7 @@ body{
101109
font-size: 11px !important;
102110
}
103111
/* Little hack for presentation sidebar */
104-
.tooltip.left {
112+
.tooltip.left{
105113
margin-left: -20px;
106114
}
107115

@@ -196,23 +204,23 @@ body{
196204
/**
197205
* Split pane
198206
*/
199-
.gutter {
207+
.gutter{
200208
background-color: #eee;
201209
background-repeat: no-repeat;
202210
background-position: 50%;
203211
}
204212

205-
.gutter.gutter-horizontal {
213+
.gutter.gutter-horizontal{
206214
background-image: url('../gfx/grips/vertical.png');
207215
cursor: ew-resize;
208216
}
209217

210-
.gutter.gutter-vertical {
218+
.gutter.gutter-vertical{
211219
background-image: url('../gfx/grips/horizontal.png');
212220
cursor: ns-resize;
213221
}
214222

215-
split, .gutter.gutter-horizontal {
223+
split, .gutter.gutter-horizontal{
216224
height: 100%;
217225
float: left;
218226
}

app/index.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
</head>
1616
<body>
1717

18+
<!-- Draggable area (OSX only) -->
19+
<div id="draggable-area"></div>
20+
1821
<!-- Sidebar -->
1922
<div id="sidebar">
2023
<!-- Menu -->

app/js/main.functions.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,13 @@ function renderApp(refresh) {
249249
delay: { show: 400 }
250250
});
251251

252-
// Padding sidebar buttons to not be under traffic lights
252+
// OSX specific tuning
253253
if (conf.get('system.os') === 'osx') {
254+
// Padding sidebar buttons to not be under traffic lights
254255
$('#sidebar ul').css('margin-top', '22px');
256+
} else {
257+
// Remove draggable area to avoid bugs
258+
$('#draggable-area').remove(); // OSX only draggable area
255259
}
256260
}
257261

0 commit comments

Comments
 (0)