diff --git a/Duplicati/Server/webroot/ngax/less/base.less b/Duplicati/Server/webroot/ngax/less/base.less index 871e88ed2..d3ff1e482 100644 --- a/Duplicati/Server/webroot/ngax/less/base.less +++ b/Duplicati/Server/webroot/ngax/less/base.less @@ -7,16 +7,16 @@ .flexbox() { display: -webkit-box; display: -moz-box; - display: -ms-flexbox; - display: -webkit-flex; + display: flexbox; + display: flex; display: flex; } .flex(@grow: 0; @shrink: 1; @basis: auto) { -webkit-box-flex: @grow @shrink @basis; -moz-box-flex: @grow @shrink @basis; - -webkit-flex: @grow @shrink @basis; - -ms-flex: @grow @shrink @basis; + flex: @grow @shrink @basis; + flex: @grow @shrink @basis; flex: @grow @shrink @basis; } @@ -77,11 +77,11 @@ textarea { background: url('../img/external-link-hover.png'); background-size: 16px; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/external-link-hover_2x.png'); } - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 288dpi), only screen and (min-resolution: 2.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 288dpi), only screen and (resolution >= 2.25dppx) { background-image: url('../img/external-link-hover_3x.png'); } } @@ -91,11 +91,11 @@ a { background: url('../img/external-link.png'); background-size: 16px; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/external-link_2x.png'); } - @media only screen and (-webkit-min-device-pixel-ratio: 2.25), only screen and (min-resolution: 288dpi), only screen and (min-resolution: 2.25dppx) { + @media only screen and (min-device-pixel-ratio: 2.25), only screen and (resolution >= 288dpi), only screen and (resolution >= 2.25dppx) { background-image: url('../img/external-link_3x.png'); } } @@ -107,11 +107,11 @@ a { background: url('../img/external-link-hover.png'); background-size: 16px; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/external-link-hover_2x.png'); } - @media only screen and (-webkit-min-device-pixel-ratio: 2.25), only screen and (min-resolution: 288dpi), only screen and (min-resolution: 2.25dppx) { + @media only screen and (min-device-pixel-ratio: 2.25), only screen and (resolution >= 288dpi), only screen and (resolution >= 2.25dppx) { background-image: url('../img/external-link-hover_3x.png'); } } @@ -185,12 +185,12 @@ wait-area { div .horizontal-rule { width: 100%; border-bottom: 1px solid @border; - margin: 5px 0 5px 0; + margin: 5px 0; } .box { margin: 10px; - margin-bottom: 0px; + margin-bottom: 0; } .title { @@ -262,19 +262,19 @@ wait-area { } .success-color { - color: #339900; + color: #390; } .error-color { - color: #cc0000; + color: #c00; } .warning-color { - color: #ffcc00; + color: #fc0; } .fatal-color { - color: #990000; + color: #900; } ul.tabs { @@ -379,9 +379,9 @@ ul.tabs { ul.notification { position: fixed; - bottom: 0px; - left: 0px; - right: 0px; + bottom: 0; + left: 0; + right: 0; margin: auto; width: 480px; } @@ -390,10 +390,7 @@ ul.notification { .title { border: 1px solid @lColor; background-color: @lColor; - border-top-left-radius: 5px; - border-top-right-radius: 5px; - border-bottom-left-radius: 0px; - border-bottom-right-radius: 0px; + border-radius: 5px 5px 0 0; padding: 2px; padding-left: 5px; padding-right: 5px; @@ -407,10 +404,7 @@ ul.notification { .content { background-color: white; border: 1px solid @lColor; - border-top-left-radius: 0px; - border-top-right-radius: 0px; - border-bottom-left-radius: 5px; - border-bottom-right-radius: 5px; + border-radius: 0 0 5px 5px; padding: 2px; padding-left: 5px; padding-right: 5px; @@ -572,10 +566,10 @@ ul.notification { div.powered-by { font-size: 16px; - margin: 0px; + margin: 0; line-height: 16px; float: left; - padding: 0px; + padding: 0; margin-left: 5px; } } @@ -612,6 +606,7 @@ div.captcha { margin-right: auto; width: 180px; } + .code { background: lightgray; color: black; @@ -619,6 +614,7 @@ div.captcha { font-size: xx-large; padding: 10px; } + .answer { margin-top: 16px; } @@ -641,9 +637,9 @@ body { overflow: hidden; height: 70px; position: fixed; - top: 0px; - left: 0px; - right: 0px; + top: 0; + left: 0; + right: 0; z-index: 100; a { @@ -717,9 +713,9 @@ body { .buttons { position: absolute; - right: 0px; - top: 0px; - bottom: 0px; + right: 0; + top: 0; + bottom: 0; width: 26px; margin: 13px 15px; @@ -733,11 +729,11 @@ body { z-index: 10; position: relative; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/progress-stop_2x.png'); } - @media only screen and (-webkit-min-device-pixel-ratio: 2.25), only screen and (min-resolution: 288dpi), only screen and (min-resolution: 2.25dppx) { + @media only screen and (min-device-pixel-ratio: 2.25), only screen and (resolution >= 288dpi), only screen and (resolution >= 2.25dppx) { background-image: url('../img/progress-stop_3x.png'); } } @@ -746,11 +742,11 @@ body { background: url('../img/progress-resume.png'); background-size: 100%; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/progress-resume_2x.png'); } - @media only screen and (-webkit-min-device-pixel-ratio: 2.25), only screen and (min-resolution: 288dpi), only screen and (min-resolution: 2.25dppx) { + @media only screen and (min-device-pixel-ratio: 2.25), only screen and (resolution >= 288dpi), only screen and (resolution >= 2.25dppx) { background-image: url('../img/progress-resume_3x.png'); } } @@ -758,9 +754,9 @@ body { .progress-bar { position: absolute; - top: 0px; - bottom: 0px; - left: 0px; + top: 0; + bottom: 0; + left: 0; background: fade(@hColor, 25%); z-index: 5; } @@ -779,8 +775,8 @@ body { .action-icons { display: inline-block; line-height: normal; - margin: 10px 0px; - padding: 13px 0px; + margin: 10px 0; + padding: 13px 0; float: left; } @@ -801,11 +797,11 @@ body { background: url('../img/pause.png'); background-size: 100%; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/pause_2x.png'); } - @media only screen and (-webkit-min-device-pixel-ratio: 2.25), only screen and (min-resolution: 288dpi), only screen and (min-resolution: 2.25dppx) { + @media only screen and (min-device-pixel-ratio: 2.25), only screen and (resolution >= 288dpi), only screen and (resolution >= 2.25dppx) { background-image: url('../img/pause_3x.png'); } } @@ -814,11 +810,11 @@ body { background: url('../img/resume.png'); background-size: 100%; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/resume_2x.png'); } - @media only screen and (-webkit-min-device-pixel-ratio: 2.25), only screen and (min-resolution: 288dpi), only screen and (min-resolution: 2.25dppx) { + @media only screen and (min-device-pixel-ratio: 2.25), only screen and (resolution >= 288dpi), only screen and (resolution >= 2.25dppx) { background-image: url('../img/resume_3x.png'); } } @@ -827,11 +823,11 @@ body { background: url('../img/throttle.png'); background-size: 100%; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/throttle_2x.png'); } - @media only screen and (-webkit-min-device-pixel-ratio: 2.25), only screen and (min-resolution: 288dpi), only screen and (min-resolution: 2.25dppx) { + @media only screen and (min-device-pixel-ratio: 2.25), only screen and (resolution >= 288dpi), only screen and (resolution >= 2.25dppx) { background-image: url('../img/throttle_3x.png'); } } @@ -899,11 +895,11 @@ body { background: url('../img/mainmenu/add.png') no-repeat 8px 7px; background-size: 27px 26px; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/mainmenu/add_2x.png'); } - @media only screen and (-webkit-min-device-pixel-ratio: 2.25), only screen and (min-resolution: 288dpi), only screen and (min-resolution: 2.25dppx) { + @media only screen and (min-device-pixel-ratio: 2.25), only screen and (resolution >= 288dpi), only screen and (resolution >= 2.25dppx) { background-image: url('../img/mainmenu/add_3x.png'); } } @@ -912,11 +908,11 @@ body { background: url('../img/mainmenu/restore.png') no-repeat 8px 7px; background-size: 27px 26px; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/mainmenu/restore_2x.png'); } - @media only screen and (-webkit-min-device-pixel-ratio: 2.25), only screen and (min-resolution: 288dpi), only screen and (min-resolution: 2.25dppx) { + @media only screen and (min-device-pixel-ratio: 2.25), only screen and (resolution >= 288dpi), only screen and (resolution >= 2.25dppx) { background-image: url('../img/mainmenu/restore_3x.png'); } } @@ -925,11 +921,11 @@ body { background: url('../img/mainmenu/resume.png') no-repeat 8px 7px; background-size: 27px 26px; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/mainmenu/resume_2x.png'); } - @media only screen and (-webkit-min-device-pixel-ratio: 2.25), only screen and (min-resolution: 288dpi), only screen and (min-resolution: 2.25dppx) { + @media only screen and (min-device-pixel-ratio: 2.25), only screen and (resolution >= 288dpi), only screen and (resolution >= 2.25dppx) { background-image: url('../img/mainmenu/resume_3x.png'); } } @@ -938,11 +934,11 @@ body { background: url('../img/mainmenu/settings.png') no-repeat 8px 7px; background-size: 27px 26px; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/mainmenu/settings_2x.png'); } - @media only screen and (-webkit-min-device-pixel-ratio: 2.25), only screen and (min-resolution: 288dpi), only screen and (min-resolution: 2.25dppx) { + @media only screen and (min-device-pixel-ratio: 2.25), only screen and (resolution >= 288dpi), only screen and (resolution >= 2.25dppx) { background-image: url('../img/mainmenu/settings_3x.png'); } } @@ -951,11 +947,11 @@ body { background: url('../img/mainmenu/logout.png') no-repeat 8px 7px; background-size: 27px 26px; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/mainmenu/logout_2x.png'); } - @media only screen and (-webkit-min-device-pixel-ratio: 2.25), only screen and (min-resolution: 288dpi), only screen and (min-resolution: 2.25dppx) { + @media only screen and (min-device-pixel-ratio: 2.25), only screen and (resolution >= 288dpi), only screen and (resolution >= 2.25dppx) { background-image: url('../img/mainmenu/logout_3x.png'); } } @@ -964,11 +960,11 @@ body { background: url('../img/mainmenu/home.png') no-repeat 8px 7px; background-size: 27px 26px; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/mainmenu/home_2x.png'); } - @media only screen and (-webkit-min-device-pixel-ratio: 2.25), only screen and (min-resolution: 288dpi), only screen and (min-resolution: 2.25dppx) { + @media only screen and (min-device-pixel-ratio: 2.25), only screen and (resolution >= 288dpi), only screen and (resolution >= 2.25dppx) { background-image: url('../img/mainmenu/home_3x.png'); } } @@ -977,11 +973,11 @@ body { background: url('../img/mainmenu/about.png') no-repeat 8px 7px; background-size: 27px 26px; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/mainmenu/about_2x.png'); } - @media only screen and (-webkit-min-device-pixel-ratio: 2.25), only screen and (min-resolution: 288dpi), only screen and (min-resolution: 2.25dppx) { + @media only screen and (min-device-pixel-ratio: 2.25), only screen and (resolution >= 288dpi), only screen and (resolution >= 2.25dppx) { background-image: url('../img/mainmenu/about_3x.png'); } } @@ -990,11 +986,11 @@ body { background: lighten(@lColor, 15%) url('../img/mainmenu/over/home.png') no-repeat 8px 7px; background-size: 27px 26px; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/mainmenu/over/home_2x.png'); } - @media only screen and (-webkit-min-device-pixel-ratio: 2.25), only screen and (min-resolution: 288dpi), only screen and (min-resolution: 2.25dppx) { + @media only screen and (min-device-pixel-ratio: 2.25), only screen and (resolution >= 288dpi), only screen and (resolution >= 2.25dppx) { background-image: url('../img/mainmenu/over/home_3x.png'); } } @@ -1003,11 +999,11 @@ body { background: lighten(@lColor, 15%) url('../img/mainmenu/over/add.png') no-repeat 8px 7px; background-size: 27px 26px; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/mainmenu/over/add_2x.png'); } - @media only screen and (-webkit-min-device-pixel-ratio: 2.25), only screen and (min-resolution: 288dpi), only screen and (min-resolution: 2.25dppx) { + @media only screen and (min-device-pixel-ratio: 2.25), only screen and (resolution >= 288dpi), only screen and (resolution >= 2.25dppx) { background-image: url('../img/mainmenu/over/add_3x.png'); } } @@ -1016,11 +1012,11 @@ body { background: lighten(@lColor, 15%) url('../img/mainmenu/over/restore.png') no-repeat 8px 7px; background-size: 27px 26px; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/mainmenu/over/restore_2x.png'); } - @media only screen and (-webkit-min-device-pixel-ratio: 2.25), only screen and (min-resolution: 288dpi), only screen and (min-resolution: 2.25dppx) { + @media only screen and (min-device-pixel-ratio: 2.25), only screen and (resolution >= 288dpi), only screen and (resolution >= 2.25dppx) { background-image: url('../img/mainmenu/over/restore_3x.png'); } } @@ -1029,11 +1025,11 @@ body { background: lighten(@lColor, 15%) url('../img/mainmenu/over/resume.png') no-repeat 8px 7px; background-size: 27px 26px; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/mainmenu/over/resume_2x.png'); } - @media only screen and (-webkit-min-device-pixel-ratio: 2.25), only screen and (min-resolution: 288dpi), only screen and (min-resolution: 2.25dppx) { + @media only screen and (min-device-pixel-ratio: 2.25), only screen and (resolution >= 288dpi), only screen and (resolution >= 2.25dppx) { background-image: url('../img/mainmenu/over/resume_3x.png'); } } @@ -1042,11 +1038,11 @@ body { background: lighten(@lColor, 15%) url('../img/mainmenu/over/settings.png') no-repeat 8px 7px; background-size: 27px 26px; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/mainmenu/over/settings_2x.png'); } - @media only screen and (-webkit-min-device-pixel-ratio: 2.25), only screen and (min-resolution: 288dpi), only screen and (min-resolution: 2.25dppx) { + @media only screen and (min-device-pixel-ratio: 2.25), only screen and (resolution >= 288dpi), only screen and (resolution >= 2.25dppx) { background-image: url('../img/mainmenu/over/settings_3x.png'); } } @@ -1055,11 +1051,11 @@ body { background: lighten(@lColor, 15%) url('../img/mainmenu/over/about.png') no-repeat 8px 7px; background-size: 27px 26px; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/mainmenu/over/about_2x.png'); } - @media only screen and (-webkit-min-device-pixel-ratio: 2.25), only screen and (min-resolution: 288dpi), only screen and (min-resolution: 2.25dppx) { + @media only screen and (min-device-pixel-ratio: 2.25), only screen and (resolution >= 288dpi), only screen and (resolution >= 2.25dppx) { background-image: url('../img/mainmenu/over/about_3x.png'); } } @@ -1068,11 +1064,11 @@ body { background: @lColor url('../img/mainmenu/over/add.png') no-repeat 8px 7px; background-size: 27px 26px; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/mainmenu/over/add_2x.png'); } - @media only screen and (-webkit-min-device-pixel-ratio: 2.25), only screen and (min-resolution: 288dpi), only screen and (min-resolution: 2.25dppx) { + @media only screen and (min-device-pixel-ratio: 2.25), only screen and (resolution >= 288dpi), only screen and (resolution >= 2.25dppx) { background-image: url('../img/mainmenu/over/add_3x.png'); } } @@ -1081,11 +1077,11 @@ body { background: @lColor url('../img/mainmenu/over/restore.png') no-repeat 8px 7px; background-size: 27px 26px; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/mainmenu/over/restore_2x.png'); } - @media only screen and (-webkit-min-device-pixel-ratio: 2.25), only screen and (min-resolution: 288dpi), only screen and (min-resolution: 2.25dppx) { + @media only screen and (min-device-pixel-ratio: 2.25), only screen and (resolution >= 288dpi), only screen and (resolution >= 2.25dppx) { background-image: url('../img/mainmenu/over/restore_3x.png'); } } @@ -1094,11 +1090,11 @@ body { background: @lColor url('../img/mainmenu/over/resume.png') no-repeat 8px 7px; background-size: 27px 26px; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/mainmenu/over/resume_2x.png'); } - @media only screen and (-webkit-min-device-pixel-ratio: 2.25), only screen and (min-resolution: 288dpi), only screen and (min-resolution: 2.25dppx) { + @media only screen and (min-device-pixel-ratio: 2.25), only screen and (resolution >= 288dpi), only screen and (resolution >= 2.25dppx) { background-image: url('../img/mainmenu/over/resume_3x.png'); } } @@ -1107,11 +1103,11 @@ body { background: @lColor url('../img/mainmenu/over/settings.png') no-repeat 8px 7px; background-size: 27px 26px; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/mainmenu/over/settings_2x.png'); } - @media only screen and (-webkit-min-device-pixel-ratio: 2.25), only screen and (min-resolution: 288dpi), only screen and (min-resolution: 2.25dppx) { + @media only screen and (min-device-pixel-ratio: 2.25), only screen and (resolution >= 288dpi), only screen and (resolution >= 2.25dppx) { background-image: url('../img/mainmenu/over/settings_3x.png'); } } @@ -1120,11 +1116,11 @@ body { background: @lColor url('../img/mainmenu/over/logout.png') no-repeat 8px 7px; background-size: 27px 26px; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/mainmenu/over/logout_2x.png'); } - @media only screen and (-webkit-min-device-pixel-ratio: 2.25), only screen and (min-resolution: 288dpi), only screen and (min-resolution: 2.25dppx) { + @media only screen and (min-device-pixel-ratio: 2.25), only screen and (resolution >= 288dpi), only screen and (resolution >= 2.25dppx) { background-image: url('../img/mainmenu/over/logout_3x.png'); } } @@ -1133,11 +1129,11 @@ body { background: @lColor url('../img/mainmenu/over/home.png') no-repeat 8px 7px; background-size: 27px 26px; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/mainmenu/over/home_2x.png'); } - @media only screen and (-webkit-min-device-pixel-ratio: 2.25), only screen and (min-resolution: 288dpi), only screen and (min-resolution: 2.25dppx) { + @media only screen and (min-device-pixel-ratio: 2.25), only screen and (resolution >= 288dpi), only screen and (resolution >= 2.25dppx) { background-image: url('../img/mainmenu/over/home_3x.png'); } } @@ -1146,11 +1142,11 @@ body { background: @lColor url('../img/mainmenu/over/about.png') no-repeat 8px 7px; background-size: 27px 26px; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/mainmenu/over/about_2x.png'); } - @media only screen and (-webkit-min-device-pixel-ratio: 2.25), only screen and (min-resolution: 288dpi), only screen and (min-resolution: 2.25dppx) { + @media only screen and (min-device-pixel-ratio: 2.25), only screen and (resolution >= 288dpi), only screen and (resolution >= 2.25dppx) { background-image: url('../img/mainmenu/over/about_3x.png'); } } @@ -1173,17 +1169,15 @@ body { position: absolute; background: white; border: 1px @headerBg solid; - box-shadow: 0 4px 8px rgba(0, 0, 0, 0.3); + box-shadow: 0 4px 8px rgb(0 0 0 / 30%); z-index: 200; padding: 5px; li { - a { color: @lColor; font-size: 15px; font-weight: 400; - padding: 0; display: block; min-width: 200px; padding: 4px 10px; @@ -1215,7 +1209,6 @@ body { } .tasks { - .tasklist { .task { border-top: 1px solid #eee; @@ -1229,14 +1222,14 @@ body { } .task:first-child { - padding-top: 0px; - border-top: 0px none; + padding-top: 0; + border-top: 0 none; } .progress-small { text-align: center; height: 18px; - background: rgba(164, 209,235, 0.50); + background: rgb(164 209 235 / 50%); } .progress-small-bg { @@ -1252,7 +1245,7 @@ body { &.action-link { font-size: 14px; background: none; - padding-left: 0px; + padding-left: 0; } } @@ -1299,6 +1292,7 @@ body { dt.active, dt:hover { /* background: @lColor; */ + /* color: white; */ } @@ -1373,11 +1367,11 @@ body { background-size: 485px 24px; color: #c7e5f6; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/steps/line-out_2x.png'); } - @media only screen and (-webkit-min-device-pixel-ratio: 2.25), only screen and (min-resolution: 288dpi), only screen and (min-resolution: 2.25dppx) { + @media only screen and (min-device-pixel-ratio: 2.25), only screen and (resolution >= 288dpi), only screen and (resolution >= 2.25dppx) { background-image: url('../img/steps/line-out_3x.png'); } @@ -1536,19 +1530,19 @@ body { .step1 { li.strength.score-0 { - color: #ff0000; + color: #f00; } li.strength.score-1 { - color: #ff7700; + color: #f70; } li.strength.score-2 { - color: #aaaa00; + color: #aa0; } li.strength.score-3 { - color: #007700; + color: #070; } li.strength.score-4 { @@ -1556,7 +1550,7 @@ body { } li.strength.score-x { - color: #ff0000; + color: #f00; } } @@ -1779,7 +1773,7 @@ body { } div.headerthreedotmenu { - margin: 20px 0 20px 0; + margin: 20px 0; h2 { display: inline; @@ -1801,7 +1795,7 @@ body { } .expandable { - margin: 20px 0 20px 0; + margin: 20px 0; h2 { display: inline; @@ -1839,7 +1833,7 @@ body { ul.entries { li { - padding: 10px 0 10px 0; + padding: 10px 0; border-bottom: 1px solid @border; } } @@ -1951,7 +1945,7 @@ body { /* Modal windows */ .remodal { padding: 30px; - box-shadow: 0px 2px 7px rgba(0, 0, 0, 0.3); + box-shadow: 0 2px 7px rgb(0 0 0 / 30%); background: white; display: none; @@ -1997,16 +1991,13 @@ div.blocker, div.connection-lost, div.modal-dialog { position: fixed; - top: 0px; - left: 0px; - right: 0px; - bottom: 0px; + inset: 0; margin: auto; } div.blocker { z-index: 5000; - background-color: #000000; + background-color: #000; opacity: 0.65; } @@ -2022,15 +2013,16 @@ div.connection-lost, div.modal-dialog { z-index: 5001; .flexbox; + -webkit-box-pack: center; -moz-box-pack: center; -ms-flex-pack: center; - -webkit-justify-content: center; + justify-content: center; justify-content: center; -webkit-box-align: center; -moz-box-align: center; -ms-flex-align: center; - -webkit-align-items: center; + align-items: center; align-items: center; div.info { @@ -2098,12 +2090,13 @@ div.modal-dialog { ul { float: right; } + /* tooltipped css taken from: https://github.com/primer/primer-tooltips and https://sachinchoolur.github.io/ngclipboard/ */ .tooltipped { position: relative } - .tooltipped:after { + .tooltipped::after { position: absolute; z-index: 1000000; display: none; @@ -2119,43 +2112,43 @@ div.modal-dialog { white-space: pre; pointer-events: none; content: attr(aria-label); - background: rgba(0, 0, 0, 0.8); + background: rgb(0 0 0 / 80%); border-radius: 3px; -webkit-font-smoothing: subpixel-antialiased } - .tooltipped:before { + .tooltipped::before { position: absolute; z-index: 1000001; display: none; width: 0; height: 0; - color: rgba(0, 0, 0, 0.8); + color: rgb(0 0 0 / 80%); pointer-events: none; content: ""; border: 5px solid transparent } - .tooltipped:hover:before, .tooltipped:hover:after, .tooltipped:active:before, .tooltipped:active:after, .tooltipped:focus:before, .tooltipped:focus:after { + .tooltipped:hover::before, .tooltipped:hover::after, .tooltipped:active::before, .tooltipped:active::after, .tooltipped:focus::before, .tooltipped:focus::after { display: inline-block; text-decoration: none } - .tooltipped-w:after { + .tooltipped-w::after { right: 100%; bottom: 50%; margin-right: 5px; - -webkit-transform: translateY(50%); - -ms-transform: translateY(50%); + transform: translateY(50%); + transform: translateY(50%); transform: translateY(50%) } - .tooltipped-w:before { + .tooltipped-w::before { top: 50%; bottom: 50%; left: -5px; margin-top: -5px; - border-left-color: rgba(0, 0, 0, 0.8) + border-left-color: rgb(0 0 0 / 80%) } } } @@ -2174,7 +2167,7 @@ div.modal-dialog { form.styled { ul { margin: 20px; - margin-left: 0px; + margin-left: 0; } input[type="radio"] { @@ -2201,7 +2194,7 @@ div.modal-dialog { form.styled { li { line-height: normal; - padding: 0px; + padding: 0; input { height: auto; @@ -2215,19 +2208,19 @@ div.modal-dialog { /* Progress bar styles from Bootstrap */ .progress-bar-striped { - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); - -webkit-background-size: 40px 40px; + background-image: linear-gradient(45deg, rgb(255 255 255 / 15%) 25%, transparent 25%, transparent 50%, rgb(255 255 255 / 15%) 50%, rgb(255 255 255 / 15%) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgb(255 255 255 / 15%) 25%, transparent 25%, transparent 50%, rgb(255 255 255 / 15%) 50%, rgb(255 255 255 / 15%) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgb(255 255 255 / 15%) 25%, transparent 25%, transparent 50%, rgb(255 255 255 / 15%) 50%, rgb(255 255 255 / 15%) 75%, transparent 75%, transparent); + background-size: 40px 40px; background-size: 40px 40px; } .progress-striped { .progress-bar { - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); - -webkit-background-size: 40px 40px; + background-image: linear-gradient(45deg, rgb(255 255 255 / 15%) 25%, transparent 25%, transparent 50%, rgb(255 255 255 / 15%) 50%, rgb(255 255 255 / 15%) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgb(255 255 255 / 15%) 25%, transparent 25%, transparent 50%, rgb(255 255 255 / 15%) 50%, rgb(255 255 255 / 15%) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgb(255 255 255 / 15%) 25%, transparent 25%, transparent 50%, rgb(255 255 255 / 15%) 50%, rgb(255 255 255 / 15%) 75%, transparent 75%, transparent); + background-size: 40px 40px; background-size: 40px 40px; } } @@ -2248,8 +2241,8 @@ div.modal-dialog { &.active { .progress-bar { - -webkit-animation: progress-bar-stripes 2s linear infinite; - -o-animation: progress-bar-stripes 2s linear infinite; + animation: progress-bar-stripes 2s linear infinite; + animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite; } } @@ -2257,24 +2250,23 @@ div.modal-dialog { .progress-bar { float: left; width: 0; - height: 100%; font-size: 12px; line-height: 20px; color: #fff; text-align: center; background-color: #337ab7; - -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15); - box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15); - -webkit-transition: width .6s ease; - -o-transition: width .6s ease; + box-shadow: inset 0 -1px 0 rgb(0 0 0 / 15%); + box-shadow: inset 0 -1px 0 rgb(0 0 0 / 15%); + transition: width .6s ease; + transition: width .6s ease; transition: width .6s ease; height: 100%; position: absolute; top: 0; &.active { - -webkit-animation: progress-bar-stripes 2s linear infinite; - -o-animation: progress-bar-stripes 2s linear infinite; + animation: progress-bar-stripes 2s linear infinite; + animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite; } } @@ -2326,16 +2318,16 @@ div.modal-dialog { width: 16px; height: 16px; vertical-align: middle; - background-image: url(../img/treeicons.png); + background-image: url("../img/treeicons.png"); background-repeat: no-repeat; - background-position: -80px 0px; + background-position: -80px 0; background-size: 112px 64px; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/treeicons_2x.png'); } - @media only screen and (-webkit-min-device-pixel-ratio: 2.25), only screen and (min-resolution: 288dpi), only screen and (min-resolution: 2.25dppx) { + @media only screen and (min-device-pixel-ratio: 2.25), only screen and (resolution >= 288dpi), only screen and (resolution >= 2.25dppx) { background-image: url('../img/treeicons_3x.png'); } @@ -2354,31 +2346,31 @@ div.modal-dialog { width: 16px; height: 16px; vertical-align: middle; - background-image: url(../img/treeicons.png); + background-image: url("../img/treeicons.png"); background-repeat: no-repeat; - background-position: 0px -16px; + background-position: 0 -16px; background-size: 112px 64px; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/treeicons_2x.png'); } - @media only screen and (-webkit-min-device-pixel-ratio: 2.25), only screen and (min-resolution: 288dpi), only screen and (min-resolution: 2.25dppx) { + @media only screen and (min-device-pixel-ratio: 2.25), only screen and (resolution >= 288dpi), only screen and (resolution >= 2.25dppx) { background-image: url('../img/treeicons_3x.png'); } &.invisible { - background-position: 0px -32px; + background-position: 0 -32px; } &.loading { cursor: progress; - background-image: url(../img/loader-16.gif); + background-image: url("../img/loader-16.gif"); background-repeat: no-repeat; - background-position: 0px 0px; + background-position: 0 0; background-size: 16px 16px; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/loader-32.gif'); } } @@ -2408,7 +2400,7 @@ div.modal-dialog { } &.x-tree-icon-computer { - background-position: 0px -48px; + background-position: 0 -48px; } &.x-tree-icon-hyperv { @@ -2416,7 +2408,7 @@ div.modal-dialog { } &.x-tree-icon-hypervmachine { - background-position: -96px 0px; + background-position: -96px 0; } &.x-tree-icon-mssql { @@ -2470,31 +2462,31 @@ div.modal-dialog { width: 16px; display: inline-block; cursor: pointer; - background-image: url(../img/treeicons.png); + background-image: url("../img/treeicons.png"); background-repeat: no-repeat; background-position: 0 0; vertical-align: middle; background-size: 112px 64px; - @media only screen and (-webkit-min-device-pixel-ratio: 1.25), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 1.25dppx) { + @media only screen and (min-device-pixel-ratio: 1.25), only screen and (resolution >= 192dpi), only screen and (resolution >= 1.25dppx) { background-image: url('../img/treeicons_2x.png'); } - @media only screen and (-webkit-min-device-pixel-ratio: 2.25), only screen and (min-resolution: 288dpi), only screen and (min-resolution: 2.25dppx) { + @media only screen and (min-device-pixel-ratio: 2.25), only screen and (resolution >= 288dpi), only screen and (resolution >= 2.25dppx) { background-image: url('../img/treeicons_3x.png'); } } &.partial { - background-position: -32px 0px; + background-position: -32px 0; } &.include { - background-position: -16px 0px; + background-position: -16px 0; } &.exclude { - background-position: -48px 0px; + background-position: -48px 0; } &.root { @@ -2507,7 +2499,6 @@ div.modal-dialog { .throttlesettings { div.multiple { - select { width: auto; margin-right: 5px; @@ -2538,7 +2529,7 @@ div.modal-dialog { } } -@media (max-width: 1150px) { +@media (width <= 1150px) { body { .container { .header { @@ -2546,7 +2537,7 @@ div.modal-dialog { .statepadding { padding-right: 90px; - margin-left: 0px; + margin-left: 0; } .state { @@ -2583,11 +2574,11 @@ div.modal-dialog { text-transform: uppercase; text-align: right; - @media (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 192dpi), (min-resolution: 1.25dppx) { + @media (min-device-pixel-ratio: 1.25), (resolution >= 192dpi), (resolution >= 1.25dppx) { background-image: url('../img/menu_2x.png'); } - @media (-webkit-min-device-pixel-ratio: 2.25), (min-resolution: 288dpi), (min-resolution: 2.25dppx) { + @media (min-device-pixel-ratio: 2.25), (resolution >= 288dpi), (resolution >= 2.25dppx) { background-image: url('../img/menu_3x.png'); } } @@ -2597,11 +2588,11 @@ div.modal-dialog { background-size: 39px 39px; color: @lColor; - @media (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 192dpi), (min-resolution: 1.25dppx) { + @media (min-device-pixel-ratio: 1.25), (resolution >= 192dpi), (resolution >= 1.25dppx) { background-image: url('../img/menu_active_2x.png'); } - @media (-webkit-min-device-pixel-ratio: 2.25), (min-resolution: 288dpi), (min-resolution: 2.25dppx) { + @media (min-device-pixel-ratio: 2.25), (resolution >= 288dpi), (resolution >= 2.25dppx) { background-image: url('../img/menu_active_3x.png'); } } @@ -2615,7 +2606,7 @@ div.modal-dialog { display: none; position: fixed; background: none repeat scroll 0 0 white; - box-shadow: 0 4px 8px rgba(0, 0, 0, 0.3); + box-shadow: 0 4px 8px rgb(0 0 0 / 30%); left: 10px; padding: 20px; top: 60px; @@ -2636,8 +2627,8 @@ div.modal-dialog { .content { float: none; - padding: 20px 20px; - margin: 0px auto 30px auto; + padding: 20px; + margin: 0 auto 30px; .state { width: auto; @@ -2652,7 +2643,7 @@ div.modal-dialog { } } -@media (max-width: 768px) { +@media (width <= 768px) { body { .container { .body { @@ -2678,7 +2669,6 @@ div.modal-dialog { body { .container { - .header { .logo { padding-left: 10px; @@ -2776,7 +2766,7 @@ div.modal-dialog { } } -@media (max-width: 640px) { +@media (width <= 640px) { body { h2 { font-size: 20px; @@ -2788,7 +2778,7 @@ div.modal-dialog { padding-bottom: 10px; .content { - margin: 0px auto; + margin: 0 auto; div.add, div.restore { @@ -2796,6 +2786,7 @@ div.modal-dialog { .input.overlayButton { padding-top: 8px; padding-bottom: 30px; + /* border-bottom: 1px #ddd solid; */ margin-bottom: 10px; @@ -2909,9 +2900,9 @@ div.modal-dialog { border-bottom: none; a { - /*color: transparent; + /* color: transparent; height: 32px; - width: 32px;*/ + width: 32px; */ } } @@ -2946,19 +2937,19 @@ div.modal-dialog { } } -@media (max-width: 580px) { +@media (width <= 580px) { .advancedentry .longdescription { margin-left: 0; } } -@media (max-width: 492px) { +@media (width <= 492px) { ul.notification { width: auto; } } -@media (max-width: 480px) { +@media (width <= 480px) { body { font-size: 15px; @@ -3040,15 +3031,15 @@ div.modal-dialog { } } -@media (max-width: 400px) { +@media (width <= 400px) { body { font-size: 15px; .container { .header { .menubutton { - margin-right: 0px; - padding-left: 0px; + margin-right: 0; + padding-left: 0; padding-right: 40px; span { @@ -3060,7 +3051,7 @@ div.modal-dialog { } } -@media (max-width: 325px) { +@media (width <= 325px) { body { font-size: 15px; @@ -3076,7 +3067,7 @@ div.modal-dialog { } } -@media (max-width: 200px) { +@media (width <= 200px) { body { font-size: 15px; @@ -3084,12 +3075,12 @@ div.modal-dialog { .header { .menubutton { position: static; - margin-top: 0px; + margin-top: 0; } .action-icons-small { clear: right; - margin-top: 0px; + margin-top: 0; } } } diff --git a/Duplicati/Server/webroot/ngax/less/dark.less b/Duplicati/Server/webroot/ngax/less/dark.less index 80a73bf82..58aa1ba5b 100644 --- a/Duplicati/Server/webroot/ngax/less/dark.less +++ b/Duplicati/Server/webroot/ngax/less/dark.less @@ -11,11 +11,11 @@ body { } body .footer { - background-color: #333333 !important; + background-color: #333 !important; } body .header { - background-color: #333333 !important; + background-color: #333 !important; } body #mainmenu { @@ -60,8 +60,9 @@ body .container .body .content div.add .steps .step, body .container .body .cont } body .step3 source-folder-picker, body #folder_path_picker, body #restore_file_picker { - background-color: #ffffff; + background-color: #fff; } + .restorewizard, .addwizard form.styled div.subtext { color: darken(@tColor, 15%); } diff --git a/Duplicati/Server/webroot/ngax/less/form.less b/Duplicati/Server/webroot/ngax/less/form.less index 66e7d2953..a17589fac 100755 --- a/Duplicati/Server/webroot/ngax/less/form.less +++ b/Duplicati/Server/webroot/ngax/less/form.less @@ -89,7 +89,7 @@ form.styled { width: 446px; padding: 0 12px; - -webkit-appearance: menulist-button; + appearance: menulist-button; background: white; border-radius: 2px; height: var(--height); @@ -129,7 +129,7 @@ form.styled { } } -@media (max-width: 480px) { +@media (width <= 480px) { form.styled { input, textarea,