wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-08-17 11:27:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into keyboard-shortcuts

Browse Source
This commit is contained in:
Kim Gardner
2017-06-20 09:46:04 +01:00
committed by GitHub
parent 12a5654fb8 6959699ecc
commit fc15bcae4e
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-admin/src/components/ui/Header.css
+8 -2
View File
@@ -40,12 +40,12 @@
height: 100%; height: 100%;
} }
.rightPanel ul { .rightPanel > ul {
list-style: none; list-style: none;
margin-right: 20px; margin-right: 20px;
} }
.rightPanel li { .rightPanel > ul > li {
display: inline-block; display: inline-block;
float: right; float: right;
margin-left: 15px; margin-left: 15px;
@@ -54,6 +54,12 @@
line-height: 33px; line-height: 33px;
} }
.rightPanel a {
color: black;
text-decoration: none;
font-weight: 400;
}
.rightPanel .settings { .rightPanel .settings {
line-height: 0; line-height: 0;
} }
client/coral-admin/src/components/ui/Header.js
+16 -4
View File
@@ -71,13 +71,25 @@ const CoralHeader = ({
<IconButton name="settings" id="menu-settings"/> <IconButton name="settings" id="menu-settings"/>
<Menu target="menu-settings" align="right"> <Menu target="menu-settings" align="right">
<MenuItem onClick={() => showShortcuts(true)}>{t('configure.shortcuts')}</MenuItem> <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> </Menu>
</div> </div>
</li> </li>
<li>
{`v${process.env.VERSION}`}
</li>
</ul> </ul>
</div> </div>
</div> </div>