Skip to content

Commit

Permalink
Marigolds : suppression style en ligne des boutons marquer comme lu d…
Browse files Browse the repository at this point in the history
…es flux
  • Loading branch information
Simounet committed Jan 23, 2017
1 parent acbb279 commit 6228b16
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 9 deletions.
28 changes: 22 additions & 6 deletions templates/marigolds/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -229,10 +229,6 @@ html, body { position: relative; height: 100%; }
background:#222222;
}

#main aside{

}

#title{ color:#ffffff; }

::-moz-selection { background: #f16529; color: #fff; text-shadow: none; }
Expand Down Expand Up @@ -318,7 +314,7 @@ header a,header a:hover,header a:visited{
border:0px;
color:#ffffff;
text-decoration:none;
padding: 0.5em 0.8em;
padding: 0.4em 0.8em;
font-size:10px;
font-weight:bold;

Expand All @@ -338,6 +334,11 @@ header a,header a:hover,header a:visited{
cursor:pointer;
}

.unreadForFolder,
.readFolder {
padding: 0px 3px 0px 3px;
}

#main aside a.unreadForFolder,#main aside a.readFolder{

background-color:#F16529;
Expand All @@ -346,7 +347,6 @@ header a,header a:hover,header a:visited{
margin:3px 3px 3px 0px;
font-size:10px;
font-weight:bold;
padding:0px 3px 0px 3px;
line-height: 20px;

min-width:55px;
Expand Down Expand Up @@ -376,6 +376,10 @@ header a,header a:hover,header a:visited{
font-weight: normal;
}

.unreadForFeed {
margin: 5px 0 0 10px;
}

#menuBar aside h3{
margin:5px;
}
Expand Down Expand Up @@ -868,6 +872,18 @@ footer a,#main aside a{
.versionBloc{
display:none;
}

#main aside a {
display: inline-block;
padding-top: 0.6em;
padding-bottom: 0.6em;
}

#main button {
padding-top: 0.8em;
padding-bottom: 0.8em;
}

.pluginBloc .pluginMenu li {
float: none;
display: block;
Expand Down
6 changes: 3 additions & 3 deletions templates/marigolds/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ <h1 class="folder{if="$unreadEventsForFolder==0"} hidefeed{/if}"{if="$displayOnl
<li class="errorSync" title="{function="_t('SYNCHRONISATION_ERROR')"}">
{/if}
{function="Plugin::callHook("menu_pre_feed_link", array(&$value))"} <a href="index.php?action=selectedFeed&amp;feed={$value2['id']}" class="feedLink" data-id="{$value2['id']}" title="{$value2['url']}">{function="Functions::truncate($value2['name'],37)"} </a>
<button class="right unreadForFeed" style="margin:5px 0 0 10px;">
<button class="right unreadForFeed">
<span title="{function="_t('MARK_AS_READ')"}">{$unread[$value2['id']]}</span>
</button>
{function="Plugin::callHook("menu_post_feed_link", array(&$value))"}
Expand All @@ -90,7 +90,7 @@ <h1 class="folder{if="$unreadEventsForFolder==0"} hidefeed{/if}"{if="$displayOnl
{/if}
{function="Plugin::callHook("menu_pre_feed_link", array(&$value))"} <a href="index.php?action=selectedFeed&amp;feed={$value2['id']}" class="feedLink" data-id="{$value2['id']}" title="{$value2['url']}">{function="Functions::truncate($value2['name'],37)"} </a>
{if="isset($unread[$value2['id']])"}
<button class="right unreadForFeed" style="margin:5px 0 0 10px;">
<button class="right unreadForFeed">
<span title="{function="_t('MARK_AS_READ')"}">{$unread[$value2['id']]}</span>
</button>
{/if}
Expand All @@ -114,7 +114,7 @@ <h1 class="folder{if="$unreadEventsForFolder==0"} hidefeed{/if}"{if="$displayOnl
{/if}
{function="Plugin::callHook("menu_pre_feed_link", array(&$value))"} <a href="index.php?action=selectedFeed&amp;feed={$value2['id']}" class="feedLink" data-id="{$value2['id']}" title="{$value2['url']}">{function="Functions::truncate($value2['name'],37)"} </a>
{if="isset($unread[$value2['id']])"}
<button class="right unreadForFeed" style="margin:5px 0 0 10px;">
<button class="right unreadForFeed">
<span title="{function="_t('MARK_AS_READ')"}">{$unread[$value2['id']]}</span>
</button>
{/if}
Expand Down

0 comments on commit 6228b16

Please sign in to comment.