Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
pro-blocks
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
duanledexianxianxian
pro-blocks
Commits
b55be88e
Commit
b55be88e
authored
Oct 25, 2017
by
ddcat1115
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update styles
parent
7dc26cf5
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
51 additions
and
20 deletions
+51
-20
src/components/Result/index.less
src/components/Result/index.less
+9
-10
src/routes/List/CardList.js
src/routes/List/CardList.js
+2
-2
src/routes/List/CardList.less
src/routes/List/CardList.less
+5
-0
src/routes/User/Login.js
src/routes/User/Login.js
+4
-4
src/routes/User/Login.less
src/routes/User/Login.less
+8
-0
src/routes/User/Register.js
src/routes/User/Register.js
+1
-1
src/routes/User/RegisterResult.js
src/routes/User/RegisterResult.js
+7
-3
src/routes/User/RegisterResult.less
src/routes/User/RegisterResult.less
+15
-0
No files found.
src/components/Result/index.less
View file @
b55be88e
...
@@ -6,9 +6,9 @@
...
@@ -6,9 +6,9 @@
margin: 0 auto;
margin: 0 auto;
.icon {
.icon {
font-size:
64
px;
font-size:
72
px;
line-height:
64
px;
line-height:
72
px;
margin-bottom:
32
px;
margin-bottom:
24
px;
& > .success {
& > .success {
color: @success-color;
color: @success-color;
...
@@ -20,30 +20,29 @@
...
@@ -20,30 +20,29 @@
}
}
.title {
.title {
font-size: 2
0
px;
font-size: 2
4
px;
color: @heading-color;
color: @heading-color;
font-weight: 500;
font-weight: 500;
line-height:
28
px;
line-height:
32
px;
margin-bottom:
8
px;
margin-bottom:
16
px;
}
}
.description {
.description {
font-size: 14px;
font-size: 14px;
line-height: 22px;
line-height: 22px;
color: @text-color-secondary;
color: @text-color-secondary;
margin-bottom:
16
px;
margin-bottom:
24
px;
}
}
.extra {
.extra {
background: #fafafa;
background: #fafafa;
padding: 16px 40px;
padding: 24px 40px;
margin-top: 16px;
border-radius: @border-radius-sm;
border-radius: @border-radius-sm;
text-align: left;
text-align: left;
}
}
.actions {
.actions {
margin-top:
40
px;
margin-top:
32
px;
button:not(:last-child) {
button:not(:last-child) {
margin-right: 8px;
margin-right: 8px;
...
...
src/routes/List/CardList.js
View file @
b55be88e
import
React
,
{
PureComponent
}
from
'
react
'
;
import
React
,
{
PureComponent
}
from
'
react
'
;
import
{
connect
}
from
'
dva
'
;
import
{
connect
}
from
'
dva
'
;
import
{
Link
}
from
'
dva/router
'
;
import
{
Link
}
from
'
dva/router
'
;
import
{
Card
,
Avatar
,
Button
,
Icon
,
List
}
from
'
antd
'
;
import
{
Card
,
Button
,
Icon
,
List
}
from
'
antd
'
;
import
PageHeaderLayout
from
'
../../layouts/PageHeaderLayout
'
;
import
PageHeaderLayout
from
'
../../layouts/PageHeaderLayout
'
;
...
@@ -65,7 +65,7 @@ export default class CardList extends PureComponent {
...
@@ -65,7 +65,7 @@ export default class CardList extends PureComponent {
<
Card
hoverable
actions
=
{[
<
a
>
操作一
<
/a>, <a>操作二</
a
>
]}
>
<
Card
hoverable
actions
=
{[
<
a
>
操作一
<
/a>, <a>操作二</
a
>
]}
>
<
Link
to
=
"
/list/card-list
"
>
<
Link
to
=
"
/list/card-list
"
>
<
Card
.
Meta
<
Card
.
Meta
avatar
=
{
<
Avatar
size
=
"
large
"
src
=
{
item
.
avatar
}
/>
}
avatar
=
{
<
img
alt
=
""
className
=
{
styles
.
cardAvatar
}
src
=
{
item
.
avatar
}
/>
}
title
=
{
item
.
title
}
title
=
{
item
.
title
}
description
=
{(
description
=
{(
<
p
className
=
{
styles
.
cardDescription
}
>
<
p
className
=
{
styles
.
cardDescription
}
>
...
...
src/routes/List/CardList.less
View file @
b55be88e
...
@@ -27,6 +27,11 @@
...
@@ -27,6 +27,11 @@
height: 185px;
height: 185px;
}
}
.cardAvatar {
width: 48px;
height: 48px;
}
.cardDescription {
.cardDescription {
.textOverflowMulti();
.textOverflowMulti();
color: @text-color;
color: @text-color;
...
...
src/routes/User/Login.js
View file @
b55be88e
...
@@ -94,7 +94,7 @@ export default class Login extends Component {
...
@@ -94,7 +94,7 @@ export default class Login extends Component {
})(
})(
<
Input
<
Input
size
=
"
large
"
size
=
"
large
"
prefix
=
{
<
Icon
type
=
"
user
"
style
=
{{
fontSize
:
14
,
color
:
'
rgba(0, 0, 0, 0.25)
'
}
}
/>
}
prefix
=
{
<
Icon
type
=
"
user
"
className
=
{
styles
.
prefixIcon
}
/>
}
placeholder
=
"
admin
"
placeholder
=
"
admin
"
/>
/>
)}
)}
...
@@ -107,7 +107,7 @@ export default class Login extends Component {
...
@@ -107,7 +107,7 @@ export default class Login extends Component {
})(
})(
<
Input
<
Input
size
=
"
large
"
size
=
"
large
"
prefix
=
{
<
Icon
type
=
"
lock
"
style
=
{{
fontSize
:
14
,
color
:
'
rgba(0, 0, 0, 0.25)
'
}
}
/>
}
prefix
=
{
<
Icon
type
=
"
lock
"
className
=
{
styles
.
prefixIcon
}
/>
}
type
=
"
password
"
type
=
"
password
"
placeholder
=
"
888888
"
placeholder
=
"
888888
"
/>
/>
...
@@ -131,7 +131,7 @@ export default class Login extends Component {
...
@@ -131,7 +131,7 @@ export default class Login extends Component {
})(
})(
<
Input
<
Input
size
=
"
large
"
size
=
"
large
"
prefix
=
{
<
Icon
type
=
"
mobile
"
style
=
{{
fontSize
:
14
,
color
:
'
rgba(0, 0, 0, 0.25)
'
}
}
/>
}
prefix
=
{
<
Icon
type
=
"
mobile
"
className
=
{
styles
.
prefixIcon
}
/>
}
placeholder
=
"
手机号
"
placeholder
=
"
手机号
"
/>
/>
)}
)}
...
@@ -146,7 +146,7 @@ export default class Login extends Component {
...
@@ -146,7 +146,7 @@ export default class Login extends Component {
})(
})(
<
Input
<
Input
size
=
"
large
"
size
=
"
large
"
prefix
=
{
<
Icon
type
=
"
mail
"
style
=
{{
fontSize
:
14
,
color
:
'
rgba(0, 0, 0, 0.25)
'
}
}
/>
}
prefix
=
{
<
Icon
type
=
"
mail
"
className
=
{
styles
.
prefixIcon
}
/>
}
placeholder
=
"
验证码
"
placeholder
=
"
验证码
"
/>
/>
)}
)}
...
...
src/routes/User/Login.less
View file @
b55be88e
...
@@ -12,6 +12,9 @@
...
@@ -12,6 +12,9 @@
font-size: 16px;
font-size: 16px;
line-height: 24px;
line-height: 24px;
}
}
.ant-input-affix-wrapper .ant-input:not(:first-child) {
padding-left: 34px;
}
}
}
}
}
...
@@ -27,6 +30,11 @@
...
@@ -27,6 +30,11 @@
}
}
}
}
.prefixIcon {
font-size: @font-size-base;
color: @disabled-color;
}
.getCaptcha {
.getCaptcha {
display: block;
display: block;
width: 100%;
width: 100%;
...
...
src/routes/User/Register.js
View file @
b55be88e
...
@@ -160,7 +160,7 @@ export default class Register extends Component {
...
@@ -160,7 +160,7 @@ export default class Register extends Component {
<
FormItem
help
=
{
this
.
state
.
help
}
>
<
FormItem
help
=
{
this
.
state
.
help
}
>
<
Popover
<
Popover
content
=
{
content
=
{
<
div
>
<
div
style
=
{{
padding
:
'
4px 0
'
}}
>
{
passwordStatusMap
[
this
.
getPasswordStatus
()]}
{
passwordStatusMap
[
this
.
getPasswordStatus
()]}
{
this
.
renderPasswordProgress
()}
{
this
.
renderPasswordProgress
()}
<
p
style
=
{{
marginTop
:
10
}}
>
请至少输入
6
个字符
。
请不要使用容易被猜到的密码
。
<
/p
>
<
p
style
=
{{
marginTop
:
10
}}
>
请至少输入
6
个字符
。
请不要使用容易被猜到的密码
。
<
/p
>
...
...
src/routes/User/RegisterResult.js
View file @
b55be88e
...
@@ -2,9 +2,12 @@ import React from 'react';
...
@@ -2,9 +2,12 @@ import React from 'react';
import
{
Button
}
from
'
antd
'
;
import
{
Button
}
from
'
antd
'
;
import
{
Link
}
from
'
dva/router
'
;
import
{
Link
}
from
'
dva/router
'
;
import
Result
from
'
../../components/Result
'
;
import
Result
from
'
../../components/Result
'
;
import
styles
from
'
./RegisterResult.less
'
;
const
title
=
<
div
className
=
{
styles
.
title
}
>
你的账户
:
AntDesign
@
example
.
com
注册成功
<
/div>
;
const
actions
=
(
const
actions
=
(
<
div
>
<
div
className
=
{
styles
.
actions
}
>
<
Button
size
=
"
large
"
type
=
"
primary
"
><
a
href
=
""
>
查看邮箱
<
/a></
Button
>
<
Button
size
=
"
large
"
type
=
"
primary
"
><
a
href
=
""
>
查看邮箱
<
/a></
Button
>
<
Button
size
=
"
large
"
><
Link
to
=
"
/
"
>
返回首页
<
/Link></
Button
>
<
Button
size
=
"
large
"
><
Link
to
=
"
/
"
>
返回首页
<
/Link></
Button
>
<
/div
>
<
/div
>
...
@@ -12,10 +15,11 @@ const actions = (
...
@@ -12,10 +15,11 @@ const actions = (
export
default
()
=>
(
export
default
()
=>
(
<
Result
<
Result
className
=
{
styles
.
registerResult
}
type
=
"
success
"
type
=
"
success
"
title
=
"
你的账户:AntDesign@example.com 注册成功
"
title
=
{
title
}
description
=
"
激活邮件已发送到你的邮箱中,邮件有效期为24小时。请及时登录邮箱,点击邮件中的链接激活帐户。
"
description
=
"
激活邮件已发送到你的邮箱中,邮件有效期为24小时。请及时登录邮箱,点击邮件中的链接激活帐户。
"
actions
=
{
actions
}
actions
=
{
actions
}
style
=
{{
marginTop
:
64
}}
style
=
{{
marginTop
:
56
}}
/
>
/
>
);
);
src/routes/User/RegisterResult.less
0 → 100644
View file @
b55be88e
.registerResult {
:global {
.anticon {
font-size: 64px;
}
}
.title {
margin-top: 32px;
font-size: 20px;
line-height: 28px;
}
.actions {
margin-top: 40px;
}
}
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