Skip to content

Commit 76bfafd

Browse files
committed
tiny redesign and style fixes
1 parent 3e36c1c commit 76bfafd

File tree

7 files changed

+59
-20
lines changed

7 files changed

+59
-20
lines changed

dist/angular-filemanager.min.css

Lines changed: 2 additions & 2 deletions
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/dialogs.css

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
white-space: pre-wrap;
1717
}
1818

19-
.modal .modal-header {
20-
padding-bottom: 0;
21-
}
2219

2320
.modal .breadcrumb {
2421
margin-bottom: 10px;
@@ -62,4 +59,34 @@
6259
width: 100%;
6360
height: 1px;
6461
opacity: 0;
62+
}
63+
64+
65+
.modal .modal-content {
66+
border-radius: 10px 10px 4px 4px;
67+
}
68+
69+
.modal .modal-header {
70+
border-radius: 4px 4px 0 0;
71+
background: #2196F3;
72+
padding: 1.3em;
73+
}
74+
75+
.modal .modal-header .modal-title {
76+
font-size: 20px;
77+
line-height: 100%;
78+
color: #D4E5F5;
79+
margin: 0;
80+
}
81+
82+
.modal .modal-header .close {
83+
opacity: 1;
84+
color: #D4E5F5;
85+
}
86+
87+
.modal .modal-header .close.fullscreen {
88+
font-size: 14px;
89+
position: relative;
90+
top: 4px;
91+
margin-right: .8em;
6592
}

src/css/main.css

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,4 +381,13 @@ table th > a:focus {
381381

382382
.selected .item-extension::after {
383383
color: #2196F3;
384+
}
385+
386+
.form-control.search-input {
387+
max-width: 20em;
388+
display: inline;
389+
}
390+
391+
.like-code {
392+
display: inline;
384393
}

src/js/controllers/main.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232

3333
$scope.fileNavigator.onRefresh = function() {
3434
$scope.temps = [];
35+
$scope.query = '';
3536
$rootScope.selectedModalPath = $scope.fileNavigator.currentPath;
3637
};
3738

src/templates/modals.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -215,14 +215,14 @@ <h4 class="modal-title">{{'extract_item' | translate}}</h4>
215215
<span aria-hidden="true">&times;</span>
216216
<span class="sr-only">{{"close" | translate}}</span>
217217
</button>
218-
<button type="button" class="close mr5" ng-click="fullscreen=!fullscreen" style="font-size: 15px;margin-top:1px;">
219-
<i class="glyphicon glyphicon-fullscreen mr5"></i>
218+
<button type="button" class="close fullscreen" ng-click="fullscreen=!fullscreen">
219+
<i class="glyphicon glyphicon-fullscreen"></i>
220220
<span class="sr-only">{{'toggle_fullscreen' | translate}}</span>
221221
</button>
222222
<h4 class="modal-title">{{'edit_file' | translate}}</h4>
223223
</div>
224224
<div class="modal-body">
225-
<label class="radio">{{'file_content' | translate}}</label>
225+
<label class="radio bold">{{ singleSelection().model.fullPath() }}</label>
226226
<span class="label label-warning" ng-show="apiMiddleware.apiHandler.inprocess">{{'loading' | translate}} ...</span>
227227
<textarea class="form-control code" ng-model="singleSelection().tempModel.content" ng-show="!apiMiddleware.apiHandler.inprocess" autofocus="autofocus"></textarea>
228228
<div ng-include data-src="'error-bar'" class="clearfix"></div>
@@ -402,14 +402,14 @@ <h4 class="modal-title">{{"select_destination_folder" | translate}}</h4>
402402
<div class="panel panel-primary mt10 mb0">
403403
<div class="panel-body">
404404
<div class="detail-sources">
405-
<code class="mr5"><b>{{"Selection" | translate}}:</b>
405+
<div class="like-code mr5"><b>{{"Selection" | translate}}:</b>
406406
<span ng-include="'selected-files-msg'"></span>
407-
</code>
407+
</div>
408408
</div>
409409
<div class="detail-sources">
410-
<code class="mr5">
410+
<div class="like-code mr5">
411411
<b>{{"destination" | translate}}:</b> {{ getSelectedPath() }}
412-
</code>
412+
</div>
413413
<a href="" class="label label-primary" ng-click="openNavigator(fileNavigator.currentPath)">
414414
{{'change' | translate}}
415415
</a>
@@ -427,7 +427,7 @@ <h4 class="modal-title">{{"select_destination_folder" | translate}}</h4>
427427

428428
<script type="text/ng-template" id="selected-files-msg">
429429
<span ng-show="temps.length == 1">
430-
<b>{{singleSelection().model.name}}</b>
430+
{{singleSelection().model.name}}
431431
</span>
432432
<span ng-show="temps.length > 1">
433433
{{'these_elements' | translate:totalSelecteds()}}

src/templates/navbar.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@
1010
<a class="navbar-brand hidden-xs" href="" ng-click="fileNavigator.goTo(-1)">{{config.appName}}</a>
1111
</div>
1212
<div id="navbar" class="navbar-collapse collapse">
13-
<div class="navbar-form navbar-right">
14-
<input type="text" class="form-control input-sm" ng-show="config.searchForm" placeholder="{{'search' | translate}}..." ng-model="$parent.query">
13+
<div class="navbar-form navbar-right text-right">
14+
<input type="text" class="form-control input-sm hidden-xs search-input" ng-show="config.searchForm" placeholder="{{'search' | translate}}..." ng-model="$parent.query">
1515
<button class="btn btn-default btn-sm" ng-click="modal('newfolder') && prepareNewFolder()">
16-
<i class="glyphicon glyphicon-plus"></i> {{"new_folder" | translate}}
16+
<i class="glyphicon glyphicon-plus"></i>
17+
<span class="visible-sm-inline">{{"new_folder" | translate}}</span>
1718
</button>
1819
<button class="btn btn-default btn-sm" ng-show="config.allowedActions.upload" ng-click="modal('uploadfile')">
19-
<i class="glyphicon glyphicon-cloud-upload"></i> {{"upload_files" | translate}}
20+
<i class="glyphicon glyphicon-cloud-upload"></i>
21+
<span class="visible-sm-inline">{{"upload_files" | translate}}</span>
2022
</button>
2123

2224
<button class="btn btn-default btn-sm dropdown-toggle" type="button" id="dropDownMenuLang" data-toggle="dropdown" aria-expanded="true">

0 commit comments

Comments
 (0)