Skip to content
Permalink
Browse files

Merge remote-tracking branch 'upstream/pr/14557' into 3.x

* upstream/pr/14557:
  Minor change style for dashboards
  • Loading branch information...
JoshuaLuckers committed May 4, 2019
2 parents 27abcd2 + 9f135b5 commit 140b924d15baea3ad8daf4bcab1b8a473d90614e
@@ -167,7 +167,8 @@
}
table {
width: 100%;
border-collapse: collapse;
border: 1px solid #ddd;
border-radius: 5px;
th {
font-weight: bold;
padding: 10px;
@@ -187,18 +188,29 @@
text-decoration: $delTextDeco;
}
}
tr:last-child {
td { border: none; }
tr:last-child td {
border: none;
&:first-child {
border-bottom-left-radius: 10px;
}
&:last-child {
border-bottom-right-radius: 10px;
}
}
}
.widget-footer {
padding-top: 10px;
border-top: 1px solid $lighterGray;
a {
display: block;
padding-bottom: 5px;
padding-top: 5px;
color: $blue;
font-size: 14px;
font-weight: bold;
text-decoration: none;
display: block;
text-align: center;
text-transform: uppercase;
}
}
.widget-actions {
@@ -238,14 +250,25 @@
}
}
.user-name {
font-weight: bold;
color: $colorSplash;
font-weight: 500;
}
.user-group {
color: $mediumGray;
}
}
.resource{
.title{
color: $colorSplash;
font-weight: 500;
}
}
.occurred {
.occurred-time {
&-date{
color: $colorSplash;
font-weight: 500;
}
&-time {
color: $mediumGray;
}
}
@@ -343,7 +366,10 @@
}

.updates-widget {
.updates-title { font-weight: bold; }
.updates-title {
font-weight: 500;
color: $colorSplash;
}
.updates-updateable {
display: inline-block;
background: $blue;

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -21751,7 +21751,8 @@ body.x-body-masked .x-window-plain .x-window-mc {
overflow: auto; }
.dashboard table {
width: 100%;
border-collapse: collapse; }
border: 1px solid #ddd;
border-radius: 5px; }
.dashboard table th {
font-weight: bold;
padding: 10px;
@@ -21769,14 +21770,23 @@ body.x-body-masked .x-window-plain .x-window-mc {
text-decoration: line-through; }
.dashboard table tr:last-child td {
border: none; }
.dashboard table tr:last-child td:first-child {
border-bottom-left-radius: 10px; }
.dashboard table tr:last-child td:last-child {
border-bottom-right-radius: 10px; }
.dashboard .widget-footer {
padding-top: 10px;
border-top: 1px solid #F0F0F0; }
.dashboard .widget-footer a {
display: block;
padding-bottom: 5px;
padding-top: 5px;
color: #3697CD;
font-size: 14px;
font-weight: bold;
text-decoration: none;
display: block;
text-align: center; }
text-align: center;
text-transform: uppercase; }
.dashboard .widget-actions a {
display: inline-block;
padding: 3px 5px;
@@ -21807,10 +21817,17 @@ body.x-body-masked .x-window-plain .x-window-mc {
.dashboard .user-with-avatar .user-avatar img {
border-radius: 30px; }
.dashboard .user-with-avatar .user-name {
font-weight: bold; }
color: #234368;
font-weight: 500; }
.dashboard .user-with-avatar .user-group {
color: #999999; }
.dashboard .occurred .occurred-time {
.dashboard .resource .title {
color: #234368;
font-weight: 500; }
.dashboard .occurred-date {
color: #234368;
font-weight: 500; }
.dashboard .occurred-time {
color: #999999; }

#modx-news-feed-container img {
@@ -21893,7 +21910,8 @@ body.x-body-masked .x-window-plain .x-window-mc {
background-color: transparent; }

.updates-widget .updates-title {
font-weight: bold; }
font-weight: 500;
color: #234368; }

.updates-widget .updates-updateable {
display: inline-block;
@@ -17,8 +17,8 @@
{foreach $data.results as $record}
<tr>
<td>{$record.id}</td>
<td>
<div class="{if !$record.published}unpublished{elseif $record.deleted}deleted{/if}">{$record.pagetitle}</div>
<td class="resource">
<div class="{if !$record.published}unpublished{elseif $record.deleted}deleted{else}title{/if}">{$record.pagetitle}</div>
{if !empty($record.action)}
<div>
<small>{$record.action}</small>
@@ -83,4 +83,4 @@
<div class="widget-footer">
<a href="{$_config.manager_url}?a=system/logs">{$_lang.w_view_all} &rarr;</a>
</div>
</div>
</div>

0 comments on commit 140b924

Please sign in to comment.
You can’t perform that action at this time.