diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2016-11-01 18:03:51 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-11-01 18:05:55 +0100 |
commit | dd03118098d342398f91b56bd2f27d370bc5b661 (patch) | |
tree | f71f271940d889805636eaa0363df5fa7372670c /app/assets | |
parent | 57304ac375e905fb0efa1b98a6100828bdbef2e1 (diff) |
Fix follow icon changing plus to minus, add terms page stub
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/components/features/followers/components/account.jsx | 4 | ||||
-rw-r--r-- | app/assets/stylesheets/about.scss | 38 |
2 files changed, 40 insertions, 2 deletions
diff --git a/app/assets/javascripts/components/features/followers/components/account.jsx b/app/assets/javascripts/components/features/followers/components/account.jsx index 9d863a1ae..adcd90360 100644 --- a/app/assets/javascripts/components/features/followers/components/account.jsx +++ b/app/assets/javascripts/components/features/followers/components/account.jsx @@ -64,9 +64,11 @@ const Account = React.createClass({ } if (account.get('id') !== me) { + const following = account.getIn(['relationship', 'following']); + buttons = ( <div style={buttonsStyle}> - <IconButton icon='user-plus' title='Follow' onClick={this.handleFollow} active={account.getIn(['relationship', 'following'])} /> + <IconButton icon={following ? 'user-times' : 'user-plus'} title='Follow' onClick={this.handleFollow} active={following} /> </div> ); } diff --git a/app/assets/stylesheets/about.scss b/app/assets/stylesheets/about.scss index 5ebe2576f..3681672d8 100644 --- a/app/assets/stylesheets/about.scss +++ b/app/assets/stylesheets/about.scss @@ -25,10 +25,46 @@ } } - p { + h2 { + font: 24px/28px 'Judson', sans-serif; + font-weight: 300; + margin-bottom: 20px; + color: #fff; + } + + h3 { + font: 20px/28px 'Judson', sans-serif; + font-weight: 300; + margin-bottom: 20px; + color: #d9e1e8; + } + + ul, ol { + list-style: inherit; + margin-left: 20px; + + &[type='a'] { + list-style-type: lower-alpha; + } + + &[type='i'] { + list-style-type: lower-roman; + } + } + + li > ol, li > ul { + margin-top: 20px; + } + + p, li { font: 20px/28px 'Judson', sans-serif; font-weight: 300; margin-bottom: 26px; + + a { + color: #2b90d9; + text-decoration: underline; + } } em { |