Browse Source

- Fix a little CSS issue on Webkit

- Fix the room presence status
pull/16/head
Jaussoin Timothée 11 years ago
parent
commit
799526c7b0
  1. 4
      app/widgets/Rooms/_rooms.tpl
  2. 6
      themes/material/css/list.css

4
app/widgets/Rooms/_rooms.tpl

@ -5,9 +5,9 @@
</li> </li>
{loop="$conferences"} {loop="$conferences"}
{$connected = $c->checkConnected($value->conference, $value->nick)} {$connected = $c->checkConnected($value->conference, $value->nick)}
<li data-jid="{$value->conference}" class="condensed"
<li data-jid="{$value->conference}"
{if="$value->nick != null"} data-nick="{$value->nick}" {/if} {if="$value->nick != null"} data-nick="{$value->nick}" {/if}
class="room {if="$connected"}online{/if}">
class="condensed room {if="$connected"}online{/if}">
{if="$connected"} {if="$connected"}
<span class="icon bubble color {$value->name|stringToColor}"><i class="md md-people"></i></span> <span class="icon bubble color {$value->name|stringToColor}"><i class="md md-people"></i></span>
{else} {else}

6
themes/material/css/list.css

@ -74,7 +74,7 @@ ul.active li.active:not(.subheader) {
ul.active li:hover:not(.subheader) > p.more:after, ul.active li:hover:not(.subheader) > p.more:after,
ul.active.all li:hover > p.more:after, ul.active.all li:hover > p.more:after,
ul.active li.active:not(.subheader) > p.more:after { ul.active li.active:not(.subheader) > p.more:after {
background-image: linear-gradient(to bottom, transparent, rgba(247, 247, 247, 1));
background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0), rgba(247, 247, 247, 1));
} }
ul.active li:focus:not(.subheader), ul.active li:focus:not(.subheader),
@ -86,7 +86,7 @@ ul.active li.active:not(.subheader) {
ul.active li:focus:not(.subheader) > p.more:after, ul.active li:focus:not(.subheader) > p.more:after,
ul.active.all li:focus > p.more:after, ul.active.all li:focus > p.more:after,
ul.active li.active:not(.subheader) > p.more:after { ul.active li.active:not(.subheader) > p.more:after {
background-image: linear-gradient(to bottom, transparent, rgba(237, 237, 237, 1));
background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0), rgba(237, 237, 237, 1));
} }
.dark ul.active li:hover:not(.subheader), .dark ul.active li:hover:not(.subheader),
@ -123,7 +123,7 @@ ul li > p.more:after {
display: block; display: block;
width: 100%; width: 100%;
height: 3rem; height: 3rem;
background-image: linear-gradient(to bottom, transparent, white);
background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0), white);
content: ""; content: "";
position: absolute; position: absolute;
bottom: 0; bottom: 0;

Loading…
Cancel
Save