From 37466c7b0aa48f464c102ca923b0c3970031916e Mon Sep 17 00:00:00 2001 From: santisiri Date: Fri, 24 Jul 2020 19:59:46 +0200 Subject: [PATCH] secondary feed done --- imports/ui/components/Account/Account.jsx | 3 +-- imports/ui/components/Ledger/Ledger.jsx | 4 +++- imports/ui/components/Stamp/Stamp.jsx | 2 +- public/templates/daoverse/css/daoverse.css | 19 ++++++++++++++++--- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/imports/ui/components/Account/Account.jsx b/imports/ui/components/Account/Account.jsx index 7eed1f332..502b3c95d 100644 --- a/imports/ui/components/Account/Account.jsx +++ b/imports/ui/components/Account/Account.jsx @@ -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'; @@ -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 (
diff --git a/imports/ui/components/Ledger/Ledger.jsx b/imports/ui/components/Ledger/Ledger.jsx index ad5a00a68..4aea3f353 100644 --- a/imports/ui/components/Ledger/Ledger.jsx +++ b/imports/ui/components/Ledger/Ledger.jsx @@ -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'; @@ -10,9 +11,10 @@ const Ledger = () => { return (
-

Recent events.

+

{TAPi18n.__('recent-activity')}

+
); }; diff --git a/imports/ui/components/Stamp/Stamp.jsx b/imports/ui/components/Stamp/Stamp.jsx index 71906ae3a..8c770f8ed 100644 --- a/imports/ui/components/Stamp/Stamp.jsx +++ b/imports/ui/components/Stamp/Stamp.jsx @@ -47,7 +47,7 @@ export default class Stamp extends Component { render() { return (
- + {parser(this.state.label)}
diff --git a/public/templates/daoverse/css/daoverse.css b/public/templates/daoverse/css/daoverse.css index 308d59fa0..f0f1099e6 100755 --- a/public/templates/daoverse/css/daoverse.css +++ b/public/templates/daoverse/css/daoverse.css @@ -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; @@ -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;