Skip to content

Commit 4953143

Browse files
committed
style(*): lock screen and buttons
1 parent fc127a0 commit 4953143

File tree

9 files changed

+118
-14
lines changed

9 files changed

+118
-14
lines changed

src/main/resources/static/apps/admin/assets/css/style.css

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

src/main/resources/static/apps/admin/assets/css/style.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.

src/main/resources/static/apps/admin/assets/css/style.scss

Lines changed: 47 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ $color-light:#ecf0f5;
77
$color-black:#222d32;
88
$color-text-light: rgba(255, 255, 255, 0.87);
99
$color-text-dark: #333333;
10+
$color-gray: #d2d6de;
1011

1112
$color-primary: #3c8dbc;
1213

@@ -153,7 +154,10 @@ html, body {
153154
margin-top: .5rem;
154155
}
155156
.lockscreen-wrapper {
156-
margin-top: 20%;
157+
margin-top: 10%;
158+
.lockscreen-name {
159+
font-size: 1.25rem;
160+
}
157161
}
158162
}
159163

@@ -262,6 +266,21 @@ md-toolbar,
262266
margin-bottom: 0;
263267
.box-header {
264268
height: 41px;
269+
&>.header-center {
270+
position: absolute;
271+
top: 0;
272+
padding-right: 20px;
273+
width: 100%;
274+
height: 0;
275+
z-index: 88;
276+
text-align: center;
277+
.msg-block {
278+
display: inline-block;
279+
padding: 0 10px 3px 10px;
280+
border-radius: 0 0 3px 3px;
281+
background: linear-gradient($color-gray, lighten($color-gray, 10%));
282+
}
283+
}
265284
&>.box-tools {
266285
&.pull-left {
267286
left: 10px;
@@ -537,6 +556,32 @@ md-backdrop.md-dialog-backdrop {
537556
}
538557
}
539558

559+
/* angularjs component styles */
560+
.btn[ui-wait-on] {
561+
position: relative;
562+
.in-process {
563+
position: absolute;
564+
width: 100%;
565+
top: 0;
566+
left: 0;
567+
line-height: 32px;
568+
}
569+
&.btn-xs {
570+
.in-process {
571+
line-height: 20px;
572+
}
573+
}
574+
&.btn-sm {
575+
.in-process {
576+
line-height: 28px;
577+
}
578+
}
579+
&.btn-lg {
580+
.in-process {
581+
line-height: 42px;
582+
}
583+
}
584+
}
540585

541586
/* misc */
542587

@@ -564,4 +609,4 @@ md-backdrop.md-dialog-backdrop {
564609

565610
.radius {
566611
border-radius: 4px;
567-
}
612+
}

src/main/resources/static/apps/admin/modules/cms/articles.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</ui-page-content-header-left>
1111
<ui-page-content-header-right>
1212
<button class="btn btn-sm btn-primary" ng-click="edit()">
13-
<i class="glyphicon glyphicon-plus-sign"></i>
13+
<i class="fa fa-fw fa-plus-circle"></i>
1414
<span ng-bind="'common.add'|translate"></span>
1515
</button>
1616
</ui-page-content-header-right>

src/main/resources/static/apps/admin/modules/cms/channels.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ui-page-content>
77
<ui-page-content-header-right>
88
<button type="button" class="btn btn-sm btn-primary" ng-click="add()">
9-
<i class="glyphicon glyphicon-plus-sign"></i>
9+
<i class="fa fa-fw fa-plus-circle"></i>
1010
<span ng-bind="'admin.modules.cms.channels.addChannel'|translate"></span>
1111
</button>
1212
</ui-page-content-header-right>

src/main/resources/static/apps/admin/modules/cms/page.html

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55
<ui-page-content ng-if="viewModel.id">
66
<ui-page-content-header-right>
77
<a target="_blank" class="btn btn-sm btn-default" href="/page/{{viewModel.channel.nameKey}}">
8-
<i class="fa fa-internet-explorer" aria-hidden="true"></i>
8+
<i class="fa fa-fw fa-internet-explorer" aria-hidden="true"></i>
99
<span ng-bind="'common.preview'|translate"></span>
1010
</a>
11-
<button type="button" class="btn btn-sm btn-primary" ng-click="save()" ui-wait-on="isSaving"
12-
ng-bind="'common.saveChanges'|translate"></button>
11+
<button type="button" class="btn btn-sm btn-primary" ng-click="save()" ui-wait-on="isSaving">
12+
<i class="fa fa-fw fa-save"></i>
13+
<span ng-bind="'common.saveChanges'|translate"></span>
14+
</button>
1315
</ui-page-content-header-right>
1416

1517
<div>
@@ -22,8 +24,11 @@
2224
<div class="form-group" ng-if="viewModel.attachments && viewModel.attachments.length > 0">
2325
<div class="tag" ng-repeat="item in viewModel.attachments">
2426
<a href="/files/{{item.uuid}}" target="_blank">
25-
<span ng-bind="item.name"></span>.<span ng-bind="item.extName"></span>
27+
<b ng-bind="item.fullname"></b>
2628
</a>
29+
<small>
30+
({{item.size/1024/1024|number:2}} MB, {{item.createTime|appDateTime}})
31+
</small>
2732
<a class="text-danger pull-right" ng-click="removeAttachment(item)">
2833
<i class="glyphicon glyphicon-trash"></i>
2934
</a>

src/main/resources/static/apps/admin/modules/core/menus.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
breadcrumbs="[{'text': 'admin.modules.core.menus.title'}]"></ui-page-header>
55
<ui-page-content>
66
<ui-page-content-header-right>
7-
<button type="button" class="btn btn-sm btn-primary" ng-click="add()" ng-bind="'admin.modules.core.menus.addMenu'|translate"></button>
7+
<button type="button" class="btn btn-sm btn-primary" ng-click="add()">
8+
<i class="fa fa-fw fa-plus-circle"></i>
9+
<span ng-bind="'admin.modules.core.menus.addMenu'|translate"></span>
10+
</button>
811
</ui-page-content-header-right>
912

1013
<ui-menu-tree ng-model="menus"

src/main/resources/static/apps/admin/modules/core/roles.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
breadcrumbs="[{'text': 'admin.modules.core.roles.title'}]"></ui-page-header>
55
<ui-page-content>
66
<ui-page-content-header-right>
7-
<button type="button" class="btn btn-sm btn-primary" ng-click="add()" ng-bind="'admin.modules.core.roles.addRole'|translate"></button>
7+
<button type="button" class="btn btn-sm btn-primary" ng-click="add()">
8+
<i class="fa fa-fw fa-plus-circle"></i>
9+
<span ng-bind="'admin.modules.core.roles.addRole'|translate"></span>
10+
</button>
811
</ui-page-content-header-right>
912

1013
<table class="table table-striped table-hover">

src/main/resources/static/apps/admin/modules/core/users.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@
1010
on-search="search(__model)"></ui-search>
1111
</ui-page-content-header-left>
1212
<ui-page-content-header-right>
13-
<a class="btn btn-sm btn-primary" href="/sso/signup" target="_blank"
14-
ng-bind="'admin.modules.core.users.addUser'|translate"></a>
13+
<a class="btn btn-sm btn-primary" href="/sso/signup" target="_blank">
14+
<i class="fa fa-fw fa-plus-circle"></i>
15+
<span ng-bind="'admin.modules.core.users.addUser'|translate"></span>
16+
</a>
1517
</ui-page-content-header-right>
1618
<ui-page-content-footer>
1719
<bn-ui-pager ng-model="pager" on-page="pageUsers(page)"></bn-ui-pager>

0 commit comments

Comments
 (0)