composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-22 00:32:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Portal: CSS Fixes (lack of consistency with border-radius)

Browse Source 
SVN:trunk[5293]
This commit is contained in:
Guillaume Lajarige
2018-01-24 14:21:36 +00:00
parent 07849922b8
commit d531ec846f
3 changed files with 82 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.css vendored
View File

@@ -404,7 +404,7 @@ pre code {
color: inherit; color: inherit;
white-space: pre-wrap; white-space: pre-wrap;
background-color: transparent; background-color: transparent;
border-radius: 0; border-radius: 0px;
} }
.pre-scrollable { .pre-scrollable {
max-height: 340px; max-height: 340px;
@@ -1882,7 +1882,7 @@ a.btn.disabled, fieldset[disabled] a.btn {
.btn-link { .btn-link {
color: #ea7d1e; color: #ea7d1e;
font-weight: normal; font-weight: normal;
border-radius: 0; border-radius: 0px;
} }
.btn-link, .btn-link:active, .btn-link.active, .btn-link[disabled], fieldset[disabled] .btn-link { .btn-link, .btn-link:active, .btn-link.active, .btn-link[disabled], fieldset[disabled] .btn-link {
background-color: transparent; background-color: transparent;
@@ -2133,32 +2133,32 @@ tbody.collapse.in {
margin-left: 5px; margin-left: 5px;
} }
.btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) { .btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
border-radius: 0; border-radius: 0px;
} }
.btn-group > .btn:first-child { .btn-group > .btn:first-child {
margin-left: 0; margin-left: 0;
} }
.btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) { .btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) {
border-bottom-right-radius: 0; border-bottom-right-radius: 0px;
border-top-right-radius: 0; border-top-right-radius: 0px;
} }
.btn-group > .btn:last-child:not(:first-child), .btn-group > .dropdown-toggle:not(:first-child) { .btn-group > .btn:last-child:not(:first-child), .btn-group > .dropdown-toggle:not(:first-child) {
border-bottom-left-radius: 0; border-bottom-left-radius: 0px;
border-top-left-radius: 0; border-top-left-radius: 0px;
} }
.btn-group > .btn-group { .btn-group > .btn-group {
float: left; float: left;
} }
.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn { .btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
border-radius: 0; border-radius: 0px;
} }
.btn-group > .btn-group:first-child:not(:last-child) > .btn:last-child, .btn-group > .btn-group:first-child:not(:last-child) > .dropdown-toggle { .btn-group > .btn-group:first-child:not(:last-child) > .btn:last-child, .btn-group > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
border-bottom-right-radius: 0; border-bottom-right-radius: 0px;
border-top-right-radius: 0; border-top-right-radius: 0px;
} }
.btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child { .btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child {
border-bottom-left-radius: 0; border-bottom-left-radius: 0px;
border-top-left-radius: 0; border-top-left-radius: 0px;
} }
.btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle { .btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle {
outline: 0; outline: 0;
@@ -2203,28 +2203,28 @@ tbody.collapse.in {
margin-left: 0; margin-left: 0;
} }
.btn-group-vertical > .btn:not(:first-child):not(:last-child) { .btn-group-vertical > .btn:not(:first-child):not(:last-child) {
border-radius: 0; border-radius: 0px;
} }
.btn-group-vertical > .btn:first-child:not(:last-child) { .btn-group-vertical > .btn:first-child:not(:last-child) {
border-top-right-radius: 4px; border-top-right-radius: 0px;
border-bottom-right-radius: 0; border-bottom-right-radius: 0px;
border-bottom-left-radius: 0; border-bottom-left-radius: 0px;
} }
.btn-group-vertical > .btn:last-child:not(:first-child) { .btn-group-vertical > .btn:last-child:not(:first-child) {
border-bottom-left-radius: 4px; border-bottom-left-radius: 0px;
border-top-right-radius: 0; border-top-right-radius: 0px;
border-top-left-radius: 0; border-top-left-radius: 0px;
} }
.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
border-radius: 0; border-radius: 0px;
} }
.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 { .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; border-bottom-right-radius: 0px;
border-bottom-left-radius: 0; border-bottom-left-radius: 0px;
} }
.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child { .btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {
border-top-right-radius: 0; border-top-right-radius: 0px;
border-top-left-radius: 0; border-top-left-radius: 0px;
} }
.btn-group-justified { .btn-group-justified {
display: table; display: table;
@@ -2297,7 +2297,7 @@ textarea.input-group-sm > .form-control, textarea.input-group-sm > .input-group-
display: table-cell; 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) { .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; border-radius: 0px;
} }
.input-group-addon, .input-group-btn { .input-group-addon, .input-group-btn {
width: 1%; width: 1%;
@@ -2329,15 +2329,15 @@ textarea.input-group-sm > .form-control, textarea.input-group-sm > .input-group-
margin-top: 0; margin-top: 0;
} }
.input-group .form-control:first-child, .input-group-addon:first-child, .input-group-btn:first-child > .btn, .input-group-btn:first-child > .btn-group > .btn, .input-group-btn:first-child > .dropdown-toggle, .input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle), .input-group-btn:last-child > .btn-group:not(:last-child) > .btn { .input-group .form-control:first-child, .input-group-addon:first-child, .input-group-btn:first-child > .btn, .input-group-btn:first-child > .btn-group > .btn, .input-group-btn:first-child > .dropdown-toggle, .input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle), .input-group-btn:last-child > .btn-group:not(:last-child) > .btn {
border-bottom-right-radius: 0; border-bottom-right-radius: 0px;
border-top-right-radius: 0; border-top-right-radius: 0px;
} }
.input-group-addon:first-child { .input-group-addon:first-child {
border-right: 0; border-right: 0;
} }
.input-group .form-control:last-child, .input-group-addon:last-child, .input-group-btn:last-child > .btn, .input-group-btn:last-child > .btn-group > .btn, .input-group-btn:last-child > .dropdown-toggle, .input-group-btn:first-child > .btn:not(:first-child), .input-group-btn:first-child > .btn-group:not(:first-child) > .btn { .input-group .form-control:last-child, .input-group-addon:last-child, .input-group-btn:last-child > .btn, .input-group-btn:last-child > .btn-group > .btn, .input-group-btn:last-child > .dropdown-toggle, .input-group-btn:first-child > .btn:not(:first-child), .input-group-btn:first-child > .btn-group:not(:first-child) > .btn {
border-bottom-left-radius: 0; border-bottom-left-radius: 0px;
border-top-left-radius: 0; border-top-left-radius: 0px;
} }
.input-group-addon:last-child { .input-group-addon:last-child {
border-left: 0; border-left: 0;
@@ -3129,12 +3129,12 @@ textarea.input-group-sm > .form-control, textarea.input-group-sm > .input-group-
} }
.pagination > li:first-child > a, .pagination > li:first-child > span { .pagination > li:first-child > a, .pagination > li:first-child > span {
margin-left: 0; margin-left: 0;
border-bottom-left-radius: 4px; border-bottom-left-radius: 0px;
border-top-left-radius: 4px; border-top-left-radius: 0px;
} }
.pagination > li:last-child > a, .pagination > li:last-child > span { .pagination > li:last-child > a, .pagination > li:last-child > span {
border-bottom-right-radius: 4px; border-bottom-right-radius: 0px;
border-top-right-radius: 4px; border-top-right-radius: 0px;
} }
.pagination > li > a:hover, .pagination > li > span:hover, .pagination > li > a:focus, .pagination > li > span:focus { .pagination > li > a:hover, .pagination > li > span:hover, .pagination > li > a:focus, .pagination > li > span:focus {
z-index: 3; z-index: 3;
@@ -3598,13 +3598,13 @@ a.thumbnail:hover, a.thumbnail:focus, a.thumbnail.active {
border: 1px solid #ddd; border: 1px solid #ddd;
} }
.list-group-item:first-child { .list-group-item:first-child {
border-top-right-radius: 4px; border-top-right-radius: 0px;
border-top-left-radius: 4px; border-top-left-radius: 0px;
} }
.list-group-item:last-child { .list-group-item:last-child {
margin-bottom: 0; margin-bottom: 0;
border-bottom-right-radius: 4px; border-bottom-right-radius: 0px;
border-bottom-left-radius: 4px; border-bottom-left-radius: 0px;
} }
a.list-group-item, button.list-group-item { a.list-group-item, button.list-group-item {
color: #555; color: #555;
@@ -3774,7 +3774,7 @@ a.list-group-item-danger.active, button.list-group-item-danger.active, a.list-gr
} }
.panel > .list-group .list-group-item, .panel > .panel-collapse > .list-group .list-group-item { .panel > .list-group .list-group-item, .panel > .panel-collapse > .list-group .list-group-item {
border-width: 1px 0; border-width: 1px 0;
border-radius: 0; border-radius: 0px;
} }
.panel > .list-group:first-child .list-group-item:first-child, .panel > .panel-collapse > .list-group:first-child .list-group-item:first-child { .panel > .list-group:first-child .list-group-item:first-child, .panel > .panel-collapse > .list-group:first-child .list-group-item:first-child {
border-top: 0; border-top: 0;
@@ -3788,8 +3788,8 @@ a.list-group-item-danger.active, button.list-group-item-danger.active, a.list-gr
border-bottom-left-radius: 0px; border-bottom-left-radius: 0px;
} }
.panel > .panel-heading + .panel-collapse > .list-group .list-group-item:first-child { .panel > .panel-heading + .panel-collapse > .list-group .list-group-item:first-child {
border-top-right-radius: 0; border-top-right-radius: 0px;
border-top-left-radius: 0; border-top-left-radius: 0px;
} }
.panel-heading + .list-group .list-group-item:first-child { .panel-heading + .list-group .list-group-item:first-child {
border-top-width: 0; border-top-width: 0;

80
datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.scss vendored
View File

@@ -527,7 +527,7 @@ pre code {
color: inherit; color: inherit;
white-space: pre-wrap; white-space: pre-wrap;
background-color: transparent; background-color: transparent;
border-radius: 0 border-radius: $border-radius-base
} }
.pre-scrollable { .pre-scrollable {
max-height: 340px; max-height: 340px;
@@ -2487,7 +2487,7 @@ fieldset[disabled] .btn-danger.active {
.btn-link { .btn-link {
color: $brand-primary; color: $brand-primary;
font-weight: normal; font-weight: normal;
border-radius: 0 border-radius: $border-radius-base
} }
.btn-link, .btn-link,
.btn-link:active, .btn-link:active,
@@ -2779,34 +2779,34 @@ tbody.collapse.in {
margin-left: 5px margin-left: 5px
} }
.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle) { .btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
border-radius: 0 border-radius: $border-radius-base
} }
.btn-group>.btn:first-child { .btn-group>.btn:first-child {
margin-left: 0 margin-left: 0
} }
.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle) { .btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle) {
border-bottom-right-radius: 0; border-bottom-right-radius: $border-radius-base;
border-top-right-radius: 0 border-top-right-radius: $border-radius-base
} }
.btn-group>.btn:last-child:not(:first-child), .btn-group>.btn:last-child:not(:first-child),
.btn-group>.dropdown-toggle:not(:first-child) { .btn-group>.dropdown-toggle:not(:first-child) {
border-bottom-left-radius: 0; border-bottom-left-radius: $border-radius-base;
border-top-left-radius: 0 border-top-left-radius: $border-radius-base
} }
.btn-group>.btn-group { .btn-group>.btn-group {
float: left float: left
} }
.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn { .btn-group>.btn-group:not(:first-child):not(:last-child)>.btn {
border-radius: 0 border-radius: $border-radius-base
} }
.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child, .btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,
.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle { .btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle {
border-bottom-right-radius: 0; border-bottom-right-radius: $border-radius-base;
border-top-right-radius: 0 border-top-right-radius: $border-radius-base
} }
.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child { .btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child {
border-bottom-left-radius: 0; border-bottom-left-radius: $border-radius-base;
border-top-left-radius: 0 border-top-left-radius: $border-radius-base
} }
.btn-group .dropdown-toggle:active, .btn-group .dropdown-toggle:active,
.btn-group.open .dropdown-toggle { .btn-group.open .dropdown-toggle {
@@ -2857,29 +2857,29 @@ tbody.collapse.in {
margin-left: 0 margin-left: 0
} }
.btn-group-vertical>.btn:not(:first-child):not(:last-child) { .btn-group-vertical>.btn:not(:first-child):not(:last-child) {
border-radius: 0 border-radius: $border-radius-base
} }
.btn-group-vertical>.btn:first-child:not(:last-child) { .btn-group-vertical>.btn:first-child:not(:last-child) {
border-top-right-radius: 4px; border-top-right-radius: $border-radius-base;
border-bottom-right-radius: 0; border-bottom-right-radius: $border-radius-base;
border-bottom-left-radius: 0 border-bottom-left-radius: $border-radius-base
} }
.btn-group-vertical>.btn:last-child:not(:first-child) { .btn-group-vertical>.btn:last-child:not(:first-child) {
border-bottom-left-radius: 4px; border-bottom-left-radius: $border-radius-base;
border-top-right-radius: 0; border-top-right-radius: $border-radius-base;
border-top-left-radius: 0 border-top-left-radius: $border-radius-base
} }
.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn { .btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn {
border-radius: 0 border-radius: $border-radius-base
} }
.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child, .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 { .btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle {
border-bottom-right-radius: 0; border-bottom-right-radius: $border-radius-base;
border-bottom-left-radius: 0 border-bottom-left-radius: $border-radius-base
} }
.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child { .btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child {
border-top-right-radius: 0; border-top-right-radius: $border-radius-base;
border-top-left-radius: 0 border-top-left-radius: $border-radius-base
} }
.btn-group-justified { .btn-group-justified {
display: table; display: table;
@@ -2978,7 +2978,7 @@ select[multiple].input-group-sm>.input-group-btn>.btn {
.input-group-addon:not(:first-child):not(:last-child), .input-group-addon:not(:first-child):not(:last-child),
.input-group-btn: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) { .input-group .form-control:not(:first-child):not(:last-child) {
border-radius: 0 border-radius: $border-radius-base
} }
.input-group-addon, .input-group-addon,
.input-group-btn { .input-group-btn {
@@ -3018,8 +3018,8 @@ select[multiple].input-group-sm>.input-group-btn>.btn {
.input-group-btn:first-child>.dropdown-toggle, .input-group-btn:first-child>.dropdown-toggle,
.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle), .input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle),
.input-group-btn:last-child>.btn-group:not(:last-child)>.btn { .input-group-btn:last-child>.btn-group:not(:last-child)>.btn {
border-bottom-right-radius: 0; border-bottom-right-radius: $border-radius-base;
border-top-right-radius: 0 border-top-right-radius: $border-radius-base
} }
.input-group-addon:first-child { .input-group-addon:first-child {
border-right: 0 border-right: 0
@@ -3031,8 +3031,8 @@ select[multiple].input-group-sm>.input-group-btn>.btn {
.input-group-btn:last-child>.dropdown-toggle, .input-group-btn:last-child>.dropdown-toggle,
.input-group-btn:first-child>.btn:not(:first-child), .input-group-btn:first-child>.btn:not(:first-child),
.input-group-btn:first-child>.btn-group:not(:first-child)>.btn { .input-group-btn:first-child>.btn-group:not(:first-child)>.btn {
border-bottom-left-radius: 0; border-bottom-left-radius: $border-radius-base;
border-top-left-radius: 0 border-top-left-radius: $border-radius-base
} }
.input-group-addon:last-child { .input-group-addon:last-child {
border-left: 0 border-left: 0
@@ -3906,13 +3906,13 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
.pagination>li:first-child>a, .pagination>li:first-child>a,
.pagination>li:first-child>span { .pagination>li:first-child>span {
margin-left: 0; margin-left: 0;
border-bottom-left-radius: 4px; border-bottom-left-radius: $border-radius-base;
border-top-left-radius: 4px border-top-left-radius: $border-radius-base
} }
.pagination>li:last-child>a, .pagination>li:last-child>a,
.pagination>li:last-child>span { .pagination>li:last-child>span {
border-bottom-right-radius: 4px; border-bottom-right-radius: $border-radius-base;
border-top-right-radius: 4px border-top-right-radius: $border-radius-base
} }
.pagination>li>a:hover, .pagination>li>a:hover,
.pagination>li>span:hover, .pagination>li>span:hover,
@@ -4429,13 +4429,13 @@ a.thumbnail.active {
border: 1px solid #dddddd border: 1px solid #dddddd
} }
.list-group-item:first-child { .list-group-item:first-child {
border-top-right-radius: 4px; border-top-right-radius: $border-radius-base;
border-top-left-radius: 4px border-top-left-radius: $border-radius-base
} }
.list-group-item:last-child { .list-group-item:last-child {
margin-bottom: 0; margin-bottom: 0;
border-bottom-right-radius: 4px; border-bottom-right-radius: $border-radius-base;
border-bottom-left-radius: 4px border-bottom-left-radius: $border-radius-base
} }
a.list-group-item, a.list-group-item,
button.list-group-item { button.list-group-item {
@@ -4674,7 +4674,7 @@ button.list-group-item-danger.active:focus {
.panel>.list-group .list-group-item, .panel>.list-group .list-group-item,
.panel>.panel-collapse>.list-group .list-group-item { .panel>.panel-collapse>.list-group .list-group-item {
border-width: 1px 0; border-width: 1px 0;
border-radius: 0 border-radius: $border-radius-base
} }
.panel>.list-group:first-child .list-group-item:first-child, .panel>.list-group:first-child .list-group-item:first-child,
.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child { .panel>.panel-collapse>.list-group:first-child .list-group-item:first-child {
@@ -4690,8 +4690,8 @@ button.list-group-item-danger.active:focus {
border-bottom-left-radius: $border-radius-base border-bottom-left-radius: $border-radius-base
} }
.panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child { .panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child {
border-top-right-radius: 0; border-top-right-radius: $border-radius-base;
border-top-left-radius: 0 border-top-left-radius: $border-radius-base
} }
.panel-heading+.list-group .list-group-item:first-child { .panel-heading+.list-group .list-group-item:first-child {
border-top-width: 0 border-top-width: 0

4
datamodels/2.x/itop-portal-base/portal/web/css/variables.scss
View File

@@ -509,7 +509,7 @@ $pagination-disabled-border: #ddd !default;
$pager-bg: $pagination-bg !default; $pager-bg: $pagination-bg !default;
$pager-border: $pagination-border !default; $pager-border: $pagination-border !default;
$pager-border-radius: 15px !default; $pager-border-radius: $border-radius-base !default;
$pager-hover-bg: $brand-primary !default; $pager-hover-bg: $brand-primary !default;
@@ -825,7 +825,7 @@ $badge-active-bg: #fff !default;
$badge-font-weight: bold !default; $badge-font-weight: bold !default;
$badge-line-height: 1 !default; $badge-line-height: 1 !default;
$badge-border-radius: 10px !default; $badge-border-radius: $border-radius-base !default;
//== Breadcrumbs //== Breadcrumbs