Commit 4e60a70f authored by Evonne's avatar Evonne Committed by Robert Lyon
Browse files

Bug 184510 Small raw theme changes

- getting consistency with list-group
- random responsive alignments

behatnotneeded

Change-Id: Ib95dd215c6a524d8075550779f8c12323279aaa1
parent be0298e6
......@@ -2,7 +2,7 @@
<p class="editor-description">{$noplans}</p>
{/if}
{foreach from=$plans item=plan}
<div{if $plan.description} class="card-body flush"{/if}>
<div class="listing{if $plan.description} card-body flush{/if}">
{if $editing}
<div class="float-right btn-group">
<a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/plan/edit.php?id={$plan.id}{if $plan.view}&view={$plan.view}{/if}" title="{str(tag=editspecific arg1=$plan.title)|escape:html|safe}">
......
......@@ -24,7 +24,6 @@
<span class="lead text-small">{str tag=nogroupviewsyet section=view}</span>
</div>
{/if}
<hr />
{/if}
{if $sharedviews}
......@@ -55,7 +54,6 @@
<span class="lead text-small">{str tag=nosharedviewsyet section=view}</span>
</div>
{/if}
<hr />
{/if}
......@@ -87,7 +85,6 @@
<span class="lead text-small">{str tag=nosharedcollectionsyet section=collection}</span>
</div>
{/if}
<hr />
{/if}
{if $allsubmitted}
......@@ -116,7 +113,6 @@
<span class="lead text-small">{str tag=nosubmittedviewscollectionsyet section=view}</span>
</div>
{/if}
<hr />
{/if}
{if $nosubmissions}
<h4 class="title list-group-item-heading">
......@@ -138,7 +134,6 @@
{literal}}{/literal});
</script>
{/if}
<hr />
{/if}
{if $mysubmitted || $group_view_submission_form}
......
{if $myviews}
<div class="list-group">
<div id="myviewlist" class="list-group">
<div id="myviewlist">
{$myviews.tablerows|safe}
</div>
{if $myviews.pagination}
......
......@@ -917,3 +917,15 @@ a.online-users {
padding-left: 0;
}
}
// view last updated
.last-updated {
margin-top: $grid-gutter-width;
}
// shared view filter in smaller screens too close to top element
@include media-breakpoint-down(lg) {
#search_inputgroupsort_container {
margin-top: 10px;
}
}
......@@ -60,7 +60,6 @@ a[data-toggle="collapse"] {
&.collapsed .collapse-indicator {
transform: rotate(0deg);
transition-duration: 0.3s;
margin-top: 2px;
}
}
......
......@@ -129,7 +129,6 @@
// Sidebar notification item styles
.list-group-item-profile-notification {
word-wrap: normal;
word-break: break-all;
white-space: normal;
&:first-child {
padding-right: 80px;
......@@ -306,6 +305,7 @@
}
+ .pagination-container {
padding-top: 10px;
padding-bottom: 10px;
}
}
......@@ -395,6 +395,27 @@
}
}
.bt-groupviews,
.bt-groupviews-editor {
h4.title {
font-weight: bold;
font-size: $font-size-base;
padding: 10px 0;
border-bottom: 1px solid $list-group-border;
margin: 0;
}
}
.bt-plans,
.bt-plans-editor {
h4.title {
font-weight: bold;
font-size: $font-size-base;
margin: 0;
padding-bottom: 10px;
}
}
.memberswrap,
#friendslist {
.list-group-item {
......@@ -449,18 +470,11 @@
// Rmove some list's first child top border when they don't have anything between card header and list
.card.card-secondary {
&.bt-recentposts, &.bt-recentposts-editor,
&.bt-recentforumposts, &.bt-recentforumposts-editor,
&.bt-navigation, &.bt-navigation-editor,
&.bt-entireresume, &.bt-entireresume-editor,
&.bt-resumefield, &.bt-resumefield-editor,
&.bt-filedownload, &.bt-filedownload-editor,
&.bt-folder, &.bt-folder-editor,
&.bt-myviews, &.bt-myviews-editor,
&.bt-newviews, &.bt-newviews-editor,
&.bt-inbox, &.bt-inbox-editor,
&.bt-watchlist, &.bt-watchlist-editor {
.list-group {
> .block,
> .block > .listing,
> .block .file-download-list,
> .block .forumposts {
> .list-group {
.list-group-item:first-child,
+ .list-group-item:first-child,
.block-header:first-child + .list-group-item {
......@@ -468,9 +482,22 @@
}
}
}
// except list in list
&.bt-entireresume, &.bt-entireresume-editor {
.list-group .list-group {
// exceptions
&.bt-taggedposts > .block > .list-group,
&.bt-taggedposts-editor > .block > .list-group,
.list-group .list-group {
.list-group-item:first-child,
+ .list-group-item:first-child,
.block-header:first-child + .list-group-item {
border-top: 1px solid $list-group-border-color;
}
}
&.bt-plans .block .listing,
&.bt-plans-editor .block .listing {
h4 + .list-group,
p + .list-group,
.tags + .list-group {
.list-group-item:first-child,
+ .list-group-item:first-child,
.block-header:first-child + .list-group-item {
......
......@@ -43,6 +43,7 @@
@include media-breakpoint-down(xs) {
margin: 0;
height: auto;
}
}
.tag-filters {
......
......@@ -24,7 +24,7 @@
.footer-inner {
@extend .clearfix;
padding-top: 15px;
padding-bottom: 15px;
padding-bottom: 30px;
.mahara-logo {
margin-right: 20px;
}
......
......@@ -166,6 +166,9 @@ body.presentation-iframe {
.peoplelistinfo {
clear: both;
.profile img {
margin-right: 10px;
}
.leftdiv {
float: left;
margin-bottom: 5px;
......@@ -254,13 +257,11 @@ form#settings,
// Profile page accept friends form
.pendingfriendscard {
margin-top: 40px;
padding-top: 30px;
margin-top: 60px;
margin-bottom: 20px;
@include media-breakpoint-down(md) {
margin-top: -30px;
padding-top: 0;
}
}
......
......@@ -145,3 +145,8 @@ h3 {
}
}
}
// remove border radius from first child list-group-item in a card that appears under a card-header
.card-header + .list-group .list-group-item:first-child {
border-radius: 0;
}
......@@ -30,7 +30,6 @@
position: static;
clear: both;
max-height: none;
border: 1px solid $navbar-default-link-border;
@include media-breakpoint-up(md) {
position: absolute;
......
......@@ -105,6 +105,7 @@ label.sr-only + div.tox-tinymce {
background-color: transparent;
border-color: transparent;
text-decoration-line: underline;
font-weight: 400;
color: $btn-primary-bg;
box-shadow: none;
&:hover {
......
......@@ -249,6 +249,10 @@
content: fa-content($fa-var-mobile);
}
.icon-cpd:before {
content: fa-content($fa-var-award);
}
.icon-on-hover {
~ .icon-action {
......
......@@ -20,7 +20,7 @@
<a class="tag secondary-link" href="{$results->baseurl}{if $tag}{$results->queryprefix}tag={$tag|urlencode|safe}{/if}">{if $tag}{$tag|str_shorten_text:50}{else}{str tag=alltags}{/if}</a>
</h2>
{if $not_institution_tag}
<div class="btn-top-right btn-group btn-group-top d-block">
<div class="btn-top-right btn-group btn-group-top d-block{if !$tag} d-none{/if}">
<a class="btn btn-secondary edit-tag float-right{if !$tag} d-none{/if}" href="{$WWWROOT}edittags.php?tag={$tag|urlencode|safe}"><span class="icon icon-pencil-alt left" role="presentation" aria-hidden="true"></span>{str tag=editthistag}</a>
</div>
{/if}
......
......@@ -16,7 +16,7 @@
</div>
</div>
<div class="metadata text-right">
<div class="metadata text-right last-updated">
{$lastupdatedstr}{if $visitstring}; {$visitstring}{/if}
</div>
{include file="footer.tpl"}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment