Skip to content

Commit

Permalink
Fix #111
Browse files Browse the repository at this point in the history
  • Loading branch information
rafajaques committed Jun 15, 2016
1 parent c3c38cf commit 064544e
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 7 deletions.
20 changes: 14 additions & 6 deletions app/css/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,21 @@ body{
background-color: #fff;
-webkit-overflow-scrolling: touch;
}
#draggable-area{
position: absolute;
top: 0;
height: 25px;
width: 100%;
z-index: 5000;
-webkit-app-region: drag !important;
}
.loader-inner{
position: absolute;
top:50%;
left:50%;
z-index:1000;
}
.ball-scale-ripple-multiple > div {
.ball-scale-ripple-multiple > div{
background: #494E57;
}
.top-margin{
Expand Down Expand Up @@ -101,7 +109,7 @@ body{
font-size: 11px !important;
}
/* Little hack for presentation sidebar */
.tooltip.left {
.tooltip.left{
margin-left: -20px;
}

Expand Down Expand Up @@ -196,23 +204,23 @@ body{
/**
* Split pane
*/
.gutter {
.gutter{
background-color: #eee;
background-repeat: no-repeat;
background-position: 50%;
}

.gutter.gutter-horizontal {
.gutter.gutter-horizontal{
background-image: url('../gfx/grips/vertical.png');
cursor: ew-resize;
}

.gutter.gutter-vertical {
.gutter.gutter-vertical{
background-image: url('../gfx/grips/horizontal.png');
cursor: ns-resize;
}

split, .gutter.gutter-horizontal {
split, .gutter.gutter-horizontal{
height: 100%;
float: left;
}
3 changes: 3 additions & 0 deletions app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
</head>
<body>

<!-- Draggable area (OSX only) -->
<div id="draggable-area"></div>

<!-- Sidebar -->
<div id="sidebar">
<!-- Menu -->
Expand Down
6 changes: 5 additions & 1 deletion app/js/main.functions.js
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,13 @@ function renderApp(refresh) {
delay: { show: 400 }
});

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

Expand Down

0 comments on commit 064544e

Please sign in to comment.