From 813792dd600f4e485d52cc1066a8c1297578432d Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Thu, 1 Oct 2015 09:33:21 +0500
Subject: pot-375 - Making modals compatible with themes

---
 .../components/user_settings/premade_theme_chooser.jsx    |  4 ++--
 .../components/user_settings/user_settings_appearance.jsx | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/user_settings/premade_theme_chooser.jsx b/web/react/components/user_settings/premade_theme_chooser.jsx
index f8f916bd0..d2b88d09a 100644
--- a/web/react/components/user_settings/premade_theme_chooser.jsx
+++ b/web/react/components/user_settings/premade_theme_chooser.jsx
@@ -24,7 +24,7 @@ export default class PremadeThemeChooser extends React.Component {
 
                 premadeThemes.push(
                     <div
-                        className='col-sm-3 premade-themes'
+                        className='col-xs-6 col-sm-3 premade-themes'
                         key={'premade-theme-key' + k}
                     >
                         <div
@@ -34,7 +34,7 @@ export default class PremadeThemeChooser extends React.Component {
                             <label>
                                 <img
                                     className='img-responsive'
-                                    src={'/static/images/themes/' + premadeTheme.type.toLowerCase() + '.png'}
+                                    src={'/static/images/themes/' + premadeTheme.type.toLowerCase() + '.jpg'}
                                 />
                                 <div className='theme-label'>{Utils.toTitleCase(premadeTheme.type)}</div>
                             </label>
diff --git a/web/react/components/user_settings/user_settings_appearance.jsx b/web/react/components/user_settings/user_settings_appearance.jsx
index 4372069e7..e9ca0f4a5 100644
--- a/web/react/components/user_settings/user_settings_appearance.jsx
+++ b/web/react/components/user_settings/user_settings_appearance.jsx
@@ -214,14 +214,15 @@ export default class UserSettingsAppearance extends React.Component {
                     <div className='divider-dark first'/>
                     {themeUI}
                     <div className='divider-dark'/>
+                    <br/>
+                    <a
+                        href='#'
+                        className='theme'
+                        onClick={this.handleImportModal}
+                    >
+                        {'Import from Slack'}
+                    </a>
                 </div>
-                <br/>
-                <a
-                    className='theme'
-                    onClick={this.handleImportModal}
-                >
-                    {'Import from Slack'}
-                </a>
             </div>
         );
     }
-- 
cgit v1.2.3-1-g7c22