File tree 6 files changed +13
-40
lines changed
6 files changed +13
-40
lines changed Original file line number Diff line number Diff line change @@ -82,7 +82,7 @@ class CommitBlock extends React.Component {
82
82
size = '10px'
83
83
ml = '-10rem'
84
84
>
85
- { ' Hours Counter: ' + this . countHours ( ) }
85
+ { this . countHours ( ) + ' work hours scheduled' }
86
86
</ Text >
87
87
88
88
< Flex row center >
Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ class DayBlock extends React.Component {
18
18
< Card
19
19
key = { setBlock . id }
20
20
height = '8px'
21
- width = '5px '
21
+ width = '8px '
22
22
borderBottom = { setBlock . blockFraction === 1.0 ? '4px #F93B6A solid' : ( setBlock . blockFraction === 0.5 ? '4px #F93B6A solid' : '' ) }
23
23
borderTop = { setBlock . blockFraction === 1.0 ? '4px #F93B6A solid' : ( setBlock . blockFraction === - 0.5 ? '4px #F93B6A solid' : '' ) }
24
24
bg = 'lightGrey'
@@ -48,12 +48,12 @@ class DayBlock extends React.Component {
48
48
onClick = { ( ) => onClick ( day ) }
49
49
>
50
50
< Flex row center >
51
- < Flex column >
51
+ < Flex column mx = 'auto' >
52
52
{ // If you are waiting for the API to respond, it does not render
53
53
! fetchingData && this . renderTinySetBlocks ( currentWeeklySetblocks , day )
54
54
}
55
55
</ Flex >
56
- < Flex column >
56
+ < Flex column mr = 'auto' >
57
57
< Text align = 'center' mb = '0rem' color = { selected ? 'red' : 'textSecondary' } >
58
58
{ day . getDate ( ) }
59
59
</ Text >
Original file line number Diff line number Diff line change @@ -283,8 +283,8 @@ class SetBlock extends React.Component {
283
283
< Card
284
284
height = '16px'
285
285
width = '16px'
286
- borderRight = { data . blockFraction === 1.0 ? '8px #F93B6A solid' : ( data . blockFraction === 0.5 ? '8px #F93B6A solid' : '' ) }
287
- borderLeft = { data . blockFraction === 1.0 ? '8px #F93B6A solid' : ( data . blockFraction === - 0.5 ? '8px #F93B6A solid' : '' ) }
286
+ borderBottom = { data . blockFraction === 1.0 ? '8px #F93B6A solid' : ( data . blockFraction === 0.5 ? '8px #F93B6A solid' : '' ) }
287
+ borderTop = { data . blockFraction === 1.0 ? '8px #F93B6A solid' : ( data . blockFraction === - 0.5 ? '8px #F93B6A solid' : '' ) }
288
288
bg = 'lightGrey'
289
289
mx = '1rem'
290
290
>
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -23,10 +23,9 @@ export default class TeamMember extends React.Component {
23
23
>
24
24
< Flex
25
25
direction = 'row'
26
- justifyContent = 'space-evenly'
27
26
mb = '2rem'
28
27
width = '100%'
29
- height = '50px '
28
+ height = '60px '
30
29
onClick = { goToPage }
31
30
>
32
31
< Card
@@ -35,20 +34,16 @@ export default class TeamMember extends React.Component {
35
34
bg = { color }
36
35
borderRadius = { 50 }
37
36
my = 'auto'
37
+ ml = '20%'
38
38
/>
39
39
< Text
40
40
color = 'textSecondary'
41
41
size = '1rem'
42
42
weight = '600'
43
+ ml = '15%'
43
44
>
44
45
{ name }
45
46
</ Text >
46
-
47
- < Image
48
- my = 'auto'
49
- height = '20px'
50
- src = { require ( '../images/SettingsIcon.png' ) }
51
- />
52
47
</ Flex >
53
48
</ Card >
54
49
</ >
Original file line number Diff line number Diff line change 1
1
import React from 'react' ;
2
2
3
3
import TeamList from './TeamList' ;
4
- import TeamLogo from './TeamLogo' ;
5
4
import Header from './Header' ;
6
5
import Flex from './Flex' ;
6
+ import Text from './Text' ;
7
7
8
8
9
9
export default class TeamPage extends React . Component {
@@ -24,7 +24,9 @@ export default class TeamPage extends React.Component {
24
24
>
25
25
< Header />
26
26
27
- < TeamLogo />
27
+ < Text align = 'center' size = '2rem' my = '0.5rem' weight = '900' >
28
+ { 'Team' }
29
+ </ Text >
28
30
29
31
< TeamList goToPage = { this . goToPage } />
30
32
</ Flex >
You can’t perform that action at this time.
0 commit comments