Merge branch 'master' into keyboard-shortcuts

This commit is contained in:
Kim Gardner
2017-06-20 09:46:04 +01:00
committed by GitHub
2 changed files with 24 additions and 6 deletions
@@ -40,12 +40,12 @@
height: 100%;
}
.rightPanel ul {
.rightPanel > ul {
list-style: none;
margin-right: 20px;
}
.rightPanel li {
.rightPanel > ul > li {
display: inline-block;
float: right;
margin-left: 15px;
@@ -54,6 +54,12 @@
line-height: 33px;
}
.rightPanel a {
color: black;
text-decoration: none;
font-weight: 400;
}
.rightPanel .settings {
line-height: 0;
}
+16 -4
View File
@@ -71,13 +71,25 @@ const CoralHeader = ({
<IconButton name="settings" id="menu-settings"/>
<Menu target="menu-settings" align="right">
<MenuItem onClick={() => showShortcuts(true)}>{t('configure.shortcuts')}</MenuItem>
<MenuItem onClick={handleLogout}>{t('configure.sign_out')}</MenuItem>
<MenuItem>
<a href="https://github.com/coralproject/talk/releases" target="_blank">
View latest version
</a>
</MenuItem>
<MenuItem>
<a href="https://coralproject.net/contribute.html#other-ideas-and-bug-reports" target="_blank">
Report a bug or give feedback
</a>
</MenuItem>
<MenuItem onClick={handleLogout}>
{t('configure.sign_out')}
</MenuItem>
<MenuItem>
Talk {`v${process.env.VERSION}`}
</MenuItem>
</Menu>
</div>
</li>
<li>
{`v${process.env.VERSION}`}
</li>
</ul>
</div>
</div>