diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2021-05-19 08:39:50 +0200 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2021-05-19 08:39:50 +0200 |
commit | 76b2ac014edca73aa0f54dfa47fa89fec3a94203 (patch) | |
tree | b1616404214aaf50d149b63b60b4a0288dedb7e4 /controller-server | |
parent | 380b78bb4dd288978ad3b07b19c21ddecddde51e (diff) |
Thinner shadows on next panels, weaker on bottom
Diffstat (limited to 'controller-server')
3 files changed, 54 insertions, 51 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/Badges.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/Badges.java index f17ec6afb8f..2b3f954c2ef 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/Badges.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/Badges.java @@ -70,7 +70,7 @@ public class Badges { static final double xPad = 6; static final double logoSize = 16; - static final String dark = "#5a5a5a"; + static final String dark = "#404040"; static final String success = "#00f244"; static final String running = "#ab83ff"; static final String failure = "#bf103c"; @@ -89,7 +89,7 @@ public class Badges { } static void addShadow(List<String> sections, double x) { - sections.add(" <rect x='" + (x - 6) + "' rx='3' width='" + 9 + "' height='20' fill='url(#shadow)'/>\n"); + sections.add(" <rect x='" + (x - 6) + "' rx='3' width='" + 8 + "' height='20' fill='url(#shadow)'/>\n"); } static String historyBadge(ApplicationId id, JobStatus status, int length) { @@ -222,7 +222,7 @@ public class Badges { " <stop offset='0' stop-color='#fff' stop-opacity='.5'/>\n" + " <stop offset='.1' stop-color='#fff' stop-opacity='.15'/>\n" + " <stop offset='.9' stop-color='#000' stop-opacity='.15'/>\n" + - " <stop offset='1' stop-color='#000' stop-opacity='.7'/>\n" + + " <stop offset='1' stop-color='#000' stop-opacity='.5'/>\n" + " </linearGradient>\n" + // Dispersed light at the left of the badge. " <linearGradient id='left-light' x2='100%' y2='0'>\n" + @@ -238,8 +238,9 @@ public class Badges { " </linearGradient>\n" + // Shadow to highlight the border between sections, without using a heavy separator. " <linearGradient id='shadow' x2='100%' y2='0'>\n" + - " <stop offset='0' stop-color='#222' stop-opacity='.4'/>\n" + - " <stop offset='.5' stop-color='#555' stop-opacity='.4'/>\n" + + " <stop offset='0' stop-color='#222' stop-opacity='.3'/>\n" + + " <stop offset='.625' stop-color='#555' stop-opacity='.3'/>\n" + + " <stop offset='.9' stop-color='#555' stop-opacity='.05'/>\n" + " <stop offset='1' stop-color='#555' stop-opacity='.0'/>\n" + " </linearGradient>\n" + // Weak shade across each panel to highlight borders further. diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/history.svg b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/history.svg index 2bd6aac9ac3..f466f38750c 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/history.svg +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/history.svg @@ -4,7 +4,7 @@ <stop offset='0' stop-color='#fff' stop-opacity='.5'/> <stop offset='.1' stop-color='#fff' stop-opacity='.15'/> <stop offset='.9' stop-color='#000' stop-opacity='.15'/> - <stop offset='1' stop-color='#000' stop-opacity='.7'/> + <stop offset='1' stop-color='#000' stop-opacity='.5'/> </linearGradient> <linearGradient id='left-light' x2='100%' y2='0'> <stop offset='0' stop-color='#fff' stop-opacity='.3'/> @@ -17,8 +17,9 @@ <stop offset='1' stop-color='#000' stop-opacity='.3'/> </linearGradient> <linearGradient id='shadow' x2='100%' y2='0'> - <stop offset='0' stop-color='#222' stop-opacity='.4'/> - <stop offset='.5' stop-color='#555' stop-opacity='.4'/> + <stop offset='0' stop-color='#222' stop-opacity='.3'/> + <stop offset='.625' stop-color='#555' stop-opacity='.3'/> + <stop offset='.9' stop-color='#555' stop-opacity='.05'/> <stop offset='1' stop-color='#555' stop-opacity='.0'/> </linearGradient> <linearGradient id='shade' x2='100%' y2='0'> @@ -42,106 +43,106 @@ <rect width='659.058159125822' height='20' rx='3' fill='#fff'/> </clipPath> <g clip-path='url(#rounded)'> - <rect x='653.26809109179' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='653.26809109179' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='646.1879570885093' rx='3' width='13.080134003280707' height='20' fill='#00f244'/> <rect x='646.1879570885093' rx='3' width='13.080134003280707' height='20' fill='url(#shade)'/> - <rect x='646.4043039211865' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='646.4043039211865' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='639.1078230852286' rx='3' width='13.296480835957981' height='20' fill='#bf103c'/> <rect x='639.1078230852286' rx='3' width='13.296480835957981' height='20' fill='url(#shade)'/> - <rect x='639.3307808029524' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='639.3307808029524' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='631.8113422492706' rx='3' width='13.519438553681752' height='20' fill='#bf103c'/> <rect x='631.8113422492706' rx='3' width='13.519438553681752' height='20' fill='url(#shade)'/> - <rect x='632.0411128600877' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='632.0411128600877' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='624.2919036955889' rx='3' width='13.749209164498811' height='20' fill='#bf103c'/> <rect x='624.2919036955889' rx='3' width='13.749209164498811' height='20' fill='url(#shade)'/> - <rect x='624.5286953802824' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='624.5286953802824' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='616.5426945310901' rx='3' width='13.986000849192376' height='20' fill='#bf103c'/> <rect x='616.5426945310901' rx='3' width='13.986000849192376' height='20' fill='url(#shade)'/> - <rect x='616.7867218317995' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='616.7867218317995' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='608.5566936818977' rx='3' width='14.230028149901685' height='20' fill='#bf103c'/> <rect x='608.5566936818977' rx='3' width='14.230028149901685' height='20' fill='url(#shade)'/> - <rect x='608.8081776965013' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='608.8081776965013' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='600.326665531996' rx='3' width='14.48151216450522' height='20' fill='#bf103c'/> <rect x='600.326665531996' rx='3' width='14.48151216450522' height='20' fill='url(#shade)'/> - <rect x='600.5858341144344' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='600.5858341144344' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='591.8451533674908' rx='3' width='14.740680746943664' height='20' fill='#bf103c'/> <rect x='591.8451533674908' rx='3' width='14.740680746943664' height='20' fill='url(#shade)'/> - <rect x='592.1122413342111' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='592.1122413342111' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='583.1044726205471' rx='3' width='15.007768713664104' height='20' fill='#bf103c'/> <rect x='583.1044726205471' rx='3' width='15.007768713664104' height='20' fill='url(#shade)'/> - <rect x='583.3797219632555' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='583.3797219632555' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='574.096703906883' rx='3' width='15.283018056372542' height='20' fill='#bf103c'/> <rect x='574.096703906883' rx='3' width='15.283018056372542' height='20' fill='url(#shade)'/> - <rect x='574.380364011798' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='574.380364011798' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='564.8136858505105' rx='3' width='15.566678161287442' height='20' fill='#bf103c'/> <rect x='564.8136858505105' rx='3' width='15.566678161287442' height='20' fill='url(#shade)'/> - <rect x='565.1060137243161' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='565.1060137243161' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='555.2470076892231' rx='3' width='15.859006035092985' height='20' fill='#bf103c'/> <rect x='555.2470076892231' rx='3' width='15.859006035092985' height='20' fill='url(#shade)'/> - <rect x='555.5482681919269' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='555.5482681919269' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='545.3880016541301' rx='3' width='16.16026653779677' height='20' fill='#bf103c'/> <rect x='545.3880016541301' rx='3' width='16.16026653779677' height='20' fill='url(#shade)'/> - <rect x='545.6984677390362' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='545.6984677390362' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='535.2277351163333' rx='3' width='16.470732622702883' height='20' fill='#bf103c'/> <rect x='535.2277351163333' rx='3' width='16.470732622702883' height='20' fill='url(#shade)'/> - <rect x='535.5476880773482' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='535.5476880773482' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='524.7570024936304' rx='3' width='16.790685583717845' height='20' fill='#bf103c'/> <rect x='524.7570024936304' rx='3' width='16.790685583717845' height='20' fill='url(#shade)'/> - <rect x='525.0867322201259' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='525.0867322201259' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='513.9663169099125' rx='3' width='17.12041531021341' height='20' fill='#bf103c'/> <rect x='513.9663169099125' rx='3' width='17.12041531021341' height='20' fill='url(#shade)'/> - <rect x='514.3061221493763' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='514.3061221493763' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='502.84590159969906' rx='3' width='17.460220549677203' height='20' fill='#bf103c'/> <rect x='502.84590159969906' rx='3' width='17.460220549677203' height='20' fill='url(#shade)'/> - <rect x='503.196090228411' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='503.196090228411' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='491.38568105002184' rx='3' width='17.810409178389147' height='20' fill='#bf103c'/> <rect x='491.38568105002184' rx='3' width='17.810409178389147' height='20' fill='url(#shade)'/> - <rect x='491.7465703520016' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='491.7465703520016' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='479.5752718716327' rx='3' width='18.171298480368904' height='20' fill='#bf103c'/> <rect x='479.5752718716327' rx='3' width='18.171298480368904' height='20' fill='url(#shade)'/> - <rect x='479.9471888261109' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='479.9471888261109' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='467.40397339126383' rx='3' width='18.543215434847077' height='20' fill='#bf103c'/> <rect x='467.40397339126383' rx='3' width='18.543215434847077' height='20' fill='url(#shade)'/> - <rect x='467.7872549689374' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='467.7872549689374' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='454.86075795641676' rx='3' width='18.92649701252067' height='20' fill='#bf103c'/> <rect x='454.86075795641676' rx='3' width='18.92649701252067' height='20' fill='url(#shade)'/> - <rect x='455.25575142475725' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='455.25575142475725' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='441.9342609438961' rx='3' width='19.32149048086113' height='20' fill='#bf103c'/> <rect x='441.9342609438961' rx='3' width='19.32149048086113' height='20' fill='url(#shade)'/> - <rect x='442.3413241817867' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='442.3413241817867' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='428.61277046303496' rx='3' width='19.728553718751726' height='20' fill='#bf103c'/> <rect x='428.61277046303496' rx='3' width='19.728553718751726' height='20' fill='url(#shade)'/> - <rect x='429.03227228502243' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='429.03227228502243' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='414.8842167442832' rx='3' width='20.148055540739207' height='20' fill='#bf103c'/> <rect x='414.8842167442832' rx='3' width='20.148055540739207' height='20' fill='url(#shade)'/> - <rect x='415.31653723473755' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='415.31653723473755' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='400.736161203544' rx='3' width='20.58037603119359' height='20' fill='#bf103c'/> <rect x='400.736161203544' rx='3' width='20.58037603119359' height='20' fill='url(#shade)'/> - <rect x='401.1816920610293' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='401.1816920610293' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='386.1557851723504' rx='3' width='21.025906888678875' height='20' fill='#bf103c'/> <rect x='386.1557851723504' rx='3' width='21.025906888678875' height='20' fill='url(#shade)'/> - <rect x='386.61493006451815' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='386.61493006451815' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='371.12987828367153' rx='3' width='21.485051780846597' height='20' fill='#bf103c'/> <rect x='371.12987828367153' rx='3' width='21.485051780846597' height='20' fill='url(#shade)'/> - <rect x='371.60305321299876' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='371.60305321299876' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='355.6448265028249' rx='3' width='21.958226710173836' height='20' fill='#bf103c'/> <rect x='355.6448265028249' rx='3' width='21.958226710173836' height='20' fill='url(#shade)'/> - <rect x='356.13246018352817' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='356.13246018352817' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='339.68659979265107' rx='3' width='22.445860390877083' height='20' fill='#bf103c'/> <rect x='339.68659979265107' rx='3' width='22.445860390877083' height='20' fill='url(#shade)'/> - <rect x='340.18913403911733' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='340.18913403911733' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='323.24073940177396' rx='3' width='22.948394637343355' height='20' fill='#bf103c'/> <rect x='323.24073940177396' rx='3' width='22.948394637343355' height='20' fill='url(#shade)'/> - <rect x='323.7586295288612' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='323.7586295288612' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='306.2923447644306' rx='3' width='23.466284764430597' height='20' fill='#bf103c'/> <rect x='306.2923447644306' rx='3' width='23.466284764430597' height='20' fill='url(#shade)'/> - <rect x='306.82606' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='306.82606' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='288.82606' rx='3' width='24.0' height='20' fill='#bf103c'/> <rect x='288.82606' rx='3' width='24.0' height='20' fill='url(#shade)'/> - <rect x='288.82606' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='288.82606' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='163.18729000000002' rx='3' width='131.63876999999997' height='20' fill='url(#run-on-failure)'/> <rect x='163.18729000000002' rx='3' width='131.63876999999997' height='20' fill='url(#shade)'/> - <rect width='169.18729000000002' height='20' fill='#5a5a5a'/> + <rect width='169.18729000000002' height='20' fill='#404040'/> <rect x='-6.0' rx='3' width='175.18729000000002' height='20' fill='url(#shade)'/> <rect width='2' height='20' fill='url(#left-light)'/> <rect x='657.058159125822' width='2' height='20' fill='url(#right-shadow)'/> diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/overview.svg b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/overview.svg index 5bf44782cf2..dde2b740e37 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/overview.svg +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/overview.svg @@ -4,7 +4,7 @@ <stop offset='0' stop-color='#fff' stop-opacity='.5'/> <stop offset='.1' stop-color='#fff' stop-opacity='.15'/> <stop offset='.9' stop-color='#000' stop-opacity='.15'/> - <stop offset='1' stop-color='#000' stop-opacity='.7'/> + <stop offset='1' stop-color='#000' stop-opacity='.5'/> </linearGradient> <linearGradient id='left-light' x2='100%' y2='0'> <stop offset='0' stop-color='#fff' stop-opacity='.3'/> @@ -17,8 +17,9 @@ <stop offset='1' stop-color='#000' stop-opacity='.3'/> </linearGradient> <linearGradient id='shadow' x2='100%' y2='0'> - <stop offset='0' stop-color='#222' stop-opacity='.4'/> - <stop offset='.5' stop-color='#555' stop-opacity='.4'/> + <stop offset='0' stop-color='#222' stop-opacity='.3'/> + <stop offset='.625' stop-color='#555' stop-opacity='.3'/> + <stop offset='.9' stop-color='#555' stop-opacity='.05'/> <stop offset='1' stop-color='#555' stop-opacity='.0'/> </linearGradient> <linearGradient id='shade' x2='100%' y2='0'> @@ -42,25 +43,25 @@ <rect width='763.7809900000001' height='20' rx='3' fill='#fff'/> </clipPath> <g clip-path='url(#rounded)'> - <rect x='757.7809900000001' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='757.7809900000001' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='725.59036' rx='3' width='38.19063' height='20' fill='url(#run-on-success)'/> <polygon points='635.8470950000001 0 635.8470950000001 20 734.59036 20 742.59036 0' fill='#00f244'/> <rect x='635.8470950000001' rx='3' width='131.74345499999998' height='20' fill='url(#shade)'/> - <rect x='635.8470950000001' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='635.8470950000001' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='603.656465' rx='3' width='38.19063' height='20' fill='#bf103c'/> <polygon points='486.981225 0 486.981225 20 612.656465 20 620.656465 0' fill='#00f244'/> <rect x='486.981225' rx='3' width='158.67543' height='20' fill='url(#shade)'/> - <rect x='486.981225' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='486.981225' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='348.865175' rx='3' width='144.11604999999997' height='20' fill='url(#run-on-success)'/> <rect x='358.865175' rx='3' width='134.11604999999997' height='20' fill='url(#shade)'/> - <rect x='358.865175' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='358.865175' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='326.674545' rx='3' width='38.19063' height='20' fill='#00f244'/> <polygon points='237.71563000000003 0 237.71563000000003 20 335.674545 20 343.674545 0' fill='url(#run-on-failure)'/> <rect x='237.71563000000003' rx='3' width='130.959105' height='20' fill='url(#shade)'/> - <rect x='237.71563000000003' rx='3' width='9' height='20' fill='url(#shadow)'/> + <rect x='237.71563000000003' rx='3' width='8' height='20' fill='url(#shadow)'/> <rect x='153.18729000000002' rx='3' width='90.52834000000001' height='20' fill='#00f244'/> <rect x='163.18729000000002' rx='3' width='80.52834000000001' height='20' fill='url(#shade)'/> - <rect width='169.18729000000002' height='20' fill='#5a5a5a'/> + <rect width='169.18729000000002' height='20' fill='#404040'/> <rect x='-6.0' rx='3' width='175.18729000000002' height='20' fill='url(#shade)'/> <rect width='2' height='20' fill='url(#left-light)'/> <rect x='761.7809900000001' width='2' height='20' fill='url(#right-shadow)'/> |