ソースを参照

beginning of theming

AlexiCauvin 6 年 前
コミット
3a5f39ff9a
共有10 個のファイルを変更した120 個の追加61 個の削除を含む
  1. 18 9
      src/css/AccountPage.styl
  2. 30 11
      src/css/Dashboard.styl
  3. 9 0
      src/css/ExtandedAction.styl
  4. 1 19
      src/css/FileItem.styl
  5. 17 6
      src/css/Folder.styl
  6. 33 4
      src/css/Generic.styl
  7. 0 1
      src/css/Header.styl
  8. 7 7
      src/css/Sidebar.styl
  9. 4 3
      src/css/Variable.styl
  10. 1 1
      src/css/btnSwtich.styl

+ 18 - 9
src/css/AccountPage.styl ファイルの表示

@@ -42,6 +42,15 @@ settingText()
42 42
   width 30px
43 43
 
44 44
 .account
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
45 54
   &__userinformation
46 55
     display flex
47 56
     justify-content center
@@ -60,10 +69,10 @@ settingText()
60 69
     &__name
61 70
       font-size 22px
62 71
     &__email
63
-      color blue
72
+      color thirdColor
64 73
     &__company
65 74
       font-size 20px
66
-      color blue
75
+      color thirdColor
67 76
   &__delimiter
68 77
     position relative
69 78
     top 3px
@@ -104,7 +113,7 @@ settingText()
104 113
           &:hover
105 114
             background-color lightGrey
106 115
           &.active
107
-            background-color blue
116
+            background-color thirdColor
108 117
             color white
109 118
     &__setting
110 119
       border-radius 10px
@@ -123,11 +132,11 @@ settingText()
123 132
           &__txtinput
124 133
             display block
125 134
             width auto
126
-            border 1px solid blue
135
+            border 1px solid thirdColor
127 136
             border-radius 5px
128 137
           &__button
129 138
             vertical-align top
130
-            border 1px solid blue
139
+            border 1px solid thirdColor
131 140
             border-radius 5px
132 141
             padding 8px 25px
133 142
             cursor pointer
@@ -145,22 +154,22 @@ settingText()
145 154
         &__timezone
146 155
           margin 15px 0 30px 0
147 156
           &__btn
148
-            border 1px solid blue
157
+            border 1px solid thirdColor
149 158
             border-radius 5px
150 159
             padding 10px 35px
151
-            color blue
160
+            color thirdColor
152 161
             background-color transparent
153 162
             &::after
154 163
               margin-left 10px
155 164
             &:hover, &:focus
156
-              background-color blue
165
+              background-color thirdColor
157 166
               color white
158 167
           &__submenu
159 168
             max-height 265px
160 169
             overflow-Y auto
161 170
             &__item
162 171
               &:hover, &:focus
163
-                background-color blue
172
+                background-color thirdColor
164 173
                 color white
165 174
       .notification
166 175
         &__text

+ 30 - 11
src/css/Dashboard.styl ファイルの表示

@@ -4,21 +4,21 @@ flexwrap()
4 4
 
5 5
 btnNotification()
6 6
   margin 20px 0
7
-  border 1px solid blue
7
+  border 1px solid thirdColor
8 8
   padding 10px 15px
9 9
 
10 10
 hoverfocus()
11
-  background-color blue
11
+  background-color thirdColor
12 12
   color white
13 13
 
14 14
 bgandcolor()
15 15
   background-color transparent
16
-  color blue
16
+  color thirdColor
17 17
 
18 18
 label()
19 19
   font-weight 500
20 20
   font-size 18px
21
-  color blue
21
+  color thirdColor
22 22
 
23 23
 coloricon()
24 24
   .fa-gavel
@@ -32,6 +32,25 @@ coloricon()
32 32
 
33 33
 .dashboard
34 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
35 54
   &__header
36 55
     flexwrap()
37 56
     align-items center
@@ -51,7 +70,7 @@ coloricon()
51 70
       margin-bottom 20px
52 71
       font-size 40px
53 72
       font-weight 500
54
-      color darkBlue
73
+      color darkthirdColor
55 74
     &__detail
56 75
       margin-bottom 20px
57 76
       font-size 18px
@@ -132,11 +151,11 @@ coloricon()
132 151
       padding 15px
133 152
       cursor pointer
134 153
       &:hover
135
-        background-color folder-hover
154
+        background-color fourthColor
136 155
       &:nth-child(even)
137 156
         background-color grey-hover
138 157
         &:hover
139
-          background-color folder-hover
158
+          background-color fourthColor
140 159
       &__icon
141 160
         margin 0 25px
142 161
         font-size 25px
@@ -172,13 +191,13 @@ coloricon()
172 191
         border-bottom 1px solid grey
173 192
         padding 10px 15px
174 193
         &:hover
175
-          background-color folder-hover
194
+          background-color fourthColor
176 195
         &:nth-last-child(1)
177 196
           border-bottom 0
178 197
         &:nth-child(even)
179 198
           background-color grey-hover
180 199
           &:hover
181
-            background-color folder-hover
200
+            background-color fourthColor
182 201
         &__avatar
183 202
           margin-right 20px
184 203
           & > img
@@ -191,7 +210,7 @@ coloricon()
191 210
             font-size 18px
192 211
         &__delete
193 212
           font-size 20px
194
-          color blue
213
+          color thirdColor
195 214
           cursor pointer
196 215
     &__btnadd
197 216
       border-top 1px solid grey
@@ -214,7 +233,7 @@ coloricon()
214 233
             font-size 25px
215 234
         &__text
216 235
           font-size 18px
217
-          color blue
236
+          color thirdColor
218 237
           cursor pointer
219 238
     &__form
220 239
       padding 15px

+ 9 - 0
src/css/ExtandedAction.styl ファイルの表示

@@ -1,4 +1,13 @@
1 1
 .extandedaction
2
+  .btn-outline-primary
3
+    color thirdColor
4
+    border-color thirdColor
5
+    &:hover, &:focus, &:active
6
+      color off-white
7
+      border-color thirdColor
8
+      background-color thirdColor
9
+      box-shadow 0 0 1px 2px fifthColor
10
+      outline fifthColor
2 11
   &__subdropdown
3 12
     margin 0
4 13
     padding 0

+ 1 - 19
src/css/FileItem.styl ファイルの表示

@@ -1,8 +1,3 @@
1
-iconrules()
2
-  display inline-block
3
-  margin-right 10px
4
-  font-size 20px
5
-
6 1
 .currentColor
7 2
   color currentColor
8 3
 
@@ -21,7 +16,7 @@ iconrules()
21 16
   border-bottom 0
22 17
   cursor pointer
23 18
   &:hover
24
-    background-color files-hover
19
+    background-color fourthColor
25 20
   &__type
26 21
     font-size 30px
27 22
     text-align center
@@ -32,19 +27,6 @@ iconrules()
32 27
     &__text
33 28
       margin-right 10px
34 29
       font-size 17px
35
-    &__icons
36
-      &__download
37
-        iconrules()
38
-        &:hover, &:focus
39
-          color blue
40
-      &__archive
41
-        iconrules()
42
-        &:hover, &:focus
43
-          color blue
44
-      &__delete
45
-        iconrules()
46
-        &:hover, &:focus
47
-          color blue
48 30
   &__status
49 31
     &__text
50 32
       font-size 20px

+ 17 - 6
src/css/Folder.styl ファイルの表示

@@ -1,6 +1,6 @@
1 1
 // -----------------------------------------------------
2 2
 // border management for Workspace container
3
-border-style = 1px solid darkBlue
3
+border-style = 1px solid secondColor
4 4
 .folder__header
5 5
   border border-style
6 6
 .folder + .file, .file + .file
@@ -16,6 +16,9 @@ border-style = 1px solid darkBlue
16 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
20
+  padding-right 7px
21
+
19 22
 folderclose()
20 23
   height 0
21 24
   visibility hidden
@@ -55,9 +58,9 @@ folderopen()
55 58
     background-color lightGrey
56 59
     cursor pointer
57 60
     &:hover
58
-      background-color folder-hover
61
+      background-color fourthColor
59 62
       .folder__header__triangleborder__triangle
60
-        border-color folder-hover transparent transparent transparent
63
+        border-color fourthColor transparent transparent transparent
61 64
     &__triangleborder
62 65
       display none
63 66
       position absolute
@@ -65,7 +68,7 @@ folderopen()
65 68
       left -1px
66 69
       border-style solid
67 70
       border-width 25px 30px 0 30px
68
-      border-color darkBlue transparent transparent transparent
71
+      border-color secondColor transparent transparent transparent
69 72
       z-index 1
70 73
       &__triangle
71 74
         display none
@@ -79,7 +82,7 @@ folderopen()
79 82
       display flex
80 83
       &__icon
81 84
         font-size 25px
82
-        color darkBlue
85
+        color darkGrey
83 86
         text-align center
84 87
       &__text
85 88
         margin 0 15px 0 0
@@ -88,7 +91,7 @@ folderopen()
88 91
         overflow hidden
89 92
         width 400px
90 93
         font-size 17px
91
-        color darkBlue
94
+        color darkGrey
92 95
       &__button
93 96
         &__advancedbtn
94 97
           position relative
@@ -100,6 +103,14 @@ folderopen()
100 103
           .addbtn
101 104
             &__text
102 105
               font-size 17px
106
+              color thirdColor
107
+              border-color thirdColor
108
+              &:hover, &:focus, &:active
109
+                color off-white
110
+                border-color thirdColor
111
+                background-color thirdColor
112
+                box-shadow 0 0 1px 2px fifthColor
113
+                outline fifthColor
103 114
               &::after
104 115
                 margin-left 20px
105 116
             &__subdropdown

+ 33 - 4
src/css/Generic.styl ファイルの表示

@@ -3,6 +3,35 @@
3 3
   &__content
4 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
+
22
+.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
34
+
6 35
 .sidebarpagecontainer
7 36
   display flex
8 37
   padding-top 88px
@@ -112,7 +141,7 @@
112 141
 .subTitle
113 142
   font-size 20px
114 143
   font-weight 500
115
-  color blue
144
+  color thirdColor
116 145
 
117 146
 .btnaction
118 147
   display flex
@@ -131,13 +160,13 @@
131 160
   &__btn
132 161
     display flex
133 162
     margin-bottom 30px
134
-    border 1px solid blue
163
+    border 1px solid thirdColor
135 164
     border-radius 10px
136 165
     padding 15px 25px
137
-    color blue
166
+    color thirdColor
138 167
     cursor pointer
139 168
     &:hover, &:focus
140
-      background-color blue
169
+      background-color thirdColor
141 170
       color white
142 171
     &__icon
143 172
       margin-right 20px

+ 0 - 1
src/css/Header.styl ファイルの表示

@@ -2,7 +2,6 @@
2 2
   position fixed
3 3
   width 100%
4 4
   box-shadow shadow-bottom
5
-  background mainColor
6 5
   z-index 5
7 6
   &__logo
8 7
     &__img

+ 7 - 7
src/css/Sidebar.styl ファイルの表示

@@ -50,7 +50,7 @@ leftside()
50 50
     border-bottom-right-radius 15px
51 51
     padding 8px 15px
52 52
     cursor pointer
53
-    background-color blue
53
+    background-color thirdColor
54 54
     color white
55 55
     transition all sidebar-animate-speed
56 56
   &__btnnewworkspace
@@ -70,13 +70,13 @@ leftside()
70 70
         &__wrapper
71 71
           display flex
72 72
           align-items center
73
-          border-bottom 1px solid darkBlue
73
+          border-bottom 1px solid secondColor
74 74
           width 100%
75 75
           height 100%
76
-          background-color blue
76
+          background-color thirdColor
77 77
           cursor pointer
78 78
           &:hover
79
-            background-color darkenBlue
79
+            background-color fifthColor
80 80
         &__number
81 81
           leftside()
82 82
           padding 12px
@@ -103,12 +103,12 @@ leftside()
103 103
           &__dropdown
104 104
             display flex
105 105
             align-items center
106
-            border-top 1px solid darkBlue
106
+            border-top 1px solid secondColor
107 107
             cursor pointer
108 108
             &:nth-last-child(1)
109
-              border-bottom 1px solid darkBlue
109
+              border-bottom 1px solid secondColor
110 110
             &:hover
111
-              background-color lightBlue
111
+              background-color thirdColor
112 112
             &__showdropdown
113 113
               display flex
114 114
               justify-content space-between

+ 4 - 3
src/css/Variable.styl ファイルの表示

@@ -4,9 +4,10 @@
4 4
 /*** COULEURS ****/
5 5
 
6 6
 mainColor = #fdfdfd // Bg header
7
-secondColor = #215e8e // bg sidebar
8
-thirdColor = #2571fe // bg workspace name
9
-fourthColor = #82b2cc // bg filter sidebar
7
+secondColor = #7d4e24 // #7d4e24 bg sidebar
8
+thirdColor = lighten(secondColor, 25%) // #2571fe bg workspace name
9
+fourthColor = lighten(secondColor, 55%) // #82b2cc bg filter sidebar
10
+fifthColor = lighten(secondColor, 10%)
10 11
 
11 12
 fontColor = #252525
12 13
 

+ 1 - 1
src/css/btnSwtich.styl ファイルの表示

@@ -39,7 +39,7 @@ input:checked + .slider
39 39
   background-color blue
40 40
 
41 41
 input:focus + .slider
42
-  box-shadow 0 0 1px blue
42
+  box-shadow 0 0 1px thirdColor
43 43
 
44 44
 input:checked + .slider:before
45 45
   -webkit-transform translateX(26px)