Procházet zdrojové kódy

Merge branch 'develop' of github.com:tracim/app_Thread into develop

Skylsmoi před 6 roky
rodič
revize
b590c23df3
1 změnil soubory, kde provedl 53 přidání a 111 odebrání
  1. 53 111
      src/css/index.styl

+ 53 - 111
src/css/index.styl Zobrazit soubor

@@ -1,124 +1,75 @@
1 1
 @import "../../node_modules/tracim_lib/src/css/Variable.styl"
2 2
 
3
-bgandcolor()
4
-  border-color threadColor
5
-  color off-white
6
-  background-color threadColor
7
-
8
-bgandcolorhover()
9
-  border-color darkenThread
3
+btnState()
10 4
   background-color darkenThread
11
-  box-shadow shadow-all-side-thread
5
+  color off-white
12 6
 
13 7
 .wsContentThread
14 8
   width 1100px
15 9
   &__header
16
-    color white
10
+    // color white
17 11
     background-color threadColor
18 12
     &__editionmode
19 13
       display none
20 14
     &__icon
21 15
       .fa-comments-o
22 16
         color white
23
-  &__option
24
-    &__menu
25
-      .selectStatus
26
-        margin-right 15px
27
-  &__app
28
-    display flex
29
-    flex-flow column
30
-    width 100%
31
-    &__messagelist
32
-      flex 1 1 auto
33
-      margin 0
34
-      padding 15px 35px
35
-      list-style none
36
-      overflow-y auto
37
-      background-color off-white
38
-      &__item
39
-        &__avatar
40
-          position relative
41
-          top 40px
42
-          left -20px
43
-          & > img
44
-            width 45px
45
-            height 45px
46
-            border-radius 25px
47
-        &__createhour
48
-          margin-left 35px
49
-          opacity 0.7
50
-          font-size 14px
51
-        &__content
52
-          display inline-block
53
-          border 1px solid grey
54
-          border-radius 5px
55
-          padding 15px
17
+  .selectStatus
18
+    margin-right 15px
19
+    .dropdown-item
20
+      &:hover, &:focus, &:active, &visited, &:focus-within
21
+        background-color threadColor
22
+        color off-white!important // @FIXME 04/07/2018 AC - we must use a plugin for this
23
+  .optionicon
24
+    &:hover, &:focus, &:active
25
+      color threadColor
26
+  .timeline
27
+    margin 0
28
+  .thread
29
+    &__contentpage
30
+      &__messagelist
31
+        &__item__avatar
32
+          border 1px solid darkenThread
56 33
           background-color off-white
57
-          font-size 15px
58
-    &__texteditor
59
-      flex 0 1 auto
60
-      border-top 1px solid grey
61
-      padding 35px 20px
62
-      &__textinput
63
-        width 85%
64
-        & > textarea
65
-          border-radius 5px
66
-          border 1.5px solid grey
67
-          padding 5px
68
-          height 80px
69
-          width 100%
70
-      &__wrapper
71
-        display flex
72
-        flex-direction column
73
-        justify-content center
74
-      &__advancedtext
75
-        &__btn
76
-          border-color threadColor
77
-          color threadColor
78
-          cursor pointer
79
-          &:hover, &:focus
80
-            bgandcolorhover()
81
-      &__submit
82
-        &__btn
83
-          display flex
84
-          cursor pointer
85
-          bgandcolor()
86
-          width 118px
87
-          &:hover, &:focus
88
-            bgandcolorhover()
34
+      &__texteditor
35
+        flex 0 0 auto
36
+        &__advancedtext
37
+          &__btn
38
+            color fontColor
39
+            border-color threadColor
40
+            cursor pointer
41
+            &:hover ,&:focus, &:visited, &:active
42
+              btnState()
43
+              border-color darkenThread
44
+              box-shadow none
45
+        &__submit
46
+          &__btn
47
+            background-color threadColor
48
+            color white
49
+            &:hover, &:focus, &:visited, &:active
50
+              background-color darkenThread
51
+
89 52
 
90 53
 .received
91
-  text-align right
92
-  .wsContentGeneric__messagelist__item
93
-    &__avatar
94
-      left 20px
95
-    &__createhour
96
-      margin-left 0
97
-      margin-right 35px
98
-    &__content
99
-      color white
100
-      background-color threadColor
54
+  .timeline__messagelist__item__content
55
+    background-color threadColor
101 56
 
102
-.activeEditionTitle
103
-  .wsContentThread
57
+.popupCreateContent
58
+  .cardPopup
104 59
     &__header
105
-      &__editionmode
106
-        display block
107
-      &__title
108
-        display none
60
+      background-color threadColor
61
+  .createcontent
62
+    &__contentname
63
+      color threadColor
64
+    &__form
65
+      &__button
66
+        & > button
67
+          border-color threadColor
68
+          background-color threadColor
69
+          &:hover, &:active, &:visited &:focus
70
+            background-color darkenThread
71
+            box-shadow none
109 72
 
110
-.activeAdvancedText
111
-  .wsContentThread__app
112
-    &__texteditor
113
-      padding 10px
114
-      height 500px
115
-      &__textinput
116
-        width 100%
117
-      &__wrapper
118
-        flex-direction row
119
-        width 100%
120
-      &__advancedtext
121
-        margin-right 20px
122 73
 
123 74
 @media (min-width: min-lg) and (max-width: max-lg)
124 75
   .wsContentThread
@@ -127,15 +78,11 @@ bgandcolorhover()
127 78
 @media (min-width: min-md) and (max-width: max-md)
128 79
   .wsContentThread
129 80
     width 700px
130
-    &__app__texteditor__textinput
131
-      width 75%
132 81
 
133 82
 @media (min-width: min-sm) and (max-width: max-sm)
134 83
   .wsContentThread
135 84
     top 69px
136 85
     width 500px
137
-    &__app__texteditor__textinput
138
-      width 70%
139 86
 
140 87
 @media (max-width: max-xs)
141 88
   .wsContentThread
@@ -143,8 +90,3 @@ bgandcolorhover()
143 90
     width 100%
144 91
     box-shadow none
145 92
     z-index 1
146
-    &__app
147
-      &__texteditor
148
-        padding 55px 20px 30px 20px
149
-        &__textinput
150
-          width 60%