Skip to content

Commit 809ffe6

Browse files
joni2backjoni2back
committed
separate css, fix loader-spinner
1 parent d5374b0 commit 809ffe6

File tree

14 files changed

+568
-575
lines changed

14 files changed

+568
-575
lines changed

‎README.md‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
A very smart filemanager to manage your files in the browser developed in AngularJS with Material-Design styles by [Jonas Sciangula Street](https://github.com/joni2back)
44

55
#### [Try the DEMO](http://angular-filemanager.zendelsolutions.com/)
6-
[![Analytics](https://ga-beacon.appspot.com/UA-35182652-1/github.com/joni2back/angular-filemanager?pixel)](https://github.com/joni2back/angular-filemanager)
76
---------
87
![alt tag](https://raw.githubusercontent.com/joni2back/angular-filemanager/master/screenshot1.png)
98
![alt tag](https://raw.githubusercontent.com/joni2back/angular-filemanager/master/screenshot2.png)
@@ -48,7 +47,7 @@ A very smart filemanager to manage your files in the browser developed in Angula
4847
<link rel="stylesheet" href="bower_components/bootswatch/paper/bootstrap.min.css" />
4948

5049
<!-- angular-filemanager -->
51-
<link rel="stylesheet" href="dist/angular-filemanager.css">
50+
<link rel="stylesheet" href="dist/angular-filemanager.min.css">
5251
<script src="dist/angular-filemanager.min.js"></script>
5352
```
5453

@@ -73,11 +72,13 @@ A very smart filemanager to manage your files in the browser developed in Angula
7372
<script src="src/js/providers/translations.js"></script>
7473
<script src="src/js/controllers/main.js"></script>
7574
<script src="src/js/controllers/selector-controller.js"></script>
76-
<link href="src/css/angular-filemanager.css" rel="stylesheet">
75+
<link href="src/css/animations.css" rel="stylesheet">
76+
<link href="src/css/dialogs.css" rel="stylesheet">
77+
<link href="src/css/main.css" rel="stylesheet">
7778
-->
7879

7980
<!-- Comment if you need to use raw source code -->
80-
<link href="dist/angular-filemanager.css" rel="stylesheet">
81+
<link href="dist/angular-filemanager.min.css" rel="stylesheet">
8182
<script src="dist/angular-filemanager.min.js"></script>
8283
<!-- /Comment if you need to use raw source code -->
8384
```
@@ -90,7 +91,7 @@ A very smart filemanager to manage your files in the browser developed in Angula
9091
angular.module('FileManagerApp').config(['fileManagerConfigProvider', function (config) {
9192
var defaults = config.$get();
9293
config.set({
93-
appName: 'github.com/joni2back/angular-filemanager',
94+
appName: 'my angular-filemanager',
9495
allowedActions: angular.extend(defaults.allowedActions, {
9596
remove: true
9697
})

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-filemanager",
3-
"version": "1.4.3",
3+
"version": "1.4.4",
44
"homepage": "https://github.com/joni2back/angular-filemanager",
55
"authors": [
66
"Jonas Sciangula Street <[email protected]>"

‎dist/angular-filemanager.css‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎dist/angular-filemanager.min.css‎

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

‎gulpfile.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ var src = 'src/';
1414
var dst = 'dist/';
1515
var tplPath = 'src/templates' //must be same as fileManagerConfig.tplPath
1616
var jsFile = 'angular-filemanager.min.js';
17+
var cssFile = 'angular-filemanager.min.css';
1718

1819
gulp.task('clean', function (cb) {
1920
del(dst + '/*', cb);
@@ -44,6 +45,7 @@ gulp.task('concat-uglify-js', ['clean', 'cache-templates'], function() {
4445
gulp.task('minify-css', function() {
4546
return gulp.src(src + 'css/*.css')
4647
.pipe(minifyCss({compatibility: 'ie8'}))
48+
.pipe(concat(cssFile))
4749
.pipe(gulp.dest(dst));
4850
});
4951

‎index.html‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en" data-ng-app="FileManagerApp">
33
<head>
44
<!--
5-
* Angular FileManager v1.4.3 (https://github.com/joni2back/angular-filemanager)
5+
* Angular FileManager v1.4.4 (https://github.com/joni2back/angular-filemanager)
66
* Jonas Sciangula Street <[email protected]>
77
* Licensed under MIT (https://github.com/joni2back/angular-filemanager/blob/master/LICENSE)
88
-->
@@ -31,11 +31,13 @@
3131
<script src="src/js/providers/translations.js"></script>
3232
<script src="src/js/controllers/main.js"></script>
3333
<script src="src/js/controllers/selector-controller.js"></script>
34-
<link href="src/css/angular-filemanager.css" rel="stylesheet">
34+
<link href="src/css/animations.css" rel="stylesheet">
35+
<link href="src/css/dialogs.css" rel="stylesheet">
36+
<link href="src/css/main.css" rel="stylesheet">
3537
-->
3638

3739
<!-- Comment if you need to use raw source code -->
38-
<link href="dist/angular-filemanager.css" rel="stylesheet">
40+
<link href="dist/angular-filemanager.min.css" rel="stylesheet">
3941
<script src="dist/angular-filemanager.min.js"></script>
4042
<!-- /Comment if you need to use raw source code -->
4143

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-filemanager",
3-
"version": "1.4.3",
3+
"version": "1.4.4",
44
"description": "A very smart filemanager to manage your files in the browser.",
55
"main": "src/app.js",
66
"scripts": {

0 commit comments

Comments
 (0)