blob: 000e42d5b433b855d959fe6cf1ae8ef708a52639 [file] [log] [blame]
talig8e9c0652017-12-20 14:30:43 +02001$yours-bg-color: $tlv-gray;
2$theirs-bg-color: $tlv-light-gray;
3$error-text-color: $red;
4$selected-width: 1px;
5$selected-color: $blue;
6
7@mixin levels {
Einav Weiss Keidar1801b242018-08-13 16:19:46 +03008 @for $i from 1 to 6 {
9 .level-#{$i} {
10 padding-left: 18px + 10 * $i;
11 }
12 }
talig8e9c0652017-12-20 14:30:43 +020013}
14
15.merge-editor-modal {
Einav Weiss Keidar1801b242018-08-13 16:19:46 +030016 .modal-lg {
17 width: 1300px;
18 }
talig8e9c0652017-12-20 14:30:43 +020019}
20
21.merge-editor {
Einav Weiss Keidar1801b242018-08-13 16:19:46 +030022 margin: 30px 40px;
23 max-height: 600px;
24 border: 1px solid $light-gray;
25 .grid-section {
26 &.conflict-titles-section {
27 @extend .body-1;
28 background-color: $blue;
29 height: 33px;
30 padding-top: 6px;
31 padding-bottom: 3px;
32 color: $white;
33 position: sticky;
34 top: 0;
35 z-index: 2;
36 border-bottom: 1px solid $tlv-light-gray;
37 .grid-item {
38 padding-left: 10px;
39 }
40 .form-group {
41 margin-bottom: 0;
42 .checkbox {
43 label {
44 margin-right: 0;
45 }
talig8e9c0652017-12-20 14:30:43 +020046
Einav Weiss Keidar1801b242018-08-13 16:19:46 +030047 text-align: right;
talig8e9c0652017-12-20 14:30:43 +020048
Einav Weiss Keidar1801b242018-08-13 16:19:46 +030049 input[type='checkbox'] {
50 cursor: pointer;
51 margin-top: 1px;
52 }
53 }
54 }
55 }
56 }
57 .merge-editor-body {
58 max-height: 500px;
59 overflow-y: scroll;
60 padding: 10px;
61 .conflict-section {
62 margin-bottom: 0;
63 border-left: 0;
64 border-right: 0;
65 padding: 5px 0;
talig8e9c0652017-12-20 14:30:43 +020066
Einav Weiss Keidar1801b242018-08-13 16:19:46 +030067 .conflict-resolve-btn {
68 align-self: flex-end;
69 }
talig8e9c0652017-12-20 14:30:43 +020070
Einav Weiss Keidar1801b242018-08-13 16:19:46 +030071 .grid-items {
72 align-items: center;
talig8e9c0652017-12-20 14:30:43 +020073
Einav Weiss Keidar1801b242018-08-13 16:19:46 +030074 input[type='radio']:not(:checked) {
75 cursor: pointer;
76 }
77 }
78 }
talig8e9c0652017-12-20 14:30:43 +020079
Einav Weiss Keidar1801b242018-08-13 16:19:46 +030080 .collapsible-section {
81 display: flex;
82 cursor: pointer;
talig8e9c0652017-12-20 14:30:43 +020083
Einav Weiss Keidar1801b242018-08-13 16:19:46 +030084 .conflict-title {
85 @extend .heading-5-semibold;
86 text-transform: uppercase;
87 }
88 }
talig8e9c0652017-12-20 14:30:43 +020089
Einav Weiss Keidar1801b242018-08-13 16:19:46 +030090 .merge-chevron {
91 margin-right: 7px;
92 &.right {
93 transform: rotate(90deg);
94 }
95 }
talig8e9c0652017-12-20 14:30:43 +020096
Einav Weiss Keidar1801b242018-08-13 16:19:46 +030097 .grid-section .grid-items .field-col:not(.grid-col-title) {
98 &.grid-col-yours {
99 border-top: $selected-width solid $yours-bg-color;
100 border-bottom: $selected-width solid $yours-bg-color;
101 }
talig8e9c0652017-12-20 14:30:43 +0200102
Einav Weiss Keidar1801b242018-08-13 16:19:46 +0300103 &.theirs-color {
104 border-top: $selected-width solid $theirs-bg-color;
105 border-bottom: $selected-width solid $theirs-bg-color;
106 }
107 }
talig8e9c0652017-12-20 14:30:43 +0200108
Einav Weiss Keidar1801b242018-08-13 16:19:46 +0300109 .merge-editor-text-field {
110 display: flex;
111 justify-content: space-between;
112 margin: 0;
talig8e9c0652017-12-20 14:30:43 +0200113
Einav Weiss Keidar1801b242018-08-13 16:19:46 +0300114 .field {
115 color: $text-black;
talig8e9c0652017-12-20 14:30:43 +0200116
Einav Weiss Keidar1801b242018-08-13 16:19:46 +0300117 &.field-name:not(.field-object-name) {
118 color: $gray;
119 }
120 }
talig8e9c0652017-12-20 14:30:43 +0200121
Einav Weiss Keidar1801b242018-08-13 16:19:46 +0300122 &.diff {
123 .field {
124 color: $red;
125 }
126 }
talig8e9c0652017-12-20 14:30:43 +0200127
Einav Weiss Keidar1801b242018-08-13 16:19:46 +0300128 &.grid-section {
129 padding-bottom: 0;
talig8e9c0652017-12-20 14:30:43 +0200130
Einav Weiss Keidar1801b242018-08-13 16:19:46 +0300131 .grid-items {
132 flex: 1;
talig8e9c0652017-12-20 14:30:43 +0200133
Einav Weiss Keidar1801b242018-08-13 16:19:46 +0300134 .field-col {
135 padding: 7px 0;
136 height: 100%;
talig8e9c0652017-12-20 14:30:43 +0200137
Einav Weiss Keidar1801b242018-08-13 16:19:46 +0300138 &:not(:first-child) {
139 padding-left: 8px;
140 }
talig8e9c0652017-12-20 14:30:43 +0200141
Einav Weiss Keidar1801b242018-08-13 16:19:46 +0300142 &.grid-col-yours {
143 background-color: $yours-bg-color;
144 }
talig8e9c0652017-12-20 14:30:43 +0200145
Einav Weiss Keidar1801b242018-08-13 16:19:46 +0300146 &.grid-col-theirs {
147 background-color: $theirs-bg-color;
148 }
talig8e9c0652017-12-20 14:30:43 +0200149
Einav Weiss Keidar1801b242018-08-13 16:19:46 +0300150 @include levels;
talig8e9c0652017-12-20 14:30:43 +0200151
Einav Weiss Keidar1801b242018-08-13 16:19:46 +0300152 .field {
153 @extend .body-1;
154 flex: 2;
155 min-width: 0;
talig8e9c0652017-12-20 14:30:43 +0200156
Einav Weiss Keidar1801b242018-08-13 16:19:46 +0300157 &.field-name {
158 @include multiline-ellipsis($bgColor: white);
159 &.diff {
160 color: $red;
161 }
162 text-transform: uppercase;
163 &.field-object-name {
164 @extend .body-1-semibold;
165 margin-bottom: 5px;
166 margin-top: 10px;
167 }
168 }
talig8e9c0652017-12-20 14:30:43 +0200169
Einav Weiss Keidar1801b242018-08-13 16:19:46 +0300170 &.field-yours {
171 @include multiline-ellipsis($bgColor: $yours-bg-color);
172 }
talig8e9c0652017-12-20 14:30:43 +0200173
Einav Weiss Keidar1801b242018-08-13 16:19:46 +0300174 &.field-theirs {
175 @include multiline-ellipsis($bgColor: $theirs-bg-color);
176 }
177 &.field-name,
178 &.field.field-yours,
179 &.field.field-theirs {
180 word-break: break-word;
181 text-align: initial;
182 }
183 &.empty-field {
184 padding-top: 2px;
185 }
186 }
talig8e9c0652017-12-20 14:30:43 +0200187
Einav Weiss Keidar1801b242018-08-13 16:19:46 +0300188 *::after {
189 bottom: 0;
190 }
191 }
192 }
193 }
talig8e9c0652017-12-20 14:30:43 +0200194
Einav Weiss Keidar1801b242018-08-13 16:19:46 +0300195 &.field-error {
196 @extend .body-1;
197 color: $error-text-color;
198 min-width: 0;
199 white-space: nowrap;
200 overflow: hidden;
201 text-overflow: ellipsis;
202 }
203 }
204 }
talig8e9c0652017-12-20 14:30:43 +0200205}