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

N°1370 Portal badge : change some aligns + handle description correctly

Browse Source 
SVN:trunk[5742]
This commit is contained in:
Pierre Goiffon
2018-04-26 12:56:54 +00:00
parent 71d07be646
commit 22b181a8f7
2 changed files with 98 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
datamodels/2.x/itop-portal-base/portal/src/views/bricks/manage/tile-badge.html.twig
View File

@@ -9,6 +9,7 @@
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>
<div> <div>
<div class="tile_decoration">{% if oBrick.GetDecorationClassHome %}<span <div class="tile_decoration">{% if oBrick.GetDecorationClassHome %}<span
class="icon {{ oBrick.GetDecorationClassHome }}"></span>{% else %}<img src="{{ sIconURL }}" class="icon {{ oBrick.GetDecorationClassHome }}"></span>{% else %}<img src="{{ sIconURL }}"
@@ -20,9 +21,10 @@
<div class="tile_title">{{ iCount }}</div> <div class="tile_title">{{ iCount }}</div>
<div class="tile_description">{{ oBrick.GetTitle()|dict_s }}</div> <div class="tile_description">{{ oBrick.GetTitle()|dict_s }}</div>
</div> </div>
<div class="tile_description"><p>{{ oBrick.GetDescription|dict_s|raw }}</p></div>
</div> </div>
</div> </div>
</div>
<div class="tile_description">{{ oBrick.GetDescription|dict_s|raw }}</div>
</a> </a>
{% endblock %} {% endblock %}
</div> </div>

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

@@ -146,7 +146,7 @@ footer{
#sidebar .logo img{ #sidebar .logo img{
width: 40%; width: 40%;
max-width: 100%; max-width: 100%;
} }
} }
@media (min-width: 992px){ @media (min-width: 992px){
@@ -365,54 +365,70 @@ footer{
color: #555555; color: #555555;
} }
.home div.tile-badge > a.tile { .home div.tile-badge > a.tile {
display: table; padding: 0;
width: 100%; margin: 0;
padding: 12% 15% 5%; margin-bottom: 25px;
height: 12em;
min-height: unset;
} }
.home div.tile-badge > a.tile > div { .home div.tile-badge > a.tile > div {
display: table-row; padding: 12% 10% 0;
}
.home div.tile-badge > a.tile > div {
display: table;
width: 100%;
} }
.home div.tile-badge > a.tile > div > div { .home div.tile-badge > a.tile > div > div {
display: table-row;
}
.home div.tile-badge > a.tile > div > div > div {
display: table-cell; display: table-cell;
} }
.home div.tile-badge > a.tile > div > div.tile_decoration { .home div.tile-badge > a.tile > div > div > div.tile_decoration {
text-align: center; text-align: left;
vertical-align: top; vertical-align: top;
position: inherit; position: inherit;
float: inherit; float: inherit;
} }
.home div.tile-badge > a.tile > div > div.tile_body { .home div.tile-badge > a.tile > div > div > div.tile_body {
text-align: right; text-align: right;
padding-left: 0; padding-left: 0;
} }
.home div.tile-badge > a.tile > div > div.tile_body > div:first-child { .home div.tile-badge > a.tile > div > div > div.tile_body > div:first-child {
text-align: center;
margin: 0 auto; margin: 0 auto;
margin-left: 10%; margin-left: 10%;
} }
.home div.tile-badge > a.tile > div > div.tile_body > div:first-child > div { .home div.tile-badge > a.tile > div > div > div.tile_body > div:first-child > div.tile_description {
text-align: center;
}
.home div.tile-badge > a.tile > div > div.tile_body > div:first-child > div.tile_description {
margin-bottom: 1.5em; margin-bottom: 1.5em;
text-align: right;
} }
.home div.tile-badge > a.tile > div > div.tile_body > div:first-child > div.tile_title { .home div.tile-badge > a.tile > div > div > div.tile_body > div:first-child > div.tile_title {
font-size: 4.5em; font-size: 4.5em;
font-weight: normal; font-weight: normal;
margin-bottom: 0.5em; margin-bottom: 0.5em;
} }
.home div.tile-badge > a.tile > div > div.tile_body > div.tile_description { .home div.tile-badge > a.tile > div.tile_description {
text-align: right; display: block;
padding: 0 5%;
font-size: 1em;
font-style: italic;
text-align: center;
line-height: normal;
height: 2em; /* needed even if height is defined on a.tile :/ */
overflow: hidden;
} }
.home div.tile-chart > a > div { .home div.tile-chart > a > div {
@@ -899,6 +915,7 @@ table .group-actions .item-action-wrapper .panel-body > p:last-child{
} }
.mosaic-item-description{ .mosaic-item-description{
overflow: hidden; overflow: hidden;
text-overflow: ellipsis;
} }
/* Layout 1 */ /* Layout 1 */
.mosaic-item-layout-1 .mosaic-item-name{ .mosaic-item-layout-1 .mosaic-item-name{