Skip to content
Snippets Groups Projects
Commit f9ae5791 authored by Kyle Doherty's avatar Kyle Doherty
Browse files

fix position of emoi in sidebar

parent f47a4eca
No related branches found
No related tags found
No related merge requests found
......@@ -3,7 +3,7 @@ import React, { Component, PropTypes } from "react";
import { emoji } from "metabase/lib/emoji";
const EmojiIcon = ({ size = 18, style, className, name }) =>
<span className={className} style={{ width: size, height: size, lineHeight: 1, ...style }}>
<span className={className} style={{ width: size, height: size, ...style }}>
{emoji[name].react}
</span>
......
......@@ -6,9 +6,9 @@ import Icon from "metabase/components/Icon.jsx";
import EmojiIcon from "./EmojiIcon.jsx";
import cx from "classnames";
const LabelIcon = ({ icon = "", size = 18, className }) =>
const LabelIcon = ({ icon = "", size = 18, className, style }) =>
icon.charAt(0) === ":" ?
<EmojiIcon className={cx(S.icon, S.emojiIcon, className)} name={icon} size={size} />
<EmojiIcon className={cx(S.icon, S.emojiIcon, className)} name={icon} size={size} style={style} />
: icon.charAt(0) === "#" ?
<span className={cx(S.icon, S.colorIcon, className)} style={{ backgroundColor: icon, width: size, height: size }}></span>
:
......
......@@ -30,6 +30,7 @@
border: 1px solid rgb(235,235,235);
border-radius: 3px;
background-color: rgb(248,248,248);
cursor: pointer;
}
:local(.dropdownButton) {
......
......@@ -36,7 +36,7 @@ const QuestionSidebarSectionTitle = ({ name, href }) =>
const QuestionSidebarItem = ({ name, icon, href }) =>
<li>
<Link to={href} className={S.item} activeClassName={S.selected}>
<LabelIcon icon={icon} />
<LabelIcon icon={icon} style={{ lineHeight: 1 }} />
<span className={S.name}>{name}</span>
</Link>
</li>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment