Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
DoorLock
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
felix
DoorLock
Commits
f659d378
Commit
f659d378
authored
Nov 03, 2017
by
wangying
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
上传样式
parent
09a9dcd5
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
39 additions
and
91 deletions
+39
-91
web/lib/less/addDevice/addDevice.less
+1
-1
web/lib/less/device/device.less
+11
-3
web/lib/less/doorlockUsers/doorlockUser.less
+3
-3
web/lib/less/login/login.less
+1
-1
web/lib/less/public/core.less
+5
-5
web/lib/less/public/variables.less
+1
-0
web/view/addDevice/addDevice.css
+0
-10
web/view/addDevice/index.html
+1
-1
web/view/bindUser/bindUser.css
+0
-6
web/view/device/device.css
+12
-8
web/view/device/recordList.css
+0
-6
web/view/doorlockManage/doorlockManage.css
+0
-6
web/view/doorlockUsers/doorlockUser.css
+2
-12
web/view/doorlockUsers/inviteBind.html
+1
-0
web/view/doorlockUsers/unlockInfo.css
+0
-6
web/view/doorlockUsers/userList.css
+0
-6
web/view/login/index.html
+1
-1
web/view/login/login.css
+0
-10
web/view/myInfo/myInfo.css
+0
-6
No files found.
web/lib/less/addDevice/addDevice.less
View file @
f659d378
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
@import "../public/header.less";
@import "../public/header.less";
//添加设备
//添加设备
.noBottomGradient();
//
.noBottomGradient();
.addDevice li{
.addDevice li{
margin: 10px;
margin: 10px;
...
...
web/lib/less/device/device.less
View file @
f659d378
...
@@ -158,13 +158,21 @@
...
@@ -158,13 +158,21 @@
vertical-align: middle;
vertical-align: middle;
}
}
&:nth-child(2){
&:nth-child(2){
width:
40
px;
width:
35
px;
display: inline-block;
display: inline-block;
vertical-align: middle;
vertical-align: middle;
text-align: right;
text-align: left;
font-size: 13px;
font-size: 13px;
line-height: 1;
margin-left: 6px;
}
}
}
}
&.yellowWarning span:nth-child(1){
color: #f99b22;
}
&.redWarning span:nth-child(1){
color: #fc2168;
}
}
}
.bindDoorlock{
.bindDoorlock{
...
...
web/lib/less/doorlockUsers/doorlockUser.less
View file @
f659d378
...
@@ -29,7 +29,6 @@
...
@@ -29,7 +29,6 @@
//门锁用户
//门锁用户
.userInfoLink{
.userInfoLink{
margin-top: 20px;
li{
li{
&:not(.userInfo){
&:not(.userInfo){
height: 52px;
height: 52px;
...
@@ -162,9 +161,10 @@
...
@@ -162,9 +161,10 @@
&:nth-child(2){
&:nth-child(2){
color: inherit;
color: inherit;
font-size: @INVITEBIND-TITLE-FONTSIZE;
font-size: @INVITEBIND-TITLE-FONTSIZE;
margin-top: 3
3
px;
margin-top: 3
2
px;
}
}
}
}
//二维码已过期,请重新生成
p{
p{
position: absolute;
position: absolute;
top: 0;
top: 0;
...
@@ -172,7 +172,7 @@
...
@@ -172,7 +172,7 @@
width: 100%;
width: 100%;
height: 100%;
height: 100%;
text-align: center;
text-align: center;
background-color:
rgba(255, 255, 255, 0.1)
;
background-color:
@INVITEBIND-QRCODEEXPIRE-BACKDROP
;
span{
span{
.transformV_center(left,0);
.transformV_center(left,0);
width: 100%;
width: 100%;
...
...
web/lib/less/login/login.less
View file @
f659d378
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
@import "../public/header.less";
@import "../public/header.less";
//引导页
//引导页
.noBottomGradient();
//
.noBottomGradient();
#app{
#app{
width: 100%;
width: 100%;
...
...
web/lib/less/public/core.less
View file @
f659d378
...
@@ -13,12 +13,12 @@ body{
...
@@ -13,12 +13,12 @@ body{
color: @BODY-TEXT-COLOR;
color: @BODY-TEXT-COLOR;
font-size: @BODY-TEXT-FONTSIZE;
font-size: @BODY-TEXT-FONTSIZE;
//font-family: @BODY-TEXT-FONTFAMILY;
//font-family: @BODY-TEXT-FONTFAMILY;
.white_gradient_border();
//
.white_gradient_border();
background-color: @BODY-BG-COLOR;
background-color: @BODY-BG-COLOR;
-webkit-background-size: 100% 1px;/*no*/
// -webkit-background-size: 100% 1px;
background-size: 100% 1px;/*no*/
// background-size: 100% 1px;
background-repeat: no-repeat;
//
background-repeat: no-repeat;
background-position: bottom center;
//
background-position: bottom center;
}
}
ul{
ul{
...
...
web/lib/less/public/variables.less
View file @
f659d378
...
@@ -275,6 +275,7 @@
...
@@ -275,6 +275,7 @@
@INVITEBIND-TEXT-COLOR: @C_GRAY_3;
@INVITEBIND-TEXT-COLOR: @C_GRAY_3;
@INVITEBIND-TEXT-FONTSIZE: @F_SIZE_16;
@INVITEBIND-TEXT-FONTSIZE: @F_SIZE_16;
@INVITEBIND-TITLE-FONTSIZE: @F_SIZE_18;
@INVITEBIND-TITLE-FONTSIZE: @F_SIZE_18;
@INVITEBIND-QRCODEEXPIRE-BACKDROP: @CUSTOM-BACKDROP-BG;
//绑定开锁信息
//绑定开锁信息
@UNLOCKINFO-TITLE-FONTSIZE: @F_SIZE_16;
@UNLOCKINFO-TITLE-FONTSIZE: @F_SIZE_16;
...
...
web/view/addDevice/addDevice.css
View file @
f659d378
...
@@ -24,13 +24,7 @@ body {
...
@@ -24,13 +24,7 @@ body {
user-select
:
none
;
user-select
:
none
;
color
:
#fff
;
color
:
#fff
;
font-size
:
0.373rem
;
font-size
:
0.373rem
;
background
:
-webkit-linear-gradient
(
left
,
#242635
,
#fff
,
#242635
);
background
:
linear-gradient
(
to
right
,
#242635
,
#fff
,
#242635
);
background-color
:
#242635
;
background-color
:
#242635
;
-webkit-background-size
:
100%
1px
;
background-size
:
100%
1px
;
background-repeat
:
no-repeat
;
background-position
:
bottom
center
;
}
}
ul
{
ul
{
...
@@ -452,10 +446,6 @@ p {
...
@@ -452,10 +446,6 @@ p {
padding-top
:
1.173rem
;
padding-top
:
1.173rem
;
}
}
.noBottomGradient
{
background-image
:
none
;
}
.addDevice
li
{
.addDevice
li
{
margin
:
0.267rem
;
margin
:
0.267rem
;
border
:
1px
solid
;
border
:
1px
solid
;
...
...
web/view/addDevice/index.html
View file @
f659d378
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
<script
type=
"text/javascript"
src=
"../../lib/js/p.js"
></script>
<script
type=
"text/javascript"
src=
"../../lib/js/p.js"
></script>
<script
type=
"text/javascript"
src=
"../../lib/js/UIOT.js"
></script>
<script
type=
"text/javascript"
src=
"../../lib/js/UIOT.js"
></script>
</head>
</head>
<body
ontouchstart=
""
class=
"noBottomGradient"
>
<body
ontouchstart=
""
>
<div
id=
"app"
v-cloak
>
<div
id=
"app"
v-cloak
>
<div
class=
"header"
>
<div
class=
"header"
>
...
...
web/view/bindUser/bindUser.css
View file @
f659d378
...
@@ -24,13 +24,7 @@ body {
...
@@ -24,13 +24,7 @@ body {
user-select
:
none
;
user-select
:
none
;
color
:
#fff
;
color
:
#fff
;
font-size
:
0.373rem
;
font-size
:
0.373rem
;
background
:
-webkit-linear-gradient
(
left
,
#242635
,
#fff
,
#242635
);
background
:
linear-gradient
(
to
right
,
#242635
,
#fff
,
#242635
);
background-color
:
#242635
;
background-color
:
#242635
;
-webkit-background-size
:
100%
1px
;
background-size
:
100%
1px
;
background-repeat
:
no-repeat
;
background-position
:
bottom
center
;
}
}
ul
{
ul
{
...
...
web/view/device/device.css
View file @
f659d378
...
@@ -24,13 +24,7 @@ body {
...
@@ -24,13 +24,7 @@ body {
user-select
:
none
;
user-select
:
none
;
color
:
#fff
;
color
:
#fff
;
font-size
:
0.373rem
;
font-size
:
0.373rem
;
background
:
-webkit-linear-gradient
(
left
,
#242635
,
#fff
,
#242635
);
background
:
linear-gradient
(
to
right
,
#242635
,
#fff
,
#242635
);
background-color
:
#242635
;
background-color
:
#242635
;
-webkit-background-size
:
100%
1px
;
background-size
:
100%
1px
;
background-repeat
:
no-repeat
;
background-position
:
bottom
center
;
}
}
ul
{
ul
{
...
@@ -1137,11 +1131,21 @@ p {
...
@@ -1137,11 +1131,21 @@ p {
}
}
.batteryState
span
:nth-child
(
2
)
{
.batteryState
span
:nth-child
(
2
)
{
width
:
1.067
rem
;
width
:
0.933
rem
;
display
:
inline-block
;
display
:
inline-block
;
vertical-align
:
middle
;
vertical-align
:
middle
;
text-align
:
righ
t
;
text-align
:
lef
t
;
font-size
:
0.347rem
;
font-size
:
0.347rem
;
line-height
:
1
;
margin-left
:
0.16rem
;
}
.batteryState.yellowWarning
span
:nth-child
(
1
)
{
color
:
#f99b22
;
}
.batteryState.redWarning
span
:nth-child
(
1
)
{
color
:
#fc2168
;
}
}
.bindDoorlock
{
.bindDoorlock
{
...
...
web/view/device/recordList.css
View file @
f659d378
...
@@ -24,13 +24,7 @@ body {
...
@@ -24,13 +24,7 @@ body {
user-select
:
none
;
user-select
:
none
;
color
:
#fff
;
color
:
#fff
;
font-size
:
0.373rem
;
font-size
:
0.373rem
;
background
:
-webkit-linear-gradient
(
left
,
#242635
,
#fff
,
#242635
);
background
:
linear-gradient
(
to
right
,
#242635
,
#fff
,
#242635
);
background-color
:
#242635
;
background-color
:
#242635
;
-webkit-background-size
:
100%
1px
;
background-size
:
100%
1px
;
background-repeat
:
no-repeat
;
background-position
:
bottom
center
;
}
}
ul
{
ul
{
...
...
web/view/doorlockManage/doorlockManage.css
View file @
f659d378
...
@@ -24,13 +24,7 @@ body {
...
@@ -24,13 +24,7 @@ body {
user-select
:
none
;
user-select
:
none
;
color
:
#fff
;
color
:
#fff
;
font-size
:
0.373rem
;
font-size
:
0.373rem
;
background
:
-webkit-linear-gradient
(
left
,
#242635
,
#fff
,
#242635
);
background
:
linear-gradient
(
to
right
,
#242635
,
#fff
,
#242635
);
background-color
:
#242635
;
background-color
:
#242635
;
-webkit-background-size
:
100%
1px
;
background-size
:
100%
1px
;
background-repeat
:
no-repeat
;
background-position
:
bottom
center
;
}
}
ul
{
ul
{
...
...
web/view/doorlockUsers/doorlockUser.css
View file @
f659d378
...
@@ -24,13 +24,7 @@ body {
...
@@ -24,13 +24,7 @@ body {
user-select
:
none
;
user-select
:
none
;
color
:
#fff
;
color
:
#fff
;
font-size
:
0.373rem
;
font-size
:
0.373rem
;
background
:
-webkit-linear-gradient
(
left
,
#242635
,
#fff
,
#242635
);
background
:
linear-gradient
(
to
right
,
#242635
,
#fff
,
#242635
);
background-color
:
#242635
;
background-color
:
#242635
;
-webkit-background-size
:
100%
1px
;
background-size
:
100%
1px
;
background-repeat
:
no-repeat
;
background-position
:
bottom
center
;
}
}
ul
{
ul
{
...
@@ -649,10 +643,6 @@ p {
...
@@ -649,10 +643,6 @@ p {
color
:
#999
;
color
:
#999
;
}
}
.userInfoLink
{
margin-top
:
0.533rem
;
}
.userInfoLink
li
:not
(
.userInfo
)
{
.userInfoLink
li
:not
(
.userInfo
)
{
height
:
1.387rem
;
height
:
1.387rem
;
line-height
:
1.387rem
;
line-height
:
1.387rem
;
...
@@ -833,7 +823,7 @@ p {
...
@@ -833,7 +823,7 @@ p {
.inviteBind
li
:not
(
:first-child
)
:nth-child
(
2
)
{
.inviteBind
li
:not
(
:first-child
)
:nth-child
(
2
)
{
color
:
inherit
;
color
:
inherit
;
font-size
:
0.48rem
;
font-size
:
0.48rem
;
margin-top
:
0.8
8
rem
;
margin-top
:
0.8
53
rem
;
}
}
.inviteBind
li
p
{
.inviteBind
li
p
{
...
@@ -843,7 +833,7 @@ p {
...
@@ -843,7 +833,7 @@ p {
width
:
100%
;
width
:
100%
;
height
:
100%
;
height
:
100%
;
text-align
:
center
;
text-align
:
center
;
background-color
:
rgba
(
255
,
255
,
255
,
0.1
);
background-color
:
rgba
(
36
,
38
,
53
,
0.9
);
}
}
.inviteBind
li
p
span
{
.inviteBind
li
p
span
{
...
...
web/view/doorlockUsers/inviteBind.html
View file @
f659d378
...
@@ -27,6 +27,7 @@
...
@@ -27,6 +27,7 @@
<div
class=
"content"
>
<div
class=
"content"
>
<ul
class=
"inviteBind"
>
<ul
class=
"inviteBind"
>
<li>
<li>
<img
src=
"../../resources/image/qrcode.png"
width=
"100%"
height=
"100%"
>
<p>
<p>
<span>
{{ $t('inviteBind.qrcodeExpireTip') }}
</span>
<span>
{{ $t('inviteBind.qrcodeExpireTip') }}
</span>
</p>
</p>
...
...
web/view/doorlockUsers/unlockInfo.css
View file @
f659d378
...
@@ -24,13 +24,7 @@ body {
...
@@ -24,13 +24,7 @@ body {
user-select
:
none
;
user-select
:
none
;
color
:
#fff
;
color
:
#fff
;
font-size
:
0.373rem
;
font-size
:
0.373rem
;
background
:
-webkit-linear-gradient
(
left
,
#242635
,
#fff
,
#242635
);
background
:
linear-gradient
(
to
right
,
#242635
,
#fff
,
#242635
);
background-color
:
#242635
;
background-color
:
#242635
;
-webkit-background-size
:
100%
1px
;
background-size
:
100%
1px
;
background-repeat
:
no-repeat
;
background-position
:
bottom
center
;
}
}
ul
{
ul
{
...
...
web/view/doorlockUsers/userList.css
View file @
f659d378
...
@@ -24,13 +24,7 @@ body {
...
@@ -24,13 +24,7 @@ body {
user-select
:
none
;
user-select
:
none
;
color
:
#fff
;
color
:
#fff
;
font-size
:
0.373rem
;
font-size
:
0.373rem
;
background
:
-webkit-linear-gradient
(
left
,
#242635
,
#fff
,
#242635
);
background
:
linear-gradient
(
to
right
,
#242635
,
#fff
,
#242635
);
background-color
:
#242635
;
background-color
:
#242635
;
-webkit-background-size
:
100%
1px
;
background-size
:
100%
1px
;
background-repeat
:
no-repeat
;
background-position
:
bottom
center
;
}
}
ul
{
ul
{
...
...
web/view/login/index.html
View file @
f659d378
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
<script
type=
"text/javascript"
src=
"../../lib/js/p.js"
></script>
<script
type=
"text/javascript"
src=
"../../lib/js/p.js"
></script>
<script
type=
"text/javascript"
src=
"../../lib/js/UIOT.js"
></script>
<script
type=
"text/javascript"
src=
"../../lib/js/UIOT.js"
></script>
</head>
</head>
<body
ontouchstart=
""
class=
"noBottomGradient"
>
<body
ontouchstart=
""
>
<div
id=
"app"
v-cloak
>
<div
id=
"app"
v-cloak
>
<div
class=
"guideBg"
>
<div
class=
"guideBg"
>
...
...
web/view/login/login.css
View file @
f659d378
...
@@ -24,13 +24,7 @@ body {
...
@@ -24,13 +24,7 @@ body {
user-select
:
none
;
user-select
:
none
;
color
:
#fff
;
color
:
#fff
;
font-size
:
0.373rem
;
font-size
:
0.373rem
;
background
:
-webkit-linear-gradient
(
left
,
#242635
,
#fff
,
#242635
);
background
:
linear-gradient
(
to
right
,
#242635
,
#fff
,
#242635
);
background-color
:
#242635
;
background-color
:
#242635
;
-webkit-background-size
:
100%
1px
;
background-size
:
100%
1px
;
background-repeat
:
no-repeat
;
background-position
:
bottom
center
;
}
}
ul
{
ul
{
...
@@ -452,10 +446,6 @@ p {
...
@@ -452,10 +446,6 @@ p {
padding-top
:
1.173rem
;
padding-top
:
1.173rem
;
}
}
.noBottomGradient
{
background-image
:
none
;
}
#app
{
#app
{
width
:
100%
;
width
:
100%
;
height
:
100%
;
height
:
100%
;
...
...
web/view/myInfo/myInfo.css
View file @
f659d378
...
@@ -24,13 +24,7 @@ body {
...
@@ -24,13 +24,7 @@ body {
user-select
:
none
;
user-select
:
none
;
color
:
#fff
;
color
:
#fff
;
font-size
:
0.373rem
;
font-size
:
0.373rem
;
background
:
-webkit-linear-gradient
(
left
,
#242635
,
#fff
,
#242635
);
background
:
linear-gradient
(
to
right
,
#242635
,
#fff
,
#242635
);
background-color
:
#242635
;
background-color
:
#242635
;
-webkit-background-size
:
100%
1px
;
background-size
:
100%
1px
;
background-repeat
:
no-repeat
;
background-position
:
bottom
center
;
}
}
ul
{
ul
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment