소스 검색

fixed responsive of login page integration

Skylsmoi 6 년 전
부모
커밋
04b09cbbaf
5개의 변경된 파일21개의 추가작업 그리고 68개의 파일을 삭제
  1. 1 1
      src/component/common/Input/InputGroupText.jsx
  2. 1 27
      src/container/Login.jsx
  3. 14 35
      src/css/Header.styl
  4. 3 5
      src/css/Login.styl
  5. 2 0
      src/css/index.styl

+ 1 - 1
src/component/common/Input/InputGroupText.jsx 파일 보기

@@ -27,7 +27,7 @@ InputGroupText.PropTypes = {
27 27
   parentClassName: PropTypes.string.isRequired,
28 28
   customClass: PropTypes.string,
29 29
   icon: PropTypes.string,
30
-  type: PropTypes.string.isRequired,
30
+  type: PropTypes.oneOf(['text', 'email', 'password', 'tel']).isRequired,
31 31
   placeHolder: PropTypes.string,
32 32
   invalidMsg: PropTypes.string,
33 33
   onChange: PropTypes.func

+ 1 - 27
src/container/Login.jsx 파일 보기

@@ -40,7 +40,7 @@ class Login extends React.Component {
40 40
     const LoginWrapper = props => (
41 41
       <div className='loginpage'>
42 42
         <section className='loginpage__content'>
43
-          <div className='container-fluid contentbody'>
43
+          <div className='container-fluid'>
44 44
             {props.children}
45 45
           </div>
46 46
         </section>
@@ -122,29 +122,3 @@ class Login extends React.Component {
122 122
 
123 123
 const mapStateToProps = ({ user }) => ({ user })
124 124
 export default connect(mapStateToProps)(Login)
125
-
126
-/*
127
-<form>
128
-  <div className='row mt-4 mb-4'>
129
-
130
-    <div className='col-12 col-sm-6 col-md-6 col-lg-6 col-xl-6'>
131
-      <div className='connection__form__rememberme form-check'>
132
-        <label className='connection__form__rememberme__label form-check-label'>
133
-          <input type='checkbox' className='connection__form__rememberme__label__checkbox form-check-input' />
134
-          Se souvenir de moi
135
-        </label>
136
-      </div>
137
-    </div>
138
-
139
-    <div className='col-12 col-sm-6 col-md-6 col-lg-6 text-sm-right'>
140
-      <div className='connection__form__pwforgot'>
141
-        Mot de passe oublié ?
142
-      </div>
143
-    </div>
144
-
145
-  </div>
146
-
147
-  <button type='submit' className='connection__form__btnsubmit btn btn-primary'>Connexion</button>
148
-
149
-</form>
150
-*/

+ 14 - 35
src/css/Header.styl 파일 보기

@@ -1,7 +1,9 @@
1 1
 .header
2
+  position fixed
2 3
   width 100%
3 4
   box-shadow shadow-bottom
4 5
   background off-white
6
+  z-index 3
5 7
   &__logo
6 8
     &__img
7 9
       margin-left 40px
@@ -20,9 +22,8 @@
20 22
             color dark-blue
21 23
     &__rightside
22 24
       display flex
23
-      justify-content flex-end
24 25
       margin-top 15px
25
-      width 60%
26
+      width 100%
26 27
       list-style none
27 28
       &__itemsearch
28 29
         margin-right 8%
@@ -96,62 +97,40 @@
96 97
               padding 10px 0
97 98
 
98 99
 @media (min-width: min-lg) and (max-width: max-lg)
99
-  .header__menu__rightside
100
-    width 100%
100
+  .header
101
+    &__menu
102
+      &__rightside
103
+        width 100%
101 104
 
102 105
 @media (min-width: min-md) and (max-width: max-md)
103 106
   .header
104 107
     &__logo__img
105
-        margin-left 0
108
+      margin-left 0
106 109
     &__menu
107
-      &__list
108
-        margin-left 0
109 110
       &__rightside
110
-        width 67%
111
+        width 100%
111 112
 
112 113
 @media (min-width: min-sm) and (max-width: max-sm)
113 114
   .header
114
-    position fixed
115
-    z-index 2
116 115
     &__logo__img
117 116
       margin-left 0
118 117
     &__menu
119
-      &__list
120
-        margin-left 0
121
-        .list__item
122
-          padding-right 0
123
-          padding-bottom 12px
124 118
       &__rightside
125
-        margin-top 12px
126 119
         padding-left 0
127
-        justify-content center
128 120
         width 100%
129
-        &__itemsearch
130
-          margin-right 45px
131 121
         &__itemquestion
132 122
           display none
133 123
 
134 124
 @media (max-width: max-xs)
135 125
   .header
136
-    position fixed
137
-    z-index 2
138 126
     &__logo__img
139 127
       margin-left 0
140
-    &__menu__list
141
-      margin-left 0
142
-      .list__item
143
-        padding-right 0
144
-        padding-bottom 12px
128
+    &__menu
145 129
       &__rightside
146
-        padding-top 12px
147
-        justify-content center
148
-        width 100%
130
+        flex-wrap wrap
149 131
         padding-left 0
150
-        &__itemsearch
151
-          margin-right 6%
152
-          width 100%
153
-        &__itemlanguage__languagedropdown
154
-          .languagedropdown__btnlanguage
155
-            margin-right 0
132
+        width 418px
156 133
         &__itemquestion
157 134
           display none
135
+        &__itemprofil__profilgroup
136
+          margin-top 20px

+ 3 - 5
src/css/Login.styl 파일 보기

@@ -1,14 +1,15 @@
1 1
 .loginpage
2 2
   &__content
3 3
     position relative
4
-    min-height calc(100vh - 139px)
4
+    padding-top 85px // 85 = header height
5
+    min-height 100%
5 6
     background dark-blue url('../img/tracimLogoAsBg.png') no-repeat 25% 3px
6 7
     background-size contain
7 8
     display table
8 9
     width 100%
9 10
     &__logo
10 11
       margin 0 auto
11
-      padding 50px 0
12
+      padding 35px 0
12 13
       width 170px
13 14
     &__connection
14 15
       border none
@@ -67,7 +68,6 @@
67 68
           padding-bottom 2px
68 69
           border-bottom 1px solid dark-grey
69 70
 
70
-
71 71
 @media (min-width: min-lg) and (max-width: max-lg)
72 72
   .loginpage__content
73 73
     .connection__form
@@ -82,14 +82,12 @@
82 82
   .loginpage__content
83 83
     padding-top 69px
84 84
     display block
85
-    min-height calc(100vh - 50px)
86 85
     .connection__form
87 86
       width 90%
88 87
 
89 88
 @media (max-width: max-xs)
90 89
   .loginpage__content
91 90
     padding-top 69px
92
-    min-height calc(100vh - 50px)
93 91
     background-size cover
94 92
     display block
95 93
     &__connection

+ 2 - 0
src/css/index.styl 파일 보기

@@ -1,5 +1,7 @@
1 1
 body
2 2
   font-family 'Quicksand', sans-serif
3
+html, body, #content, #content > div
4
+  height 100%
3 5
 
4 6
 @import 'Variable'
5 7