Merge pull request #139 from carlbernardo/style/flex

[style] fixes flex box
gut-js · Feb 10, 2016 · 17dc307 · 17dc307
2 parents a4fcf2a + 2a828dc
commit 17dc307
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/client/components/FriendsPref.js b/client/components/FriendsPref.js
@@ -46,7 +46,7 @@ class FriendsPref extends React.Component {
     if (this.props.location) {
       return (
         <div className='add-user-container col-md-12 col-xl-12'>
-          <div className='row'>
+          <div className='row row-eq-height'>
             <div className='add-friends col-sm-12 col-md-6 col-xl-6'>
               <h1>Select <span className='cursive'>pea-ps</span> to dine with</h1>
               {this.displayButton()}

diff --git a/client/components/Poll.js b/client/components/Poll.js
@@ -10,7 +10,7 @@ class Poll extends React.Component {
 
   render(){
     return (
-      <div>
+      <div className='poll-header'>
         <h1>Select <span className='cursive'>one</span></h1>
         <PollCategory
           pollActions={this.props.pollActions}

diff --git a/client/components/SignIn.js b/client/components/SignIn.js
@@ -76,9 +76,6 @@ class SignIn extends React.Component {
                 onClick={this.handleClick}>
                 Sign in
               </button>
-              <div className='toggle google'>
-                <a href='https://accounts.google.com/o/oauth2/auth?response_type=code&scope=openid%20profile%20email&client_id=1007941048671-mqral0q9jeg17ervhv01gknh7tml237i.apps.googleusercontent.com&redirect_uri=http://127.0.0.1:5679/oauthsignin&connection=google-oauth2'>Sign in with Google</a>
-              </div>
             </div>
             <div className='toggle'>
               {"Don't"} have an account? Click <a href="#" onClick={this.switch}>here</a> to register.

diff --git a/client/static/styles/modules/friends.scss b/client/static/styles/modules/friends.scss
@@ -103,8 +103,16 @@
 
 @media (max-width: 895px) {
   .add-friends {
-    height:230px;
-    min-height:100px;
+    height:100%;
+    min-height:380px;
+  }
+
+  .add-friends, .user-friends {
+    flex-grow: 1;
+  }
+
+  .add-user-container .row {
+    flex-wrap: wrap;
   }
 
   #dine-alone {