Browse Source

https://github.com/tracim/tracim/issues/797, added color on jsx files with the classes in index.html

AlexiCauvin 5 years ago
parent
commit
0fe117b50b

+ 3 - 3
frontend/src/component/Account/Password.jsx View File

@@ -17,16 +17,16 @@ export const Password = props => {
17 17
           {props.t('Password')}
18 18
         </div>
19 19
         <input
20
-          className='personaldata__form__txtinput form-control'
20
+          className='personaldata__form__txtinput primaryColorBorderLighten form-control'
21 21
           type='password'
22 22
           placeholder={props.t('Old password')}
23 23
         />
24 24
         <input
25
-          className='personaldata__form__txtinput form-control mt-4'
25
+          className='personaldata__form__txtinput primaryColorBorderLighten form-control mt-4'
26 26
           type='password'
27 27
           placeholder={props.t('New password')}
28 28
         />
29
-        <button type='submit' className='personaldata__form__button btn btn-outline-primary mt-4'>
29
+        <button type='submit' className='personaldata__form__button primaryColorBorderLighten btn btn-outline-primary mt-4'>
30 30
           {props.t('Send')}
31 31
         </button>
32 32
       </form>

+ 3 - 3
frontend/src/component/Account/PersonalData.jsx View File

@@ -19,7 +19,7 @@ export const PersonalData = props => {
19 19
         </div>
20 20
         <div className='d-flex align-items-center justify-content-between flex-wrap mb-4'>
21 21
           <input
22
-            className='personaldata__form__txtinput form-control mt-3 mt-sm-0'
22
+            className='personaldata__form__txtinput primaryColorBorderLighten form-control mt-3 mt-sm-0'
23 23
             type='text'
24 24
             placeholder={props.t('Change your name')}
25 25
           />
@@ -29,12 +29,12 @@ export const PersonalData = props => {
29 29
         </div>
30 30
         <div className='d-flex align-items-center justify-content-between flex-wrap mb-4'>
31 31
           <input
32
-            className='personaldata__form__txtinput form-control mt-3 mt-sm-0'
32
+            className='personaldata__form__txtinput primaryColorBorderLighten form-control mt-3 mt-sm-0'
33 33
             type='email'
34 34
             placeholder={props.t('Change your email')}
35 35
           />
36 36
         </div>
37
-        <button type='submit' className='personaldata__form__button btn btn-outline-primary'>
37
+        <button type='submit' className='personaldata__form__button primaryColorBorderLighten btn btn-outline-primary'>
38 38
           {props.t('Send')}
39 39
         </button>
40 40
       </form>

+ 2 - 2
frontend/src/component/Account/UserInfo.jsx View File

@@ -10,7 +10,7 @@ export const UserInfo = props => {
10 10
         <div className='account__userinformation__name mb-3'>
11 11
           {`${props.user.firstname} ${props.user.lastname}`}
12 12
         </div>
13
-        <a href={`mailto:${props.user.email}`} className='account__userinformation__email d-block mb-3'>
13
+        <a href={`mailto:${props.user.email}`} className='account__userinformation__email d-block primaryColorFontLighten mb-3'>
14 14
           {props.user.email}
15 15
         </a>
16 16
         <div className='account__userinformation__role mb-3'>
@@ -19,7 +19,7 @@ export const UserInfo = props => {
19 19
         { /* <div className='account__userinformation__job mb-3'>
20 20
           {props.user.job}
21 21
         </div>
22
-        <a href='http://www.algoo.fr' className='account__userinformation__company'>
22
+        <a href='http://www.algoo.fr' className='account__userinformation__company primaryColorFontLighten'>
23 23
           {props.user.company}
24 24
         </a> */ }
25 25
       </div>

+ 1 - 1
frontend/src/component/Dashboard/MoreInfo.jsx View File

@@ -6,7 +6,7 @@ export const MoreInfo = props =>
6 6
   <div className='moreinfo'>
7 7
     <div className='moreinfo__webdav genericBtnInfoDashboard'>
8 8
       <div
9
-        className='moreinfo__webdav__btn genericBtnInfoDashboard__btn'
9
+        className='moreinfo__webdav__btn genericBtnInfoDashboard__btn primaryColorBorderLighten primaryColorFontLighten'
10 10
         onClick={props.onClickToggleWebdav}
11 11
       >
12 12
         <div className='moreinfo__webdav__btn__icon genericBtnInfoDashboard__btn__icon'>

+ 2 - 2
frontend/src/component/Dashboard/UserStatus.jsx View File

@@ -40,7 +40,7 @@ export const UserStatus = props =>
40 40
         ? (
41 41
           <div className='userstatus__notification__subscribe dropdown'>
42 42
             <button
43
-              className='userstatus__notification__subscribe__btn btn btn-outline-primary dropdown-toggle'
43
+              className='userstatus__notification__subscribe__btn btn btn-outline-primary dropdown-toggle primaryColorBorderLighten'
44 44
               type='button'
45 45
               id='dropdownMenuButton'
46 46
               data-toggle='dropdown'
@@ -62,7 +62,7 @@ export const UserStatus = props =>
62 62
         )
63 63
         : (
64 64
           <div
65
-            className='userstatus__notification__btn btn btn-outline-primary'
65
+            className='userstatus__notification__btn btn btn-outline-primary primaryColorBorderLighten'
66 66
             onClick={props.onClickToggleNotifBtn}
67 67
           >
68 68
             {props.t('Change your status')}

+ 4 - 2
frontend/src/component/Dashboard/UserStatus.styl View File

@@ -16,13 +16,15 @@
16 16
     font-size 18px
17 17
     &__btn
18 18
       margin 20px 0
19
-      border 1px solid thirdColor
19
+      border-width 1px
20
+      border-style solid
20 21
       padding 10px 15px
21 22
       cursor pointer
22 23
     &__subscribe
23 24
       &__btn
24 25
         margin 20px 0
25
-        border 1px solid thirdColor
26
+        border-width 1px
27
+        border-style solid
26 28
         padding 10px 15px
27 29
       &__submenu
28 30
         padding 0

+ 1 - 1
frontend/src/component/Header/MenuActionListItem/Search.jsx View File

@@ -14,7 +14,7 @@ const Search = props => {
14 14
           onChange={props.onChangeInput}
15 15
         />
16 16
         <button
17
-          className='search__addonsearch input-group-addon'
17
+          className='search__addonsearch input-group-addon primaryColorBgLightenHover primaryColorFontHover'
18 18
           id='headerInputSearch'
19 19
           onClick={props.onClickSubmit}
20 20
         >

+ 1 - 1
frontend/src/container/Dashboard.jsx View File

@@ -218,7 +218,7 @@ class Dashboard extends React.Component {
218 218
           <PageContent>
219 219
             <div className='dashboard__workspace-wrapper'>
220 220
               <div className='dashboard__workspace'>
221
-                <div className='dashboard__workspace__title'>
221
+                <div className='dashboard__workspace__title primaryColorFont'>
222 222
                   {props.curWs.label}
223 223
                 </div>
224 224
 

+ 1 - 1
frontend/src/container/Login.jsx View File

@@ -84,7 +84,7 @@ class Login extends React.Component {
84 84
               <div className='col-12 col-sm-11 col-md-8 col-lg-6 col-xl-4'>
85 85
 
86 86
                 <Card customClass='loginpage__connection'>
87
-                  <CardHeader customClass='connection__header text-center'>{this.props.t('Connection')}</CardHeader>
87
+                  <CardHeader customClass='connection__header primaryColorBgLighten text-center'>{this.props.t('Connection')}</CardHeader>
88 88
 
89 89
                   <CardBody formClass='connection__form'>
90 90
                     <div>

+ 1 - 1
frontend/src/container/ProgressBar.jsx View File

@@ -13,7 +13,7 @@ class ProgressBar extends Component {
13 13
               <span className='progress-right'>
14 14
                 <span className='progress-bar' />
15 15
               </span>
16
-              <div className='progress-value'>
16
+              <div className='progress-value primaryColorBg'>
17 17
                 90%
18 18
               </div>
19 19
             </div>

+ 4 - 5
frontend/src/css/AccountPage.styl View File

@@ -69,11 +69,8 @@ settingText()
69 69
         height 150px
70 70
     &__name
71 71
       font-size 22px
72
-    &__email
73
-      color thirdColor
74 72
     &__company
75 73
       font-size 20px
76
-      color thirdColor
77 74
   &__delimiter
78 75
     position relative
79 76
     top 3px
@@ -133,11 +130,13 @@ settingText()
133 130
           &__txtinput
134 131
             display block
135 132
             width auto
136
-            border 1px solid thirdColor
133
+            border-width 1px
134
+            border-style solid
137 135
             border-radius 5px
138 136
           &__button
139 137
             vertical-align top
140
-            border 1px solid thirdColor
138
+            border-width 1px
139
+            border-style solid
141 140
             border-radius 5px
142 141
             padding 8px 25px
143 142
             cursor pointer

+ 2 - 2
frontend/src/css/Generic.styl View File

@@ -202,10 +202,10 @@ a
202 202
   &__btn
203 203
     display flex
204 204
     margin-bottom 30px
205
-    border 1px solid thirdColor
205
+    border-width 1px
206
+    border-style solid
206 207
     border-radius 10px
207 208
     padding 15px 25px
208
-    color thirdColor
209 209
     cursor pointer
210 210
     &:hover, &:focus
211 211
       background-color thirdColor

+ 0 - 3
frontend/src/css/Header.styl View File

@@ -33,9 +33,6 @@
33 33
           .search__addonsearch
34 34
             background-color transparent
35 35
             cursor pointer
36
-            &:hover
37
-              background-color thirdColor
38
-              color mainColor
39 36
       .btnnavbar
40 37
         border 1px solid grey
41 38
         background-color transparent

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

@@ -15,8 +15,7 @@
15 15
     border none
16 16
     box-shadow shadow-right
17 17
     .connection__header
18
-      background-color thirdColor
19
-      color #FFF
18
+      color off-white
20 19
       font-size 25px
21 20
   .connection__form
22 21
     &__rememberme

+ 0 - 1
frontend/src/css/ProgressBar.styl View File

@@ -64,7 +64,6 @@
64 64
     height 90%
65 65
     border 10px solid off-white
66 66
     border-radius 50%
67
-    background darkBlue
68 67
     font-size 24px
69 68
     color off-white
70 69
     line-height 135px