Adding or separator between ldap, username, email, github

Updating code theme name

Updating conditions for login page

updated the 2.0 Dockerfile to include the proper location of mm gzip

Fixing search loading icon on mobile

Adding or separator between ldap, username, email and github

docker/2.0/Dockerfile

@@ -34,7 +34,7 @@ VOLUME /var/lib/mysql
 WORKDIR /mattermost
 
 # Copy over files
-ADD https://github.com/mattermost/platform/releases/download/v2.0.0-rc2/mattermost.tar.gz /
+ADD https://github.com/mattermost/platform/releases/download/v2.0.0/mattermost.tar.gz /
 RUN tar -zxvf /mattermost.tar.gz --strip-components=1 && rm /mattermost.tar.gz
 ADD config_docker.json /
 ADD docker-entry.sh /

web/react/components/login.jsx

@@ -19,6 +19,8 @@ export default class Login extends React.Component {
     render() {
         const teamDisplayName = this.props.teamDisplayName;
         const teamName = this.props.teamName;
+        const ldapEnabled = global.window.mm_config.EnableLdap === 'true';
+        const usernameSigninEnabled = global.window.mm_config.EnableSignInWithUsername === 'true';
 
         let loginMessage = [];
         if (global.window.mm_config.EnableSignUpWithGitLab === 'true') {
@@ -173,6 +175,22 @@ export default class Login extends React.Component {
             );
         }
 
+        if (ldapEnabled && (loginMessage.length > 0 || emailSignup || usernameSigninEnabled)) {
+            ldapLogin = (
+                <div>
+                    <div className='or__container'>
+                        <FormattedMessage
+                            id='login.or'
+                            defaultMessage='or'
+                        />
+                    </div>
+                    <LoginLdap
+                        teamName={this.props.teamName}
+                    />
+                </div>
+            );
+        }
+
         let findTeams = null;
         if (!Utils.isMobileApp()) {
             findTeams = (
@@ -197,6 +215,22 @@ export default class Login extends React.Component {
             );
         }
 
+        if (usernameSigninEnabled && (loginMessage.length > 0 || emailSignup || ldapEnabled)) {
+            usernameLogin = (
+                <div>
+                    <div className='or__container'>
+                        <FormattedMessage
+                            id='login.or'
+                            defaultMessage='or'
+                        />
+                    </div>
+                    <LoginUsername
+                        teamName={this.props.teamName}
+                    />
+                </div>
+            );
+        }
+
         return (
             <div className='signup-team__container'>
                 <h5 className='margin--less'>

web/react/utils/constants.jsx

@@ -267,7 +267,7 @@ export default {
             buttonColor: '#FFFFFF',
             mentionHighlightBg: '#984063',
             mentionHighlightLink: '#A4FFEB',
-            codeTheme: 'solarized_dark'
+            codeTheme: 'solarized-dark'
         },
         windows10: {
             type: 'Windows Dark',
@@ -386,11 +386,11 @@ export default {
             uiName: 'Code Theme',
             themes: [
                 {
-                    id: 'solarized_dark',
+                    id: 'solarized-dark',
                     uiName: 'Solarized Dark'
                 },
                 {
-                    id: 'solarized_light',
+                    id: 'solarized-light',
                     uiName: 'Solarized Light'
                 },
                 {