Преглед изворни кода

fix several small bugs in the css

AlexiCauvin пре 6 година
родитељ
комит
4e10779b93

+ 5 - 5
src/component/common/Input/DropdownCreateButton.jsx Прегледај датотеку

28
               <i className='fa fa-fw fa-folder-o' />
28
               <i className='fa fa-fw fa-folder-o' />
29
             </div>
29
             </div>
30
             <div className='setting__link__folder__text'>
30
             <div className='setting__link__folder__text'>
31
-              Créer un Dossier
31
+              Créer un dossier
32
             </div>
32
             </div>
33
           </div>
33
           </div>
34
         </div>
34
         </div>
38
               <i className='fa fa-fw fa-file-text-o' />
38
               <i className='fa fa-fw fa-file-text-o' />
39
             </div>
39
             </div>
40
             <div className='setting__link__apphtml__text'>
40
             <div className='setting__link__apphtml__text'>
41
-              Créer une page Html
41
+              Rédiger un document
42
             </div>
42
             </div>
43
           </div>
43
           </div>
44
         </div>
44
         </div>
58
               <i className='fa fa-fw fa-file-code-o' />
58
               <i className='fa fa-fw fa-file-code-o' />
59
             </div>
59
             </div>
60
             <div className='setting__link__appmarkdown__text'>
60
             <div className='setting__link__appmarkdown__text'>
61
-              Créer une page markdown
61
+              Rédiger un document markdown
62
             </div>
62
             </div>
63
           </div>
63
           </div>
64
         </div>
64
         </div>
68
               <i className='fa fa-fw fa-comments-o' />
68
               <i className='fa fa-fw fa-comments-o' />
69
             </div>
69
             </div>
70
             <div className='setting__link__appthread__text'>
70
             <div className='setting__link__appthread__text'>
71
-              Créer une discussion
71
+              Lancer une discussion
72
             </div>
72
             </div>
73
           </div>
73
           </div>
74
         </div>
74
         </div>
88
               <i className='fa fa-fw fa-ticket' />
88
               <i className='fa fa-fw fa-ticket' />
89
             </div>
89
             </div>
90
             <div className='setting__link__appissue__text'>
90
             <div className='setting__link__appissue__text'>
91
-              Créer un ticket
91
+              Ouvrir un ticket
92
             </div>
92
             </div>
93
           </div>
93
           </div>
94
         </div>
94
         </div>

+ 1 - 1
src/container/Header.jsx Прегледај датотеку

40
           <Logo logoSrc={logoHeader} onClickImg={this.handleClickLogo} />
40
           <Logo logoSrc={logoHeader} onClickImg={this.handleClickLogo} />
41
 
41
 
42
           <div className='header__breadcrumb d-none d-lg-block ml-4'>
42
           <div className='header__breadcrumb d-none d-lg-block ml-4'>
43
-            Ressource humaine - liste des contenus
43
+            Dev Tracim - liste des contenus
44
           </div>
44
           </div>
45
 
45
 
46
           <NavbarToggler />
46
           <NavbarToggler />

+ 1 - 1
src/container/Sidebar.jsx Прегледај датотеку

65
     return (
65
     return (
66
       <div className={classnames('sidebar', {'sidebarclose': sidebarClose})}>
66
       <div className={classnames('sidebar', {'sidebarclose': sidebarClose})}>
67
         <div className='sidebar__expand' onClick={this.handleClickToggleSidebar}>
67
         <div className='sidebar__expand' onClick={this.handleClickToggleSidebar}>
68
-          <i className={classnames('fa fa-arrow-left', {'fa-arrow-right': sidebarClose, 'fa-arrow-left': !sidebarClose})} />
68
+          <i className={classnames('fa fa-chevron-left', {'fa-chevron-right': sidebarClose, 'fa-chevron-left': !sidebarClose})} />
69
         </div>
69
         </div>
70
 
70
 
71
         <div className='sidebarSticky'>
71
         <div className='sidebarSticky'>

+ 12 - 4
src/css/Sidebar.styl Прегледај датотеку

42
   &__expand
42
   &__expand
43
     position absolute
43
     position absolute
44
     top 0
44
     top 0
45
-    right -40px
46
-    padding 4px 10px
45
+    right -42px
46
+    display flex
47
+    justify-content center
48
+    align-items center
47
     border-left 1px solid off-white
49
     border-left 1px solid off-white
48
     border-bottom-right-radius 15px
50
     border-bottom-right-radius 15px
51
+    padding 8px 15px
49
     cursor pointer
52
     cursor pointer
50
     background-color blue
53
     background-color blue
51
     color white
54
     color white
52
     transition all sidebar-animate-speed
55
     transition all sidebar-animate-speed
53
-    & > i
54
-      padding 0 5px 8px 0
55
   &__btnnewworkspace
56
   &__btnnewworkspace
56
     margin 50px 0
57
     margin 50px 0
57
     overflow hidden
58
     overflow hidden
122
               .dropdown__icon
123
               .dropdown__icon
123
                 background-color rgba(253, 253, 253, 0.8)
124
                 background-color rgba(253, 253, 253, 0.8)
124
 
125
 
126
+/***** MEDIA 992px and 1199px ******/
127
+
128
+@media (min-width: min-lg) and (max-width: max-lg)
129
+
130
+  .sidebar
131
+    position fixed
132
+
125
 /***** MEDIA 576px and 991px ******/
133
 /***** MEDIA 576px and 991px ******/
126
 
134
 
127
 @media (min-width: min-sm) and (max-width: max-md)
135
 @media (min-width: min-sm) and (max-width: max-md)

+ 1 - 3
src/css/index.styl Прегледај датотеку

35
 @import 'Homepage'
35
 @import 'Homepage'
36
 @import 'HomepageCard'
36
 @import 'HomepageCard'
37
 
37
 
38
-@import 'PopupExtandedAction'
39
-@import 'ContentTypeList'
40
-@import 'BtnEditFolder'
38
+@import 'ExtandedAction'