Skip to content

Commit

Permalink
secondary feed done
Browse files Browse the repository at this point in the history
  • Loading branch information
santisiri committed Jul 24, 2020
1 parent 5eecb89 commit 37466c7
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 7 deletions.
3 changes: 1 addition & 2 deletions imports/ui/components/Account/Account.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Meteor } from 'meteor/meteor';
import React from 'react';
import PropTypes from 'prop-types';
import { TAPi18n } from 'meteor/tap:i18n';

import ApolloClient, { gql, InMemoryCache } from 'apollo-boost';
import { ApolloProvider } from 'react-apollo';
Expand Down Expand Up @@ -57,7 +56,7 @@ const AccountQuery = ({ publicAddress, width, height }) => {

if (publicAddress !== '0x0000000000000000000000000000000000000000') {
const { loading, error, data } = useQuery(gql(ENS_ACCOUNT.replace('{{ensAddress}}', publicAddress)));

if (loading) {
return (
<div className="identity">
Expand Down
4 changes: 3 additions & 1 deletion imports/ui/components/Ledger/Ledger.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { TAPi18n } from 'meteor/tap:i18n';

import Vote from '/imports/ui/components/Vote/Vote.jsx';

Expand All @@ -10,9 +11,10 @@ const Ledger = () => {
return (
<div>
<div className="ledger-title">
<h4>Recent events.</h4>
<h4>{TAPi18n.__('recent-activity')}</h4>
</div>
<Vote />
<div className="ledger-footer" />
</div>
);
};
Expand Down
2 changes: 1 addition & 1 deletion imports/ui/components/Stamp/Stamp.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export default class Stamp extends Component {
render() {
return (
<div className="date-info">
<a href={this.state.url} title={this.state.fullDate} className="verifier verifier-live verifier-feed">
<a href={this.state.url} title={this.state.fullDate.replace(/&#183;/g, '·')} className="verifier verifier-live verifier-feed">
{parser(this.state.label)}
</a>
</div>
Expand Down
19 changes: 16 additions & 3 deletions public/templates/daoverse/css/daoverse.css
Original file line number Diff line number Diff line change
Expand Up @@ -1424,7 +1424,7 @@ blockquote {
}

.vote.vote-search.vote-feed:hover {
margin-top: -4px;
margin-top: 0px;
margin-bottom: 25px;
box-shadow: 0 10px 20px 0 rgba(0, 0, 0, .1);
color: #0d0d17;
Expand Down Expand Up @@ -6191,8 +6191,21 @@ blockquote {
margin-right: 0px;
padding: 5px 0px 0px;
margin-bottom: -1px;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
border-top-left-radius: 20px;
border-top-right-radius: 20px;
margin-left: 0px;
margin-bottom: -10px;
background: #f4f4f5;
border: 1px solid #7d849f33;
}

.ledger-footer {
margin-right: 0px;
padding: 5px 0px 0px;
min-height: 30px;
margin-bottom: -1px;
border-bottom-left-radius: 20px;
border-bottom-right-radius: 20px;
margin-left: 0px;
margin-bottom: -10px;
background: #f4f4f5;
Expand Down

0 comments on commit 37466c7

Please sign in to comment.