Skip to content

Commit aeea083

Browse files
ultra7677ultra7677
committed
version 1.1
1 parent 60cc247 commit aeea083

File tree

12 files changed

+108
-49
lines changed

12 files changed

+108
-49
lines changed

‎src/main/resources/static/css/calendar.css

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,15 @@
8282
position: absolute;
8383
left: 0;
8484
right: 0;
85-
background: cadetblue;
85+
background: #55A57C;
8686
}
8787

8888
.page.calendar .day-container[holiday="COMPANY"] {
89-
background: #ebccd1;
89+
background: #71AADA;
9090
}
9191

9292
.page.calendar .day-container[holiday="NATIONALITY"] {
93-
background: #a94442;
93+
background: #E47775;
9494
}
9595

9696
.page.calendar .day[dayofweek="SUNDAY"] {
@@ -143,15 +143,15 @@
143143
}
144144

145145
.page.calendar .legend-item.nationality .color {
146-
background: #a94442;
146+
background: #E47775;
147147
}
148148

149149
.page.calendar .legend-item.company .color {
150-
background: #ebccd1;
150+
background: #71AADA;
151151
}
152152

153153
.page.calendar .legend-item.today .color {
154-
background: cadetblue;
154+
background: #55A57C;
155155
}
156156

157157
.page.calendar .holidays-list {
@@ -171,11 +171,11 @@
171171
}
172172

173173
.page.calendar .holidays-list .color[holiday="COMPANY"] {
174-
background: #ebccd1;
174+
background: #71AADA;
175175
}
176176

177177
.page.calendar .holidays-list .color[holiday="NATIONALITY"] {
178-
background: #a94442;
178+
background: #E47775;
179179
}
180180

181181
.page.calendar .holidays-list .date {

‎src/main/resources/static/css/common.css

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,23 @@ ul, menu, dir {
1111
max-width : 970px;
1212
}
1313

14+
.panel.panel-default.up{
15+
margin-left : 30px;
16+
margin-top : 0px;
17+
padding-right: 0px;
18+
padding-left: 0px;
19+
width:38.7%;
20+
min-height : 270px;
21+
}
22+
1423
.page-body {
1524
padding: 30px 50px;
1625
}
1726

1827
.navbar {
1928
margin-bottom: 0px;
29+
background-color: #f8f8f8;
30+
border-color: #e7e7e7;
2031
}
2132

2233
.input-field {
@@ -46,7 +57,7 @@ ul, menu, dir {
4657
height: 30px;
4758
line-height: 30px;
4859
width: 100%;
49-
color: #2B1E1E;
60+
color: #000000;
5061
font-size: 14px;
5162
}
5263

@@ -73,7 +84,7 @@ ul, menu, dir {
7384
.btn-xlarge {
7485
height: 45px;
7586
width: 100%;
76-
background-color: #4A90E2;
87+
background-color: #6283AB;
7788
border-radius: 5px;
7889
color: #fff;
7990
border: none;
@@ -87,7 +98,7 @@ ul, menu, dir {
8798
}
8899

89100
.useful-links a {
90-
color: #504949;
101+
color: #CAC6C6;
91102
font-size: 12px;
92103
}
93104

@@ -105,9 +116,10 @@ form .form-error-message {
105116
}
106117

107118
.panel.action-panel .panel-heading {
108-
background: rgba(245, 245, 245, 0.5);
119+
background: rgba(0,0,0,.0001);
109120
border-bottom: 1px solid white;
110121
font-weight: bold;
122+
color: #C5C5C5;
111123
}
112124

113125
.hidden {
@@ -121,12 +133,20 @@ form .form-error-message {
121133
.panel .panel-heading .bar-container {
122134
position: absolute;
123135
right: 15px;
124-
top: 0;
136+
top: 7px;
125137
bottom: 0;
126138
padding: 3px 0px;
127139
}
128140

129141
.btn-primary {
130-
background-color: #4A90E2;
131-
border-color: #4A90E2;
132-
}
142+
background-color: #B4BCC5;
143+
border-color: #B4BCC5;
144+
}
145+
146+
.span-text{
147+
color : #565656;
148+
}
149+
150+
.span-heading{
151+
color : #2F2C2C;
152+
}

‎src/main/resources/static/css/employee.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@
3636

3737
.employee.information td .col-xs-3{
3838
padding:0px;
39-
}
39+
}

‎src/main/resources/static/css/leaverequest.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
.leave-reuqest .panel{
2-
width:800px;
2+
33
}
44

‎src/main/resources/static/css/login.css

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,26 @@
11
body {
2-
background-image: url("/imgs/bg.jpg");
2+
background-image: url(/imgs/bg.png);
3+
background-size: cover;
4+
background-size: auto 1400px;
5+
background-repeat: no-repeat;
6+
}
7+
8+
.input-field{
9+
background-color: rgb(228, 228, 228);
10+
}
11+
12+
.input-label {
13+
height: 30px;
14+
line-height: 30px;
15+
width: 100%;
16+
color: #CCCCCC;
17+
font-size: 14px;
18+
}
19+
20+
.panel.panel-default.action-panel{
21+
left : 30%;
22+
top : 18%;
23+
right : 0px;
324
}
425

526
.input-field-group.password {
@@ -28,4 +49,5 @@ body {
2849
width: 50%;
2950
float: right;
3051
text-align: right;
31-
}
52+
}
53+

‎src/main/resources/static/css/register.css

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,28 @@
11
body {
2-
background-image: url("/imgs/bg.jpg");
2+
background-image: url("/imgs/bg.png");
3+
background-size: cover;
4+
background-size: auto 1400px;
5+
background-repeat: no-repeat;
36
}
47

58
.btn.register{
69
margin-top: 20px;
710
}
811

12+
.input-label {
13+
height: 30px;
14+
line-height: 30px;
15+
width: 100%;
16+
color: #CCCCCC;
17+
font-size: 14px;
18+
}
19+
20+
.panel.panel-default.action-panel{
21+
left : 30%;
22+
top : 10%;
23+
right : 0px;
24+
}
25+
926
.useful-links .forget-password {
1027
width: 50%;
1128
float: left;
@@ -19,4 +36,4 @@ body {
1936

2037
.useful-links{
2138
margin-top: 10px;
22-
}
39+
}

‎src/main/resources/static/css/setting.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
.page.setting .modal-dialog {
23
width: 500px;
34
margin:100px auto;

‎src/main/resources/static/imgs/bg.png

924 KB
Loading

‎src/main/resources/templates/accounts/login.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<link rel="stylesheet" th:href="@{/css/login.css}"></link>
1010
</head>
1111
<body>
12-
<nav class="navbar navbar-default"></nav>
1312
<div class="panel panel-default action-panel">
1413
<div class="panel-heading" th:text="#{login.form.title}"></div>
1514
<div class="panel-body">
@@ -26,7 +25,7 @@
2625
<input name="password" class="input-field" type="password" th:field="*{password}" th:placeholder="#{login.form.placeholder.password}" />
2726
<div class="input-field-error-message" th:if="${#fields.hasErrors('password')}"></div>
2827
</div>
29-
<input class="btn btn-xlarge login" type="submit" th:value="#{login.form.bottom.login}" />
28+
<input class="btn btn-xlarge login" type="submit" th:value="#{login.form.bottom.login}" />
3029
</form>
3130
<form class="oauth-login-form" action="#" th:action="@{/oauth/login}" method="POST">
3231
<div class="split-line"></div>

‎src/main/resources/templates/accounts/register.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@
99
<link rel="stylesheet" th:href="@{/css/register.css}"></link>
1010
</head>
1111
<body>
12-
<nav class="navbar navbar-default"></nav>
1312
<div class="panel panel-default action-panel">
14-
<div class="panel-heading" th:text="#{login.form.title}"></div>
13+
<div class="panel-heading" th:text="#{register.form.title}"></div>
1514
<div class="panel-body">
1615
<form class="panel-form" action="#" th:action="@{/user/register}" th:object="${registerForm}" method="POST">
1716
<ul class="form-error-message" th:if="${#fields.hasGlobalErrors()}">

‎src/main/resources/templates/employee/information.html

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -69,56 +69,56 @@
6969
<tr>
7070
<th>
7171
<span class="glyphicon glyphicon-user" aria-hidden="true"></span>
72-
<span th:text="#{employee.info.name}"></span>
73-
<span th:if="${employeeInfoForm.name != null}" th:text="${employeeInfoForm.name}"></span>
72+
<span class="span-heading" th:text="#{employee.info.name}"></span>
73+
<span class="span-text" th:if="${employeeInfoForm.name != null}" th:text="${employeeInfoForm.name}"></span>
7474
</th>
7575
<th>
7676
<span class="glyphicon glyphicon-envelope" aria-hidden="true"></span>
77-
<span th:text="#{employee.info.email}"></span>
78-
<span th:if="${employeeInfoForm.email != null}" th:text="${employeeInfoForm.email}"></span>
77+
<span class="span-heading" th:text="#{employee.info.email}"></span>
78+
<span class="span-text" th:if="${employeeInfoForm.email != null}" th:text="${employeeInfoForm.email}"></span>
7979
</th>
8080
</tr>
8181
<tr>
8282
<th>
8383
<span class="glyphicon glyphicon-earphone" aria-hidden="true"></span>
84-
<span th:text="#{employee.info.tel}"></span>
85-
<span th:if="${employeeInfoForm.phoneNumber != null}" th:text="${employeeInfoForm.phoneNumber}"></span>
84+
<span class="span-heading" th:text="#{employee.info.tel}"></span>
85+
<span class="span-text" th:if="${employeeInfoForm.phoneNumber != null}" th:text="${employeeInfoForm.phoneNumber}"></span>
8686
</th>
8787
<th>
8888
<span class="glyphicon glyphicon-calendar" aria-hidden="true"></span>
89-
<span th:text="#{employee.info.birthdate}"></span>
90-
<span th:if="${employeeInfoForm.birthDate != null}" th:text="${employeeInfoForm.birthDate}"></span>
89+
<span class="span-heading" th:text="#{employee.info.birthdate}"></span>
90+
<span class="span-text" th:if="${employeeInfoForm.birthDate != null}" th:text="${employeeInfoForm.birthDate}"></span>
9191
</th>
9292
</tr>
9393
<tr>
9494
<th>
9595
<span class="glyphicon glyphicon-home" aria-hidden="true"></span>
96-
<span th:text="#{employee.info.department}"></span>
97-
<span th:if="${employeeInfoForm.department != null}" th:text="${employeeInfoForm.department}"></span>
96+
<span class="span-heading" th:text="#{employee.info.department}"></span>
97+
<span class="span-text" th:if="${employeeInfoForm.department != null}" th:text="${employeeInfoForm.department}"></span>
9898
</th>
9999
<th>
100100
<span class="glyphicon glyphicon-star" aria-hidden="true"></span>
101-
<span th:text="#{employee.info.position}"></span>
102-
<span th:if="${employeeInfoForm.position != null}" th:text="${employeeInfoForm.position}"></span>
101+
<span class="span-heading" th:text="#{employee.info.position}"></span>
102+
<span class="span-text" th:if="${employeeInfoForm.position != null}" th:text="${employeeInfoForm.position}"></span>
103103
</th>
104104
</tr>
105105
<tr>
106106
<th>
107107
<span class="glyphicon glyphicon-ok-sign" aria-hidden="true"></span>
108-
<span th:text="#{employee.info.gender}"></span>
109-
<span th:if="${employeeInfoForm.gender != null}" th:text="${employeeInfoForm.gender}"></span>
108+
<span class="span-heading" th:text="#{employee.info.gender}"></span>
109+
<span class="span-text" th:if="${employeeInfoForm.gender != null}" th:text="${employeeInfoForm.gender}"></span>
110110
</th>
111111
<th>
112112
<span class="glyphicon glyphicon-calendar" aria-hidden="true"></span>
113-
<span th:text="#{employee.info.entrydate}"></span>
114-
<span th:if="${employeeInfoForm.entryDate != null}" th:text="${employeeInfoForm.entryDate}"></span>
113+
<span class="span-heading" th:text="#{employee.info.entrydate}"></span>
114+
<span class="span-text" th:if="${employeeInfoForm.entryDate != null}" th:text="${employeeInfoForm.entryDate}"></span>
115115
</th>
116116
</tr>
117117
<tr>
118118
<th>
119119
<span class="glyphicon glyphicon-th-large" aria-hidden="true"></span>
120-
<span th:text= "#{employee.info.company}"></span>
121-
<span th:text= "${companyInfo.name}"></span>
120+
<span class="span-heading" th:text= "#{employee.info.company}"></span>
121+
<span class="span-text" th:text= "${companyInfo.name}"></span>
122122
</th>
123123
<th>
124124
</th>
@@ -127,7 +127,7 @@
127127
</table>
128128
</div>
129129
<div class= "media-right">
130-
<a href="#" th:href="@{/edit.html}" role="button" class="btn btn-default btn-xs"> Edit</a>
130+
<a href="#" th:href="@{/edit.html}" role="button" class="btn btn-primary btn-xs"> Edit</a>
131131
</div>
132132
</div>
133133
</div>

‎src/main/resources/templates/settings/index.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,9 @@ <h4 class="modal-title" id="myModalLabel" th:text="#{company.info.editdepartment
219219
</div>
220220

221221
<div class="page-body">
222-
223-
<div class="panel panel-default" th:object ="${settingPage.companyInfoForm}">
222+
223+
<div class="row">
224+
<div class="panel panel-default up col-md-5" th:object ="${settingPage.companyInfoForm}">
224225
<div class="panel-heading" th:text="#{company.info.header}"></div>
225226
<div class="panel-body">
226227
<div class="media">
@@ -249,7 +250,7 @@ <h4 class="modal-title" id="myModalLabel" th:text="#{company.info.editdepartment
249250
</div>
250251
</div>
251252

252-
<div class="panel panel-default" th:object = "${settingPage.departmentInfoForm}">
253+
<div class="panel panel-default up col-md-5" th:object = "${settingPage.departmentInfoForm}">
253254
<div class="panel-heading" th:text="#{company.info.department}"> </div>
254255
<div class="panel-body">
255256
<div class="media">
@@ -275,7 +276,7 @@ <h4 class="modal-title" id="myModalLabel" th:text="#{company.info.editdepartment
275276
</div>
276277
</div>
277278
</div>
278-
279+
</div>
279280

280281
<form class="workhours-form" action="#" th:action="@{/setting/workhours}" th:object="${settingPage.workHoursForm}" method="POST">
281282
<div class="panel panel-default workhours">

0 commit comments

Comments
 (0)