diff --git a/src/Elements/Highlight.js b/src/Elements/Highlight.js index 9f87e8b..b989b12 100644 --- a/src/Elements/Highlight.js +++ b/src/Elements/Highlight.js @@ -46,38 +46,63 @@ export default class Highlight { const mt = getNumStyle('margin-top') const mb = getNumStyle('margin-bottom') - this._$margin.css({ - left: -ml, - top: -mt, - width: width + ml + mr, - height: height + mt + mb - }) - const bl = getNumStyle('border-left-width') const br = getNumStyle('border-right-width') const bt = getNumStyle('border-top-width') const bb = getNumStyle('border-bottom-width') - const bw = width - bl - br - const bh = height - bt - bb - - this._$padding.css({ - left: bl, - top: bt, - width: bw, - height: bh - }) - const pl = getNumStyle('padding-left') const pr = getNumStyle('padding-right') const pt = getNumStyle('padding-top') const pb = getNumStyle('padding-bottom') + const pw = width - bl - br + const ph = height - bt - bb + + const marginColor = 'rgba(246, 178, 107, 0.66)' + const borderColor = 'rgba(255, 229, 153, 0.66)' + const paddingColor = 'rgba(147, 196, 125, 0.55)' + const contentColor = 'rgba(111, 168, 220, 0.66)' + + this._$margin.css({ + left: -ml, + top: -mt, + width: width + ml + mr, + height: height + mt + mb, + borderTop: `${mt}px solid ${marginColor}`, + borderLeft: `${ml}px solid ${marginColor}`, + borderRight: `${mr}px solid ${marginColor}`, + borderBottom: `${mb}px solid ${marginColor}` + }) + + this._$border.css({ + left: 0, + top: 0, + width, + height, + borderTop: `${bt}px solid ${borderColor}`, + borderLeft: `${bl}px solid ${borderColor}`, + borderRight: `${br}px solid ${borderColor}`, + borderBottom: `${bb}px solid ${borderColor}` + }) + + this._$padding.css({ + left: bl, + top: bt, + width: pw, + height: ph, + borderTop: `${pt}px solid ${paddingColor}`, + borderLeft: `${pl}px solid ${paddingColor}`, + borderRight: `${pr}px solid ${paddingColor}`, + borderBottom: `${pb}px solid ${paddingColor}` + }) + this._$content.css({ left: bl + pl, top: bl + pt, - width: bw - pl - pr, - height: bh - pt - pb + width: pw - pl - pr, + height: ph - pt - pb, + background: contentColor }) this._$size @@ -104,6 +129,7 @@ export default class Highlight { this._$margin = $el.find('.eruda-margin') this._$padding = $el.find('.eruda-padding') this._$content = $el.find('.eruda-content') + this._$border = $el.find('.eruda-border') this._$size = $el.find('.eruda-size') } } diff --git a/src/Elements/Highlight.scss b/src/Elements/Highlight.scss index 41b4bff..7ffe480 100644 --- a/src/Elements/Highlight.scss +++ b/src/Elements/Highlight.scss @@ -11,7 +11,6 @@ pointer-events: none !important; } .indicator { - opacity: 0.5; position: absolute; left: 0; right: 0; @@ -20,7 +19,6 @@ } .margin { position: absolute; - background: #e8925b; z-index: 100; } .border { @@ -29,17 +27,14 @@ right: 0; width: 100%; height: 100%; - background: #ffcd7c; z-index: 200; } .padding { position: absolute; - background: #86af76; z-index: 300; } .content { position: absolute; - background: #5e88c1; z-index: 400; } .size {