Skip to content

Commit 4e34f16

Browse files
committed
修正 - Member list, Team listのデザイン修正
1 parent 503a806 commit 4e34f16

3 files changed

Lines changed: 26 additions & 8 deletions

File tree

browser/main/Containers/MainContainer.jsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ module.exports = React.createClass({
7373
fetchPlanet(planet.userName, planet.name)
7474
})
7575
})
76-
7776
})
7877
.catch(function (err) {
7978
if (err.status === 401) {

browser/main/Containers/UserContainer.jsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,12 @@ module.exports = React.createClass({
296296
var teams = user.Teams == null ? [] : user.Teams.map(function (team) {
297297
return (
298298
<li key={'user-' + team.id}>
299-
<Link to='userHome' params={{userName: team.name}}>{team.profileName} ({team.name})</Link>
299+
<Link to='userHome' params={{userName: team.name}}>
300+
<div className='teamInfo'>
301+
<div className='teamProfileName'>{team.profileName}</div>
302+
<div className='teamName'>@{team.name}</div>
303+
</div>
304+
</Link>
300305
</li>
301306
)
302307
})

browser/styles/main/containers/UserContainer.styl

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,20 @@
251251
font-size 1.2em
252252
margin-bottom 15px
253253
.teams
254-
margin-left 10px
255254
li
255+
padding 0 10px
256+
margin-bottom 15px
257+
clearfix()
258+
.teamInfo
259+
float left
260+
.teamProfileName
261+
margin-bottom 5px
262+
.teamName
263+
margin-left 5px
264+
font-size 0.8em
265+
color inactiveTextColor
266+
a:hover .teamProfileName, a:hover .teamName
267+
text-decoration underline
256268
margin-bottom 10px
257269
font-size 1.1em
258270
.createTeamButton, .addMemberButton
@@ -278,11 +290,8 @@
278290
color inactiveTextColor
279291
.createTeamButton, .addMemberButton
280292
btnStripDefault()
281-
.members .role
282-
margin-left 7px
283-
margin-top 2px
284-
color inactiveTextColor
285-
font-size 0.85em
293+
a:hover .memberProfileName, a:hover .memberName
294+
text-decoration underline
286295
.planetList
287296
absolute right bottom
288297
top 125px
@@ -300,6 +309,11 @@
300309
.planets
301310
margin-left 15px
302311
li
312+
a
313+
font-size 1.1em
314+
text-decoration none
315+
&:hover
316+
text-decoration underline
303317
margin-bottom 10px
304318
.createPlanetButton
305319
btnStripDefault()

0 commit comments

Comments
 (0)