Browse Source

update theming tracimv2

AlexiCauvin 6 years ago
parent
commit
4c724ace5a

+ 6 - 6
src/component/Workspace/FileItem.jsx View File

7
   const iconStatus = (() => {
7
   const iconStatus = (() => {
8
     switch (props.status) {
8
     switch (props.status) {
9
       case 'current':
9
       case 'current':
10
-        return 'fa fa-cogs'
10
+        return 'fa fa-fw fa-cogs'
11
       case 'validated':
11
       case 'validated':
12
-        return 'fa fa-check'
12
+        return 'fa fa-fw fa-check'
13
       case 'canceled':
13
       case 'canceled':
14
-        return 'fa fa-times'
14
+        return 'fa fa-fw fa-times'
15
       case 'outdated':
15
       case 'outdated':
16
-        return 'fa fa-ban'
16
+        return 'fa fa-fw fa-ban'
17
     }
17
     }
18
   })()
18
   })()
19
 
19
 
78
       </div>
78
       </div>
79
 
79
 
80
       <div className='col-2 col-sm-2 col-md-2 col-lg-2 col-xl-2'>
80
       <div className='col-2 col-sm-2 col-md-2 col-lg-2 col-xl-2'>
81
-        <div className={classnames('file__status d-flex align-items-center justify-content-center') + colorStatus}>
82
-          <div className='file__status__icon d-block mr-3'>
81
+        <div className={classnames('file__status d-flex align-items-center justify-content-start') + colorStatus}>
82
+          <div className='file__status__icon d-block '>
83
             <i className={iconStatus} />
83
             <i className={iconStatus} />
84
           </div>
84
           </div>
85
           <div className='file__status__text d-none d-xl-block'>
85
           <div className='file__status__text d-none d-xl-block'>

+ 1 - 1
src/component/common/Input/DropdownCreateButton.jsx View File

6
   return (
6
   return (
7
     <div className={classnames(props.parentClass, props.customClass, 'dropdownCreateBtn')}>
7
     <div className={classnames(props.parentClass, props.customClass, 'dropdownCreateBtn')}>
8
       <button
8
       <button
9
-        className={classnames(`${props.parentClass}__label`, 'dropdownCreateBtn__label btn btn-succes dropdown-toggle')}
9
+        className={classnames(`${props.parentClass}__label`, 'dropdownCreateBtn__label btn btn-primary dropdown-toggle')}
10
         type='button'
10
         type='button'
11
         id='dropdownCreateBtn'
11
         id='dropdownCreateBtn'
12
         data-toggle='dropdown'
12
         data-toggle='dropdown'

+ 1 - 1
src/container/Header.jsx View File

9
 import MenuActionListItemDropdownLang from '../component/Header/MenuActionListItem/DropdownLang.jsx'
9
 import MenuActionListItemDropdownLang from '../component/Header/MenuActionListItem/DropdownLang.jsx'
10
 import MenuActionListItemHelp from '../component/Header/MenuActionListItem/Help.jsx'
10
 import MenuActionListItemHelp from '../component/Header/MenuActionListItem/Help.jsx'
11
 import MenuActionListItemMenuProfil from '../component/Header/MenuActionListItem/MenuProfil.jsx'
11
 import MenuActionListItemMenuProfil from '../component/Header/MenuActionListItem/MenuProfil.jsx'
12
-import logoHeader from '../img/logoHeader.svg'
12
+import logoHeader from '../img/logo-tracim.png'
13
 import { setLangActive } from '../action-creator.sync.js'
13
 import { setLangActive } from '../action-creator.sync.js'
14
 
14
 
15
 class Header extends React.Component {
15
 class Header extends React.Component {

+ 1 - 1
src/container/Sidebar.jsx View File

90
           </nav>
90
           </nav>
91
 
91
 
92
           <div className='sidebar__btnnewworkspace'>
92
           <div className='sidebar__btnnewworkspace'>
93
-            <button className='sidebar__btnnewworkspace__btn btn btn-success'>
93
+            <button className='sidebar__btnnewworkspace__btn btn btn-primary'>
94
               {t('Sidebar.create_new_workspace')}
94
               {t('Sidebar.create_new_workspace')}
95
             </button>
95
             </button>
96
           </div>
96
           </div>

+ 2 - 21
src/css/Dashboard.styl View File

32
 
32
 
33
 .dashboard
33
 .dashboard
34
   margin-left 20px
34
   margin-left 20px
35
-  .btn-primary
36
-    background-color thirdColor
37
-    color off-white
38
-    border-color secondColor
39
-    &:hover, &:focus, &:active
40
-      color off-white
41
-      border-color secondColor
42
-      background-color secondColor
43
-      box-shadow 0 0 1px 2px fifthColor
44
-      outline fifthColor
45
-  .btn-outline-primary
46
-    color thirdColor
47
-    border-color thirdColor
48
-    &:hover, &:focus, &:active
49
-      color off-white
50
-      border-color thirdColor
51
-      background-color thirdColor
52
-      box-shadow 0 0 1px 2px fifthColor
53
-      outline fifthColor
54
   &__header
35
   &__header
55
     flexwrap()
36
     flexwrap()
56
     align-items center
37
     align-items center
210
             font-size 18px
191
             font-size 18px
211
         &__delete
192
         &__delete
212
           font-size 20px
193
           font-size 20px
213
-          color thirdColor
194
+          color darkGrey
214
           cursor pointer
195
           cursor pointer
215
     &__btnadd
196
     &__btnadd
216
       border-top 1px solid grey
197
       border-top 1px solid grey
233
             font-size 25px
214
             font-size 25px
234
         &__text
215
         &__text
235
           font-size 18px
216
           font-size 18px
236
-          color thirdColor
217
+          color fontColor
237
           cursor pointer
218
           cursor pointer
238
     &__form
219
     &__form
239
       padding 15px
220
       padding 15px

+ 2 - 2
src/css/ExtandedAction.styl View File

1
 .extandedaction
1
 .extandedaction
2
   .btn-outline-primary
2
   .btn-outline-primary
3
-    color thirdColor
4
-    border-color thirdColor
3
+    color fontColor
4
+    border-color secondColor
5
     &:hover, &:focus, &:active
5
     &:hover, &:focus, &:active
6
       color off-white
6
       color off-white
7
       border-color thirdColor
7
       border-color thirdColor

+ 2 - 1
src/css/FileItem.styl View File

16
   border-bottom 0
16
   border-bottom 0
17
   cursor pointer
17
   cursor pointer
18
   &:hover
18
   &:hover
19
-    background-color fourthColor
19
+    background-color hover-theme
20
   &__type
20
   &__type
21
     font-size 30px
21
     font-size 30px
22
     text-align center
22
     text-align center
29
       font-size 17px
29
       font-size 17px
30
   &__status
30
   &__status
31
     &__text
31
     &__text
32
+      margin-left 15px
32
       font-size 20px
33
       font-size 20px
33
     &__icon
34
     &__icon
34
       font-size 30px
35
       font-size 30px

+ 6 - 6
src/css/Folder.styl View File

16
 // @Info: the very last line of file or folder has it's border bottom added in js
16
 // @Info: the very last line of file or folder has it's border bottom added in js
17
 // -----------------------------------------------------
17
 // -----------------------------------------------------
18
 
18
 
19
-.folder.active > .folder__content > .file, .folder.active > .folder__content > .extandedaction
19
+.folder > .folder__content > .file, .folder > .folder__content > .extandedaction
20
   padding-right 7px
20
   padding-right 7px
21
 
21
 
22
 folderclose()
22
 folderclose()
58
     background-color lightGrey
58
     background-color lightGrey
59
     cursor pointer
59
     cursor pointer
60
     &:hover
60
     &:hover
61
-      background-color fourthColor
61
+      background-color hover-theme
62
       .folder__header__triangleborder__triangle
62
       .folder__header__triangleborder__triangle
63
-        border-color fourthColor transparent transparent transparent
63
+        border-color hover-theme transparent transparent transparent
64
     &__triangleborder
64
     &__triangleborder
65
       display none
65
       display none
66
       position absolute
66
       position absolute
77
         left -30px
77
         left -30px
78
         border-style solid
78
         border-style solid
79
         border-width 25px 30px 0 30px
79
         border-width 25px 30px 0 30px
80
-        border-color lightGrey transparent transparent transparent
80
+        border-color fourthColor transparent transparent transparent
81
     &__name
81
     &__name
82
       display flex
82
       display flex
83
       &__icon
83
       &__icon
103
           .addbtn
103
           .addbtn
104
             &__text
104
             &__text
105
               font-size 17px
105
               font-size 17px
106
-              color thirdColor
107
-              border-color thirdColor
106
+              color fontColor
107
+              border-color secondColor
108
               &:hover, &:focus, &:active
108
               &:hover, &:focus, &:active
109
                 color off-white
109
                 color off-white
110
                 border-color thirdColor
110
                 border-color thirdColor

+ 29 - 27
src/css/Generic.styl View File

3
   &__content
3
   &__content
4
     height 100%
4
     height 100%
5
 
5
 
6
-.btn-outline-primary
7
-  &:hover, &:focus, &:active, &:visited
8
-    color off-white
9
-    border-color thirdColor
10
-    background-color thirdColor
11
-    box-shadow 0 0 1px 2px fifthColor
12
-    outline fifthColor
13
-
14
-.btn-outline-primary.dropdown-toggle
15
-  &:hover, &:focus, &:active, &:visited
16
-    color off-white
17
-    border-color thirdColor
18
-    background-color thirdColor
19
-    box-shadow 0 0 1px 2px fifthColor
20
-    outline fifthColor
21
 
6
 
22
 .btn-primary
7
 .btn-primary
23
-  &:hover, &:focus, &:active, &:visited
24
-    color off-white
25
-    border-color secondColor
26
-    background-color secondColor
27
-    box-shadow 0 0 1px 2px fifthColor
28
-    outline fifthColor
29
-
30
-.dropdown-item
31
-  &:hover, &:focus, &:active, &:visited
32
-    background-color fourthColor
33
-    color off-white
8
+  background-color thirdColor
9
+  border-color secondColor
10
+  &:hover, &:focus, &:active, &:visited, &:focus-within
11
+    background-color hover-button
12
+    border-color hover-button
13
+    box-shadow 0 0 1px 2px secondColor
14
+    outline secondColor solid 1px
15
+
16
+.btn-outline-primary
17
+  color fontColor
18
+  border-color secondColor
19
+  &:hover, &:focus, &:active, &:visited, &:focus-within
20
+    background-color hover-button
21
+    border-color hover-button
22
+    box-shadow 0 0 1px 2px secondColor
23
+    outline secondColor solid 1px
24
+
25
+.btn-primary.active, .btn-primary:active, .show>.btn-primary.dropdown-toggle
26
+  background-color hover-button
27
+  border-color hover-button
28
+  box-shadow 0 0 1px 2px secondColor
29
+  outline secondColor solid 1px
30
+
31
+.btn-outline-primary.active, .btn-outline-primary:active, .show>.btn-outline-primary.dropdown-toggle
32
+  background-color hover-button
33
+  border-color hover-button
34
+  box-shadow 0 0 1px 2px secondColor
35
+  outline secondColor solid 1px
34
 
36
 
35
 .sidebarpagecontainer
37
 .sidebarpagecontainer
36
   display flex
38
   display flex
93
   margin-left 10px
95
   margin-left 10px
94
   &__label
96
   &__label
95
     padding 10px 65px
97
     padding 10px 65px
96
-    background-color green
98
+    background-color thirdColor
97
     cursor pointer
99
     cursor pointer
98
     &__text
100
     &__text
99
       display inline-block
101
       display inline-block

+ 2 - 0
src/css/Header.styl View File

100
             padding 0
100
             padding 0
101
             left inherit
101
             left inherit
102
             right 0
102
             right 0
103
+            .dropdown-item
104
+              color fontColor
103
             &__link
105
             &__link
104
               padding 10px 0
106
               padding 10px 0
105
 
107
 

+ 5 - 0
src/css/Sidebar.styl View File

60
       display block
60
       display block
61
       margin 0 auto
61
       margin 0 auto
62
       padding 15px 30px
62
       padding 15px 30px
63
+      background-color thirdColor
64
+      border-color thirdColor
65
+      &:hover, &:focus, &:active, &:visited
66
+        background-color fifthColor
67
+        border-color fifthColor
63
   &__navigation
68
   &__navigation
64
     padding 0
69
     padding 0
65
     overflow hidden
70
     overflow hidden

+ 3 - 0
src/css/Variable.styl View File

9
 fourthColor = lighten(secondColor, 55%) // #82b2cc bg filter sidebar
9
 fourthColor = lighten(secondColor, 55%) // #82b2cc bg filter sidebar
10
 fifthColor = lighten(secondColor, 10%)
10
 fifthColor = lighten(secondColor, 10%)
11
 
11
 
12
+hover-theme = lighten(secondColor, 75%)
13
+hover-button = lighten(secondColor, 10%)
14
+
12
 fontColor = #252525
15
 fontColor = #252525
13
 
16
 
14
 darkGrey = #252525
17
 darkGrey = #252525