summaryrefslogtreecommitdiffstats
path: root/web/react/components
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-12-14 15:27:07 -0800
committerCorey Hulen <corey@hulen.com>2015-12-14 15:27:07 -0800
commit6c7c04f38d0485dadcd7dd0ea2ba3a95bdfde448 (patch)
treebea4500f130fad966863e3969504e87339ac9c18 /web/react/components
parent8392e5ecc4b95af18529bd6ab4fe69fbb24dd17f (diff)
parent1e9f26baac5be61a7d3c080f81feba056e1eb5fc (diff)
downloadchat-6c7c04f38d0485dadcd7dd0ea2ba3a95bdfde448.tar.gz
chat-6c7c04f38d0485dadcd7dd0ea2ba3a95bdfde448.tar.bz2
chat-6c7c04f38d0485dadcd7dd0ea2ba3a95bdfde448.zip
Merge pull request #1711 from asaadmahmoodspin/code-themes
Multiple UI Improvements
Diffstat (limited to 'web/react/components')
-rw-r--r--web/react/components/user_settings/custom_theme_chooser.jsx22
1 files changed, 22 insertions, 0 deletions
diff --git a/web/react/components/user_settings/custom_theme_chooser.jsx b/web/react/components/user_settings/custom_theme_chooser.jsx
index 35f836adb..778c74c23 100644
--- a/web/react/components/user_settings/custom_theme_chooser.jsx
+++ b/web/react/components/user_settings/custom_theme_chooser.jsx
@@ -3,6 +3,9 @@
import Constants from '../../utils/constants.jsx';
+const OverlayTrigger = ReactBootstrap.OverlayTrigger;
+const Popover = ReactBootstrap.Popover;
+
export default class CustomThemeChooser extends React.Component {
constructor(props) {
super(props);
@@ -72,6 +75,19 @@ export default class CustomThemeChooser extends React.Component {
);
});
+ var popoverContent = (
+ <Popover
+ bsStyle='info'
+ id='code-popover'
+ className='code-popover'
+ >
+ <img
+ width='200'
+ src={'/static/images/themes/code_themes/' + theme[element.id] + 'Large.png'}
+ />
+ </Popover>
+ );
+
elements.push(
<div
className='col-sm-4 form-group'
@@ -90,11 +106,17 @@ export default class CustomThemeChooser extends React.Component {
>
{codeThemeOptions}
</select>
+ <OverlayTrigger
+ placement='top'
+ overlay={popoverContent}
+ ref='headerOverlay'
+ >
<span className='input-group-addon'>
<img
src={'/static/images/themes/code_themes/' + theme[element.id] + '.png'}
/>
</span>
+ </OverlayTrigger>
</div>
</div>
);