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

N°931 Portal: Start working on UI.

Browse Source
This commit is contained in:
Molkobain
2018-10-01 09:27:07 +02:00
parent 8f55d4054a
commit 4595c565cc
3 changed files with 86 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3213,19 +3213,20 @@ textarea.input-group-sm > .form-control, textarea.input-group-sm > .input-group-
cursor: not-allowed;
}
.label {
display: inline;
display: inline-block;
padding: 0.2em 0.6em 0.3em;
font-size: 75%;
font-weight: bold;
line-height: 1;
color: #fff;
color: #222;
background-color: #fff;
text-align: center;
white-space: nowrap;
vertical-align: baseline;
border-radius: 0.25em;
border-radius: 0px;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.15), 0 0 1px 1px #f1f1f1;
}
a.label:hover, a.label:focus {
color: #fff;
color: #222;
text-decoration: none;
cursor: pointer;
}
@@ -3237,10 +3238,11 @@ a.label:hover, a.label:focus {
top: -1px;
}
.label-default {
background-color: #474949;
color: #222;
background-color: #fff;
}
.label-default[href]:hover, .label-default[href]:focus {
background-color: #2e2f2f;
background-color: #f9f9f9;
}
.label-primary {
background-color: #ea7d1e;
@@ -5044,3 +5046,26 @@ table.dataTable tbody tr.selected a, table.dataTable tbody th.selected a, table.
color: #444;
background-color: #fcfcfc;
}
/* Temp */
.label {
margin-right: 0.4em;
margin-bottom: 0.4em;
padding: 0.5em 0.7em 0.5em;
font-size: 85%;
font-weight: normal;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.15), 0 0 1px 1px #f1f1f1;
}
.label:last-of-type {
margin-right: 0;
}
.selectize-control.multi .selectize-input .attribute-set-item[data-value] {
border-radius: 0;
background-color: #fff;
background-image: none;
border: none;
text-shadow: none;
color: black;
}
.selectize-control.multi .selectize-input .attribute-set-item[data-value] .remove {
border-left: none;
}

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

@@ -4017,20 +4017,21 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
cursor: not-allowed
}
.label {
display: inline;
display: inline-block;
padding: .2em .6em .3em;
font-size: 75%;
font-weight: bold;
line-height: 1;
color: #ffffff;
color: $label-default-color;
background-color: $label-default-bg;
text-align: center;
white-space: nowrap;
vertical-align: baseline;
border-radius: .25em
border-radius: $label-border-radius;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.15), 0 0 1px 1px #f1f1f1;
}
a.label:hover,
a.label:focus {
color: #ffffff;
color: $label-default-color;
text-decoration: none;
cursor: pointer
}
@@ -4042,11 +4043,12 @@ a.label:focus {
top: -1px
}
.label-default {
background-color: #474949
color: $label-default-color;
background-color: $label-default-bg;
}
.label-default[href]:hover,
.label-default[href]:focus {
background-color: #2e2f2f
background-color: darken($label-default-bg, 2.5%);
}
.label-primary {
background-color: $brand-primary
@@ -6163,3 +6165,36 @@ table.dataTable{
}
}
}
/* Temp */
.label{
margin-right: 0.4em;
margin-bottom: 0.4em;
padding: 0.5em 0.7em 0.5em;
font-size: 90%;
font-weight: normal;
//color: $white;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.15), 0 0 1px 1px #f1f1f1;
&:last-of-type{
margin-right: 0;
}
}
.selectize-control.multi .selectize-input .attribute-set-item[data-value]{
border-radius: 0;
background-color: $white;
background-image: none;
border: none;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.15), 0 0 1px 1px #f1f1f1;
text-shadow: none;
color: black;
.remove{
border-left: none;
}
}

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

@@ -602,19 +602,26 @@ $popover-arrow-outer-fallback-color: darken($popover-fallback-border-color, 20%
//== Labels
//
//##
$label-border-radius: $border-radius-base !default;
//** Default label background color
$label-default-color: $btn-default-color !default;
$label-default-bg: $btn-default-bg !default;
//** Primary label background color
$label-primary-bg: $brand-primary !default;
$label-primary-color: $btn-primary-color !default;
$label-primary-bg: $btn-primary-bg !default;
//** Success label background color
$label-success-bg: $brand-success !default;
$label-success-color: $btn-success-color !default;
$label-success-bg: $btn-success-bg !default;
//** Info label background color
$label-info-bg: $brand-info !default;
$label-info-color: $btn-info-color !default;
$label-info-bg: $btn-info-bg !default;
//** Warning label background color
$label-warning-bg: $brand-warning !default;
$label-warning-color: $btn-warning-color !default;
$label-warning-bg: $btn-warning-bg !default;
//** Danger label background color
$label-danger-bg: $brand-danger !default;
$label-danger-color: $btn-danger-color !default;
$label-danger-bg: $btn-danger-bg !default;
//** Default label text color
$label-color: #fff !default;