From 3217c67ff6d915dc21c05174b4182a89a5c2683d Mon Sep 17 00:00:00 2001 From: Benjamin Gamard Date: Thu, 2 Nov 2017 21:00:32 +0100 Subject: [PATCH] flat design --- .../src/partial/docs/settings.security.html | 2 +- .../src/main/webapp/src/style/bootstrap.css | 99 ------------------- docs-web/src/main/webapp/src/style/main.less | 3 +- 3 files changed, 2 insertions(+), 102 deletions(-) diff --git a/docs-web/src/main/webapp/src/partial/docs/settings.security.html b/docs-web/src/main/webapp/src/partial/docs/settings.security.html index 33ed422d..94ab86e3 100644 --- a/docs-web/src/main/webapp/src/partial/docs/settings.security.html +++ b/docs-web/src/main/webapp/src/partial/docs/settings.security.html @@ -1,7 +1,7 @@

- {{ user.totp_enabled ? 'Enabled' : 'Disabled' }} + {{ user.totp_enabled ? 'enabled' : 'disabled' | translate }}

diff --git a/docs-web/src/main/webapp/src/style/bootstrap.css b/docs-web/src/main/webapp/src/style/bootstrap.css index 3d6b3daa..967a5e4f 100644 --- a/docs-web/src/main/webapp/src/style/bootstrap.css +++ b/docs-web/src/main/webapp/src/style/bootstrap.css @@ -1125,9 +1125,6 @@ img { max-width: 100%; height: auto; } -.img-rounded { - border-radius: 6px; -} .img-thumbnail { display: inline-block; max-width: 100%; @@ -1136,7 +1133,6 @@ img { line-height: 1.42857143; background-color: #fff; border: 1px solid #ddd; - border-radius: 4px; -webkit-transition: all .2s ease-in-out; -o-transition: all .2s ease-in-out; transition: all .2s ease-in-out; @@ -1539,16 +1535,12 @@ code { font-size: 90%; color: #c7254e; background-color: #f9f2f4; - border-radius: 4px; } kbd { padding: 2px 4px; font-size: 90%; color: #fff; background-color: #333; - border-radius: 3px; - -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .25); - box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .25); } kbd kbd { padding: 0; @@ -1568,7 +1560,6 @@ pre { word-wrap: break-word; background-color: #f5f5f5; border: 1px solid #ccc; - border-radius: 4px; } pre code { padding: 0; @@ -1576,7 +1567,6 @@ pre code { color: inherit; white-space: pre-wrap; background-color: transparent; - border-radius: 0; } .pre-scrollable { max-height: 340px; @@ -2559,7 +2549,6 @@ output { background-color: #fff; background-image: none; border: 1px solid #ccc; - border-radius: 4px; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s; @@ -2569,8 +2558,6 @@ output { .form-control:focus { border-color: #66afe9; outline: 0; - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6); - box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6); } .form-control::-moz-placeholder { color: #999; @@ -2711,7 +2698,6 @@ fieldset[disabled] .checkbox label { padding: 5px 10px; font-size: 12px; line-height: 1.5; - border-radius: 3px; } select.input-sm { height: 30px; @@ -2726,7 +2712,6 @@ select[multiple].input-sm { padding: 5px 10px; font-size: 12px; line-height: 1.5; - border-radius: 3px; } .form-group-sm select.form-control { height: 30px; @@ -2748,7 +2733,6 @@ select[multiple].input-sm { padding: 10px 16px; font-size: 18px; line-height: 1.3333333; - border-radius: 6px; } select.input-lg { height: 46px; @@ -2763,7 +2747,6 @@ select[multiple].input-lg { padding: 10px 16px; font-size: 18px; line-height: 1.3333333; - border-radius: 6px; } .form-group-lg select.form-control { height: 46px; @@ -3021,7 +3004,6 @@ select[multiple].input-lg { user-select: none; background-image: none; border: 1px solid transparent; - border-radius: 4px; } .btn:focus, .btn:active:focus, @@ -3404,7 +3386,6 @@ fieldset[disabled] .btn-danger.focus { .btn-link { font-weight: normal; color: #337ab7; - border-radius: 0; } .btn-link, .btn-link:active, @@ -3439,21 +3420,18 @@ fieldset[disabled] .btn-link:focus { padding: 10px 16px; font-size: 18px; line-height: 1.3333333; - border-radius: 6px; } .btn-sm, .btn-group-sm > .btn { padding: 5px 10px; font-size: 12px; line-height: 1.5; - border-radius: 3px; } .btn-xs, .btn-group-xs > .btn { padding: 1px 5px; font-size: 12px; line-height: 1.5; - border-radius: 3px; } .btn-block { display: block; @@ -3538,7 +3516,6 @@ tbody.collapse.in { background-clip: padding-box; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, .15); - border-radius: 4px; -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175); box-shadow: 0 6px 12px rgba(0, 0, 0, .175); } @@ -3685,9 +3662,6 @@ tbody.collapse.in { .btn-toolbar > .input-group { margin-left: 5px; } -.btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) { - border-radius: 0; -} .btn-group > .btn:first-child { margin-left: 0; } @@ -3703,9 +3677,6 @@ tbody.collapse.in { .btn-group > .btn-group { float: left; } -.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn { - border-radius: 0; -} .btn-group > .btn-group:first-child:not(:last-child) > .btn:last-child, .btn-group > .btn-group:first-child:not(:last-child) > .dropdown-toggle { border-top-right-radius: 0; @@ -3763,9 +3734,6 @@ tbody.collapse.in { margin-top: -1px; margin-left: 0; } -.btn-group-vertical > .btn:not(:first-child):not(:last-child) { - border-radius: 0; -} .btn-group-vertical > .btn:first-child:not(:last-child) { border-top-left-radius: 4px; border-top-right-radius: 4px; @@ -3778,9 +3746,6 @@ tbody.collapse.in { border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; } -.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { - border-radius: 0; -} .btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child, .btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle { border-bottom-right-radius: 0; @@ -3843,7 +3808,6 @@ tbody.collapse.in { padding: 10px 16px; font-size: 18px; line-height: 1.3333333; - border-radius: 6px; } select.input-group-lg > .form-control, select.input-group-lg > .input-group-addon, @@ -3866,7 +3830,6 @@ select[multiple].input-group-lg > .input-group-btn > .btn { padding: 5px 10px; font-size: 12px; line-height: 1.5; - border-radius: 3px; } select.input-group-sm > .form-control, select.input-group-sm > .input-group-addon, @@ -3887,11 +3850,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .input-group .form-control { display: table-cell; } -.input-group-addon:not(:first-child):not(:last-child), -.input-group-btn:not(:first-child):not(:last-child), -.input-group .form-control:not(:first-child):not(:last-child) { - border-radius: 0; -} .input-group-addon, .input-group-btn { width: 1%; @@ -3907,17 +3865,14 @@ select[multiple].input-group-sm > .input-group-btn > .btn { text-align: center; background-color: #eee; border: 1px solid #ccc; - border-radius: 4px; } .input-group-addon.input-sm { padding: 5px 10px; font-size: 12px; - border-radius: 3px; } .input-group-addon.input-lg { padding: 10px 16px; font-size: 18px; - border-radius: 6px; } .input-group-addon input[type="radio"], .input-group-addon input[type="checkbox"] { @@ -4029,7 +3984,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn { margin-right: 2px; line-height: 1.42857143; border: 1px solid transparent; - border-radius: 4px 4px 0 0; } .nav-tabs > li > a:hover { border-color: #eee #eee #ddd; @@ -4069,7 +4023,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } .nav-tabs.nav-justified > li > a { margin-right: 0; - border-radius: 4px; } .nav-tabs.nav-justified > .active > a, .nav-tabs.nav-justified > .active > a:hover, @@ -4079,7 +4032,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn { @media (min-width: 768px) { .nav-tabs.nav-justified > li > a { border-bottom: 1px solid #ddd; - border-radius: 4px 4px 0 0; } .nav-tabs.nav-justified > .active > a, .nav-tabs.nav-justified > .active > a:hover, @@ -4090,9 +4042,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .nav-pills > li { float: left; } -.nav-pills > li > a { - border-radius: 4px; -} .nav-pills > li + li { margin-left: 2px; } @@ -4137,7 +4086,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } .nav-tabs-justified > li > a { margin-right: 0; - border-radius: 4px; } .nav-tabs-justified > .active > a, .nav-tabs-justified > .active > a:hover, @@ -4147,7 +4095,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn { @media (min-width: 768px) { .nav-tabs-justified > li > a { border-bottom: 1px solid #ddd; - border-radius: 4px 4px 0 0; } .nav-tabs-justified > .active > a, .nav-tabs-justified > .active > a:hover, @@ -4172,11 +4119,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn { margin-bottom: 20px; border: 1px solid transparent; } -@media (min-width: 768px) { - .navbar { - border-radius: 4px; - } -} @media (min-width: 768px) { .navbar-header { float: left; @@ -4247,11 +4189,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn { z-index: 1000; border-width: 0 0 1px; } -@media (min-width: 768px) { - .navbar-static-top { - border-radius: 0; - } -} .navbar-fixed-top, .navbar-fixed-bottom { position: fixed; @@ -4259,12 +4196,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn { left: 0; z-index: 1030; } -@media (min-width: 768px) { - .navbar-fixed-top, - .navbar-fixed-bottom { - border-radius: 0; - } -} .navbar-fixed-top { top: 0; border-width: 0 0 1px; @@ -4304,7 +4235,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn { background-color: transparent; background-image: none; border: 1px solid transparent; - border-radius: 4px; } .navbar-toggle:focus { outline: 0; @@ -4313,7 +4243,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn { display: block; width: 22px; height: 2px; - border-radius: 1px; } .navbar-toggle .icon-bar + .icon-bar { margin-top: 4px; @@ -4593,7 +4522,6 @@ fieldset[disabled] .navbar-default .btn-link:focus { } .navbar-inverse { background-color: #222; - border-color: #080808; } .navbar-inverse .navbar-brand { color: #9d9d9d; @@ -4698,7 +4626,6 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { margin-bottom: 20px; list-style: none; background-color: #f5f5f5; - border-radius: 4px; } .breadcrumb > li { display: inline-block; @@ -4715,7 +4642,6 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { display: inline-block; padding-left: 0; margin: 20px 0; - border-radius: 4px; } .pagination > li { display: inline; @@ -4822,7 +4748,6 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { padding: 5px 14px; background-color: #fff; border: 1px solid #ddd; - border-radius: 15px; } .pager li > a:hover, .pager li > a:focus { @@ -4855,7 +4780,6 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { text-align: center; white-space: nowrap; vertical-align: baseline; - border-radius: .25em; } a.label:hover, a.label:focus { @@ -4924,7 +4848,6 @@ a.label:focus { white-space: nowrap; vertical-align: middle; background-color: #777; - border-radius: 10px; } .badge:empty { display: none; @@ -4981,7 +4904,6 @@ a.badge:focus { .container-fluid .jumbotron { padding-right: 15px; padding-left: 15px; - border-radius: 6px; } .jumbotron .container { max-width: 100%; @@ -5008,7 +4930,6 @@ a.badge:focus { line-height: 1.42857143; background-color: #fff; border: 1px solid #ddd; - border-radius: 4px; -webkit-transition: border .2s ease-in-out; -o-transition: border .2s ease-in-out; transition: border .2s ease-in-out; @@ -5031,7 +4952,6 @@ a.thumbnail.active { padding: 15px; margin-bottom: 20px; border: 1px solid transparent; - border-radius: 4px; } .alert h4 { margin-top: 0; @@ -5131,9 +5051,6 @@ a.thumbnail.active { margin-bottom: 20px; overflow: hidden; background-color: #f5f5f5; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1); } .progress-bar { float: left; @@ -5144,8 +5061,6 @@ a.thumbnail.active { 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; transition: width .6s ease; @@ -5454,7 +5369,6 @@ button.list-group-item-danger.active:focus { margin-bottom: 20px; background-color: #fff; border: 1px solid transparent; - border-radius: 4px; -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, .05); box-shadow: 0 1px 1px rgba(0, 0, 0, .05); } @@ -5497,7 +5411,6 @@ button.list-group-item-danger.active:focus { .panel > .list-group .list-group-item, .panel > .panel-collapse > .list-group .list-group-item { border-width: 1px 0; - border-radius: 0; } .panel > .list-group:first-child .list-group-item:first-child, .panel > .panel-collapse > .list-group:first-child .list-group-item:first-child { @@ -5667,7 +5580,6 @@ button.list-group-item-danger.active:focus { } .panel-group .panel { margin-bottom: 0; - border-radius: 4px; } .panel-group .panel + .panel { margin-top: 5px; @@ -5824,10 +5736,6 @@ button.list-group-item-danger.active:focus { padding: 19px; margin-bottom: 20px; background-color: #f5f5f5; - border: 1px solid #e3e3e3; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05); } .well blockquote { border-color: #ddd; @@ -5835,11 +5743,9 @@ button.list-group-item-danger.active:focus { } .well-lg { padding: 24px; - border-radius: 6px; } .well-sm { padding: 9px; - border-radius: 3px; } .close { float: right; @@ -5912,7 +5818,6 @@ button.close { background-clip: padding-box; border: 1px solid #999; border: 1px solid rgba(0, 0, 0, .2); - border-radius: 6px; outline: 0; -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, .5); box-shadow: 0 3px 9px rgba(0, 0, 0, .5); @@ -6039,7 +5944,6 @@ button.close { color: #fff; text-align: center; background-color: #000; - border-radius: 4px; } .tooltip-arrow { position: absolute; @@ -6132,7 +6036,6 @@ button.close { background-clip: padding-box; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, .2); - border-radius: 6px; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, .2); box-shadow: 0 5px 10px rgba(0, 0, 0, .2); @@ -6156,7 +6059,6 @@ button.close { font-size: 14px; background-color: #f7f7f7; border-bottom: 1px solid #ebebeb; - border-radius: 5px 5px 0 0; } .popover-content { padding: 9px 14px; @@ -6411,7 +6313,6 @@ button.close { background-color: #000 \9; background-color: rgba(0, 0, 0, 0); border: 1px solid #fff; - border-radius: 10px; } .carousel-indicators .active { width: 12px; diff --git a/docs-web/src/main/webapp/src/style/main.less b/docs-web/src/main/webapp/src/style/main.less index 95c27a17..652397f6 100644 --- a/docs-web/src/main/webapp/src/style/main.less +++ b/docs-web/src/main/webapp/src/style/main.less @@ -268,7 +268,6 @@ input[readonly].share-link { .login-box { background: rgba(255, 255, 255, 0.5); padding: 20px; - border-radius: 4px; .help-block, .checkbox { color: white; @@ -309,4 +308,4 @@ input[readonly].share-link { left: 0; right: 0; z-index: 99999; -} \ No newline at end of file +}