Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
beyond-clouds-front
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
Administrator
beyond-clouds-front
Commits
b79a3c2f
Commit
b79a3c2f
authored
Jan 15, 2020
by
yanju
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modify
parent
8e1e4849
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
26 deletions
+5
-26
components/common/icon/src/icon.vue
+1
-11
pages/index.vue
+4
-15
No files found.
components/common/icon/src/icon.vue
View file @
b79a3c2f
<
template
>
<<<<<<<
HEAD
<i
:class=
"'iconfont yun-icon--' + name"
:style=
"
{fontSize:size,color:nowColor,cursor:cursor,verticalAlign:vertical,paddingBottom:pb}" @mouseenter="changeStyle1" @mouseout="changeStyle2">
</i>
=======
<i
:class=
"'iconfont yun-icon--' + name"
:style=
"
{fontSize:size,color:nowColor,transition:'.5s ease',cursor:cursor,verticalAlign:'middle'}" @mouseenter="changeStyle1" @mouseout="changeStyle2">
</i>
>>>>>>> 977a273fde2a48e90ed7d1fd29c36cc7679722a5
<i
:class=
"'iconfont yun-icon--' + name"
:style=
"
{fontSize:size,color:nowColor,transition:'.5s ease',cursor:cursor,verticalAlign:vertical,paddingBottom:pb}" @mouseenter="changeStyle1" @mouseout="changeStyle2">
</i>
</
template
>
<
script
>
...
...
@@ -14,15 +10,9 @@
name
:
String
,
size
:
String
,
color
:
String
,
<<<<<<<
HEAD
hoverColor
:{
type
:
String
,
},
pb
:
String
,
vertical
:
String
,
=======
hoverColor
:
String
,
>>>>>>>
977
a273fde2a48e90ed7d1fd29c36cc7679722a5
canClick
:{
type
:
Boolean
,
default
:
true
,
...
...
pages/index.vue
View file @
b79a3c2f
...
...
@@ -3,14 +3,9 @@
<div>
<banner></banner>
<h1
class=
"title"
>
beyond-clouds-front
</h1>
<<<<<<<
HEAD
<comment-card></comment-card>
<comment-card></comment-card>
<comment-card></comment-card>
<comment-card></comment-card>
=======
<project-card></project-card>
<answer-card></answer-card>
<my-answer></my-answer>
...
...
@@ -18,8 +13,7 @@
<h2
class=
"subtitle"
@
click=
"showAlert"
>
beyond-clouds project
</h2>
>>>>>>> 977a273fde2a48e90ed7d1fd29c36cc7679722a5
</div>
</div>
</div>
</
template
>
...
...
@@ -27,16 +21,13 @@
import
Banner
from
'../components/pc/banner'
;
import
ProjectCard
from
'../components/pc/projectCard'
;
<<<<<<<
HEAD
import
Pagination
from
'../components/pc/pagination'
;
import
Avatar
from
'../components/common/avatar/avatar'
;
import
CommentCard
from
'../components/pc/commentCard'
;
=======
import
AnswerCard
from
'../components/pc/answerCard'
;
import
MyAnswer
from
'../components/pc/myAnswer'
;
import
TopicListCard
from
'../components/pc/topicListCard'
;
>>>>>>>
977
a273fde2a48e90ed7d1fd29c36cc7679722a5
export
default
{
...
...
@@ -46,11 +37,9 @@ export default {
}
},
components
:{
<<<<<<<
HEAD
Banner
,
ProjectCard
,
Pagination
,
Avatar
,
CommentCard
=======
Banner
,
ProjectCard
,
AnswerCard
,
MyAnswer
,
TopicListCard
>>>>>>>
977
a273fde2a48e90ed7d1fd29c36cc7679722a5
},
methods
:{
...
...
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