Skip to content

Commit 7c7d534

Browse files
committed
Merge branch 'fkoester-embeddable'
2 parents d85aa2d + c1255ee commit 7c7d534

File tree

5 files changed

+29
-20
lines changed

5 files changed

+29
-20
lines changed

dist/angular-filemanager.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/angular-filemanager.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/css/main.css

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
body {
2-
padding-top: 55px;
32
font-size: 14px;
3+
height: 100vh;
44
}
55

66
*,
@@ -10,6 +10,9 @@ body {
1010

1111
.navbar {
1212
min-height: 32px;
13+
margin-bottom: 0;
14+
border: 0;
15+
border-radius: 0;
1316
}
1417

1518
.navbar .navbar-toggle {
@@ -63,10 +66,6 @@ textarea.code {
6366
border-bottom: 1px solid #eee;
6467
}
6568

66-
.navbar-fixed-top {
67-
border: 0;
68-
}
69-
7069
.sidebar {
7170
display: none;
7271
}
@@ -282,20 +281,30 @@ table th > a:focus {
282281
font-weight: bold;
283282
}
284283

284+
.main {
285+
overflow-y: auto;
286+
}
287+
285288
@media (min-width: 768px) {
286289
.main {
287290
padding-right: 0;
288291
padding-left: 0;
289292
}
290293

294+
/* The view should fill all available vertical space */
295+
angular-filemanager > div,.row,.main,.sidebar {
296+
height: 100%;
297+
}
298+
299+
.container-fluid {
300+
height: -webkit-calc(100% - 55px);
301+
height: -moz-calc(100% - 55px);
302+
height: calc(100% - 55px);
303+
}
304+
291305
.sidebar {
292-
position: fixed;
293-
top: 50px;
294-
bottom: 0;
295-
left: 0;
296-
z-index: 1000;
297306
display: block;
298-
padding: 5px 0;
307+
padding: 0;
299308
overflow-x: hidden;
300309
overflow-y: auto;
301310
background-color: #f5f5f5;
@@ -313,4 +322,4 @@ table th > a:focus {
313322
.table.table-files .btn {
314323
display: none;
315324
}
316-
}
325+
}

src/templates/main.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<div class="container-fluid">
55
<div class="row">
66

7-
<div class="col-sm-3 col-md-2 sidebar file-tree animated slow fadeIn" ng-include="config.tplPath + '/sidebar.html'" ng-show="config.sidebar && fileNavigator.history[0]"></div>
8-
<div class="main" ng-class="config.sidebar && fileNavigator.history[0] && 'col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2'">
7+
<div class="col-sm-3 col-md-2 sidebar file-tree animated slow fadeIn" ng-include="config.tplPath + '/sidebar.html'" ng-show="config.sidebar &amp;&amp; fileNavigator.history[0]"></div>
8+
<div class="main" ng-class="config.sidebar &amp;&amp; fileNavigator.history[0] &amp;&amp; 'col-sm-9 col-md-10'">
99
<div ng-include="config.tplPath + '/current-folder-breadcrumb.html'" ng-show="config.breadcrumb"></div>
1010
<div ng-include="config.tplPath + '/' + viewTemplate" class="main-navigation clearfix"></div>
1111
</div>
@@ -14,4 +14,4 @@
1414

1515
<div ng-include="config.tplPath + '/modals.html'"></div>
1616
<div ng-include="config.tplPath + '/item-context-menu.html'"></div>
17-
</div>
17+
</div>

src/templates/navbar.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<nav class="navbar navbar-inverse navbar-fixed-top">
1+
<nav class="navbar navbar-inverse">
22
<div class="container-fluid">
33
<div class="navbar-header">
44
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">

0 commit comments

Comments
 (0)