talig | 8e9c065 | 2017-12-20 14:30:43 +0200 | [diff] [blame] | 1 | $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 Keidar | 1801b24 | 2018-08-13 16:19:46 +0300 | [diff] [blame^] | 8 | @for $i from 1 to 6 { |
9 | .level-#{$i} { | ||||
10 | padding-left: 18px + 10 * $i; | ||||
11 | } | ||||
12 | } | ||||
talig | 8e9c065 | 2017-12-20 14:30:43 +0200 | [diff] [blame] | 13 | } |
14 | |||||
15 | .merge-editor-modal { | ||||
Einav Weiss Keidar | 1801b24 | 2018-08-13 16:19:46 +0300 | [diff] [blame^] | 16 | .modal-lg { |
17 | width: 1300px; | ||||
18 | } | ||||
talig | 8e9c065 | 2017-12-20 14:30:43 +0200 | [diff] [blame] | 19 | } |
20 | |||||
21 | .merge-editor { | ||||
Einav Weiss Keidar | 1801b24 | 2018-08-13 16:19:46 +0300 | [diff] [blame^] | 22 | 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 | } | ||||
talig | 8e9c065 | 2017-12-20 14:30:43 +0200 | [diff] [blame] | 46 | |
Einav Weiss Keidar | 1801b24 | 2018-08-13 16:19:46 +0300 | [diff] [blame^] | 47 | text-align: right; |
talig | 8e9c065 | 2017-12-20 14:30:43 +0200 | [diff] [blame] | 48 | |
Einav Weiss Keidar | 1801b24 | 2018-08-13 16:19:46 +0300 | [diff] [blame^] | 49 | 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; | ||||
talig | 8e9c065 | 2017-12-20 14:30:43 +0200 | [diff] [blame] | 66 | |
Einav Weiss Keidar | 1801b24 | 2018-08-13 16:19:46 +0300 | [diff] [blame^] | 67 | .conflict-resolve-btn { |
68 | align-self: flex-end; | ||||
69 | } | ||||
talig | 8e9c065 | 2017-12-20 14:30:43 +0200 | [diff] [blame] | 70 | |
Einav Weiss Keidar | 1801b24 | 2018-08-13 16:19:46 +0300 | [diff] [blame^] | 71 | .grid-items { |
72 | align-items: center; | ||||
talig | 8e9c065 | 2017-12-20 14:30:43 +0200 | [diff] [blame] | 73 | |
Einav Weiss Keidar | 1801b24 | 2018-08-13 16:19:46 +0300 | [diff] [blame^] | 74 | input[type='radio']:not(:checked) { |
75 | cursor: pointer; | ||||
76 | } | ||||
77 | } | ||||
78 | } | ||||
talig | 8e9c065 | 2017-12-20 14:30:43 +0200 | [diff] [blame] | 79 | |
Einav Weiss Keidar | 1801b24 | 2018-08-13 16:19:46 +0300 | [diff] [blame^] | 80 | .collapsible-section { |
81 | display: flex; | ||||
82 | cursor: pointer; | ||||
talig | 8e9c065 | 2017-12-20 14:30:43 +0200 | [diff] [blame] | 83 | |
Einav Weiss Keidar | 1801b24 | 2018-08-13 16:19:46 +0300 | [diff] [blame^] | 84 | .conflict-title { |
85 | @extend .heading-5-semibold; | ||||
86 | text-transform: uppercase; | ||||
87 | } | ||||
88 | } | ||||
talig | 8e9c065 | 2017-12-20 14:30:43 +0200 | [diff] [blame] | 89 | |
Einav Weiss Keidar | 1801b24 | 2018-08-13 16:19:46 +0300 | [diff] [blame^] | 90 | .merge-chevron { |
91 | margin-right: 7px; | ||||
92 | &.right { | ||||
93 | transform: rotate(90deg); | ||||
94 | } | ||||
95 | } | ||||
talig | 8e9c065 | 2017-12-20 14:30:43 +0200 | [diff] [blame] | 96 | |
Einav Weiss Keidar | 1801b24 | 2018-08-13 16:19:46 +0300 | [diff] [blame^] | 97 | .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 | } | ||||
talig | 8e9c065 | 2017-12-20 14:30:43 +0200 | [diff] [blame] | 102 | |
Einav Weiss Keidar | 1801b24 | 2018-08-13 16:19:46 +0300 | [diff] [blame^] | 103 | &.theirs-color { |
104 | border-top: $selected-width solid $theirs-bg-color; | ||||
105 | border-bottom: $selected-width solid $theirs-bg-color; | ||||
106 | } | ||||
107 | } | ||||
talig | 8e9c065 | 2017-12-20 14:30:43 +0200 | [diff] [blame] | 108 | |
Einav Weiss Keidar | 1801b24 | 2018-08-13 16:19:46 +0300 | [diff] [blame^] | 109 | .merge-editor-text-field { |
110 | display: flex; | ||||
111 | justify-content: space-between; | ||||
112 | margin: 0; | ||||
talig | 8e9c065 | 2017-12-20 14:30:43 +0200 | [diff] [blame] | 113 | |
Einav Weiss Keidar | 1801b24 | 2018-08-13 16:19:46 +0300 | [diff] [blame^] | 114 | .field { |
115 | color: $text-black; | ||||
talig | 8e9c065 | 2017-12-20 14:30:43 +0200 | [diff] [blame] | 116 | |
Einav Weiss Keidar | 1801b24 | 2018-08-13 16:19:46 +0300 | [diff] [blame^] | 117 | &.field-name:not(.field-object-name) { |
118 | color: $gray; | ||||
119 | } | ||||
120 | } | ||||
talig | 8e9c065 | 2017-12-20 14:30:43 +0200 | [diff] [blame] | 121 | |
Einav Weiss Keidar | 1801b24 | 2018-08-13 16:19:46 +0300 | [diff] [blame^] | 122 | &.diff { |
123 | .field { | ||||
124 | color: $red; | ||||
125 | } | ||||
126 | } | ||||
talig | 8e9c065 | 2017-12-20 14:30:43 +0200 | [diff] [blame] | 127 | |
Einav Weiss Keidar | 1801b24 | 2018-08-13 16:19:46 +0300 | [diff] [blame^] | 128 | &.grid-section { |
129 | padding-bottom: 0; | ||||
talig | 8e9c065 | 2017-12-20 14:30:43 +0200 | [diff] [blame] | 130 | |
Einav Weiss Keidar | 1801b24 | 2018-08-13 16:19:46 +0300 | [diff] [blame^] | 131 | .grid-items { |
132 | flex: 1; | ||||
talig | 8e9c065 | 2017-12-20 14:30:43 +0200 | [diff] [blame] | 133 | |
Einav Weiss Keidar | 1801b24 | 2018-08-13 16:19:46 +0300 | [diff] [blame^] | 134 | .field-col { |
135 | padding: 7px 0; | ||||
136 | height: 100%; | ||||
talig | 8e9c065 | 2017-12-20 14:30:43 +0200 | [diff] [blame] | 137 | |
Einav Weiss Keidar | 1801b24 | 2018-08-13 16:19:46 +0300 | [diff] [blame^] | 138 | &:not(:first-child) { |
139 | padding-left: 8px; | ||||
140 | } | ||||
talig | 8e9c065 | 2017-12-20 14:30:43 +0200 | [diff] [blame] | 141 | |
Einav Weiss Keidar | 1801b24 | 2018-08-13 16:19:46 +0300 | [diff] [blame^] | 142 | &.grid-col-yours { |
143 | background-color: $yours-bg-color; | ||||
144 | } | ||||
talig | 8e9c065 | 2017-12-20 14:30:43 +0200 | [diff] [blame] | 145 | |
Einav Weiss Keidar | 1801b24 | 2018-08-13 16:19:46 +0300 | [diff] [blame^] | 146 | &.grid-col-theirs { |
147 | background-color: $theirs-bg-color; | ||||
148 | } | ||||
talig | 8e9c065 | 2017-12-20 14:30:43 +0200 | [diff] [blame] | 149 | |
Einav Weiss Keidar | 1801b24 | 2018-08-13 16:19:46 +0300 | [diff] [blame^] | 150 | @include levels; |
talig | 8e9c065 | 2017-12-20 14:30:43 +0200 | [diff] [blame] | 151 | |
Einav Weiss Keidar | 1801b24 | 2018-08-13 16:19:46 +0300 | [diff] [blame^] | 152 | .field { |
153 | @extend .body-1; | ||||
154 | flex: 2; | ||||
155 | min-width: 0; | ||||
talig | 8e9c065 | 2017-12-20 14:30:43 +0200 | [diff] [blame] | 156 | |
Einav Weiss Keidar | 1801b24 | 2018-08-13 16:19:46 +0300 | [diff] [blame^] | 157 | &.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 | } | ||||
talig | 8e9c065 | 2017-12-20 14:30:43 +0200 | [diff] [blame] | 169 | |
Einav Weiss Keidar | 1801b24 | 2018-08-13 16:19:46 +0300 | [diff] [blame^] | 170 | &.field-yours { |
171 | @include multiline-ellipsis($bgColor: $yours-bg-color); | ||||
172 | } | ||||
talig | 8e9c065 | 2017-12-20 14:30:43 +0200 | [diff] [blame] | 173 | |
Einav Weiss Keidar | 1801b24 | 2018-08-13 16:19:46 +0300 | [diff] [blame^] | 174 | &.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 | } | ||||
talig | 8e9c065 | 2017-12-20 14:30:43 +0200 | [diff] [blame] | 187 | |
Einav Weiss Keidar | 1801b24 | 2018-08-13 16:19:46 +0300 | [diff] [blame^] | 188 | *::after { |
189 | bottom: 0; | ||||
190 | } | ||||
191 | } | ||||
192 | } | ||||
193 | } | ||||
talig | 8e9c065 | 2017-12-20 14:30:43 +0200 | [diff] [blame] | 194 | |
Einav Weiss Keidar | 1801b24 | 2018-08-13 16:19:46 +0300 | [diff] [blame^] | 195 | &.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 | } | ||||
talig | 8e9c065 | 2017-12-20 14:30:43 +0200 | [diff] [blame] | 205 | } |