$head_line: #EFFDEB; $head_gutter: #DAFACE; $selected_head_gutter: #B2EE9E; $selected_head_line: #D4F5C9; $origin_line: #F2F9FF; $origin_gutter: #E0F0FF; $selected_origin_gutter: #A3D3FF; $selected_origin_line: #CEE4F9; $unselected_gutter: #EEEEEE; $unselected_line: #F8F8F8; #conflicts { .diff-wrap-lines .line_content { white-space: normal; min-height: 19px; } .head { .header, .diff-line-num { background-color: $head_gutter; } td { background-color: $head_line; } &.selected { .header, .diff-line-num { background-color: $selected_head_gutter; } td { background-color: $selected_head_line; } } } .origin { .header, .diff-line-num { background-color: $origin_gutter; } td { background-color: $origin_line; } &.selected { .header, .diff-line-num { background-color: $selected_origin_gutter; } td { background-color: $selected_origin_line; } } } .origin, .head { &.unselected { .header, .diff-line-num { background-color: $unselected_gutter; } td { background-color: $unselected_line; } } } .parallel-view { .diff-content { overflow: hidden; table { width: 50%; float: left; } } } .parallel .header { button { right: 10px; } } .line_content.header { position: relative; button { border-radius: 4px; border: 1px solid #E1E1E1; background: #FFF; font-size: 10px; position: absolute; right: 20px; height: 17px; line-height: 4px; // FIXME: 4px? top: 1px; outline: none; } } }