Skip to content

Commit 08e4c2f

Browse files
committed
style(core): sidebar menu
1 parent 4953143 commit 08e4c2f

File tree

6 files changed

+27
-9
lines changed

6 files changed

+27
-9
lines changed

src/main/java/net/bndy/wf/modules/core/services/MenuService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public Menu getMenuManagementEntry() {
146146
Menu m = new Menu();
147147
m.setName("admin.modules.core.menus.title");
148148
m.setLink("core-menus");
149-
m.setIcon("fa fa-circle-o text-red");
149+
m.setIcon("fa fa-fw fa-circle-o text-red");
150150
m.setDisplayOrder(999999);
151151
m.setVisible(true);
152152
return m;

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

Lines changed: 4 additions & 0 deletions
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: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,14 @@ md-toolbar,
201201
}
202202
}
203203

204+
.sidebar-menu {
205+
& > li {
206+
& > a {
207+
padding-left: 12px;
208+
}
209+
}
210+
}
211+
204212
.control-sidebar {
205213
.form-group {
206214
clear: both;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ <h4 class="media-heading">
3535
<i class="fa fa-clipboard"></i>
3636
<span ng-bind="'admin.modules.core.files.copyUrl'|translate"></span>
3737
</button>
38-
<button class="btn btn-xs btn-block btn-default" ng-click="remove(item)" ng-disabled="item.ref">
38+
<button class="btn btn-xs btn-block btn-default" ng-click="remove(item)" ng-if="!item.ref">
3939
<i class="fa fa-trash-o"></i>
4040
<span ng-bind="'common.delete'|translate"></span>
4141
</button>

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,20 @@
22
<ui-page-header title="'admin.modules.core.userProfile.title'"
33
breadcrumbs="[{'text': 'admin.modules.core.userProfile.title'}]"></ui-page-header>
44

5-
<div class="row">
6-
<div class="col-md-6 col-md-offset-3">
5+
<div class="padding">
6+
<div class="col-sm-12 col-md-8 col-md-offset-2">
77
<div class="row">
88
<div class="col-xs-4 padding-xs">
99
<div class="box box-info" style="height: 340px;">
1010
<div class="box-header with-border">
11-
<h3 class="box-title" ng-bind="'admin.modules.core.userProfile.titleAvatar'|translate"></h3>
11+
<h3 class="box-title"
12+
ng-bind="'admin.modules.core.userProfile.titleAvatar'|translate"></h3>
1213
</div>
1314
<div class="box-body text-center padding">
14-
<img alt="User Image" class="radius" ng-src="{{user.avatar}}" style="width: 100%;">
15+
<br/>
16+
<img alt="User Image" class="radius" ng-src="{{user.avatar}}"
17+
style="max-height: 150px;">
18+
<br/>
1519
<br/>
1620
<br/>
1721
<a class="btn btn-flat btn-default" ngf-select="uploadAvatar($file, $invalidFiles)"
@@ -58,7 +62,8 @@ <h3 class="box-title" ng-bind="'admin.modules.core.userProfile.titleAvatar'|tran
5862

5963
<div class="form-group">
6064
<label ng-bind="'admin.modules.core.userProfile.labelBirthday'|translate"></label>
61-
<input type="text" class="datepicker form-control" ng-model="viewModel.birthday"/>
65+
<input type="text" class="datepicker form-control"
66+
ng-model="viewModel.birthday"/>
6267
</div>
6368
<button class="btn btn-flat btn-primary" ng-click="updateProfile()"
6469
ui-wait-on="isUpdatingProfile" ng-disabled="!mainForm.$valid">
@@ -85,7 +90,8 @@ <h3 class="box-title" ng-bind="'admin.modules.core.userProfile.titleAvatar'|tran
8590
<ui-input name="newPassword" label="admin.modules.core.userProfile.newPassword"
8691
type="password"
8792
required="true" ng-model="pwdModel.newPassword"></ui-input>
88-
<ui-input name="confirmPassword" label="admin.modules.core.userProfile.confirmPassword"
93+
<ui-input name="confirmPassword"
94+
label="admin.modules.core.userProfile.confirmPassword"
8995
type="password"
9096
has-error="pwdModel.newPassword != pwdModel.confirmPassword"
9197
error-message="admin.modules.core.userProfile.unmatchedConfirmPassword"

0 commit comments

Comments
 (0)