Skip to content

Commit d218c1f

Browse files
committed
material design tests
1 parent 386514a commit d218c1f

File tree

12 files changed

+105
-81
lines changed

12 files changed

+105
-81
lines changed

bower.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,6 @@
2424
"angular-cookies": "~1.3.17",
2525
"bootstrap": "~3.3.2",
2626
"jquery": "~2.1.3"
27+
"bootswatch": "3.3.5"
2728
}
2829
}

dist/angular-filemanager.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: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
-->
2828
<script src="dist/angular-filemanager.min.js"></script><!-- Comment if you need to use raw source code -->
2929

30-
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css" />
30+
<link rel="stylesheet" href="bower_components/bootswatch/paper/bootstrap.min.css" />
3131
<link rel="stylesheet" href="dist/angular-filemanager.css">
3232
</head>
3333

src/css/angular-filemanager.css

Lines changed: 60 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,32 @@
11
body {
2-
padding-top: 50px;
3-
font-size: 13px;
2+
padding-top: 55px;
3+
font-size: 14px;
4+
}
5+
6+
.navbar {
7+
min-height: 32px;
8+
}
9+
10+
.navbar .navbar-toggle {
11+
padding: 5px 10px;
12+
}
13+
14+
.navbar .navbar-brand {
15+
font-size: inherit;
16+
height: 55px;
17+
line-height: 100%;
18+
}
19+
20+
.navbar-collapse.collapse {
21+
height:0px!important;
22+
}
23+
24+
.breadcrumb {
25+
border-radius: 0;
26+
}
27+
28+
.breadcrumb .btn {
29+
margin-top:-5px;
430
}
531

632
textarea.code {
@@ -21,29 +47,6 @@ textarea.code {
2147
text-align: left;
2248
}
2349

24-
* {
25-
outline:none!important;
26-
}
27-
28-
div, span {
29-
cursor:default;
30-
}
31-
32-
a:hover, a:hover *,
33-
a:focus, a:focus *,
34-
a, a * {
35-
cursor:pointer;
36-
text-decoration: none;
37-
}
38-
39-
input, select, textarea,
40-
.btn, .input-sm,
41-
.dropdown-menu,
42-
.panel, .panel-heading,
43-
.modal .modal-content {
44-
border-radius: 0!important;
45-
}
46-
4750
.bold {
4851
font-weight: bold;
4952
}
@@ -65,18 +68,38 @@ input, select, textarea,
6568
display: none;
6669
}
6770

71+
.btn-go-back {
72+
margin-top: -5px;
73+
}
74+
75+
a:hover {
76+
text-decoration: none;
77+
}
78+
79+
.table-modal-condensed {
80+
81+
}
82+
83+
.modal .modal-header {
84+
padding-bottom:0;
85+
}
86+
87+
.modal .breadcrumb {
88+
margin-bottom: 10px;
89+
}
90+
6891
@media (min-width: 768px) {
6992
.sidebar {
7093
position: fixed;
71-
top: 51px;
94+
top: 50px;
7295
bottom: 0;
7396
left: 0;
7497
z-index: 1000;
7598
display: block;
7699
padding: 5px 0;
77100
overflow-x: hidden;
78101
overflow-y: auto;
79-
/* Scrollable contents if viewport is shorter than content. */
102+
80103
background-color: #f5f5f5;
81104
border-right: 1px solid #eee;
82105
}
@@ -88,6 +111,12 @@ input, select, textarea,
88111
}
89112
}
90113

114+
@media (max-width: 475px) {
115+
.table.table-files .btn {
116+
display: none;
117+
}
118+
}
119+
91120
.nav-sidebar {
92121
margin-right: -21px;
93122
margin-bottom: 20px;
@@ -103,7 +132,7 @@ input, select, textarea,
103132
.nav-sidebar > .active > a:hover,
104133
.nav-sidebar > .active > a:focus {
105134
color: #fff;
106-
background-color: #428bca;
135+
background-color: #2196F3;
107136
}
108137

109138
.main {
@@ -153,8 +182,8 @@ input, select, textarea,
153182
margin-right: 5px;
154183
}
155184

156-
.table-files td {
157-
padding: 3px 8px!important;
185+
.table.table-files td {
186+
/*padding: 3px 8px!important;*/
158187
vertical-align: middle!important;
159188
}
160189

@@ -186,6 +215,7 @@ input, select, textarea,
186215
margin: 0;
187216
padding: 0;
188217
padding: 10px 0;
218+
border: none;
189219
}
190220

191221
.iconset .thumbnail .item-icon {

src/js/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
/**
5757
* jQuery inits
5858
*/
59-
var menuSelectors = '.main-navigation .table-files td a, .iconset a.thumbnail';
59+
var menuSelectors = '.main-navigation .table-files td:first-child, .iconset a.thumbnail';
6060

6161
$(window.document).on('shown.bs.modal', '.modal', function() {
6262
var self = this;

src/templates/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div class="col-sm-3 col-md-2 sidebar file-tree" ng-include="config.tplPath + '/sidebar.html'"></div>
88
<div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
99
<div ng-include="config.tplPath + '/current-folder-breadcrumb.html'"></div>
10-
<div ng-include="config.tplPath + '/' + viewTemplate" class="main-navigation"></div>
10+
<div ng-include="config.tplPath + '/' + viewTemplate" class="main-navigation clearfix"></div>
1111
</div>
1212
</div>
1313
</div>

src/templates/main-icons.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="iconset">
1+
<div class="iconset clearfix">
22
<div class="col-120" data-ng-repeat="item in fileNavigator.fileList | filter: query | orderBy: orderProp" data-ng-show="!fileNavigator.requesting && !fileNavigator.error">
33
<a href="" class="thumbnail text-center" data-ng-click="smartClick(item)" ng-right-click="smartRightClick(item)" title="{{item.model.name}} ({{item.model.sizeKb()}}kb)">
44
<div class="item-icon">

src/templates/main-table-modal.html

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
<table class="table table-striped table-hover mb0 table-files">
1+
<table class="table table-condensed table-modal-condensed table-hover mb0 table-files">
22
<thead>
33
<tr>
44
<th>{{"name" | translate}}</th>
5-
<th class="hidden-sm hidden-xs">{{"date" | translate}}</th>
6-
<th class="text-right">{{"actions" | translate}}</th>
5+
<th class="text-right"></th>
76
</tr>
87
</thead>
98
<tbody class="file-item">
@@ -32,9 +31,6 @@
3231
{{item.model.name | strLimit : 32}}
3332
</a>
3433
</td>
35-
<td class="hidden-sm hidden-xs">
36-
{{item.model.date.toString()}}
37-
</td>
3834
<td class="text-right">
3935
<button class="btn btn-sm btn-default" data-ng-click="select(item, temp)"><i class="glyphicon glyphicon-hand-up"></i> {{"select_this" | translate}}</button>
4036
</td>

src/templates/main-table.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<table class="table table-striped table-hover mb0 table-files">
1+
<table class="table mb0 table-files">
22
<thead>
33
<tr>
44
<th>{{"name" | translate}}</th>
55
<th class="hidden-xs">{{"size" | translate}}</th>
66
<th class="hidden-sm hidden-xs">{{"date" | translate}}</th>
77
<th class="hidden-sm hidden-xs">{{"permissions" | translate}}</th>
8-
<th class="text-right">{{"actions" | translate}}</th>
8+
<th class="text-right"></th>
99
</tr>
1010
</thead>
1111
<tbody class="file-item">
@@ -25,8 +25,8 @@
2525
</td>
2626
</tr>
2727
<tr data-ng-repeat="item in fileNavigator.fileList | filter: query | orderBy: orderProp" data-ng-show="!fileNavigator.requesting">
28-
<td>
29-
<a href="" data-ng-click="smartClick(item)" ng-right-click="smartRightClick(item)" title="{{item.model.name}} ({{item.model.sizeKb()}}kb)">
28+
<td ng-right-click="smartRightClick(item)">
29+
<a href="" data-ng-click="smartClick(item)" title="{{item.model.name}} ({{item.model.sizeKb()}}kb)">
3030
<i class="glyphicon glyphicon-folder-close" data-ng-show="item.model.type === 'dir'"></i>
3131
<i class="glyphicon glyphicon-file" data-ng-show="item.model.type === 'file'"></i>
3232
{{item.model.name | strLimit : 64}}

0 commit comments

Comments
 (0)