Skip to content

Commit 8e5a7a9

Browse files
nicolas-eoxianicolas-eoxia
authored
Merge branch 'master' into 7.5.4
2 parents 6d5561e + 577e909 commit 8e5a7a9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+3197
-2307
lines changed

‎core/assets/css/scss/element/_element.scss

+1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@
66
@import "tool";
77
@import "evaluation-method";
88
@import "navigation/navigation";
9+
@import "new-table/new-table";
910
@import "table/table";
1011
@import "installer/installer";

‎core/assets/css/scss/element/_evaluation-method.scss

+99-83
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,110 @@
1-
/**
2-
* .cotation -> classe de base
3-
* .default-cotation -> par défaut
4-
* .level1 -> cotaiton 0
5-
* .level2 -> cotation 48
6-
* .level4 -> cotation 51
7-
* .level5 -> cotation 80
8-
* .method -> cotation personnalisée
9-
*/
10-
11-
.cotation-container {
12-
.dropdown-toggle {
1+
/**
2+
* .cotation -> classe de base
3+
* .default-cotation -> par défaut
4+
* .level1 -> cotaiton 0
5+
* .level2 -> cotation 48
6+
* .level4 -> cotation 51
7+
* .level5 -> cotation 80
8+
* .method -> cotation personnalisée
9+
*/
10+
11+
//.cotation-container {
12+
// .dropdown-toggle {
13+
// &:hover {
14+
// background: rgba(0,0,0,0.1);
15+
// }
16+
// }
17+
//}
18+
19+
.cotation {
20+
display: block;
21+
width: 50px;
22+
min-width: 50px;
23+
height: 50px;
24+
line-height: 50px;
25+
text-align: center;
26+
transition: all 0.2s ease-out;
27+
28+
> * {
29+
// line-height: 50px;
30+
}
31+
32+
//.icon-add {
33+
// position: absolute;
34+
// top: 12px;
35+
// right: 8px;
36+
// font-size: 12px;
37+
// color: rgba(0,0,0,0.3);
38+
// transition: color 0.2s ease-out;
39+
//}
40+
41+
//.icon {
42+
// font-size: 16px;
43+
//}
44+
//&:hover {
45+
// cursor: pointer;
46+
//
47+
// .icon-add {
48+
// color: $color__primary;
49+
// }
50+
//}
51+
&.default-cotation {
1352
&:hover {
1453
background: rgba(0,0,0,0.1);
1554
}
1655
}
17-
}
18-
19-
.cotation {
20-
display: block;
21-
width: 50px;
22-
min-width: 50px;
23-
height: 50px;
24-
line-height: 50px;
25-
text-align: center;
26-
transition: all 0.2s ease-out;
27-
> * {
28-
// line-height: 50px;
29-
}
30-
31-
.icon {
32-
font-size: 16px;
33-
}
34-
&:hover {
35-
cursor: pointer;
36-
}
37-
&.default-cotation {
38-
&:hover {
39-
background: rgba(0,0,0,0.1);
40-
}
41-
}
4256
&[data-scale="2"], &[data-scale="3"], &[data-scale="4"] {
4357
color: #fff !important;
44-
}
45-
&[data-scale="1"], &.level1 {
46-
background: #e2e2e2;
47-
color: rgba(0,0,0,0.6);
48-
&:hover {
49-
background: darken(#e2e2e2, 8%);
50-
}
51-
}
52-
&[data-scale="2"], &.level2 {
53-
background: $color__yellow;
54-
color: #fff;
55-
&:hover {
56-
background: darken($color__yellow, 8%);
57-
}
58-
}
59-
&[data-scale="3"], &.level3 {
60-
background: $color__red;
61-
color: #fff;
62-
&:hover {
63-
background: darken($color__red, 8%);
64-
}
65-
}
66-
&[data-scale="4"], &.level4 {
67-
background: #2b2b2b;
68-
color: #fff;
69-
&:hover {
70-
background: darken(#2b2b2b, 8%);
71-
}
72-
}
73-
&.method {
74-
background: $color__primary;
75-
color: #fff;
76-
&:hover {
77-
background: $color__primary_dark;
78-
}
79-
}
80-
}
81-
82-
/** table */
83-
.wpeo-modal {
84-
.cotation {
85-
float: left;
86-
}
58+
}
59+
&[data-scale="1"], &.level1 {
60+
background: #e2e2e2;
61+
color: rgba(0,0,0,0.6);
62+
&:hover {
63+
background: darken(#e2e2e2, 8%);
64+
}
65+
}
66+
&[data-scale="2"], &.level2 {
67+
background: $color__yellow;
68+
color: #fff;
69+
&:hover {
70+
background: darken($color__yellow, 8%);
71+
}
72+
}
73+
&[data-scale="3"], &.level3 {
74+
background: $color__red;
75+
color: #fff;
76+
&:hover {
77+
background: darken($color__red, 8%);
78+
}
79+
}
80+
&[data-scale="4"], &.level4 {
81+
background: #2b2b2b;
82+
color: #fff;
83+
&:hover {
84+
background: darken(#2b2b2b, 8%);
85+
}
86+
}
87+
&.method {
88+
background: $color__primary;
89+
color: #fff;
90+
&:hover {
91+
background: $color__primary_dark;
92+
}
93+
}
94+
}
95+
96+
/** table */
97+
.wpeo-modal {
98+
.cotation {
99+
float: left;
100+
}
87101
}
88102

89103
.wpeo-table.evaluation-method {
90-
.table-header {
91-
background: $color__secondary !important;
104+
background: none !important;
105+
106+
.table-row.table-header {
107+
background: #fff !important;
92108

93109
@media ( max-width: $media__small ) {
94110
display: none;
@@ -163,4 +179,4 @@
163179
background: darken($color__primary, 60%);
164180
}
165181
}
166-
}
182+
}

‎core/assets/css/scss/element/installer/_installer.scss

+2-4
Original file line numberDiff line numberDiff line change
@@ -139,28 +139,26 @@
139139
}
140140
.owl-prev {
141141
left: -40px;
142-
@extend .fas;
142+
@extend .far;
143143
&:hover:before {
144144
left: 12px;
145145
}
146146
}
147147
.owl-next {
148148
right: -40px;
149-
@extend .fas;
149+
@extend .far;
150150
&:hover:before {
151151
right: 12px;
152152
}
153153
}
154154
.owl-prev:before {
155155
left: 16px;
156156
font-family: $font__icon;
157-
font-weight: 900;
158157
content: fa-content($fa-var-angle-left);
159158
}
160159
.owl-next:before {
161160
right: 16px;
162161
font-family: $font__icon;
163-
font-weight: 900;
164162
content: fa-content($fa-var-angle-right);
165163
}
166164
}

‎core/assets/css/scss/element/new-table/_avatar.scss

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
.wpeo-table .avatar {
2+
display: inline-block;
3+
width: 50px;
4+
height: 50px;
5+
min-width: 50px;
6+
text-align: center;
7+
span {
8+
line-height: 50px;
9+
color: #fff !important;
10+
font-size: 16px;
11+
font-weight: 300;
12+
text-transform: uppercase;
13+
}
14+
}

‎core/assets/css/scss/element/new-table/_comments.scss

+73
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
.wpeo-table.table-flex .comment-container {
2+
.comment {
3+
display: flex;
4+
margin-top: 0.2em;
5+
6+
&:first-child {
7+
margin-top: 0;
8+
}
9+
10+
.avatar {
11+
border-radius: 50%;
12+
width: 30px;
13+
height: 30px;
14+
min-width: 30px;
15+
text-align: center;
16+
color: #fff;
17+
18+
span {
19+
line-height: 30px;
20+
}
21+
}
22+
23+
.date {
24+
font-weight: 700;
25+
width: 84px;
26+
margin: auto 4px;
27+
font-size: 13px;
28+
}
29+
30+
.content {
31+
white-space: normal;
32+
margin: auto 0;
33+
}
34+
35+
.delete, .add {
36+
width: 30px;
37+
height: 30px;
38+
line-height: 24px;
39+
min-width: 30px;
40+
margin-left: 4px;
41+
}
42+
.delete {
43+
&:hover {
44+
color: $color__red;
45+
}
46+
}
47+
.add {
48+
color: #fff;
49+
}
50+
51+
.mysql-date {
52+
display: none;
53+
}
54+
.group-date {
55+
margin: auto 4px;
56+
57+
input.date {
58+
width: 84px;
59+
}
60+
}
61+
input.date, textarea {
62+
width: 100%;
63+
margin: 0;
64+
padding: 0.2em;
65+
}
66+
}
67+
68+
.comment.new {
69+
margin-bottom: 0.5em;
70+
padding-bottom: 0.5em;
71+
border-bottom: 1px solid rgba(0,0,0,0.1);
72+
}
73+
}

‎core/assets/css/scss/element/new-table/_dropdown-add.scss

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
.dropdown-add-button {
2+
display: block;
3+
width: 50px;
4+
min-width: 50px;
5+
height: 50px;
6+
line-height: 50px;
7+
position: relative;
8+
text-align: center;
9+
transition: all 0.2s ease-out;
10+
11+
.icon-add {
12+
position: absolute;
13+
top: 12px;
14+
right: 8px;
15+
font-size: 12px;
16+
color: rgba(0,0,0,0.3);
17+
transition: color 0.2s ease-out;
18+
}
19+
20+
.icon {
21+
font-size: 16px;
22+
}
23+
24+
&:hover {
25+
cursor: pointer;
26+
background: rgba(0,0,0,0.1);
27+
28+
.icon-add {
29+
color: $color__primary;
30+
}
31+
}
32+
}

0 commit comments

Comments
 (0)