Skip to content

Commit

Permalink
devil is in the details
Browse files Browse the repository at this point in the history
  • Loading branch information
santisiri committed Jul 29, 2020
1 parent 6dbf2b3 commit 429aec8
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 8 deletions.
2 changes: 1 addition & 1 deletion i18n/en.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -907,5 +907,5 @@
"memberships-account": "Memberships of {{account}}",
"proposals-sidebar": "Recent Proposals",
"memberships-sidebar": "Your Memberships",
"no-memberships-found": "None found"
"no-memberships-found": "No DAO memberships found."
}
9 changes: 8 additions & 1 deletion imports/ui/components/Item/Item.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,13 @@ export default class Item extends Component {
return (this.state.inContext) ? this.state.icon.paperActive : this.state.icon.paper;
}

getLabelStyle() {
if (this.props.children) {
return `sidebar-label sidebar-label-${this.props.children.type.name.toLowerCase()}`;
}
return 'sidebar-label';
}

render() {
if (this.props.hideEmpty && this.props.score === 0) return null;
return (
Expand All @@ -81,7 +88,7 @@ export default class Item extends Component {
:
null
}
<div className="sidebar-label">
<div className={this.getLabelStyle()}>
{this.getLabel()}
</div>
<div className={this.getTagStyle()}>
Expand Down
6 changes: 0 additions & 6 deletions imports/ui/components/Menu/Menu.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,6 @@ const MenuQuery = ({ account }) => {
</div>
);

console.log(`-0---Defualt maenu`);
console.log(defaultMenu);
console.log(_.where(defaultMenu.props.children));

console.log(`account: ${account}`);

if (account !== defaults.EMPTY) {
const { loading, error, data } = useQuery(gql(GET_MEMBERSHIPS.replace('{{memberAddress}}', account)));

Expand Down
5 changes: 5 additions & 0 deletions public/templates/daoverse/css/extra.css
Original file line number Diff line number Diff line change
Expand Up @@ -779,6 +779,11 @@ width: 1px;
color: #bfb8c6;
}

.sidebar-label.sidebar-label-dao {
max-height: 33px;
margin-top: -3px;
}

.token-wrap.token-wrap-multi {
margin-bottom:10px;
}
Expand Down

0 comments on commit 429aec8

Please sign in to comment.