From b10915076b1240e0b4a0238c5c47544547c730a6 Mon Sep 17 00:00:00 2001 From: B3Hana <180432612+B3Hana@users.noreply.github.com> Date: Thu, 28 May 2026 13:43:49 +0200 Subject: [PATCH 1/2] unify several colors and remove unused/duplicate variables in openmage adminhtml design. --- .../openmage/default/calendar-blue2.css | 107 +++++++------ .../openmage/default/calendar-blue2.css.map | 8 +- skin/adminhtml/openmage/default/form.css | 63 ++++---- skin/adminhtml/openmage/default/form.css.map | 2 +- skin/adminhtml/openmage/default/login.css | 51 ++----- skin/adminhtml/openmage/default/login.css.map | 8 +- skin/adminhtml/openmage/default/menu.css | 64 +++----- skin/adminhtml/openmage/default/menu.css.map | 2 +- skin/adminhtml/openmage/default/override.css | 107 +++++++------ .../openmage/default/override.css.map | 2 +- .../openmage/default/scss/_base.scss | 43 ++---- .../openmage/default/scss/_variables.scss | 144 ++++-------------- .../openmage/default/scss/calendar-blue2.scss | 91 ++++++----- .../adminhtml/openmage/default/scss/form.scss | 70 ++++----- .../openmage/default/scss/login.scss | 35 ++--- .../adminhtml/openmage/default/scss/menu.scss | 58 +++---- .../openmage/default/scss/override.scss | 111 +++++++------- 17 files changed, 388 insertions(+), 578 deletions(-) diff --git a/skin/adminhtml/openmage/default/calendar-blue2.css b/skin/adminhtml/openmage/default/calendar-blue2.css index 0bb4929673c..5e495ac8b7e 100644 --- a/skin/adminhtml/openmage/default/calendar-blue2.css +++ b/skin/adminhtml/openmage/default/calendar-blue2.css @@ -2,36 +2,26 @@ Edit scss version and compile with sass from scss folder like this: $ sass calendar-blue2.scss ../calendar-blue2.css */ -/* - 205 = default, - 0 = red, - 60 = yellow, - 120 = green, - 180 = turquoise, - 240 = blue, - 300 = purple -*/ -.calendar, .calendar table { - color: #202856; - cursor: default; - background: #f1f8fc; - font: 400 12px/1.33 'Open Sans', sans-serif; -} - -.calendar td.time .hour, .calendar td.time .minute, .calendar td.time .ampm { +.calendar td.time .ampm, .calendar td.time .minute, .calendar td.time .hour { padding: 0 3px 0 4px; - border: 1px solid #889; + border: 1px solid #000; font-weight: 600; - background-color: #f1f8fc; + background-color: #fff; } .calendar { - box-shadow: 0 0 8px #888; + box-shadow: 1px 3px 4px #c8c8c8; +} +.calendar table { + color: #202856; + cursor: default; + background: #fff; + font: 400 12px/1.33 "Open Sans", sans-serif; } .calendar table .wn { padding: 2px 3px 2px 2px; border-right: 1px solid #000; - background: #f1f8fc; + background: #fff; } .calendar .button { text-align: center; @@ -44,31 +34,33 @@ padding: 2px; } .calendar thead tr { - background: #0090FF; + background: #3A499D; color: #fff; } .calendar thead .daynames { - background: #f1f8fc; + background: #fff; } .calendar thead .name { - border-bottom: 1px solid #206a9b; + border-bottom: 1px solid #3A499D; padding: 2px; text-align: center; color: #202856; } .calendar thead .weekend { - color: #a66; + color: #963535; } .calendar thead .hilite { - background-color: #34abfa; + background-color: #273169; + color: #fff; } .calendar thead .active { - background-color: #006aa9; + background-color: #273169; + color: #fff; padding: 2px 0 0 2px; } .calendar tbody .day { width: 2em; - color: #456; + color: #202856; text-align: right; padding: 2px 4px 2px 2px; } @@ -77,15 +69,15 @@ color: #c8c8c8; } .calendar tbody .day.othermonth.oweekend { - color: #fbb; + color: #963535; } .calendar tbody td.hilite { - background: #def; + background: #f0f9ff; padding: 1px 3px 1px 1px; - border: 1px solid #8fc4e8; + border: 1px solid #3A499D; } .calendar tbody td.active { - background: #f1f8fc; + background: #273169; padding: 2px 2px 0 2px; } .calendar tbody td.selected { @@ -96,14 +88,14 @@ color: #202856; } .calendar tbody td.weekend { - color: #a66; + color: #963535; } .calendar tbody td.today { font-weight: 600; - color: #d50000; + color: #e63a3a; } .calendar tbody .disabled { - color: #999; + color: #c8c8c8; } .calendar tbody .emptycell { visibility: hidden; @@ -112,14 +104,14 @@ display: none; } .calendar tbody .rowhilite td { - background: #def; + background: #f0f9ff; } .calendar tbody .rowhilite td.wn { - background: #f1f8fc; + background: #f0f9ff; } .calendar tfoot .footrow { text-align: center; - background: #0090FF; + background: #3A499D; color: #fff; } .calendar tfoot .ttip { @@ -127,13 +119,14 @@ padding: 4px; } .calendar tfoot .hilite { - background: #b8daf0; - border: 1px solid #0090FF; - color: #202856; + background: #273169; + border: 1px solid #273169; + color: #fff; padding: 1px; } .calendar tfoot .active { - background: #006aa9; + background: #273169; + color: #fff; padding: 2px 0 0 2px; } .calendar .combo { @@ -143,8 +136,8 @@ left: 0; width: 4em; cursor: default; - border: 1px solid #202856; - background: #def; + border: 1px solid #3A499D; + background: #fff; color: #202856; font-size: 90%; z-index: 100; @@ -159,22 +152,24 @@ width: 4em; } .calendar .combo .hilite { - background: #34abfa; - border-top: 1px solid #46a; - border-bottom: 1px solid #46a; + background: #273169; + border-top: 1px solid #273169; + border-bottom: 1px solid #273169; + color: #fff; font-weight: 600; } .calendar .combo .active { - border-top: 1px solid #46a; - border-bottom: 1px solid #46a; - background: #f1f8fc; + border-top: 1px solid #273169; + border-bottom: 1px solid #273169; + background: #273169; + color: white; font-weight: 600; } .calendar td.time { border-top: 1px solid #000; - padding: 1px 0; + padding: 5px 0; text-align: center; - background-color: #f1f8fc; + background-color: #fff; } .calendar td.time .ampm { text-align: center; @@ -184,14 +179,14 @@ font-weight: 600; } .calendar td.time span.hilite { - border-color: #000; - background-color: #3378a3; + border-color: #025988; + background-color: #025988; color: #fff; } .calendar td.time span.active { - border-color: red; + border-color: #000; background-color: #000; - color: #a5ff00; + color: #fff; } div.calendar { diff --git a/skin/adminhtml/openmage/default/calendar-blue2.css.map b/skin/adminhtml/openmage/default/calendar-blue2.css.map index d614171034f..32e46b57f66 100644 --- a/skin/adminhtml/openmage/default/calendar-blue2.css.map +++ b/skin/adminhtml/openmage/default/calendar-blue2.css.map @@ -1,7 +1 @@ -{ -"version": 3, -"mappings": "AAAA;;;GAGG;AC4FH;;;;;;;;EAQE;ACiLF,0BAAW;EACT,KAAK,EDtPe,OAA8B;ECuPlD,MAAM,EAAE,OAAO;EACf,UAAU,EDnPc,OAAO;ECoP/B,IAAI,EAAE,qCAAqC;;;AAK7C,2EAAW;EACT,OAAO,EAAE,WAAW;EACpB,MAAM,EAAE,cAA+B;EACvC,WAAW,EAAE,GAAG;EAChB,gBAAgB,ED7PQ,OAAO;;;ADjCjC,SAAU;EACR,UAAU,EAAE,YAA0B;;AAMpC,mBAAI;EACF,OAAO,EAAE,eAAe;EACxB,YAAY,EAAE,cAAgB;EAC9B,UAAU,ECuBU,OAAO;;ADnB/B,iBAAQ;EACN,UAAU,EAAE,MAAM;EAClB,OAAO,EAAE,GAAG;;AAIZ,sBAAO;EACL,WAAW,EAAE,GAAG;EAChB,UAAU,EAAE,MAAM;EAClB,KAAK,ECkDH,IAAI;EDjDN,OAAO,EAAE,GAAG;;AAGd,kBAAG;EACD,UAAU,EC8BD,OAAO;ED7BhB,KAAK,EC4CH,IAAI;;ADzCR,yBAAU;EACR,UAAU,ECAU,OAAO;;ADG7B,qBAAM;EACJ,aAAa,EAAE,iBAA+B;EAC9C,OAAO,EAAE,GAAG;EACZ,UAAU,EAAE,MAAM;EAClB,KAAK,ECZW,OAA8B;;ADehD,wBAAS;EACP,KAAK,ECTe,IAAI;;ADY1B,uBAAQ;EACN,gBAAgB,ECZK,OAAO;;ADe9B,uBAAQ;EACN,gBAAgB,ECfE,OAAO;EDgBzB,OAAO,EAAE,WAAW;;AAKtB,oBAAK;EACH,KAAK,EAAE,GAAG;EACV,KAAK,ECtBU,IAAI;EDuBnB,UAAU,EAAE,KAAK;EACjB,OAAO,EAAE,eAAe;;AAExB,+BAAa;EACX,SAAS,EAAE,GAAG;EACd,KAAK,ECMS,OAAO;;ADJrB,wCAAW;EACT,KAAK,EC9BU,IAAI;;ADoCvB,yBAAS;EACP,UAAU,ECnCM,IAAI;EDoCpB,OAAO,EAAE,eAAe;EACxB,MAAM,EAAE,iBAAkC;;AAG5C,yBAAS;EACP,UAAU,ECjDQ,OAAO;EDkDzB,OAAO,EAAE,aAAa;;AAGxB,2BAAW;EACT,WAAW,EAAE,GAAG;EAChB,MAAM,EAAE,cAAgB;EACxB,OAAO,EAAE,eAAe;EACxB,UAAU,ECjBV,IAAI;EDkBJ,KAAK,EC/DS,OAA8B;;ADkE9C,0BAAU;EACR,KAAK,EC5Da,IAAI;;AD+DxB,wBAAQ;EACN,WAAW,EAAE,GAAG;EAChB,KAAK,EC5CG,OAA2B;;ADgDvC,yBAAU;EACR,KAAK,EC7FY,IAAI;;ADgGvB,0BAAW;EACT,UAAU,EAAE,MAAM;;AAGpB,yBAAU;EACR,OAAO,EAAE,IAAI;;AAGf,6BAAc;EACZ,UAAU,EC5EQ,IAAI;;AD8EtB,gCAAK;EACH,UAAU,ECvFQ,OAAO;;AD6F7B,wBAAS;EACP,UAAU,EAAE,MAAM;EAClB,UAAU,ECtED,OAAO;EDuEhB,KAAK,ECxDH,IAAI;;AD2DR,qBAAM;EACJ,KAAK,EC5DH,IAAI;ED6DN,OAAO,EAAE,GAAG;;AAGd,uBAAQ;EACN,UAAU,EC9FO,OAAO;ED+FxB,MAAM,EAAE,iBAAuB;EAC/B,KAAK,EChHW,OAA8B;EDiH9C,OAAO,EAAE,GAAG;;AAGd,uBAAQ;EACN,UAAU,EC5GQ,OAAO;ED6GzB,OAAO,EAAE,WAAW;;AAIxB,gBAAO;EACL,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,IAAI;EACb,GAAG,EAAE,CAAC;EACN,IAAI,EAAE,CAAC;EACP,KAAK,EAAE,GAAG;EACV,MAAM,EAAE,OAAO;EACf,MAAM,EAAE,iBAA8B;EACtC,UAAU,ECrHU,IAAI;EDsHxB,KAAK,ECnIa,OAA8B;EDoIhD,SAAS,EAAE,GAAG;EACd,OAAO,EAAE,GAAG;;AAEZ,uBAAO;EACL,UAAU,EAAE,MAAM;EAClB,OAAO,EAAE,GAAG;;AAGd,6BAAa;EACX,UAAU,EAAE,MAAM;EAClB,OAAO,EAAE,GAAG;EACZ,KAAK,EAAE,GAAG;;AAGZ,wBAAQ;EACN,UAAU,EC3IW,OAAO;ED4I5B,UAAU,EAAE,cAAkC;EAC9C,aAAa,EAAE,cAAkC;EACjD,WAAW,EAAE,GAAG;;AAGlB,wBAAQ;EACN,UAAU,EAAE,cAAkC;EAC9C,aAAa,EAAE,cAAkC;EACjD,UAAU,ECvJU,OAAO;EDwJ3B,WAAW,EAAE,GAAG;;AAIpB,iBAAQ;EACN,UAAU,EAAE,cAAgB;EAC5B,OAAO,EAAE,KAAK;EACd,UAAU,EAAE,MAAM;EAClB,gBAAgB,EChKM,OAAO;;AD0K7B,uBAAM;EAEJ,UAAU,EAAE,MAAM;;AAGpB,wBAAO;EACL,OAAO,EAAE,WAAW;EACpB,WAAW,EAAE,GAAG;;AAIhB,6BAAS;EACP,YAAY,EC/KZ,IAAI;EDgLJ,gBAAgB,ECzNF,OAAO;ED0NrB,KAAK,EChJL,IAAI;;ADmJN,6BAAS;EACP,YAAY,EC9Kd,GAAG;ED+KD,gBAAgB,ECtLhB,IAAI;EDuLJ,KAAK,EC/KO,OAAO;;;ADqL3B,YAAa;EACX,QAAQ,EAAE,QAAQ", -"sources": ["scss/calendar-blue2.scss","scss/_variables.scss","scss/_base.scss"], -"names": [], -"file": "calendar-blue2.css" -} +{"version":3,"sourceRoot":"","sources":["scss/calendar-blue2.scss","scss/_base.scss","scss/_variables.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;AAAA;ACyRA;EACE;EACA;EACA;EACA,kBCvRM;;;AFCR;EACE;;AAEA;EACE,OERsB;EFStB;EACA,YEPI;EFQJ;;AAEA;EACE;EACA;EACA,YEbE;;AFiBN;EACE;EACA;;AAIA;EACE;EACA;EACA,OE1BE;EF2BF;;AAGF;EACE,YEpCe;EFqCf,OEhCE;;AFmCJ;EACE,YEpCE;;AFuCJ;EACE;EACA;EACA;EACA,OE9CoB;;AFiDtB;EACE,OEnCc;;AFsChB;EACE,kBEvDoB;EFwDpB,OEpDE;;AFuDJ;EACE,kBE5DoB;EF6DpB,OEzDE;EF0DF;;AAKF;EACE;EACA,OEpEoB;EFqEpB;EACA;;AAEA;EACE;EACA,OE/Cc;;AFiDd;EACE,OE9DU;;AFoEd;EACE,YEnEc;EFoEd;EACA;;AAGF;EACE,YE3FkB;EF4FlB;;AAGF;EACE;EACA;EACA;EACA,YE/FA;EFgGA,OEnGkB;;AFsGpB;EACE,OExFY;;AF2Fd;EACE;EACA,OE9FO;;AFkGX;EACE,OEtFgB;;AFyFlB;EACE;;AAGF;EACE;;AAGF;EACE,YE5GgB;;AF8GhB;EACE,YE/Gc;;AFqHlB;EACE;EACA,YE1Ie;EF2If,OEtIE;;AFyIJ;EACE,OE1IE;EF2IF;;AAGF;EACE,YEnJoB;EFoJpB;EACA,OEjJE;EFkJF;;AAGF;EACE,YE1JoB;EF2JpB,OEvJE;EFwJF;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA,YEpKI;EFqKJ,OExKsB;EFyKtB;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;EACA;;AAGF;EACE,YEzLoB;EF0LpB;EACA;EACA,OExLE;EFyLF;;AAGF;EACE;EACA;EACA,YEnMoB;EFoMpB;EACA;;AAIJ;EACE;EACA;EACA;EACA,kBEzMI;;AFmNJ;EAEE;;AAGF;EACE;EACA;;AAIA;EACE,cE/Ma;EFgNb,kBEhNa;EFiNb,OEjOA;;AFoOF;EACE,cEtOA;EFuOA,kBEvOA;EFwOA,OEvOA;;;AF6OR;EACE","file":"calendar-blue2.css"} \ No newline at end of file diff --git a/skin/adminhtml/openmage/default/form.css b/skin/adminhtml/openmage/default/form.css index ba101c95b80..6cd2e0e8515 100644 --- a/skin/adminhtml/openmage/default/form.css +++ b/skin/adminhtml/openmage/default/form.css @@ -3,15 +3,6 @@ Edit scss version and compile with sass from scss folder like this: $ sass form.scss ../form.css */ -/* - 205 = default, - 0 = red, - 60 = yellow, - 120 = green, - 180 = turquoise, - 240 = blue, - 300 = purple -*/ select, textarea, input.input-text { font: 400 12px/1.33 "Open Sans", sans-serif; display: inline-block; @@ -47,13 +38,6 @@ select, textarea, input.input-text { vertical-align: middle; } -.form-button:active, .form-button:focus, button:active, button:focus { - background: #888; - border: 0; - outline: thin dotted; - outline-offset: -2px; -} - .form-button[disabled] fieldset[disabled] button, button[disabled], .form-button.disabled, button.disabled { cursor: default; pointer-events: none; @@ -77,7 +61,7 @@ select, textarea, input.input-text { } .form-button.ok_button:active, .form-button.ok_button:focus, button.add:active, button.add:focus, button.ok_button:active, button.ok_button:focus, button.save:active, button.save:focus { - background-color: #026294; + background-color: #025988; outline: thin dotted; outline-offset: -2px; color: #fff; @@ -156,7 +140,7 @@ button.cancel span { padding: 0; } button.cancel:hover { - background: #fa4545; + background: #963535; } button.delete { background: #e63a3a; @@ -167,8 +151,8 @@ button.delete span { background: none; padding: 0; } -button.delete:hover { - background: #fa4545; +button.delete:hover, button.delete:focus { + background: #963535; } button.save { padding: 0 13px; @@ -178,7 +162,7 @@ button.save span { padding: 0; } button.save:hover { - background-color: #0090FF; + background-color: #025988; } button.ok_button { padding: 0 13px; @@ -188,7 +172,7 @@ button.ok_button span { padding: 0; } button.ok_button:hover { - background-color: #0090FF; + background-color: #025988; } button.add { padding: 0 13px; @@ -198,7 +182,7 @@ button.add span { padding: 0; } button.add:hover { - background-color: #0090FF; + background-color: #025988; } button.add.disabled span { background: none; @@ -214,17 +198,19 @@ button.back:before { content: "«"; padding-right: 4px; } +button:focus, button:active { + background: #2f2f2f; + color: #fff; + border: 0; + outline: thin dotted; + outline-offset: -2px; +} button:hover { - background: #888; + background: #2f2f2f; + color: #fff; } button.disabled { - background: #888; -} -button.disabled:hover { - background: #888; -} -button.disabled:active { - background: #888; + background: #2f2f2f; } button.fail { background: #e63a3a; @@ -232,7 +218,7 @@ button.fail { padding: 0 13px; } button.fail:hover { - background: #fa4545; + background: #963535; } button.cancel_button { background: #e63a3a; @@ -240,7 +226,7 @@ button.cancel_button { padding: 0 13px; } button.cancel_button:hover { - background: #fa4545; + background: #963535; } button.icon-btn { width: auto !important; @@ -271,11 +257,18 @@ button.add-variable span { padding: 0; } +.form-button:focus, .form-button:active { + background: #2f2f2f; + color: #fff; + border: 0; + outline: thin dotted; + outline-offset: -2px; +} .form-button:hover { - background: #888; + background: #2f2f2f; } .form-button.ok_button:hover { - background-color: #0090FF; + background-color: #025988; } .form-button.large { font-size: 22px; diff --git a/skin/adminhtml/openmage/default/form.css.map b/skin/adminhtml/openmage/default/form.css.map index 006377ed9e4..fb2742bc3c6 100644 --- a/skin/adminhtml/openmage/default/form.css.map +++ b/skin/adminhtml/openmage/default/form.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["scss/form.scss","scss/_variables.scss","scss/_base.scss"],"names":[],"mappings":";AAAA;AAAA;AAAA;AAAA;AC+FA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACiFA;EACE;EACA;EACA;EACA;EACA,kBDrGM;ECsGN;EACA,ODpJoB;ECqJpB;EAEA;;;AAKF;EACE;EACA;EACA,OD/JoB;;;ACoKtB;EACE;EACA,kBD7LqB;EC8LrB;EACA,OD3HM;EC4HN;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;;;AAKF;EACE,YD3MkB;EC4MlB;EACA;EACA;;;AAKF;EACE;EACA;EACA;;;AAKF;EACE;EACA,kBD7Ka;EC8Kb;EACA,ODhKM;ECiKN;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;;;AAKF;EACE,kBD1NyB;EC2NzB;EACA;EACA,ODnLM;;;ACwLR;EACE;EACA;EACA;;;AAKF;EACE;EACA;EACA;;;AF5QF;EACE;;AAOF;EAEE;;AAEA;EACE,YChBqB;;ADmBvB;EACE,YCpBqB;;;ADwBzB;EAEE;EACA;EACA;EACA;EACA;;AAEA;EACE,YCjCqB;;ADoCvB;EACE,YCrCqB;;ADwCvB;EACE;;;AAKF;EACE,YC/CqB;;ADkDvB;EACE,YCnDqB;;;ADuDzB;EACE;;;AAGF;EACE;;;AAGF;EACE;;AAGA;EACE;;AAGF;EACE,YCrCoB;EDsCpB,OCGI;EDFJ;;AAEA;EACE;EACA;;AAGF;EACE,YCjEmB;;ADqEvB;EACE,YCpDoB;EDqDpB,OCZI;EDaJ;;AAEA;EACE;EACA;;AAGF;EACE,YChFmB;;ADoFvB;EAEE;;AAEA;EACE;EACA;;AAWF;EACE,kBC1DS;;ADkEb;EAEE;;AAEA;EACE;EACA;;AAWF;EACE,kBCpFS;;AD4Fb;EAEE;;AAEA;EACE;EACA;;AAWF;EACE,kBC9GS;;ADoHT;EACE;;AAKN;EACE;;AAEA;EACE;EACA;;AAGF;EACE;EACA;;AAYJ;EACE,YCjMgB;;ADoMlB;EAEE,YCtMgB;;ADwMhB;EACE,YCzMc;;AD4MhB;EACE,YC7Mc;;AD6NlB;EACE,YCxMoB;EDyMpB,OChKI;EDiKJ;;AAEA;EACE,YC/NmB;;ADmOvB;EACE,YClNoB;EDmNpB,OC1KI;ED2KJ;;AAEA;EACE,YCzOmB;;AD6OvB;EACE;;AAEA;EACE;EACA;EACA;;AAIJ;EACE;EACA;;AAGF;EACE;EACA;;AAGF;EACE;EACA;;AAGF;EACE;EACA;;AAGF;EACE;EACA;;;AAeF;EACE,YCjSgB;;ADmThB;EACE,kBCpQS;;ADwQb;EACE;EACA;;;AAQJ;EACE;EACA;EACA;;AAeE;EACE;;AAKJ;EACE,OCzVmB;ED0VnB;;AAGF;EACE;;AAEA;EACE;;AAGF;EACE,OCrVgB;EDsVhB;EACA;;AAEA;EACE,OCtVgB;;;AD8WxB;EACE;EACA;;;AAGF;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA,YC7XoB;ED8XpB,OCrVI;EDsVJ;;AAEF;EACE;EACA;;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAEF;EACE","file":"form.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["scss/form.scss","scss/_base.scss","scss/_variables.scss"],"names":[],"mappings":";AAAA;AAAA;AAAA;AAAA;ACgLA;EACE;EACA;EACA;EACA;EACA,kBC/KM;EDgLN;EACA,OCpLwB;EDqLxB;EAEA;;;AAKF;EACE;EACA;EACA,OC/LwB;;;ADoM1B;EACE;EACA,kBClLmB;EDmLnB;EACA,OCrMM;EDsMN;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;;;AAeF;EACE;EACA;EACA;;;AAKF;EACE;EACA,kBC1Nc;ED2Nd;EACA,OC3OM;ED4ON;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;;;AAKF;EACE,kBC3OmB;ED4OnB;EACA;EACA,OC9PM;;;ADmQR;EACE;EACA;EACA;;;AAKF;EACE;EACA;EACA;;;AD7QF;EACE;;AAOF;EAEE;;AAEA;EACE,YEKqB;;AFFvB;EACE,YECqB;;;AFGzB;EAEE;EACA;EACA;EACA;EACA;;AAEA;EACE,YEZqB;;AFevB;EACE,YEhBqB;;AFmBvB;EACE;;;AAKF;EACE,YE1BqB;;AF6BvB;EACE,YE9BqB;;;AFkCzB;EACE;;;AAGF;EACE;;;AAGF;EACE;;AAGA;EACE;;AAGF;EACE,YE3DW;EF4DX,OEvEI;EFwEJ;;AAEA;EACE;EACA;;AAGF;EACE,YEpEc;;AFwElB;EACE,YE1EW;EF2EX,OEtFI;EFuFJ;;AAEA;EACE;EACA;;AAGF;EAEE,YEpFc;;AFwFlB;EAEE;;AAEA;EACE;EACA;;AAWF;EACE,kBEtGe;;AF8GnB;EAEE;;AAEA;EACE;EACA;;AAWF;EACE,kBEhIe;;AFwInB;EAEE;;AAEA;EACE;EACA;;AAWF;EACE,kBE1Je;;AFgKf;EACE;;AAKN;EACE;;AAEA;EACE;EACA;;AAGF;EACE;EACA;;AAIJ;EAEE,YE3Kc;EF4Kd,OEvMI;EFwMJ;EACA;EACA;;AAGF;EACE,YEnLc;EFoLd,OE/MI;;AFkNN;EAEE,YEzLc;;AFwMhB;EACE,YEzNW;EF0NX,OErOI;EFsOJ;;AAEA;EACE,YE7Nc;;AFiOlB;EACE,YEnOW;EFoOX,OE/OI;EFgPJ;;AAEA;EACE,YEvOc;;AF2OlB;EACE;;AAEA;EACE;EACA;EACA;;AAIJ;EACE;EACA;;AAGF;EACE;EACA;;AAGF;EACE;EACA;;AAGF;EACE;EACA;;AAGF;EACE;EACA;;;AAOF;EAEE,YErQc;EFsQd,OEjSI;EFkSJ;EACA;EACA;;AAGF;EACE,YE7Qc;;AF+Rd;EACE,kBE3Se;;AF+SnB;EACE;EACA;;;AAQJ;EACE;EACA;EACA;;AAeE;EACE;;AAKJ;EACE,OExUmB;EFyUnB;;AAGF;EACE;;AAEA;EACE;;AAGF;EACE,OEjXoB;EFkXpB;EACA;;AAEA;EACE,OExWO;;;AFgYf;EACE;EACA;;;AAGF;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA,YE/YW;EFgZX,OE3ZI;EF4ZJ;;AAEF;EACE;EACA;;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAEF;EACE","file":"form.css"} \ No newline at end of file diff --git a/skin/adminhtml/openmage/default/login.css b/skin/adminhtml/openmage/default/login.css index fc92777f8b8..981164d0b1c 100644 --- a/skin/adminhtml/openmage/default/login.css +++ b/skin/adminhtml/openmage/default/login.css @@ -1,21 +1,3 @@ -/* - 205 = default, - 0 = red, - 60 = yellow, - 120 = green, - 180 = turquoise, - 240 = blue, - 300 = purple -*/ -/* - 205 = default, - 0 = red, - 60 = yellow, - 120 = green, - 180 = turquoise, - 240 = blue, - 300 = purple -*/ .form-button { background-image: none; background-color: #71798e; @@ -67,15 +49,13 @@ } body { - background: #e6e6e6; color: #2f2f2f; font: 400 12px/1.33 Open Sans, sans-serif; - background: #ebedef; font-size: 13px; overflow-x: hidden; } body#page-login { - background-color: #3d4f5c; + background-color: #273169; background-image: url(images/login_background.jpg); background-repeat: no-repeat; background-position: center top; @@ -96,26 +76,26 @@ body#page-login:after { a { display: inline; - color: #269de7; + color: #0090FF; text-decoration: none; } a:visited { - color: #269de7; + color: #0090FF; } a:focus { - color: #3378a3; + color: #025988; text-decoration: none; } a:hover { - color: #3378a3; + color: #025988; text-decoration: none; } a:active { - color: #3378a3; + color: #025988; text-decoration: none; } a.error span { - color: #fa4545 !important; + color: #e63a3a !important; } :focus { @@ -123,13 +103,13 @@ a.error span { } h2 { - margin-bottom: .5em; + margin-bottom: 0.5em; line-height: 1.4em; font-size: 1.7em; } p { - margin-bottom: .5em; + margin-bottom: 0.5em; } form { @@ -148,16 +128,16 @@ input.input-text { font: 12px Arial, sans-serif, Helvetica; border-width: 1px; border-style: solid; - border-color: #aaa; + border-color: #999; padding: 2px 2px 3px; line-height: 18px; font-family: Open Sans, Helvetica Neue; } input.input-text:hover { - outline: 2px solid rgba(117, 146, 163, 0.1); + outline: 2px solid #eee; } input.input-text:focus { - box-shadow: 0 0 0 2px rgba(117, 146, 163, 0.25); + outline: 2px solid #c8c8c8; } input.input-text:disabled { outline: none; @@ -169,7 +149,6 @@ input.input-text:disabled { } #page-login { - background: #f8f8f8; text-align: center; } @@ -181,7 +160,7 @@ input.input-text:disabled { } .login-container .legal { margin: 0; - font-size: .95em; + font-size: 0.95em; background: none; padding: 0; border-style: none; @@ -189,14 +168,14 @@ input.input-text:disabled { bottom: 30px; left: 0; width: 100%; - color: white; + color: #fff; text-shadow: 0 0 5px rgba(0, 0, 0, 0.5); } .login-form { background: url(images/icon-error.png) no-repeat; text-align: left; - background: white; + background: #fff; border: none; padding: 40px 50px; box-shadow: 0 30px 150px rgba(0, 0, 0, 0.5); diff --git a/skin/adminhtml/openmage/default/login.css.map b/skin/adminhtml/openmage/default/login.css.map index 4bc66de1fe1..15d19bc015d 100644 --- a/skin/adminhtml/openmage/default/login.css.map +++ b/skin/adminhtml/openmage/default/login.css.map @@ -1,7 +1 @@ -{ -"version": 3, -"mappings": "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", -"sources": ["scss/_variables.scss","scss/_base.scss","scss/_fonts.scss","scss/login.scss"], -"names": [], -"file": "login.css" -} +{"version":3,"sourceRoot":"","sources":["scss/_base.scss","scss/_variables.scss","scss/_fonts.scss","scss/login.scss"],"names":[],"mappings":"AAuMA;EACE;EACA,kBClLmB;EDmLnB;EACA,OCrMM;EDsMN;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;;;AEtNF;EACE;EACA,wLAE4D;EAC5D;EACA;;AAGF;EACE;EACA,8LAE8D;EAC9D;EACA;;AAGF;EACE;EACA,qLAE2D;EAC3D;EACA;;AAEF;EACE;EACA,iMAE+D;EAC/D;EACA;;AC5BF;EACE;EACA;;;AAGF;EACE,OFuBgB;EEtBhB;EACA;EACA;;AAEA;EACE,kBFdsB;EEetB,kBF+BmB;EE9BnB;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAKN;EACE;EACA,OFlBc;EEmBd;;AAEA;EACE,OFtBY;;AEyBd;EACE,OFzBiB;EE0BjB;;AAGF;EACE,OF9BiB;EE+BjB;;AAGF;EACE,OFnCiB;EEoCjB;;AAGF;EACE;;;AAIJ;EACE;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE,OFpDgB;;;AEuDlB;EACE;;AAEA;EACE,YFtFI;EEuFJ;EACA;EACA;EACA,cFhEmB;EEiEnB;EACA;EACA;;AAEA;EACE;;AAGF;EAEE;;AAGF;EACE;EACA;;;AAKN;EAEE,kBFlGc;;;AEqGhB;EACE;;;AAGF;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,OFxII;EE0IJ;;;AAIJ;EACE;EACA;EACA,YFjJM;EEkJN;EACA;EAEA;;AAEA;EACE;;AAEA;EACE;EACA;;AAIJ;EACE;EACA;;AAGF;EACE;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;;AAIJ;EACE;;;AAIJ;EACE;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;AACA;EACE;;;AAIJ;EACE","file":"login.css"} \ No newline at end of file diff --git a/skin/adminhtml/openmage/default/menu.css b/skin/adminhtml/openmage/default/menu.css index 65e125db79d..6d73f2ff75d 100644 --- a/skin/adminhtml/openmage/default/menu.css +++ b/skin/adminhtml/openmage/default/menu.css @@ -2,15 +2,6 @@ Edit scss version and compile with sass from scss folder like this: $ sass menu.scss ../menu.css */ -/* - 205 = default, - 0 = red, - 60 = yellow, - 120 = green, - 180 = turquoise, - 240 = blue, - 300 = purple -*/ #nav ul li.active, #nav ul li { float: none; height: auto; @@ -18,13 +9,6 @@ margin: 0; } -#usermenu ul li a:hover { - color: #2f2f2f; - text-decoration: none; - background: var(--color-main-xs); - display: block; -} - .nav-bar { background: #3A499D; padding: 0 350px 0 70px; @@ -50,19 +34,12 @@ #nav li:hover { z-index: 999; } -#nav li:hover a { - color: #d6e2e5; -} #nav li:hover ul { left: 0; } #nav li:hover ul ul { left: -10000px; } -#nav li:hover ul a { - color: #202856; - font-size: 12px; -} #nav li:hover ul li:hover ul { left: 100px; } @@ -96,7 +73,7 @@ line-height: 38px; } #nav li.level0 > a:hover { - background: #2c3878; + background: #273169; color: #fff; } #nav li.level0 li.parent > a:after { @@ -110,10 +87,6 @@ border-width: 5px 0 5px 6px; border-color: transparent transparent transparent #c8c8c8; } -#nav li.level0:hover > a { - background: #293470; - color: #fff; -} #nav li.parent a { cursor: default; } @@ -133,7 +106,7 @@ cursor: pointer; } #nav li.level1 > a.active:not(:hover), #nav li.level2 > a.active:not(:hover), #nav li.level3 > a.active:not(:hover) { - background: #f4f4f4; + background: #eee; } #nav li#bubblelauncher-status a { background-position: center 8px; @@ -160,7 +133,7 @@ width: 189px; top: 38px; left: -10000px; - box-shadow: rgba(0, 0, 0, 0.180392) 1px 3px 4px; + box-shadow: #c8c8c8 1px 3px 4px; } #nav ul li { padding: 0; @@ -176,7 +149,7 @@ font-size: 12px; } #nav ul li a:hover { - background: #202856; + background: #273169; color: #fff; } #nav ul li.parent a { @@ -237,38 +210,39 @@ #usermenu ul { position: absolute; width: 220px; - top: 40px; + top: 38px; right: -10000px; display: none; - box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.207843), 0 0 5px rgba(0, 0, 0, 0.207843); + box-shadow: #c8c8c8 1px 3px 4px; background: #fff; } -#usermenu ul li a:hover { - background: #202856; -} #usermenu ul li.last span { border-bottom: none; } +#usermenu ul a { + color: #202856; + text-decoration: none; + display: block; +} +#usermenu ul a:hover { + background: #273169; + color: #fff; + text-decoration: none; + display: block; +} #usermenu li ul li { right: 5px; display: block; } #usermenu li ul span { - border-bottom: 1px dotted hsl(205, 40%, 75%); display: block; - line-height: 31px; - padding: 0 10px; + line-height: 1.3em; + padding: 9px 12px; } #usermenu li:hover ul { right: 27px; display: block; } -#usermenu li:hover ul a { - color: #000537; - text-decoration: none; - background: hsl(205, 52%, 95%); - display: block; -} #usermenu > li > a { padding: 0 27px 0 20px; display: block; diff --git a/skin/adminhtml/openmage/default/menu.css.map b/skin/adminhtml/openmage/default/menu.css.map index 36b6bb67934..9be69229066 100644 --- a/skin/adminhtml/openmage/default/menu.css.map +++ b/skin/adminhtml/openmage/default/menu.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["scss/menu.scss","scss/_variables.scss","scss/_base.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;AAAA;AC+FA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACwEA;EACE;EACA;EACA;EACA;;;AAwIF;EACE,OD5PgB;EC6PhB;EACA;EACA;;;AFhTF;EACE,YCPmB;EDQnB;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAIJ;EACE;;AACA;EACE;EACA;EACA;;AAEA;EACE;;AAEA;EACE,OCGc;;ADAhB;EACE;;AAEA;EACE;;AAGF;EACE,OCTY;EDUZ;;AAGF;EACE;;AAEA;EACE;;AAGF;EACE;;AAMR;EACE;EACA,OCgBE;EDfF;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;;AAKF;EACE;EACA;EACA,OCLA;EDMA;EACA;;AAEA;EACE;EACA,OCXF;;ADeF;EACE;EACA;EACA,OCtCS;EDuCT,QCxCS;EDyCT;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA,OC7BA;;ADkCF;EACE;;AAKE;EACE;;AAKE;EACE;;AAGF;EACE;;AAIJ;EACE;;AAKN;EACE;;AAOF;EACE,YCtIE;;AD4IN;EACE;EACA;EACA;;AAGF;EACE;;AAKN;EACE;EACA;EACA;EACA;EACA,OC7FI;ED8FJ;;AAEA;EACE;EACA;;AAIJ;EACE;EACA;EACA;EACA;EAEA;;AAEA;EAEE;;AAKE;EACE,OCnKY;EDoKZ;;AAIJ;EACE,YC5HA;ED6HA;EACA,OC3Kc;ED4Kd;;AAEA;EACE,YC/KY;EDgLZ,OCnIF;;ADwIA;EACE;EACA;;AAKE;EACE;EACA;;AAGF;EACE;;AAIJ;EACE;;AAKN;EACE;;AAEA;EACE;;AAKN;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAIJ;EACE;EACA;EACA;EACA;;AAEA;EACE;;AAMJ;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;;;AAKN;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EAEA;EACA,YC3NI;;AD6NF;EAEE,YC5Qc;;AD8QhB;EACE;;AAMF;EACE;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAGJ;EACE;EACA;;AACA;EACE,OCzTY;ED0TZ;EACA,YChOQ;EDiOR;;AAIN;EACE;EACA;;AACA;EACE;EACA","file":"menu.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["scss/menu.scss","scss/_base.scss","scss/_variables.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;AAAA;ACuKA;EACE;EACA;EACA;EACA;;;ADpKF;EACE,YEPmB;EFQnB;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAIJ;EACE;;AACA;EACE;EACA;EACA;;AAEA;EACE;;AAEA;EACE;;AAEA;EACE;;AAGF;EACE;;AAEA;EACE;;AAGF;EACE;;AAMR;EACE;EACA,OEjDE;EFkDF;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;;AAKF;EACE;EACA;EACA,OEtEA;EFuEA;EACA;;AAEA;EACE,YE/EgB;EFgFhB,OE5EF;;AFgFF;EACE;EACA;EACA,OEnDS;EFoDT,QErDS;EFsDT;EACA;EACA;EACA;EACA;;AAKF;EACE;;AAKE;EACE;;AAKE;EACE;;AAGF;EACE;;AAIJ;EACE;;AAKN;EACE;;AAOF;EACE,YE5Ga;;AFkHjB;EACE;EACA;EACA;;AAGF;EACE;;AAKN;EACE;EACA;EACA;EACA;EACA,OEzJI;EF0JJ;;AAEA;EACE;EACA;;AAIJ;EACE;EACA;EACA;EACA;EAEA;;AAEA;EAEE;;AAKE;EACE,OErLgB;EFsLhB;;AAIJ;EACE,YExLA;EFyLA;EACA,OE7LkB;EF8LlB;;AAEA;EACE,YElMgB;EFmMhB,OE/LF;;AFoMA;EACE;EACA;;AAKE;EACE;EACA;;AAGF;EACE;;AAIJ;EACE;;AAKN;EACE;;AAEA;EACE;;AAKN;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAIJ;EACE;EACA;EACA;EACA;;AAEA;EACE;;AAMJ;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA,YE1QoB;;;AF+Q1B;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EAEA;EACA,YEvRI;;AFyRF;EACE;;AAGJ;EACE,OEjSoB;EFkSpB;EACA;;AAEF;EACE,YEvSoB;EFwSpB,OEpSE;EFqSF;EACA;;AAKA;EACE;EACA;;AAEF;EACE;EACA;EACA;;AAGJ;EACE;EACA;;AAGJ;EACE;EACA;;AACA;EACE;EACA","file":"menu.css"} \ No newline at end of file diff --git a/skin/adminhtml/openmage/default/override.css b/skin/adminhtml/openmage/default/override.css index 69aae6e25e0..a17ce826fb1 100644 --- a/skin/adminhtml/openmage/default/override.css +++ b/skin/adminhtml/openmage/default/override.css @@ -2,15 +2,6 @@ Edit scss version and compile with sass from scss folder like this: $ sass override.scss ../override.css */ -/* - 205 = default, - 0 = red, - 60 = yellow, - 120 = green, - 180 = turquoise, - 240 = blue, - 300 = purple -*/ .popup-window .content-header, body { color: #2f2f2f; font: 400 12px/1.33 "Open Sans", sans-serif; @@ -35,13 +26,13 @@ dl.accordion dt, .entry-edit .entry-edit-head { background: #fefefe; color: #2f2f2f; padding: 4px 16px; - border: 1px solid lightgrey; + border: 1px solid #d3d3d3; } .box, .entry-edit .fieldset, .entry-edit fieldset { - border: 1px solid lightgrey; + border: 1px solid #d3d3d3; background: #eee; - border-top: 1px solid lightgrey; + border-top: 1px solid #d3d3d3; } .grid tr.headings th a.sort-arrow-asc, .grid tr.headings th a.sort-arrow-desc { @@ -64,7 +55,7 @@ dl.accordion dt, .entry-edit .entry-edit-head { } ul.tabs a:hover, ul.tabs a.active { - background: #f4f4f4; + background: #eee; color: #2f2f2f; transition: background 0.3s ease-in-out; } @@ -86,7 +77,7 @@ dl.accordion dt a:after, div.collapseable a:after { height: 0; border-style: solid; border-width: 8px 6px 0 6px; - border-color: #888 transparent transparent transparent; + border-color: #71798e transparent transparent transparent; } dl.accordion dt.open a:after, div.collapseable a.open:after { @@ -99,7 +90,7 @@ dl.accordion dt.open a:after, div.collapseable a.open:after { height: 0; border-style: solid; border-width: 0 6px 8px 6px; - border-color: transparent transparent #888 transparent; + border-color: transparent transparent #71798e transparent; } .warning-msg, .success-msg, .error-msg, .notice-msg { @@ -194,26 +185,26 @@ label { a { display: inline; - color: #269de7; + color: #0090FF; text-decoration: none; } a:visited { - color: #269de7; + color: #0090FF; } a:focus { - color: #3378a3; + color: #025988; text-decoration: none; } a:hover { - color: #3378a3; + color: #025988; text-decoration: none; } a:active { - color: #3378a3; + color: #025988; text-decoration: none; } a.error span { - color: #fa4545 !important; + color: #e63a3a !important; } strong { @@ -307,28 +298,28 @@ small { float: right; } .grid table { - border: 1px solid lightgrey; + border: 1px solid #d3d3d3; border-collapse: collapse; } .grid table.border { - border: 1px solid lightgrey; + border: 1px solid #d3d3d3; } .grid table.border tfoot tr td { background: #fff !important; } .grid table td { - border: 1px solid lightgrey; + border: 1px solid #d3d3d3; background: #fff; padding: 5px; } .grid table td.first { - border-right: 1px solid lightgrey; + border-right: 1px solid #d3d3d3; } .grid table td.last { - border-right: 1px solid lightgrey; + border-right: 1px solid #d3d3d3; } .grid table tfoot tr td { - border: 1px solid lightgrey; + border: 1px solid #d3d3d3; background: #fff; } .grid table tbody tr.selected td { @@ -344,11 +335,11 @@ small { background: #fff !important; } .grid tr.filter th { - border: 1px solid lightgrey; + border: 1px solid #d3d3d3; border-top: 0; } .grid tr.filter th.sorted { - background: #f7f7f7 !important; + background: rgb(247.35, 247.35, 247.35) !important; } .grid tr.filter .range .range-line { width: 125px; @@ -397,21 +388,21 @@ small { font-weight: 400; } .grid tr.headings th a:hover { - color: lightgrey; + color: #d3d3d3; } .grid tr.headings th a.sort-arrow-desc span.sort-title { background: none; } .grid tr.headings th a.sort-arrow-desc span.sort-title:after { border-width: 6px 5px 0 5px; - border-color: lightgrey transparent transparent transparent; + border-color: #d3d3d3 transparent transparent transparent; } .grid tr.headings th a.sort-arrow-asc span.sort-title { background: none; } .grid tr.headings th a.sort-arrow-asc span.sort-title:after { border-width: 0 5px 6px 5px; - border-color: transparent transparent lightgrey transparent; + border-color: transparent transparent #d3d3d3 transparent; } .grid tr.headings th.no-link { color: #fff; @@ -430,13 +421,13 @@ small { background: #f6f6f6 !important; } .grid tbody tr.even td.sorted { - background: #e6e6e6 !important; + background: rgb(230.35, 230.35, 230.35) !important; } .grid tbody tr.odd td.sorted { - background: #f7f7f7 !important; + background: rgb(247.35, 247.35, 247.35) !important; } .grid tbody tr.selected td.sorted { - background: #e1f3ff !important; + background: rgb(224.7, 242.88, 255) !important; } .grid td input.input-text { min-width: 80px; @@ -529,7 +520,7 @@ ul.tabs { } ul.tabs dl { background: #fff; - border: 1px solid lightgrey; + border: 1px solid #d3d3d3; } ul.tabs a { background: #fff; @@ -591,7 +582,7 @@ div.collapseable a.open { } div.autocomplete { border: 0; - box-shadow: 0 3px 3px rgba(50, 50, 50, 0.15); + box-shadow: 0 3px 3px #c8c8c8; } div.autocomplete ul li { color: #2f2f2f; @@ -614,13 +605,13 @@ div.autocomplete ul li.selected { border: 0; } .section-config .section-config .section-config .section-config .section-config > .config { - background: #f8f8f8; + background: #f6f6f6; } .section-config .section-config .section-config .section-config > .config { background: #fefefe; } .section-config .section-config .section-config > .config { - background: #f8f8f8; + background: #f6f6f6; } .section-config .config-advanced > .entry-edit-head { border: 0; @@ -671,7 +662,7 @@ div.autocomplete ul li.selected { color: #2f2f2f; } .x-tree-node .x-tree-selected a span { - background: lightgrey; + background: #d3d3d3; color: #2f2f2f; } @@ -691,7 +682,7 @@ div.autocomplete ul li.selected { right: 0; bottom: 0; left: 0; - background: rgba(0, 0, 0, 0.4); + background: rgba(0, 0, 0, 0.5); color: #2f2f2f; } #loading-mask .loader { @@ -706,22 +697,22 @@ div.autocomplete ul li.selected { } .error { - color: #fa4545 !important; + color: #e63a3a !important; } .required { - color: #fa4545 !important; + color: #e63a3a !important; } .validation-advice { - color: #fa4545 !important; + color: #e63a3a !important; font-size: 12px; font-weight: 600 !important; } .order-totals { background: #eee; - border: 1px solid lightgrey !important; + border: 1px solid #d3d3d3 !important; } .order-choose-address { @@ -746,9 +737,9 @@ div.autocomplete ul li.selected { background-image: url(images/information-variant.svg) !important; background-repeat: no-repeat !important; background-size: 23px 23px !important; - background-color: #f9f5ec !important; + background-color: #f0f9ff !important; background-position: 8px center !important; - border: 1px solid #dfc97a !important; + border: 1px solid #025988 !important; color: #2f2f2f !important; } .notice-msg a { @@ -774,9 +765,9 @@ div.autocomplete ul li.selected { background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%23185b00' d='M9,20.42L2.79,14.21L5.62,11.38L9,14.77L18.88,4.88L21.71,7.71L9,20.42Z' /%3E%3C/svg%3E") !important; background-repeat: no-repeat !important; background-size: 16px 16px !important; - background-color: #e4eecb !important; + background-color: #e9f2d4 !important; background-position: 8px center !important; - border: 1px solid #ceceb6 !important; + border: 1px solid #56af45 !important; color: #185b00 !important; } .success-msg a { @@ -868,13 +859,13 @@ div.autocomplete ul li.selected { .grid-severity-notice span { border: 0; - background: #56af45; + background: #0090FF; color: #fff; } .grid-severity-critical span { border: 0; - background: #fa4545; + background: #e63a3a; color: #fff; } @@ -905,7 +896,7 @@ div.autocomplete ul li.selected { border: 0; padding: 6px 10px; background: #eee; - border-top: 1px solid lightgrey; + border-top: 1px solid #d3d3d3; } .no-display { @@ -933,7 +924,7 @@ dl.accordion dt.open a { table.actions { padding: 15px; background: #fff; - border: 1px solid lightgrey; + border: 1px solid #d3d3d3; } table.actions td { vertical-align: middle; @@ -993,7 +984,7 @@ a.rule-param-remove img { padding-left: 13px; box-sizing: border-box; width: 13px; - background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%23d50000' d='M12,2C17.53,2 22,6.47 22,12C22,17.53 17.53,22 12,22C6.47,22 2,17.53 2,12C2,6.47 6.47,2 12,2M15.59,7L12,10.59L8.41,7L7,8.41L10.59,12L7,15.59L8.41,17L12,13.41L15.59,17L17,15.59L13.41,12L17,8.41L15.59,7Z' /%3E%3C/svg%3E") no-repeat; + background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%23e63a3a' d='M12,2C17.53,2 22,6.47 22,12C22,17.53 17.53,22 12,22C6.47,22 2,17.53 2,12C2,6.47 6.47,2 12,2M15.59,7L12,10.59L8.41,7L7,8.41L10.59,12L7,15.59L8.41,17L12,13.41L15.59,17L17,15.59L13.41,12L17,8.41L15.59,7Z' /%3E%3C/svg%3E") no-repeat; height: 13px; } @@ -1014,8 +1005,12 @@ ul.tabs a.changed span.changed { } .notification-global { - background: #f9f5ec url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%23d50000' d='M13,13H11V7H13M13,17H11V15H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z' /%3E%3C/svg%3E") 27px 5px no-repeat; + background: #fffbf0 url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%23e63a3a' d='M13,13H11V7H13M13,17H11V15H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z' /%3E%3C/svg%3E") 27px 5px no-repeat; background-size: 15px; + border-color: #f0ad4e; +} +.notification-global .label { + color: #e63a3a; } #page-help-link { @@ -1093,7 +1088,7 @@ img[src$="grid-cal.gif"] { } .link-store-scope { - background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%2300a9ff' d='M15.07,11.25L14.17,12.17C13.45,12.89 13,13.5 13,15H11V14.5C11,13.39 11.45,12.39 12.17,11.67L13.41,10.41C13.78,10.05 14,9.55 14,9C14,7.89 13.1,7 12,7A2,2 0 0,0 10,9H8A4,4 0 0,1 12,5A4,4 0 0,1 16,9C16,9.88 15.64,10.67 15.07,11.25M13,19H11V17H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12C22,6.47 17.5,2 12,2Z' /%3E%3C/svg%3E"); + background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%230090FF' d='M15.07,11.25L14.17,12.17C13.45,12.89 13,13.5 13,15H11V14.5C11,13.39 11.45,12.39 12.17,11.67L13.41,10.41C13.78,10.05 14,9.55 14,9C14,7.89 13.1,7 12,7A2,2 0 0,0 10,9H8A4,4 0 0,1 12,5A4,4 0 0,1 16,9C16,9.88 15.64,10.67 15.07,11.25M13,19H11V17H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12C22,6.47 17.5,2 12,2Z' /%3E%3C/svg%3E"); } .emph, .accent { diff --git a/skin/adminhtml/openmage/default/override.css.map b/skin/adminhtml/openmage/default/override.css.map index ee7c1cb88c6..2cc4b87740a 100644 --- a/skin/adminhtml/openmage/default/override.css.map +++ b/skin/adminhtml/openmage/default/override.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["scss/override.scss","scss/_variables.scss","scss/_base.scss","scss/_fonts.scss"],"names":[],"mappings":"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","file":"override.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["scss/override.scss","scss/_base.scss","scss/_variables.scss","scss/_fonts.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;AAAA;ACMA;EACE,OC0BgB;EDzBhB;EACA,YCgBuB;;;ADXzB;EACE;EACA;EAEA;EACA;;;AAKF;EACE;EACA,OCOgB;EDNhB;EACA;;;AAKF;EACE,YCRmB;EDSnB,OCFgB;EDGhB;EACA;;;AAKF;EACE;EACA,YChBqB;EDiBrB;;;AAKF;EACE;EACA;EACA;EACA;EACA;;;AAKF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAgBF;EACE,YCzDqB;ED0DrB,OCrDgB;EDuDhB;;;AAKF;EACE,OC7DgB;ED8DhB;EACA;EACA;;;AAKF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAKF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAKF;EAEE;EACA;EACA;EACA;EAEA;;;AAKF;EACE;EACA;EACA;;;AAKF;EACE;EACA;;;AAKF;EACE;EACA,YCpJgB;EDqJhB,OC5JM;;;AD4RR;EACE,kBC7RM;ED8RN;EAEA;;;AEtSF;EACE;EACA,wLAE4D;EAC5D;EACA;;AAGF;EACE;EACA,8LAE8D;EAC9D;EACA;;AAGF;EACE;EACA,qLAE2D;EAC3D;EACA;;AAEF;EACE;EACA,iMAE+D;EAC/D;EACA;;AHpBF;EACE,OEoBgB;EFnBhB;;;AAGF;EACE,OEegB;EFdhB;;;AAGF;EACE,OEUgB;EFThB;;;AAGF;EACE,OEKgB;EFJhB;;;AAGF;EACE;EACA;;;AAGF;EACE,OELgB;EFMhB;;;AAGF;EACE,OEVgB;EFWhB;;;AAGF;EACE;EACA,OE5Bc;EF6Bd;;AAEA;EACE,OEhCY;;AFmCd;EACE,OEnCiB;EFoCjB;;AAGF;EACE,OExCiB;EFyCjB;;AAGF;EACE,OE7CiB;EF8CjB;;AAGF;EACE;;;AAIJ;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA,OErDgB;;;AFwDlB;EACE;EACA;EACA;;;AAGF;EAEE;;;AAOF;EAEE,YEjFuB;EFkFvB;;;AAOF;EACE;EACA;;AAMA;EACE;;AAGF;EACE;;AAGF;EACE;;;AAIJ;EAEE;EACA;;AACA;EAEE;EACA;;;AAIJ;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;;AAKE;EACE,OEtIY;EFuIZ;EACA;EACA;;AAGF;EACE;;AAEA;EACE;;AAYJ;EACE;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAkBJ;EACE;EACA;;AAEA;EACE;;AAEA;EACE;;AAIJ;EACE;EACA,YEhOE;EFiOF;;AAEA;EACE;;AAGF;EACE;;AAIJ;EACE;EACA,YE9OE;;AFkPF;EACE,YErOc;;AFwOhB;EACE,YEzOc;;AF4OhB;EACE,YE7Oc;;AFmPlB;EACE;;AAEA;EACE;EACA;;AAEA;EACE;;AAKF;EACE;;AAGF;EACE;;AAGF;EACE;EACA;EACA;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAIJ;ECTJ,cDU0D;ECT1D;EACA,ODQ0D;ECP1D;EACA,QDM+D;EACzD;;AAIJ;EACE,YEnSe;EFoSf;;AAEA;EACE;EACA;EACA;EACA,OE3TA;EF4TA;;AAEA;EACE,OE/TF;EFgUE;;AAEA;EACE,OE5SS;;AFkTT;EACE;;AAEA;EAEE;EACA;;AAQJ;EACE;;AAEA;EAEE;EACA;;AAMR;EACE,OEpWF;EFqWE;;AAMJ;EACE,YEtVe;;AFyVjB;EACE,YE1Ve;;AFgWnB;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAIJ;EACE;;;AAIJ;EACE,YEtZmB;EFuZnB;;;AAGF;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;;AAKN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AACA;EACE;EACA;EACA;EACA,kBEvbE;EFwbF;EACA;EAEA;EAEA;;AACA;EACE;;AAWR;EACE,YErbqB;EFsbrB;EACA;EACA;EACA;;;AAIA;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAEA;EACE,YEvce;EFwcf;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA,YErdW;EFsdX;;AAMR;EACE;EACA,OEpdc;EFqdd;;AAEA;EACE,YEnfE;EFofF;;AAGF;EACE,YExfE;EFyfF,OE9dY;EF+dZ;EACA;;AAEA;EAEE;EACA;EACA;;AAEA;EACE;EACA;EACA;;AAOF;EACE;;AAEA;EACE;EACA;;AAMR;EACE;EACA;EACA;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA,YEphBiB;EFqhBjB,OEtiBI;;;AF0iBR;EACE,YE3iBM;EF4iBN;;;AAGF;EACE,YErjBmB;EFsjBnB;;;AAIA;EACE;;AAEA;EAEE;EACA;;AAMA;EAEE;;AAaN;EACE;EAEA;;AAEA;EACE,OE3jBY;;AF6jBZ;EACE,YEnkBe;;;AF4kBjB;EACE;;AAGF;EACE;;AAEA;EACE;EACA,OEhlBQ;EFilBR;EACA;EACA;;AAOF;EACE,YEnmBe;;AFsmBjB;EACE,YEtmBW;;AF0mBf;EACE,YE5mBiB;;AFknBrB;EACE;EACA;EAEA;;AAGE;EACE;;AAGF;EACE;;AAIJ;EACE;;AAIJ;EACE;;;AAKN;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;;AAGF;EACE;;;AAIJ;EACE;;;AAGF;EACE;;;AAIA;EACE;;AAEA;EACE,OErqBY;;AFyqBhB;EACE,YE9qBiB;EF+qBjB,OE3qBc;;;AFgrBhB;EACE;;AAGF;EACE;;;AAIJ;EACE;;AACA;EACE;EACA;EACA;EACA;EACA;EACA,YEhsBO;EFisBP,OElsBc;;AFosBhB;EACE;EACA;EACA;EACA;EACA,OEzsBc;EF0sBd,YEruBI;EFsuBJ;EACA;;;AAIJ;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE,YEpuBqB;EFquBrB;;;AAGF;EACE,YE/vBM;;;AFkwBR;EACE,YEnwBM;;;AFuwBN;EACE;EACA;EACA;EACA;;AAGF;EACE;;;AAIJ;EAEE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;;AAIJ;EAEE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;;AAIJ;EAEE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;;AAIJ;EAEE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;;AAIJ;EACE;;;AAGF;EACE;EACA;EACA;;;AAIA;EACE;EACA;;AAGF;EACE;;AAGF;EACE,YEp2BI;EFq2BJ;;;AAIJ;EACE,YEv1BuB;;;AF01BzB;EACE;EACA;;AACA;EACE;;AACA;EACE,YEp2BU;;AFu2Bd;EACE;;;AAGJ;EACE;;;AAGF;EACE,kBE/3BM;EFg4BN;EACA;;AAEA;EACE;EACA;EACA;EAEA;;;AAIJ;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAMA;EAEE;EACA,YE/4BY;EFg5BZ,OE/5BI;;;AFs6BN;EAEE;EACA,YE95BW;EF+5BX,OE16BI;;;AFi8BN;EACE;;AAGF;EACE;EACA,YEv8BI;;AFy8BJ;EACE;;AAIJ;EACE,YE/8BI;EFg9BJ,qBEh9BI;;;AFo9BR;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA,YEz8BqB;EF08BrB;;;AAGF;EACE;;;AAOF;EACE;;;AAGF;EACE;;;AAGF;EAEE;;AAEA;EAEE;EACA;;AAWF;EAEE;;AAQJ;EACE;EACA,YEjhCM;EFkhCN;;AAEA;EACE;;;AAIJ;EACE;;AAEA;EACE,OElgCc;;;AFsgClB;EACE;;;AAGF;EACE,YEtiCM;EFuiCN;;AAEA;EACE;EACA;;AAGF;EACE;EACA;;AAGF;EACE;;;AAIJ;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;AAEA;EACE;;AAGF;EACE;;;AAIJ;EACE;;;AAIA;EC9yBA,cD+yBkD;EC9yBlD;EACA,OD6yBkD;EC5yBlD;EACA,QD2yBuD;;;AAGzD;EClzBE,cDmzBgD;EClzBhD;EACA,ODizBgD;EChzBhD;EACA,QD+yBqD;;;AAEvD;EACE,YE1lCM;;;AF6lCR;EACE;;;AAGF;EACE;EACA;EACA,cE7lCgB;;AF+lChB;EACE,OE5lCW;;;AFgmCf;EACE;;;AAGF;EACE;;AAEE;EACE,OEnnCE;;AFqnCJ;EACE;EACA;EACA;;AACA;EACE;EACA;;AAIN;EACE,YEhoCI;;AFkoCF;EACE;EACA;;;AAON;ECv2BA,cDw2B0D;ECv2B1D;EACA,ODs2B0D;ECr2B1D;EACA,QDo2B+D;;AAE/D;EC12BA,cD22B2D;EC12B3D;EACA,ODy2B2D;ECx2B3D;EACA,QDu2BgE;;AAEhE;EC72BA,cD82BwD;EC72BxD;EACA,OD42BwD;EC32BxD;EACA,QD02B6D;EAC3D;;AAEF;ECj3BA,cDk3ByD;ECj3BzD;EACA,ODg3ByD;EC/2BzD;EACA,QD82B8D;EAC5D;;;AAMF;ECz3BA,cD03BqD;ECz3BrD;EACA,ODw3BqD;ECv3BrD;EACA,QDs3B0D;;;AAI5D;EC93BE,cD+3BoD;EC93BpD;EACA,OD63BoD;EC53BpD;EACA,QD23ByD;;;AAG3D;EACE;;;AAGF;EACE;;;AAGF;EACE;AAAA;IACyB","file":"override.css"} \ No newline at end of file diff --git a/skin/adminhtml/openmage/default/scss/_base.scss b/skin/adminhtml/openmage/default/scss/_base.scss index 9e8f45fffba..feb16ac5b13 100644 --- a/skin/adminhtml/openmage/default/scss/_base.scss +++ b/skin/adminhtml/openmage/default/scss/_base.scss @@ -83,7 +83,7 @@ //original selectors //ul.tabs a.active, ul.tabs a:hover %extend_9 { - background: $wild_sand; + background: $color_gallery_approx; color: $color_dark_grey; //Instead of the line below you could use @include transition($transition-1, $transition-2, $transition-3, $transition-4, $transition-5, $transition-6, $transition-7, $transition-8, $transition-9, $transition-10) transition: background 0.3s ease-in-out; @@ -110,7 +110,7 @@ height: 0; border-style: solid; border-width: 8px 6px 0 6px; - border-color: $color_gray_approx transparent transparent transparent; + border-color: $openmage_blue_gray transparent transparent transparent; } //original selectors @@ -125,7 +125,7 @@ height: 0; border-style: solid; border-width: 0 6px 8px 6px; - border-color: transparent transparent $color_gray_approx transparent; + border-color: transparent transparent $openmage_blue_gray transparent; } //original selectors @@ -159,7 +159,7 @@ //.grid-severity-major span, .grid-severity-minor span %extend_16 { border: 0; - background: $color_casablanca_approx; + background: $openmage_yellow; color: $white; } @@ -181,7 +181,7 @@ margin: 0; background-color: $white; height: 26px; - color: $color_dorado_approx; + color: $openmage_base_blue_text; border: 1px solid $color_silver_approx; //Instead of the line below you could use @include box-sizing($bs) box-sizing: border-box; @@ -192,14 +192,14 @@ %extend_19 { font-size: 12px; font-weight: 400; - color: $color_dorado_approx; + color: $openmage_base_blue_text; } //original selectors //button, .form-button %extend_20 { background-image: none; - background-color: $color_boulder_approx; + background-color: $openmage_blue_gray; padding: 0 13px; color: $white; border: 0; @@ -218,7 +218,8 @@ //original selectors //button:focus, button:active, .form-button:focus, .form-button:active %extend_21 { - background: $color_gray_approx; + background: $color_dark_grey; + color: $white; border: 0; outline: thin dotted; outline-offset: -2px; @@ -236,7 +237,7 @@ //button.save, button.add, button.ok_button, .form-button.ok_button %extend_23 { background-image: none; - background-color: $color_action; + background-color: $openmage_blue; padding: 0 13px; color: $white; border: 0; @@ -254,7 +255,7 @@ //original selectors //button.save:focus, button.save:active, button.add:focus, button.add:active, button.ok_button:focus, button.ok_button:active, .form-button.ok_button:focus, .form-button.ok_button:active %extend_24 { - background-color: $color_bahama_blue_approx; + background-color: $openmage_blue_dark; outline: thin dotted; outline-offset: -2px; color: $white; @@ -276,22 +277,13 @@ padding: 1px 3px !important; } -//original selectors -//.calendar, .calendar table -%extend_27 { - color: $color_dorado_approx; - cursor: default; - background: $color_link_water_approx; - font: 400 12px/1.33 'Open Sans', sans-serif; -} - //original selectors //.calendar td.time .hour, .calendar td.time .minute, .calendar td.time .ampm %extend_28 { padding: 0 3px 0 4px; - border: 1px solid $color_manatee_approx; + border: 1px solid $black; font-weight: 600; - background-color: $color_link_water_approx; + background-color: $white; } //original selectors @@ -303,15 +295,6 @@ box-shadow: none; } -//original selectors -//#usermenu li.over ul a, #usermenu ul li a:hover -%extend_30 { - color: $color_dark_grey; - text-decoration: none; - background: var(--color-main-xs); - display: block; -} - @mixin replaceImage($img,$width,$height){ padding-left: $width; box-sizing: border-box; diff --git a/skin/adminhtml/openmage/default/scss/_variables.scss b/skin/adminhtml/openmage/default/scss/_variables.scss index 2e3f9f06dcc..5fd71e3a0c1 100644 --- a/skin/adminhtml/openmage/default/scss/_variables.scss +++ b/skin/adminhtml/openmage/default/scss/_variables.scss @@ -1,70 +1,43 @@ //colors $openmage_base_blue: #3A499D; +$openmage_base_blue_dark: #273169; +$openmage_base_blue_text: #202856; + +$black: #000; +$white: #fff; + +$openmage_green_light: #e9f2d4; +$openmage_green: #56af45; +$openmage_green_dark: #185b00; + +$openmage_yellow_light: #fffbf0; +$openmage_yellow: #f0ad4e; +$openmage_yellow_dark: #d87e34; + +$openmage_red_light: #f3dcd8; +$openmage_red: #e63a3a; +$openmage_red_dark: #963535; + +$openmage_blue_light: #f0f9ff; +$openmage_blue: #0090FF; +$openmage_blue_dark: #025988; +$openmage_blue_gray: #71798e; -$color_dolphin_approx: #68666f; $color_wild_sand_approx: #f6f6f6; -$color_curious_blue_approx: #269de7; -$color_astral_approx: #3378a3; $color_white_approx: #fefefe; -$color_alto_approx: lightgrey; + $color_gallery_approx: #eee; -$white: #fff; -$color_alice_blue_approx: #f0f9ff; -$color_boulder_approx: #71798e; -$black_10: rgba(0, 0, 0, 0.1); -$header_background: #000537; -$color_silver_approx: #ccc; -$wild_sand: #f4f4f4; -$color_gray_approx: #888; -$black_20_7843: rgba(0, 0, 0, 0.207843); +$color_alto_approx: #d3d3d3; +$color_silver_approx: #c8c8c8; + $color_martini_approx: #999; -$black_40: rgba(0, 0, 0, 0.4); -$color_coral_red_approx: #fa4545; -$color_merino_approx: #f9f5ec; -$color_chenin_approx: #dfc97a; -$color_pot_pourri_approx: #f3dcd8; -$color_sanguine_brown_approx: #963535; -$color_chrome_white_approx: #e4eecb; -$color_foggy_gray_approx: #ceceb6; -$color_san_felix_approx: #185b00; -$color_island_spice_approx: #fffbf0; -$color_brandy_punch_approx: #d87e34; -$mine_shaft_15: rgba(50, 50, 50, 0.15); -$color_alabaster_approx: #f8f8f8; -$color_apple_approx: #56af45; -$color_casablanca_approx: #f0ad4e; -$color_dorado_approx: darken($openmage_base_blue,19); -$color_geyser_approx: #d6e2e5; -$black_18_0392: rgba(0, 0, 0, 0.180392); -$color_bahama_blue_approx: #026294; -$color_cinnabar_approx: #e63a3a; -$color_link_water_approx: #f1f8fc; -$color_matisse_approx: #206a9b; -$color_coral_tree_approx: #a66; -$color_picton_blue_approx: #34abfa; -$color_allports_approx: #006aa9; -$color_fiord_approx: #456; -$color_your_pink_approx: #fbb; -$black: #000; -$color_solitude_approx: #def; -$color_cornflower_approx: #8fc4e8; -$color_guardsman_red_approx: #d50000; -$color_spindle_approx: #b8daf0; -$color_san_marino_approx: #46a; -$color_manatee_approx: #889; -$red: red; -$color_lime_approx: #a5ff00; $color_dark_grey: #2f2f2f; +$black_50: rgba(0, 0, 0, 0.5); //spacings $menu_padding_v: 9px; $menu_padding_h: 12px; - -$color-warning: $color_guardsman_red_approx; -$color-help: #00a9ff; -$color_action: #0090FF; - //fonts $font_0: Open Sans; $font_1: Helvetica Neue; @@ -72,71 +45,10 @@ $font_2: Helvetica; $font_3: Arial; $font_4: sans-serif; -//colors -$color_mercury_approx: #e6e6e6; -$color_mine_shaft_approx: #2f2f2f; -$color_mango_tango_approx: #ea7601; -$color_silver_chalice_approx: #aaa; -$color_silver_approx: #c8c8c8; -$white: #fff; -$color_clementine_approx: #ed6502; -$color_oregon_approx: #a04300; -$color_yellow_orange_approx: #ffac47; -$color_alabaster_approx: #f8f8f8; -$black_25: rgba(0, 0, 0, 0.25); -$black_50: rgba(0, 0, 0, 0.5); -$color_pizazz_approx: #ff8c00; -$color_flamingo_approx: #f16221; -$black_15: rgba(0, 0, 0, 0.15); -$black_75: rgba(0, 0, 0, 0.75); -$color_gothic_10_approx: rgba(117, 146, 163, 0.1); -$color_gothic_25_approx: rgba(117, 146, 163, 0.25); - -$hue: 205; -/* - 205 = default, - 0 = red, - 60 = yellow, - 120 = green, - 180 = turquoise, - 240 = blue, - 300 = purple -*/ - -$color-main-xs: hsla($hue, 52%, 95%, 1); -$color-main-s: hsla($hue, 52%, 88%, 1); -$color-main-m: hsla($hue, 40%, 75%, 1); -$color-main-l: hsla($hue, 20%, 55%, 1); -$color-main-xl: hsla($hue, 20%, 35%, 1); -$color-main-xxl: hsla($hue, 20%, 30%, 1); - -$color-gray-xs: hsla($hue, 14%, 97%, 1); -$color-gray-s: hsla($hue, 11%, 93%, 1); -$color-gray-m: hsla($hue, 7%, 86%, 1); -$color-gray-l: hsla($hue, 3%, 68%, 1); -$color-gray-xl: hsla($hue, 3%, 55%, 1); -$color-gray-xxl: hsla($hue, 8%, 40%, 1); -$color-gray-xxxl: hsla($hue, 18%, 25%, 1); - -$color-white-010: hsla(0, 0%, 100%, 0.1); -$color-white-025: hsla(0, 0%, 100%, 0.25); -$color-white-050: hsla(0, 0%, 100%, 0.5); -$color-white-075: hsla(0, 0%, 100%, 0.75); -$color-white-100: hsla(0, 0%, 100%, 1); - -$color-black-010: hsla($hue, 13%, 8%, 0.1); -$color-black-025: hsla($hue, 13%, 8%, 0.25); -$color-black-050: hsla($hue, 13%, 8%, 0.5); -$color-black-075: hsla($hue, 13%, 8%, 0.75); -$color-black-100: hsla($hue, 13%, 8%, 1); - - //urls login $url_login_background: url(images/login_background.jpg); $url_logo: url(images/logo.svg); //urls -$url_0: url(images/logo.svg); $url_1: url(images/information-variant.svg); -$url_2: url(images/icon-error.png); -$url_3: url(images/icon-success.png); \ No newline at end of file +$url_2: url(images/icon-error.png); \ No newline at end of file diff --git a/skin/adminhtml/openmage/default/scss/calendar-blue2.scss b/skin/adminhtml/openmage/default/scss/calendar-blue2.scss index 36a58130227..663ae5f84e8 100644 --- a/skin/adminhtml/openmage/default/scss/calendar-blue2.scss +++ b/skin/adminhtml/openmage/default/scss/calendar-blue2.scss @@ -6,16 +6,18 @@ @import "base"; .calendar { - box-shadow: 0 0 8px $color_gray_approx; - @extend %extend_27; + box-shadow: 1px 3px 4px $color_silver_approx; table { - @extend %extend_27; + color: $openmage_base_blue_text; + cursor: default; + background: $white; + font: 400 12px/1.33 'Open Sans', sans-serif; .wn { padding: 2px 3px 2px 2px; border-right: 1px solid $black; - background: $color_link_water_approx; + background: $white; } } @@ -33,31 +35,33 @@ } tr { - background: $color_action; + background: $openmage_base_blue; color: $white; } .daynames { - background: $color_link_water_approx; + background: $white; } .name { - border-bottom: 1px solid $color_matisse_approx; + border-bottom: 1px solid $openmage_base_blue; padding: 2px; text-align: center; - color: $color_dorado_approx; + color: $openmage_base_blue_text; } .weekend { - color: $color_coral_tree_approx; + color: $openmage_red_dark; } .hilite { - background-color: $color_picton_blue_approx; + background-color: $openmage_base_blue_dark; + color: $white; } .active { - background-color: $color_allports_approx; + background-color: $openmage_base_blue_dark; + color: $white; padding: 2px 0 0 2px; } } @@ -65,7 +69,7 @@ tbody { .day { width: 2em; - color: $color_fiord_approx; + color: $openmage_base_blue_text; text-align: right; padding: 2px 4px 2px 2px; @@ -74,20 +78,20 @@ color: $color_silver_approx; &.oweekend { - color: $color_your_pink_approx; + color: $openmage_red_dark; } } } td { &.hilite { - background: $color_solitude_approx; + background: $openmage_blue_light; padding: 1px 3px 1px 1px; - border: 1px solid $color_cornflower_approx; + border: 1px solid $openmage_base_blue; } &.active { - background: $color_link_water_approx; + background: $openmage_base_blue_dark; padding: 2px 2px 0 2px; } @@ -96,21 +100,21 @@ border: 1px solid $black; padding: 1px 3px 1px 1px; background: $white; - color: $color_dorado_approx; + color: $openmage_base_blue_text; } &.weekend { - color: $color_coral_tree_approx; + color: $openmage_red_dark; } &.today { font-weight: 600; - color: $color_guardsman_red_approx; + color: $openmage_red; } } .disabled { - color: $color_martini_approx; + color: $color_silver_approx; } .emptycell { @@ -122,10 +126,10 @@ } .rowhilite td { - background: $color_solitude_approx; + background: $openmage_blue_light; &.wn { - background: $color_link_water_approx; + background: $openmage_blue_light; } } } @@ -133,7 +137,7 @@ tfoot { .footrow { text-align: center; - background: $color_action; + background: $openmage_base_blue; color: $white; } @@ -143,14 +147,15 @@ } .hilite { - background: $color_spindle_approx; - border: 1px solid $color_action; - color: $color_dorado_approx; + background: $openmage_base_blue_dark; + border: 1px solid $openmage_base_blue_dark; + color: $white; padding: 1px; } .active { - background: $color_allports_approx; + background: $openmage_base_blue_dark; + color: $white; padding: 2px 0 0 2px; } } @@ -162,9 +167,9 @@ left: 0; width: 4em; cursor: default; - border: 1px solid $color_dorado_approx; - background: $color_solitude_approx; - color: $color_dorado_approx; + border: 1px solid $openmage_base_blue; + background: $white; + color: $openmage_base_blue_text; font-size: 90%; z-index: 100; @@ -180,25 +185,27 @@ } .hilite { - background: $color_picton_blue_approx; - border-top: 1px solid $color_san_marino_approx; - border-bottom: 1px solid $color_san_marino_approx; + background: $openmage_base_blue_dark; + border-top: 1px solid $openmage_base_blue_dark; + border-bottom: 1px solid $openmage_base_blue_dark; + color: $white; font-weight: 600; } .active { - border-top: 1px solid $color_san_marino_approx; - border-bottom: 1px solid $color_san_marino_approx; - background: $color_link_water_approx; + border-top: 1px solid $openmage_base_blue_dark; + border-bottom: 1px solid $openmage_base_blue_dark; + background: $openmage_base_blue_dark; + color: white; font-weight: 600; } } td.time { border-top: 1px solid $black; - padding: 1px 0; + padding: 5px 0; text-align: center; - background-color: $color_link_water_approx; + background-color: $white; .hour { @extend %extend_28; @@ -220,15 +227,15 @@ span { &.hilite { - border-color: $black; - background-color: $color_astral_approx; + border-color: $openmage_blue_dark; + background-color: $openmage_blue_dark; color: $white; } &.active { - border-color: $red; + border-color: $black; background-color: $black; - color: $color_lime_approx; + color: $white; } } } diff --git a/skin/adminhtml/openmage/default/scss/form.scss b/skin/adminhtml/openmage/default/scss/form.scss index 8c87048450b..61ec12a5686 100644 --- a/skin/adminhtml/openmage/default/scss/form.scss +++ b/skin/adminhtml/openmage/default/scss/form.scss @@ -74,7 +74,7 @@ button { } &.cancel { - background: $color_cinnabar_approx; + background: $openmage_red; color: $white; padding: 0 13px; @@ -84,12 +84,12 @@ button { } &:hover { - background: $color_coral_red_approx; + background: $openmage_red_dark; } } &.delete { - background: $color_cinnabar_approx; + background: $openmage_red; color: $white; padding: 0 13px; @@ -98,8 +98,9 @@ button { padding: 0; } - &:hover { - background: $color_coral_red_approx; + &:hover, + &:focus { + background: $openmage_red_dark; } } @@ -121,7 +122,7 @@ button { } &:hover { - background-color: $color_action; + background-color: $openmage_blue_dark; } &.disabled { @@ -147,7 +148,7 @@ button { } &:hover { - background-color: $color_action; + background-color: $openmage_blue_dark; } &.disabled { @@ -173,7 +174,7 @@ button { } &:hover { - background-color: $color_action; + background-color: $openmage_blue_dark; } &.disabled { @@ -199,29 +200,23 @@ button { } } - &:focus { - @extend %extend_21; - } - + &:focus, &:active { - @extend %extend_21; + background: $color_dark_grey; + color: $white; + border: 0; + outline: thin dotted; + outline-offset: -2px; } &:hover { - background: $color_gray_approx; + background: $color_dark_grey; + color: $white; } &.disabled { @extend %extend_22; - background: $color_gray_approx; - - &:hover { - background: $color_gray_approx; - } - - &:active { - background: $color_gray_approx; - } + background: $color_dark_grey; } &.save[disabled] { @@ -237,22 +232,22 @@ button { } &.fail { - background: $color_cinnabar_approx; + background: $openmage_red; color: $white; padding: 0 13px; &:hover { - background: $color_coral_red_approx; + background: $openmage_red_dark; } } &.cancel_button { - background: $color_cinnabar_approx; + background: $openmage_red; color: $white; padding: 0 13px; &:hover { - background: $color_coral_red_approx; + background: $openmage_red_dark; } } @@ -295,16 +290,17 @@ button { .form-button { @extend %extend_20; - &:focus { - @extend %extend_21; - } - + &:focus, &:active { - @extend %extend_21; + background: $color_dark_grey; + color: $white; + border: 0; + outline: thin dotted; + outline-offset: -2px; } &:hover { - background: $color_gray_approx; + background: $color_dark_grey; } &.disabled { @@ -323,7 +319,7 @@ button { } &:hover { - background-color: $color_action; + background-color: $openmage_blue_dark; } } @@ -374,12 +370,12 @@ button[disabled] { } p.note { - color: $color_dorado_approx; + color: $openmage_base_blue_text; font-size: 11px; font-weight: 400; span.input-counter-error { - color: $color_cinnabar_approx; + color: $openmage_red; } } } @@ -418,7 +414,7 @@ td:has(input.swatch-option) { display: flex; justify-content: center; font-size: 10px; - background: $color_cinnabar_approx; + background: $openmage_red; color: $white; border-radius: 2px; } diff --git a/skin/adminhtml/openmage/default/scss/login.scss b/skin/adminhtml/openmage/default/scss/login.scss index acbce33f92b..46eccb6b769 100644 --- a/skin/adminhtml/openmage/default/scss/login.scss +++ b/skin/adminhtml/openmage/default/scss/login.scss @@ -8,15 +8,13 @@ } body { - background: $color_mercury_approx; - color: $color_mine_shaft_approx; + color: $color_dark_grey; font: 400 12px/1.33 $font_0, sans-serif; - background: $color-gray-s; font-size: 13px; overflow-x: hidden; &#page-login { - background-color: $color-main-xxl; + background-color: $openmage_base_blue_dark; background-image: $url_login_background; background-repeat: no-repeat; background-position: center top; @@ -29,7 +27,7 @@ body { content: ''; top: 0; left: 0; - background-color: $black_25; + background-color: rgba(0, 0, 0, 0.25); width: 100%; height: 100%; z-index: -1; @@ -39,30 +37,30 @@ body { a { display: inline; - color: $color_curious_blue_approx; + color: $openmage_blue; text-decoration: none; &:visited { - color: $color_curious_blue_approx; + color: $openmage_blue; } &:focus { - color: $color_astral_approx; + color: $openmage_blue_dark; text-decoration: none; } &:hover { - color: $color_astral_approx; + color: $openmage_blue_dark; text-decoration: none; } &:active { - color: $color_astral_approx; + color: $openmage_blue_dark; text-decoration: none; } &.error span { - color: $color_coral_red_approx !important; + color: $openmage_red !important; } } @@ -85,7 +83,7 @@ form { } label { - color: $color_mine_shaft_approx; + color: $color_dark_grey; } input { @@ -96,18 +94,18 @@ input { font: 12px $font_3, $font_4, $font_2; border-width: 1px; border-style: solid; - border-color: $color_silver_chalice_approx; + border-color: $color_martini_approx; padding: 2px 2px 3px; line-height: 18px; font-family: $font_0, $font_1; &:hover { - outline: 2px solid $color_gothic_10_approx; + outline: 2px solid $color_gallery_approx; } &:focus { //Instead of the line below you could use @include box-shadow($shadow-1, $shadow-2, $shadow-3, $shadow-4, $shadow-5, $shadow-6, $shadow-7, $shadow-8, $shadow-9, $shadow-10) - box-shadow: 0 0 0 2px $color_gothic_25_approx; + outline: 2px solid $color_silver_approx; } &:disabled { @@ -119,11 +117,10 @@ input { .form-button { @extend %extend_20; - background-color: $color_action; + background-color: $openmage_blue; } #page-login { - background: $color_alabaster_approx; text-align: center; } @@ -143,7 +140,7 @@ input { bottom: 30px; left: 0; width: 100%; - color: $color-white-100; + color: $white; //Instead of the line below you could use @include text-shadow($shadow-1, $shadow-2, $shadow-3, $shadow-4, $shadow-5, $shadow-6, $shadow-7, $shadow-8, $shadow-9, $shadow-10) text-shadow: 0 0 5px $black_50; } @@ -152,7 +149,7 @@ input { .login-form { background: $url_2 no-repeat; text-align: left; - background: $color-white-100; + background: $white; border: none; padding: 40px 50px; //Instead of the line below you could use @include box-shadow($shadow-1, $shadow-2, $shadow-3, $shadow-4, $shadow-5, $shadow-6, $shadow-7, $shadow-8, $shadow-9, $shadow-10) diff --git a/skin/adminhtml/openmage/default/scss/menu.scss b/skin/adminhtml/openmage/default/scss/menu.scss index aedd0132fd2..cc589c42eb2 100644 --- a/skin/adminhtml/openmage/default/scss/menu.scss +++ b/skin/adminhtml/openmage/default/scss/menu.scss @@ -30,10 +30,6 @@ &:hover { z-index: 999; - a { - color: $color_geyser_approx; - } - ul { left: 0; @@ -41,11 +37,6 @@ left: -10000px; } - a { - color: $color_dorado_approx; - font-size: 12px; - } - li:hover ul { left: 100px; @@ -88,7 +79,7 @@ line-height: 38px; &:hover { - background: darken($openmage_base_blue,10); + background: $openmage_base_blue_dark; color: $white; } } @@ -104,11 +95,6 @@ border-width: 5px 0 5px 6px; border-color: transparent transparent transparent $color_silver_approx; } - - &:hover > a { - background: darken($openmage_base_blue,12); - color: $white; - } } &.parent { @@ -148,7 +134,7 @@ &.level1, &.level2, &.level3 { > a { &.active:not(:hover) { - background: $wild_sand; + background: $color_gallery_approx; } } } @@ -186,7 +172,7 @@ top: 38px; left: -10000px; //Instead of the line below you could use @include box-shadow($shadow-1, $shadow-2, $shadow-3, $shadow-4, $shadow-5, $shadow-6, $shadow-7, $shadow-8, $shadow-9, $shadow-10) - box-shadow: $black_18_0392 1px 3px 4px; + box-shadow: $color_silver_approx 1px 3px 4px; li { @extend %extend_17; @@ -196,7 +182,7 @@ @extend %extend_17; a { - color: $color_dorado_approx; + color: $openmage_base_blue_text; font-size: 12px; } } @@ -204,11 +190,11 @@ a { background: $white; padding: $menu_padding_v $menu_padding_h; - color: $color_dorado_approx; + color: $openmage_base_blue_text; font-size: 12px; &:hover { - background: $color_dorado_approx; + background: $openmage_base_blue_dark; color: $white; } } @@ -280,7 +266,7 @@ &.active > a { font-weight: 600; - background: darken($openmage_base_blue,14); + background: $openmage_base_blue_dark; } } } @@ -292,21 +278,28 @@ ul { position: absolute; width: 220px; - top: 40px; + top: 38px; right: -10000px; display: none; //Instead of the line below you could use @include box-shadow($shadow-1, $shadow-2, $shadow-3, $shadow-4, $shadow-5, $shadow-6, $shadow-7, $shadow-8, $shadow-9, $shadow-10) - box-shadow: 0 0 0 1px $black_20_7843, 0 0 5px $black_20_7843; + box-shadow: $color_silver_approx 1px 3px 4px; background: $white; li { - a:hover { - @extend %extend_30; - background: $color_dorado_approx; - } &.last span { border-bottom: none; } } + a { + color: $openmage_base_blue_text; + text-decoration: none; + display: block; + } + a:hover { + background: $openmage_base_blue_dark; + color: $white; + text-decoration: none; + display: block; + } } li { ul { @@ -315,21 +308,14 @@ display: block; } span { - border-bottom: 1px dotted $color-main-m; display: block; - line-height: 31px; - padding: 0 10px; + line-height: 1.3em; + padding: 9px 12px; } } &:hover ul { right: 27px; display: block; - a { - color: $header_background; - text-decoration: none; - background: $color-main-xs; - display: block; - } } } > li > a { diff --git a/skin/adminhtml/openmage/default/scss/override.scss b/skin/adminhtml/openmage/default/scss/override.scss index dbff2026b04..0fb91767b8a 100644 --- a/skin/adminhtml/openmage/default/scss/override.scss +++ b/skin/adminhtml/openmage/default/scss/override.scss @@ -47,30 +47,30 @@ label { a { display: inline; - color: $color_curious_blue_approx; + color: $openmage_blue; text-decoration: none; &:visited { - color: $color_curious_blue_approx; + color: $openmage_blue; } &:focus { - color: $color_astral_approx; + color: $openmage_blue_dark; text-decoration: none; } &:hover { - color: $color_astral_approx; + color: $openmage_blue_dark; text-decoration: none; } &:active { - color: $color_astral_approx; + color: $openmage_blue_dark; text-decoration: none; } &.error span { - color: $color_coral_red_approx !important; + color: $openmage_red !important; } } @@ -247,15 +247,15 @@ small { tbody tr { &.selected td { - background: $color_alice_blue_approx; + background: $openmage_blue_light; } &:hover td { - background: $color_alice_blue_approx; + background: $openmage_blue_light; } &:nth-child(odd):hover td { - background: $color_alice_blue_approx; + background: $openmage_blue_light; } } } @@ -306,14 +306,14 @@ small { } .date img { - @include replaceImage(icon-calendar($color_action),17px,17px); + @include replaceImage(icon-calendar($openmage_blue),17px,17px); margin-top: 5px; } } &.headings { - background: $color_boulder_approx; - border: 1px solid $color_boulder_approx; + background: $openmage_blue_gray; + border: 1px solid $openmage_blue_gray; th { padding: 4px; @@ -395,7 +395,7 @@ small { } tr.selected td.sorted { - background: darken($color_alice_blue_approx, 3%) !important; + background: darken($openmage_blue_light, 3%) !important; } } @@ -490,7 +490,7 @@ ul { &.active { border: 0; - background: $color_boulder_approx; + background: $openmage_blue_gray; color: $white !important; } } @@ -515,7 +515,7 @@ ul { &.active { @extend %extend_9; - border-left: 3px solid $color_boulder_approx; + border-left: 3px solid $openmage_blue_gray; padding: 8px 18px; border-bottom: 1px solid $color_gallery_approx; @@ -553,7 +553,7 @@ ul { text-transform: none; padding: 7px 7px 7px 10px; font-size: 18px; - background: $color_boulder_approx; + background: $openmage_blue_gray; color: $white; } } @@ -599,7 +599,7 @@ div { &.autocomplete { border: 0; //Instead of the line below you could use @include box-shadow($shadow-1, $shadow-2, $shadow-3, $shadow-4, $shadow-5, $shadow-6, $shadow-7, $shadow-8, $shadow-9, $shadow-10) - box-shadow: 0 3px 3px $mine_shaft_15; + box-shadow: 0 3px 3px $color_silver_approx; ul li { color: $color_dark_grey; @@ -634,7 +634,7 @@ div { .section-config { .section-config { .section-config > .config { - background: $color_alabaster_approx; + background: $color_wild_sand_approx; } > .config { @@ -643,7 +643,7 @@ div { } > .config { - background: $color_alabaster_approx; + background: $color_wild_sand_approx; } } } @@ -736,7 +736,7 @@ div { right: 0; bottom: 0; left: 0; - background: $black_40; + background: $black_50; color: $color_dark_grey; } .loader { @@ -752,15 +752,15 @@ div { } .error { - color: $color_coral_red_approx !important; + color: $openmage_red !important; } .required { - color: $color_coral_red_approx !important; + color: $openmage_red !important; } .validation-advice { - color: $color_coral_red_approx !important; + color: $openmage_red !important; font-size: 12px; font-weight: 600 !important; } @@ -796,9 +796,9 @@ div { background-image: $url_1 !important; background-repeat: no-repeat !important; background-size: 23px 23px !important; - background-color: $color_merino_approx !important; + background-color: $openmage_blue_light !important; background-position: 8px center !important; - border: 1px solid $color_chenin_approx !important; + border: 1px solid $openmage_blue_dark !important; color: $color_dark_grey !important; a { color: $color_dark_grey !important; @@ -811,27 +811,27 @@ div { background-image: $url_2 !important; background-repeat: no-repeat !important; background-size: 23px 23px !important; - background-color: $color_pot_pourri_approx !important; + background-color: $openmage_red_light !important; background-position: 8px center !important; - border: 1px solid $color_sanguine_brown_approx !important; - color: $color_sanguine_brown_approx !important; + border: 1px solid $openmage_red_dark !important; + color: $openmage_red_dark !important; a { - color: $color_sanguine_brown_approx !important; + color: $openmage_red_dark !important; text-decoration: underline; } } .success-msg { @extend %extend_13; - background-image: icon-success($color_san_felix_approx) !important; + background-image: icon-success($openmage_green_dark) !important; background-repeat: no-repeat !important; background-size: 16px 16px !important; - background-color: $color_chrome_white_approx !important; + background-color: $openmage_green_light !important; background-position: 8px center !important; - border: 1px solid $color_foggy_gray_approx !important; - color: $color_san_felix_approx !important; + border: 1px solid $openmage_green !important; + color: $openmage_green_dark !important; a { - color: $color_san_felix_approx !important; + color: $openmage_green_dark !important; text-decoration: underline; } } @@ -841,9 +841,9 @@ div { background-image: $url_1 !important; background-repeat: no-repeat !important; background-size: 23px 23px !important; - background-color: $color_island_spice_approx !important; + background-color: $openmage_yellow_light !important; background-position: 8px center !important; - border: 1px solid $color_brandy_punch_approx !important; + border: 1px solid $openmage_yellow_dark !important; color: $color_dark_grey !important; a { color: $color_dark_grey !important; @@ -887,7 +887,7 @@ div { .login-form { background: white; .form-button,button { - background: $color_action; + background: $openmage_blue; } } .bottom { @@ -930,7 +930,7 @@ div { span { @extend %extend_15; border: 0; - background: $color_apple_approx; + background: $openmage_blue; color: $white; } } @@ -941,7 +941,7 @@ div { span { @extend %extend_15; border: 0; - background: $color_coral_red_approx; + background: $openmage_red; color: $white; } } @@ -1111,23 +1111,28 @@ table.actions { a.rule-param-remove { img { - @include replaceImage(icon-close($color-warning),13px,13px); + @include replaceImage(icon-close($openmage_red),13px,13px); } } img.rule-param-add { - @include replaceImage(icon-add($color_apple_approx),13px,13px); + @include replaceImage(icon-add($openmage_green),13px,13px); } .address-list li.on { background: $white; } ul.tabs a.changed span.changed { - background: icon-save($color_apple_approx) !important; + background: icon-save($openmage_green) !important; } .notification-global { - background: $color_merino_approx icon-warning($color-warning) 27px 5px no-repeat; + background: $openmage_yellow_light icon-warning($openmage_red) 27px 5px no-repeat; background-size: 15px; + border-color: $openmage_yellow; + + .label { + color: $openmage_red; + } } #page-help-link { @@ -1141,7 +1146,7 @@ ul.tabs a.changed span.changed { color:$white; } a { - background: $color_action !important; + background: $openmage_blue !important; border: none; margin-top: 1px; span{ @@ -1154,7 +1159,7 @@ ul.tabs a.changed span.changed { background: $white; .read-more { a { - background: icon-arrow-right($color_action) no-repeat 0 50%; + background: icon-arrow-right($openmage_blue) no-repeat 0 50%; background-size: 13px; } } @@ -1163,17 +1168,17 @@ ul.tabs a.changed span.changed { .pager { img[src$='pager_arrow_left.gif'].arrow { - @include replaceImage(icon-arrow-left($color_action),17px,17px); + @include replaceImage(icon-arrow-left($openmage_blue),17px,17px); } img[src$='pager_arrow_right.gif'].arrow { - @include replaceImage(icon-arrow-right($color_action),17px,17px); + @include replaceImage(icon-arrow-right($openmage_blue),17px,17px); } img[src$='pager_arrow_left_off.gif'].arrow { - @include replaceImage(icon-arrow-left($color_action),17px,17px); + @include replaceImage(icon-arrow-left($openmage_blue),17px,17px); opacity: 0.5; } img[src$='pager_arrow_right_off.gif'].arrow { - @include replaceImage(icon-arrow-right($color_action),17px,17px); + @include replaceImage(icon-arrow-right($openmage_blue),17px,17px); opacity: 0.5; } @@ -1181,20 +1186,20 @@ ul.tabs a.changed span.changed { .export { img { - @include replaceImage(icon-export($color_apple_approx),19px,19px); + @include replaceImage(icon-export($openmage_green),19px,19px); } } img[src$='grid-cal.gif'] { - @include replaceImage(icon-calendar($color_action),17px,17px); + @include replaceImage(icon-calendar($openmage_blue),17px,17px); } .link-store-scope { - background: icon-help($color-help); + background: icon-help($openmage_blue); } .emph, .accent { - color: $color_action !important; + color: $openmage_blue !important; } @media screen and (-webkit-min-device-pixel-ratio:0) { From fc1ff45751e1cec9e4ec76890fe1beb6c461cb92 Mon Sep 17 00:00:00 2001 From: B3Hana <180432612+B3Hana@users.noreply.github.com> Date: Wed, 24 Jun 2026 12:12:46 +0200 Subject: [PATCH 2/2] set notice grid severity to green, as it was before --- skin/adminhtml/openmage/default/override.css | 2 +- skin/adminhtml/openmage/default/override.css.map | 2 +- skin/adminhtml/openmage/default/scss/override.scss | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/skin/adminhtml/openmage/default/override.css b/skin/adminhtml/openmage/default/override.css index a17ce826fb1..984034b70fc 100644 --- a/skin/adminhtml/openmage/default/override.css +++ b/skin/adminhtml/openmage/default/override.css @@ -859,7 +859,7 @@ div.autocomplete ul li.selected { .grid-severity-notice span { border: 0; - background: #0090FF; + background: #56af45; color: #fff; } diff --git a/skin/adminhtml/openmage/default/override.css.map b/skin/adminhtml/openmage/default/override.css.map index 2cc4b87740a..c78496ac505 100644 --- a/skin/adminhtml/openmage/default/override.css.map +++ b/skin/adminhtml/openmage/default/override.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["scss/override.scss","scss/_base.scss","scss/_variables.scss","scss/_fonts.scss"],"names":[],"mappings":"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","file":"override.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["scss/override.scss","scss/_base.scss","scss/_variables.scss","scss/_fonts.scss"],"names":[],"mappings":"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","file":"override.css"} \ No newline at end of file diff --git a/skin/adminhtml/openmage/default/scss/override.scss b/skin/adminhtml/openmage/default/scss/override.scss index 0fb91767b8a..55e4aad5bf5 100644 --- a/skin/adminhtml/openmage/default/scss/override.scss +++ b/skin/adminhtml/openmage/default/scss/override.scss @@ -930,7 +930,7 @@ div { span { @extend %extend_15; border: 0; - background: $openmage_blue; + background: $openmage_green; color: $white; } }