Commit 117de2fd authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review

Merge "Bug 184510 Small theme changes"

parents aff698b3 e76f515b
// viewfooter
.viewfooter {
padding: 0 15px;
padding: 15px;
background-color: #f7f7f7;
border-radius: 10px;
// Ensure background-color isn't visible when comments aren't enabled
.comment-container {
h3 {
padding: 30px 15px 0 15px;
}
hr {
margin: 0 15px;
}
#feedbacktable,
#feedback_pagination,
#add-comment {
padding: 0 15px;
}
}
}
......@@ -6,6 +6,7 @@
@import "../form/form";
@import "../components/loading-inner";
@import "../components/user-icon";
@import "../features/dashboard-widget";
......@@ -20,11 +20,3 @@
}
}
}
// loading message in header
.loading-inner {
background: transparent;
.icon-spinner {
color: #fff;
}
}
......@@ -4,10 +4,8 @@
border-radius: 0;
border-bottom: 0;
padding-left: 10px;
color: #FFFFFF;
a {
color: #FFFFFF;
text-decoration: underline;
}
}
......
......@@ -21,6 +21,7 @@
@import "../components/btn";
@import "../components/indicator";
@import "../components/list-group";
@import "../components/loading-inner";
@import "../components/user-icon";
// Feature related sass. We avoid this where we can in favour of reusable components
......
......@@ -43,9 +43,9 @@
<h4 class="list-group-item-heading text-inline">
{$entry->title}
</h4>
<span class="postdetails text-small text-midtone">
- {if $entry->pubdate}{str tag=publishedon section=blocktype.externalfeed arg1=$entry->pubdate}{/if}
</span>
<div class="postdetails metadata text-small">
{if $entry->pubdate}{str tag=publishedon section=blocktype.externalfeed arg1=$entry->pubdate}{/if}
</div>
</li>
{/foreach}
</ol>
......
......@@ -473,7 +473,8 @@
> .block,
> .block > .listing,
> .block .file-download-list,
> .block .forumposts {
> .block .forumposts,
> .block .blog {
> .list-group {
.list-group-item:first-child,
+ .list-group-item:first-child,
......@@ -505,4 +506,13 @@
}
}
}
// leave the bottom border in last child in card-secondary
.list-group {
&:last-child .list-group-item:last-child{
border-bottom: 1px solid $list-group-border-color;
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
}
}
}
......@@ -68,6 +68,9 @@
margin-bottom: 0;
border-bottom: 1px solid $list-group-border-color;
}
#files .filebrowser.form-group {
border-bottom: 0;
}
.uploadform.userfile {
margin-bottom: 20px;
......
......@@ -40,12 +40,6 @@
}
}
.alert-default {
background-color: rgba($body-bg, 0.4);
border: 1px solid scale-color($gray-400, $lightness: 8%);
color: $gray-500;
}
.alert {
position: relative;
padding: .75rem 1.25rem .75rem 3rem;
......@@ -60,6 +54,13 @@
}
}
.alert-default {
background-color: rgba($body-bg, 0.4);
border: 1px solid scale-color($gray-400, $lightness: 8%);
color: $gray-500;
padding-left: 1.25rem;
}
// overrides bootstrap calculations so this is same as states
.alert-success {
color: scale-color($success, $lightness: -30%);
......
......@@ -4,6 +4,12 @@
.grid-stack {
margin-left: -10px;
margin-right: -10px;
// but pages that haven't been converted need to have to reverted background
> .clearfix {
margin-left: 10px;
margin-right: 10px;
}
}
.gridstackblock.card {
......
......@@ -68,6 +68,7 @@ body {
.viewfooter {
clear: both;
margin-top: 2rem;
}
// Needed to clear the float when dropzone is visible
......@@ -130,7 +131,7 @@ iframe {
}
.view-description {
margin-bottom: 3rem;
margin-bottom: 2rem;
&.with-toolbar {
margin-right: 20px;
}
......
......@@ -341,7 +341,8 @@ pre {
.bt-resumefield,
.bt-resumefield-editor,
.bt-taggedposts .post,
.bt-taggedposts-editor .post {
.bt-taggedposts-editor .post,
.exportable-artefact-container {
h1, h2, h3, h4, h5, h6 {
font-family: $font-family-base;
font-weight: bold;
......
......@@ -37,9 +37,11 @@
<h2 class="card-header {if $skin.metadata} has-link {/if}">
<a href="" type="button" title="{str tag='viewmetadata' section='skin'}" class="title-link" data-toggle="modal" data-target="#skindata-modal-{$skin.id}" aria-labelledby="skin-info">
{$skin.title|escape|safe}
<span class="icon icon-info-circle float-right link-indicator" role="presentation" aria-hidden="true"></span>
<span class="sr-only">
{str tag=viewmetadataspecific section=skin arg1=$skin.title}
<span class="help float-right">
<span class="icon icon-info-circle link-indicator" role="presentation" aria-hidden="true"></span>
<span class="sr-only">
{str tag=viewmetadataspecific section=skin arg1=$skin.title}
</span>
</span>
</a>
</h2>
......
......@@ -2,9 +2,11 @@
{include file='modal-details.tpl'}
<input type="hidden" id="viewid" name="id" value="{$viewid}">
{if $viewdescription}
<div id="view-description" class="view-description {if $toolbarhtml}with-toolbar{/if}">
{$viewdescription|clean_html|safe}
</div>
{/if}
{if $viewinstructions}
<div id="viewinstructions" class="pageinstructions view-instructions last form-group collapsible-group small-group {if $toolbarhtml}with-toolbar{/if}">
......@@ -64,9 +66,6 @@
<h3 class="title">
{str tag="Comments" section="artefact.comment"}
</h3>
{if $feedback->count == 0}
<hr />
{/if}
{* Do not change the id because it is used by paginator.js *}
<div id="feedbacktable{if $blockid}_{$blockid}{/if}" class="feedbacktable js-feedbackbase fullwidth">
{$feedback->tablerows|safe}
......
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