Correction de l'affichage des groupes des 'utilisateurs' et des 'machines'

This commit is contained in:
xdrm-brackets 2016-07-08 18:14:06 +02:00
parent 9c6d3006a8
commit d896163134
5 changed files with 37 additions and 23 deletions

View File

@ -172,11 +172,11 @@
} }
} }
span{ & > span{
display: inline-block; display: inline-block;
position: relative; position: relative;
padding: .1em .5em; padding: .1em .5em;
margin-right: calc( .2em + 2em ); margin-right: calc( .4em + 2em );
border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px;
border: 1px solid #bdbdbd; border: 1px solid #bdbdbd;
@ -188,31 +188,38 @@
cursor: default; cursor: default;
&.add-group{
border-radius: 3px;
}
&:before{ & > span.rem-group{
content: 'x';
display: block; display: block;
position: absolute; position: absolute;
top: -1px; top: -1px;
left: 100%; left: 100%;
height: calc( 100% - .1em - 1px ); width: 1em;
height: calc( 100% - .1em - 2px );
padding: .1em .5em; padding: .1em .5em;
border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0;
border: 1px solid #bdbdbd; border: 1px solid #bdbdbd;
box-shadow: inset 0 0 2px #fafafa; box-shadow: inset 0 0 2px #fafafa;
background: url('/src/static/sub-menu-side/remove.svg') center center no-repeat;
background-size: auto 70%;
background-color: #f9f9f9; background-color: #f9f9f9;
color: inherit; color: inherit;
cursor: pointer; cursor: pointer;
&:hover{
background-image: url('/src/static/sub-menu-side/remove.svg?'+$form-invalid-color);
} }
&:hover:before{
color: $form-invalid-color;
} }
} }
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -115,7 +115,8 @@
if( $clusters != false ) if( $clusters != false )
foreach($clusters as $cluster) foreach($clusters as $cluster)
echo "<span>".$cluster['name']."</span>"; echo "<span>".$cluster['name']."<span class='rem-group' data-user='".$machine['id_machine']."'></span></span>";
echo "<span class='add-group' data-machine='".$machine['id_machine']."'>+</span>";
echo"</span>"; echo"</span>";

View File

@ -119,13 +119,13 @@
echo "</span></a>"; echo "</span></a>";
echo"</span>"; echo"</span>";
// Groupes de la machine // Groupes de l'utilisateur
echo "<span class='groups'>"; echo "<span class='groups'>";
echo file_get_contents( __ROOT__.'/src/static/container/group.svg' ); echo file_get_contents( __ROOT__.'/src/static/container/group.svg' );
if( $clusters != false ) if( $clusters != false )
foreach($clusters as $cluster) foreach($clusters as $cluster)
echo "<span>".$cluster['name']."</span>"; echo "<span>".$cluster['name']."<span class='rem-group' data-user='".$user['id_user']."'></span></span>";
echo "<span class='add-group' data-user='".$user['id_user']."'>+</span>"; echo "<span class='add-group' data-user='".$user['id_user']."'>+</span>";
echo"</span>"; echo"</span>";