N°1370 ManageBrick charts tile : integrate CSS in portal.scss

SVN:trunk[5693]
This commit is contained in:
Pierre Goiffon
2018-04-18 15:16:04 +00:00
parent 182e644a33
commit 5d6ec4ce56
3 changed files with 390 additions and 413 deletions

View File

@@ -1,7 +1,7 @@
{# itop-portal-dashlet-basic/tile.html.twig #} {# itop-portal-dashlet-basic/tile.html.twig #}
{# Image brick tile layout #} {# Image brick tile layout #}
<div class="col-xs-12 col-sm-{{ oBrick.GetWidth }}"> <div class="col-xs-12 col-sm-{{ oBrick.GetWidth }} tile-chart">
{% block pTileWrapper %} {% block pTileWrapper %}
<a href="{{ app.url_generator.generate('p_manage_brick', {'sBrickId': sBrickId, 'sDisplayType': oBrick.GetDisplayType}) }}{% if app['combodo.portal.instance.routes'][oBrick.GetRouteName]['hash'] is defined %}#{{ app['combodo.portal.instance.routes'][oBrick.GetRouteName]['hash'] }}{% endif %}" <a href="{{ app.url_generator.generate('p_manage_brick', {'sBrickId': sBrickId, 'sDisplayType': oBrick.GetDisplayType}) }}{% if app['combodo.portal.instance.routes'][oBrick.GetRouteName]['hash'] is defined %}#{{ app['combodo.portal.instance.routes'][oBrick.GetRouteName]['hash'] }}{% endif %}"
{% if app['combodo.portal.instance.routes'][oBrick.GetRouteName]['navigation_menu_attr'] is defined %}{% for key, value in app['combodo.portal.instance.routes'][oBrick.GetRouteName]['navigation_menu_attr'] %} {{ key }}="{{ value }}"{% endfor %}{% endif %} {% if app['combodo.portal.instance.routes'][oBrick.GetRouteName]['navigation_menu_attr'] is defined %}{% for key, value in app['combodo.portal.instance.routes'][oBrick.GetRouteName]['navigation_menu_attr'] %} {{ key }}="{{ value }}"{% endfor %}{% endif %}
@@ -9,9 +9,8 @@
class="tile{# vertical-center#}" class="tile{# vertical-center#}"
id="brick-{{ oBrick.GetId }}" id="brick-{{ oBrick.GetId }}"
data-brick-id="{{ oBrick.GetId }}"> data-brick-id="{{ oBrick.GetId }}">
<div style="background-color:#fff;padding:0.25em;"> <div>
<div class="tile_title"><span <div class="tile_title"><span class="icon fa fa-{{ oBrick.GetDisplayType }}"></span> {{ oBrick.GetTitle()|dict_s }}
class="icon fa fa-{{ oBrick.GetDisplayType }}"></span> {{ oBrick.GetTitle()|dict_s }}
({{ iCount }})</span> </div> ({{ iCount }})</span> </div>
{% include 'itop-portal-base/portal/src/views/bricks/manage/mode-' ~ oBrick.GetDisplayType ~ '.html.twig' with {'oBrick': oBrick, 'aColumns': aColumns, 'aNames': aNames, 'aUrls': aUrls, 'aDisplayValues': aDisplayValues} %} {% include 'itop-portal-base/portal/src/views/bricks/manage/mode-' ~ oBrick.GetDisplayType ~ '.html.twig' with {'oBrick': oBrick, 'aColumns': aColumns, 'aNames': aNames, 'aUrls': aUrls, 'aDisplayValues': aDisplayValues} %}
</div> </div>

View File

@@ -381,6 +381,9 @@ footer {
.home div.tile-badge > a.tile > div > div.tile_body > div.tile_description { .home div.tile-badge > a.tile > div > div.tile_body > div.tile_description {
text-align: right; text-align: right;
} }
.home div.tile-chart > a > div {
padding: 0.25em;
}
@media (min-width: 768px) { @media (min-width: 768px) {
.home .tile { .home .tile {
display: block; display: block;
@@ -760,38 +763,30 @@ table .group-actions {
top: 12px; top: 12px;
right: 6px; right: 6px;
} }
.mosaic-group-item > .mosaic-group-item-actions > .glyphicon { .mosaic-group-item > .mosaic-group-item-actions > .glyphicon {
margin-top: 5px; margin-top: 5px;
} }
.mosaic-group-item-actions > a { .mosaic-group-item-actions > a {
font-size: 20px; font-size: 20px;
} }
.mosaic-item-image { .mosaic-item-image {
width: 55px; width: 55px;
padding: 10px; padding: 10px;
} }
.mosaic-item-image > img { .mosaic-item-image > img {
max-height: 30px; max-height: 30px;
} }
.mosaic-item-name { .mosaic-item-name {
font-size: 14px; font-size: 14px;
max-height: 50px; max-height: 50px;
overflow: hidden; overflow: hidden;
} }
.mosaic-item-description { .mosaic-item-description {
display: none; display: none;
} }
.mosaic-item-layout-2 .mosaic-item-description { .mosaic-item-layout-2 .mosaic-item-description {
display: block; display: block;
} }
.mosaic-item-layout-5 .mosaic-item-name, .mosaic-item-layout-7 .mosaic-item-name { .mosaic-item-layout-5 .mosaic-item-name, .mosaic-item-layout-7 .mosaic-item-name {
padding-right: 40px; padding-right: 40px;
} }
@@ -811,21 +806,17 @@ table .group-actions {
/* We don't put 2% to keep a margin in case of a bad browser rendering */ /* We don't put 2% to keep a margin in case of a bad browser rendering */
word-break: break-word; word-break: break-word;
} }
.mosaic-item { .mosaic-item {
padding: 10px; padding: 10px;
} }
.mosaic-item:hover, .mosaic-item:focus { .mosaic-item:hover, .mosaic-item:focus {
background-color: #ea7d1e; background-color: #ea7d1e;
box-shadow: 0px 3px 5px rgba(0, 0, 0, 0.20); box-shadow: 0px 3px 5px rgba(0, 0, 0, 0.20);
} }
.mosaic-item-text .mosaic-item-text-wrapper { .mosaic-item-text .mosaic-item-text-wrapper {
max-height: 100px; max-height: 100px;
/* Must be .mosaic-item absolute height (in px) */ /* Must be .mosaic-item absolute height (in px) */
} }
.mosaic-item-name { .mosaic-item-name {
max-height: 100%; max-height: 100%;
/* It's ok if description is pushed down and not visible; but we truncate before it flows out of the tile */ /* It's ok if description is pushed down and not visible; but we truncate before it flows out of the tile */
@@ -833,20 +824,16 @@ table .group-actions {
font-weight: 600; font-weight: 600;
font-size: 12px; font-size: 12px;
} }
.mosaic-item-description { .mosaic-item-description {
overflow: hidden; overflow: hidden;
} }
.mosaic-item-layout-1 .mosaic-item-name { .mosaic-item-layout-1 .mosaic-item-name {
font-weight: inherit; font-weight: inherit;
font-size: 14px; font-size: 14px;
} }
.mosaic-item-layout-7 .mosaic-item-image { .mosaic-item-layout-7 .mosaic-item-image {
display: none; display: none;
} }
.mosaic-item-layout-3 .mosaic-item-description, .mosaic-item-layout-7 .mosaic-item-description { .mosaic-item-layout-3 .mosaic-item-description, .mosaic-item-layout-7 .mosaic-item-description {
margin-top: 10px; margin-top: 10px;
max-height: 40px; max-height: 40px;
@@ -858,23 +845,19 @@ table .group-actions {
.mosaic-item { .mosaic-item {
padding: 10px 15px; padding: 10px 15px;
} }
.mosaic-group-back { .mosaic-group-back {
font-size: 40px; font-size: 40px;
} }
.mosaic-item-layout-5 .mosaic-item-image, .mosaic-item-layout-7 .mosaic-item-image { .mosaic-item-layout-5 .mosaic-item-image, .mosaic-item-layout-7 .mosaic-item-image {
display: table-cell; display: table-cell;
width: 105px; width: 105px;
padding-left: 5px; padding-left: 5px;
padding-right: 18px; padding-right: 18px;
} }
.mosaic-item-layout-5 .mosaic-item-image > img, .mosaic-item-layout-7 .mosaic-item-image > img { .mosaic-item-layout-5 .mosaic-item-image > img, .mosaic-item-layout-7 .mosaic-item-image > img {
max-width: 105px; max-width: 105px;
/* Equals parent element width */ /* Equals parent element width */
} }
.mosaic-item-layout-5 .mosaic-item-name, .mosaic-item-layout-7 .mosaic-item-name { .mosaic-item-layout-5 .mosaic-item-name, .mosaic-item-layout-7 .mosaic-item-name {
font-size: 12px; font-size: 12px;
} }
@@ -886,7 +869,6 @@ table .group-actions {
height: 140px; height: 140px;
margin-right: 1.3%; margin-right: 1.3%;
} }
.mosaic-item-text .mosaic-item-text-wrapper { .mosaic-item-text .mosaic-item-text-wrapper {
max-height: 120px; max-height: 120px;
/* Must be .mosaic-item absolute height (in px) */ /* Must be .mosaic-item absolute height (in px) */
@@ -1105,7 +1087,6 @@ table .group-actions {
-moz-animation: hide-drop-zone 0.3s ease-out forwards; -moz-animation: hide-drop-zone 0.3s ease-out forwards;
-ms-animation: hide-drop-zone 0.3s ease-out forwards; -ms-animation: hide-drop-zone 0.3s ease-out forwards;
} }
@keyframes show-drop-zone { @keyframes show-drop-zone {
100% { 100% {
height: 20%; height: 20%;
@@ -1188,20 +1169,16 @@ table .group-actions {
.form_buttons .form_btn_misc { .form_buttons .form_btn_misc {
float: left !important; float: left !important;
} }
.form_buttons .form_btn_transitions { .form_buttons .form_btn_transitions {
float: right !important; float: right !important;
margin-left: 3px; margin-left: 3px;
} }
.form_buttons .form_btn_regular { .form_buttons .form_btn_regular {
text-align: right; text-align: right;
} }
.form_buttons .form_btn_regular btn { .form_buttons .form_btn_regular btn {
width: inherit; width: inherit;
} }
.form_btn_regular.sticky { .form_btn_regular.sticky {
display: block; display: block;
position: fixed; position: fixed;
@@ -1214,15 +1191,12 @@ table .group-actions {
border-radius: 0px; border-radius: 0px;
transition: right 0.3s; transition: right 0.3s;
} }
.form_btn_regular.sticky.closed { .form_btn_regular.sticky.closed {
right: -75px; right: -75px;
} }
.form_btn_regular.sticky button { .form_btn_regular.sticky button {
display: block; display: block;
} }
.form_btn_regular.sticky button:first-child { .form_btn_regular.sticky button:first-child {
margin-bottom: 4px; margin-bottom: 4px;
} }

View File

@@ -413,6 +413,10 @@ footer{
text-align: right; text-align: right;
} }
.home div.tile-chart > a > div {
padding: 0.25em;
}
@media (min-width: 768px) { @media (min-width: 768px) {
.home .tile{ .home .tile{