Browse Source

https://github.com/tracim/tracim/issues/778, alignment of the login button and the Forgotten password feature

AlexiCauvin 6 years ago
parent
commit
54e1f676cd
2 changed files with 24 additions and 24 deletions
  1. 23 22
      frontend/src/container/Login.jsx
  2. 1 2
      frontend/src/css/Login.styl

+ 23 - 22
frontend/src/container/Login.jsx View File

@@ -102,35 +102,36 @@ class Login extends React.Component {
102 102
                         onChange={this.handleChangePassword}
103 103
                       />
104 104
 
105
-                      <div className='row mt-4 mb-4'>
106
-                        <div className='col-12 col-sm-6 col-md-6 col-lg-6 col-xl-6'>
107
-                          {/*
108
-                          <InputCheckbox
109
-                            parentClassName='connection__form__rememberme'
110
-                            customClass=''
111
-                            label='Se souvenir de moi'
112
-                            checked={this.state.inputRememberMe}
113
-                            onChange={this.handleChangeRememberMe}
114
-                          />
115
-                          */}
116
-                        </div>
117
-
118
-                        <div className='col-12 col-sm-6 col-md-6 col-lg-6 col-xl-6 text-sm-right'>
105
+                      <div className='row align-items-center mt-4 mb-4'>
106
+
107
+                        {/*
108
+                          <div className='col-12 col-sm-6 col-md-6 col-lg-6 col-xl-6'>
109
+                            <InputCheckbox
110
+                              parentClassName='connection__form__rememberme'
111
+                              customClass=''
112
+                              label='Se souvenir de moi'
113
+                              checked={this.state.inputRememberMe}
114
+                              onChange={this.handleChangeRememberMe}
115
+                            />
116
+                          </div>
117
+                        */}
118
+
119
+                        <div className='col-6 col-sm-6 col-md-6 col-lg-6 col-xl-6'>
119 120
                           <LoginBtnForgotPw
120 121
                             customClass='connection__form__pwforgot'
121 122
                             label={this.props.t('Forgotten password ?')}
122 123
                           />
123 124
                         </div>
125
+                        <Button
126
+                          htmlType='button'
127
+                          bootstrapType='primary'
128
+                          customClass='connection__form__btnsubmit ml-auto'
129
+                          label={this.props.t('Connection')}
130
+                          onClick={this.handleClickSubmit}
131
+                        />
124 132
                       </div>
125
-
126
-                      <Button
127
-                        htmlType='button'
128
-                        bootstrapType='primary'
129
-                        customClass='connection__form__btnsubmit ml-auto'
130
-                        label={this.props.t('Connection')}
131
-                        onClick={this.handleClickSubmit}
132
-                      />
133 133
                     </div>
134
+
134 135
                   </CardBody>
135 136
                 </Card>
136 137
 

+ 1 - 2
frontend/src/css/Login.styl View File

@@ -52,13 +52,12 @@
52 52
       &:focus
53 53
         box-shadow shadow-all-side-green
54 54
     &__pwforgot
55
-      margin-top 3px
56 55
       cursor pointer
57 56
       font-size 13px
58 57
       &:hover::after
59 58
         position absolute
60 59
         top 20px
61
-        right 15px
60
+        left 15px
62 61
         border-bottom 1px solid darkGrey
63 62
         padding-bottom 2px
64 63
         content ' '