Skip to content

GitLab

mahara
mahara
Commit b94eabb8 authored by Liam's avatar Liam Committed by Rebecca Blundell
Browse files
Options

Bug 1765276: Lots of changes, mostly to fix problems found when looking through the styleguide 

behatnotneeded

Change-Id: Ib4c03c12c1c6e016684fc26e582c14f5f902eec3
parent ebd115dd
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 37 deletions
htdocs/theme/raw/plugintype/artefact/plans/templates/delete.tpl
View file @ b94eabb8
{include file="header.tpl"}
<div class="card card bg-danger text-white view-description">
<div class="card card bg-danger view-description">
<h2 class="card-header">{$subheading}</h2>
<div class="card-body">
<p>{$message}</p>
......
htdocs/theme/raw/plugintype/interaction/forum/templates/deletepost.tpl
View file @ b94eabb8
{include file="header.tpl"}
<div class="card card bg-danger text-white view-container">
<div class="card card bg-danger view-container">
<h2 class="card-header">{$subheading}</h2>
<div class="card-body">
{$deleteform|safe}
......
htdocs/theme/raw/plugintype/interaction/forum/templates/deletetopic.tpl
View file @ b94eabb8
{include file="header.tpl"}
<div class="card card bg-danger text-white view-container">
<div class="card card bg-danger view-container">
<h2 class="card-header">{$subheading}</h2>
<div class="card-body">
{$deleteform|safe}
......
htdocs/theme/raw/plugintype/module/multirecipientnotification/templates/activitylistin.tpl
View file @ b94eabb8
<div class="collapsible-group">
{foreach from=$data item=item name='notification'}
<div class="card collapsible notification collapsible-group {if !$item->read}card bg-primary text-white js-card-unread{else}card-secondary{/if} {if $dwoo.foreach.notification.first}first{/if} {if $dwoo.foreach.notification.last}last{/if} ">
<div class="card-heading">
<div class="card-header">
<label class="card-control">
<span class="control {if !$item->read}unread{/if}">
<input type="checkbox" class="tocheck" name="select-{$item->table}-{$item->id}" id="select-{$item->table}-{$item->id}">
......
htdocs/theme/raw/plugintype/module/multirecipientnotification/templates/activitylistout.tpl
View file @ b94eabb8
<div class="collapsible-group">
{foreach from=$data item=item name='notification'}
<div class="card card-secondary collapsible notification collapsible-group {if $dwoo.foreach.notification.first}first{/if} {if $dwoo.foreach.notification.last}last{/if}">
<h4 class="card-heading">
<h4 class="card-header">
<label class="card-control">
{if $item->table === 'module_multirecipient_notification'}
<span class="control">
......
htdocs/theme/raw/plugintype/module/multirecipientnotification/templates/indexin.tpl
View file @ b94eabb8
......@@ -19,17 +19,17 @@
{str section='admin' tag='bulkactions'}
</button>
<button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<span class="caret"></span>
<span class="icon icon-caret-down"></span>
</button>
<div class="activity-buttons dropdown-menu" role="menu">
<button class="dropdown-item btn btn-link" data-action="markasread">
<button class="btn btn-link" data-action="markasread">
{str tag='markasread' section='activity'}
</button>
<button class="dropdown-item btn btn-link btn-link-danger" data-action="deleteselected">
<button class="btn btn-link btn-link-danger" data-action="deleteselected">
{str tag='delete'}
</button>
<a class="dropdown-item btn btn-link btn-link-danger" href="#delete_all_notifications_submit" data-triggersubmit="delete_all_notifications_submit">
<a class="btn btn-link btn-link-danger" href="#delete_all_notifications_submit" data-triggersubmit="delete_all_notifications_submit">
{str section='activity' tag='deleteallnotifications'}
</a>
</div>
......@@ -38,7 +38,7 @@
<div class="form-group">
<label class="sr-only" for="notifications_type">{str section='activity' tag='type'}:</label>
<div class="input-group select-group">
<div class="input-group-addon" id="icon-addon-filter">
<div class="input-group-prepend" id="icon-addon-filter">
<span class="icon icon-filter" role="presentation" aria-hidden="true"></span>
</div>
<div class="select form-group">
......
htdocs/theme/raw/plugintype/module/multirecipientnotification/templates/indexout.tpl
View file @ b94eabb8
......@@ -19,7 +19,7 @@
{str section='admin' tag='bulkactions'}
</button>
<button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<span class="caret"></span>
<span class="icon icon-caret-down"></span>
</button>
<div class="activity-buttons dropdown-menu" role="menu">
......@@ -36,7 +36,7 @@
<div class="form-group">
<label for="notifications_type" class="sr-only">{str section='activity' tag='type'}:</label>
<div class="input-group select-group">
<div class="input-group-addon" id="icon-addon-filter">
<div class="input-group-prepend" id="icon-addon-filter">
<span class="icon icon-filter" role="presentation" aria-hidden="true"></span>
</div>
<div class="select form-group">
......
htdocs/theme/raw/sass/components/_list-group.scss
View file @ b94eabb8
......@@ -83,8 +83,12 @@
}
}
h4.list-group-item-heading {
.list-group-item h4.list-group-item-heading {
font-size: $font-size-base + 0.0715;
margin-bottom: 5px;
a {
padding: 0;
}
}
.list-group-item h5 {
......
htdocs/theme/raw/sass/features/_collection-navigation.scss
View file @ b94eabb8
.collection-nav {
background-color: $card-bg;
background-color: $card-heading-bg;
padding: 10px;
margin-bottom: 20px;
margin-left: -10px;
......@@ -10,6 +10,7 @@
h2 {
font-weight: bold;
font-size: 30px;
margin-top: 0;
@include media-breakpoint-up(lg) {
margin-right: 300px;
......
htdocs/theme/raw/sass/form/_dropdown.scss
View file @ b94eabb8
......@@ -136,6 +136,30 @@
}
}
.dropdown-menu {
z-index: 10;
> li {
padding: 3px 0;
> a {
padding: 3px 20px;
color: $theme-text-color;
}
}
> .active {
background-color: #556d32;
> a {
color: #fff;
text-decoration: none;
outline: 0;
background-color: #556d32;
&:hover,
&:focus {
text-decoration: none;
}
}
}
}
.dropdown-item {
padding: 0;
}
......
htdocs/theme/raw/sass/form/_input-group.scss
View file @ b94eabb8
......@@ -73,6 +73,21 @@
width: auto;
flex: 0 1 auto;
}
.input-group-prepend {
padding: 11px 14px;
text-align: center;
background-color: $gray-100;
border: 1px solid $input-border-color;
border-radius: 2px;
border-bottom-right-radius: 0;
border-top-right-radius: 0;
border-right: 0;
+ .select select {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
}
}
.pieform .input-group-append {
font-size: inherit;
......
htdocs/theme/raw/sass/layout/card/_card-collapse.scss
View file @ b94eabb8
......@@ -4,8 +4,11 @@
.card.collapsible {
margin-bottom: 0;
border-radius: 0;
.card-heading a {
border-radius: 0;
.card-header {
padding: 10px 8px;
a {
border-radius: 0;
}
}
&.form-group {
display:block;
......@@ -62,7 +65,7 @@
h4,
h3 {
margin: 0;
font-size: 16px;
font-size: 18px;
padding: 0;
.pieform > .collapsible-group:first-child & {
......@@ -215,8 +218,8 @@
h3 {
a {
text-shadow: 1px 0 0 $text-shadow;
background-color: darken($card-bg, 1%);
border: 1px solid $card-border-color;
// background-color: darken($card-bg, 1%);
// border: 1px solid $card-border-color;
border-bottom: 0;
padding: 10px 15px;
}
......
htdocs/theme/raw/sass/layout/card/_card-colors.scss
View file @ b94eabb8
......@@ -73,7 +73,7 @@
color: $card-warning-text;
}
.card-body {
background-color: $card-bg;
background-color: $card-warning-bg;
}
.card-footer {
background-color: $card-heading-bg;
......
htdocs/theme/raw/sass/layout/card/_card-header.scss
View file @ b94eabb8
......@@ -79,8 +79,9 @@
h2,
h3 {
.card-header {
&.card-header {
font-size: $font-size-base * 1.14285;
margin: 0;
}
}
......
htdocs/theme/raw/sass/layout/card/_card-quarter.scss
View file @ b94eabb8
......@@ -173,7 +173,7 @@
.card-collection {
position: relative;
.collection-stack.card-warning {
.collection-stack.bg-warning {
&:before,
&:after {
background-color: $state-warning-bg;
......
htdocs/theme/raw/sass/layout/card/_card-secondary.scss
View file @ b94eabb8
......@@ -67,7 +67,7 @@
}
> .card-body,
> .block > .card-body {
padding: 15px 8px;
padding: 15px;
&.flush {
padding: 15px 0 0 0;
}
......
htdocs/theme/raw/sass/utilities/_classes.scss
View file @ b94eabb8
......@@ -5,7 +5,7 @@
position: relative;
top: 0;
left: 0;
z-index: 3;
z-index: 2;
zoom: 1;
}
......
htdocs/theme/raw/sass/utilities/_custom-variables.scss
View file @ b94eabb8
......@@ -124,6 +124,7 @@ $card-info-heading-bg: $state-info-bg;
$card-warning-text: $state-warning-text;
$card-warning-border: $state-warning-border;
$card-warning-heading-bg: $state-warning-bg;
$card-warning-bg: $state-warning-bg;
$card-danger-text: $state-danger-text;
$card-danger-border: $state-danger-border;
......
htdocs/theme/raw/templates/account/cancelrequest.tpl
View file @ b94eabb8
{include file="header.tpl"}
<div id="cancelrequest" class="card card bg-danger text-white view-container">
<div id="cancelrequest" class="card card bg-danger view-container">
<h2 class="card-header">{str tag=canceldeletionrequest section=account}</h2>
<div class="card-body">
<p>{str tag=canceldeletionrequestconfirmation section=account arg1=$userdisplayname}</p>
......
htdocs/theme/raw/templates/account/delete.tpl
View file @ b94eabb8
{include file="header.tpl"}
<div id="deleteaccount" class="card card bg-danger text-white view-container">
<div id="deleteaccount" class="card card bg-danger view-container">
<h2 class="card-header">{str tag=deleteaccount1}</h2>
<div class="card-body">
{if $requiresapproval}
......
htdocs/theme/raw/templates/account/resendnotification.tpl
View file @ b94eabb8
{include file="header.tpl"}
<div id="resendnotification" class="card card bg-danger text-white view-container">
<div id="resendnotification" class="card card bg-danger view-container">
<h2 class="card-header">{str tag=resenddeletionnotification section=account}</h2>
<div class="card-body">
<p>{str tag=sendnotificationdescription section=account}</p>
......
htdocs/theme/raw/templates/admin/users/institutions.tpl
View file @ b94eabb8
......@@ -9,7 +9,7 @@
{if $delete_form}
<div class="card card bg-danger text-white view-container">
<div class="card card bg-danger view-container">
<h2 class="card-header">{str tag="deleteinstitution" section="admin"}</h2>
<div class="card-body">
<p><strong>{$institutionname}</strong></p>
......
htdocs/theme/raw/templates/collection/delete.tpl
View file @ b94eabb8
{include file="header.tpl"}
<div class="card card bg-danger text-white view-container">
<div class="card card bg-danger view-container">
<h2 class="card-header">{$subheading}</h2>
<div class="card-body">
<p>{$message}</p>
......
htdocs/theme/raw/templates/group/delete.tpl
View file @ b94eabb8
{include file="header.tpl"}
<div class="card card bg-danger text-white view-container">
<div class="card card bg-danger view-container">
<h2 class="card-header">{$subheading}</h2>
<div class="card-body">
<p>{$message}</p>
......
htdocs/theme/raw/templates/interaction/delete.tpl
View file @ b94eabb8
{include file="header.tpl"}
<div class="card card bg-danger text-white view-container">
<div class="card card bg-danger view-container">
<h2 class="card-header">{$subheading}</h2>
<div class="card-body">
{if $landingpagenote}<p class="lead">{$landingpagenote}</p>{/if}
......
htdocs/theme/raw/templates/skin/delete.tpl
View file @ b94eabb8
{include file="header.tpl"}
<div class="card card bg-danger text-white view-container">
<div class="card card bg-danger view-container">
<h2 class="card-header">{$subheading}</h2>
<div class="card-body">
<p>{$safemessage|clean_html|safe}</p>
......
htdocs/theme/raw/templates/styleguide.tpl
View file @ b94eabb8
......@@ -603,7 +603,7 @@ A dropdown card.
### Blocks drop-down card
This type of drop-down card is used in blocks, for example the "Inbox" block.
```
<div class="bt-inbox card card-secondary clearfix collapsible">
<div class="bt-inbox card card-block clearfix collapsible">
<h3 class="title card-header js-heading">
<a data-toggle="collapse" href="#target" aria-expanded="true" class="outer-link"></a>
Blocks drop-down
......@@ -1282,10 +1282,10 @@ Used as the sub subheading of a page.
</section>
<section data-markdown data-category="text">
### card heading
### card header
Used as the heading of a block or card.
```
<h3 class="title card-header">card heading</h3>
<h3 class="title card-header">card header</h3>
```
</section>
......
htdocs/theme/raw/templates/view/delete.tpl
View file @ b94eabb8
{include file="header.tpl"}
<div class="card card bg-danger text-white view-container">
<div class="card card bg-danger view-container">
<h2 class="card-header">
{str tag="deleteviewconfirm1" section="view"}
</h2>
......
htdocs/theme/raw/templates/view/indexresults.tpl
View file @ b94eabb8
......@@ -202,7 +202,7 @@
</div>
</div>
{if $view.collid}
<div class="collection-stack {if $view.submittedto} card bg-warning{/if}"></div>
<div class="collection-stack {if $view.submittedto} bg-warning{/if}"></div>
{/if}
</div>
{/foreach}
......
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