Skip to content

Commit 2bb0ca9

Browse files
author
Francis Corona
committed
File Manager icons improved and some bugs fixed.
1 parent d6a489d commit 2bb0ca9

File tree

7 files changed

+96
-37
lines changed

7 files changed

+96
-37
lines changed

BlogEngine/BlogEngine.NET/admin/app/custom/plugins/pluginView.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,14 @@ <h4 class="modal-title">{{package.Title}}</h4>
7575
</div>
7676
</div>
7777
<div id="modal-settings" class="modal fade">
78-
<div class="modal-dialog">
78+
<div class="modal-dialog iframe-package">
7979
<div class="modal-content">
8080
<div class="modal-header">
8181
<button type="button" class="close" data-dismiss="modal" aria-hidden="true" ng-click="focusInput=false"><i class="fa fa-times"></i></button>
8282
<h4 class="modal-title">{{package.Title}}</h4>
8383
</div>
8484
<div class="modal-body">
85-
<iframe id="settingsFrame" class="iframe-package" ng-src="{{extEditSrc}}"></iframe>
85+
<iframe id="settingsFrame" ng-src="{{extEditSrc}}"></iframe>
8686
</div>
8787
</div>
8888
</div>

BlogEngine/BlogEngine.NET/admin/app/editor/filemanager.cshtml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232
var editVars = { id: '@id', storageLocation: '@BlogConfig.StorageLocation' };
3333
</script>
3434
<script type="text/javascript" src="admin.res.axd"></script>
35-
<style>
36-
</style>
3735
</head>
3836
<body class="filemanager @Resources.labels.LangDirection" ng-controller="FileManagerController">
3937
@Scripts.Render("~/scripts/wysiwyg")
@@ -51,7 +49,7 @@
5149
<input type="text" class="form-control" id="txtFolder" name="txtFolder" data-ng-model="dirName" focus-me="focusInput" />
5250
</div>
5351
<div class="modal-buttons">
54-
<button type="button" ng-click="createFolder()" class="btn btn-success btn-hasicon"><i class="fa fa-save"></i>{{lbl.save}}</button>
52+
<button type="button" ng-click="createFolder()" class="btn btn-success btn-hasicon"><i class="fa fa-check"></i>{{lbl.save}}</button>
5553
<button type="button" class="btn btn-default" data-dismiss="modal" ng-click="focusInput=false">{{lbl.cancel}}</button>
5654
</div>
5755
</div>
@@ -81,7 +79,7 @@
8179
<i ng-class="item.ImgPlaceholder"></i>
8280
</a>
8381
<a ng-if="item.FileType === 2" title="{{item.Name}}" href="" ng-click="insertFile(item)">
84-
<img ng-src="@imgHandler{{item.FullPath}}" />
82+
<img ng-src="@imgHandler{{item.FullPath}}" />
8583
</a>
8684
</div>
8785
<div class="item-file-name">

BlogEngine/BlogEngine.NET/admin/themes/standard/css/styles.css

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

BlogEngine/BlogEngine.NET/admin/themes/standard/css/styles.css.map

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

BlogEngine/BlogEngine.NET/admin/themes/standard/sass/modules/_filemanager.scss

Lines changed: 40 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
.filemanager-path {
99
display: block;
1010
margin-bottom: 30px;
11+
letter-spacing: 1px;
12+
font-weight: $font-weight-bold;
1113
}
1214

1315
.search-form {
@@ -22,53 +24,81 @@
2224
margin-right: 20px;
2325
margin-bottom: 20px;
2426
background: #fff;
25-
width: 220px;
27+
width: 160px;
2628
overflow: hidden;
2729
@include box-shadow(0 1px 3px rgba(0, 0, 0, 0.10));
2830
@include transition(all ease .2s);
2931

3032
&:hover {
3133
@include box-shadow(0 1px 3px rgba(0, 0, 0, 0.30));
34+
35+
.item-file-name {
36+
background: #eee;
37+
}
3238
}
3339

3440
.item-file-image {
35-
height: 200px;
41+
height: 150px;
3642
background: #fff;
3743
overflow: hidden;
3844
position: relative;
3945

4046
a {
4147
display: block;
4248
height: 100%;
49+
position: relative;
4350

4451
img {
45-
height: 200px;
52+
height: 150px;
4653
max-width: none;
4754
width: auto;
4855
min-width: 100%;
56+
position: absolute;
57+
left: 50%;
58+
@include transform(translateX(-50%));
4959
}
5060

61+
5162
i {
5263
display: block;
5364
text-align: center;
5465
height: 100%;
5566
width: 100%;
56-
line-height: 210px;
67+
line-height: 155px;
5768
color: #444;
58-
font-size: 100px;
69+
font-size: 80px;
5970
}
6071

6172
.fa-folder {
62-
font-size: 180px;
63-
line-height: 215px;
73+
font-size: 120px;
74+
line-height: 160px;
6475
color: #ede079;
6576
}
77+
78+
.fa-file-archive-o {
79+
color: #654aa7;
80+
}
81+
82+
.fa-file-excel-o {
83+
color: #217346;
84+
}
85+
86+
.fa-file-word-o {
87+
color: #2b579a;
88+
}
89+
90+
.fa-file-pdf-o {
91+
color: #dd4a4a;
92+
}
93+
94+
.fa-file-text-o {
95+
}
6696
}
6797
}
6898

6999
.item-file-name {
70-
height: 40px;
71-
line-height: 40px;
100+
height: 35px;
101+
line-height: 35px;
72102
display: block;
73103
position: relative;
74104
@include user-select(none);
@@ -82,7 +112,7 @@
82112
input {
83113
position: absolute;
84114
left: 13px;
85-
top: 14px;
115+
top: 11px;
86116
margin: 0;
87117
}
88118
}

BlogEngine/BlogEngine.NET/admin/themes/standard/sass/modules/_modals.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44

55
.btn {
66
float: left;
7-
margin-right:10px;
8-
7+
margin-right: 10px;
98
}
9+
1010
&:after {
11-
content: "";
12-
display: table;
13-
clear: both;
14-
}
11+
content: "";
12+
display: table;
13+
clear: both;
14+
}
1515
}
1616

1717
.modal-header {

BlogEngine/BlogEngine.NET/admin/themes/standard/sass/pages/custom/_plugins.scss

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
.custom-plugins-view {
22
//
3+
.iframe-package {
4+
.modal-body {
5+
}
6+
7+
iframe {
8+
height: 100%;
9+
}
10+
}
11+
312
.modal-package {
413
padding: 0 !important;
514

@@ -126,4 +135,4 @@
126135
padding: 0 10px;
127136
}
128137
}
129-
}
138+
}

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy