Bug #1765276: Changing card-block to card-secondary, and then getting rid of card-block in raw

Fixing any issues caused by this

behatnotneeded

Change-Id: I9cf578816534e3c5a07e7153373d1faeacc89ef7

htdocs/theme/raw/pieforms/adduser.php

@@ -3,7 +3,7 @@ echo $form_tag;
 ?>
 
     <div class="card-items card-items-no-margin">
-        <div class="step step1 card card-secondary first" id="step1">
+        <div class="step step1 card card first" id="step1">
             <h3 class="card-header"><?php echo get_string('usercreationmethod', 'admin'); ?></h3>
             <div class="card-body">
                 <div class="choice">
@@ -37,7 +37,7 @@ echo $form_tag;
         </div>
 
 
-        <div class="step step2 card card-secondary">
+        <div class="step step2 card card">
             <h3 class="card-header"><?php echo get_string('basicdetails', 'admin'); ?></h3>
             <div class="card-body">
                 <?php foreach (array('username', 'password', 'staff', 'admin', 'authinstance', 'quota', 'institutionadmin') as $field) { ?>
@@ -60,7 +60,7 @@ echo $form_tag;
             </div>
         </div>
 
-        <div class="step step3 card card-secondary">
+        <div class="step step3 card card">
             <h3 class="card-header"><?php echo get_string('create', 'admin'); ?></h3>
             <div class="card-body">
                 <!-- Button trigger modal -->

htdocs/theme/raw/plugintype/artefact/blog/templates/bloglist.tpl

 {foreach from=$blogs->data item=blog}
-<div class="card {if $blog->locked}card bg-warning{else} card-secondary{/if} blog card-half">
+<div class="card {if $blog->locked}card bg-warning{else} card{/if} blog card-half">
     <h3 class="card-header has-link">
         <a class="title-link title" href="{$WWWROOT}artefact/blog/view/index.php?id={$blog->id}">
         {$blog->title}

htdocs/theme/raw/plugintype/artefact/blog/templates/posts.tpl

@@ -69,7 +69,7 @@
         </p>
 
         {if $post->files}
-        <div class="has-attachment card card-secondary collapsible" id="postfiles_{$post->id}">
+        <div class="has-attachment card card collapsible" id="postfiles_{$post->id}">
             <h5 class="card-header has-link">
                 <a class="text-left collapsed" data-toggle="collapse" href="#attach_{$post->id}" aria-expanded="false">
                     <span class="icon left icon-paperclip" role="presentation" aria-hidden="true"></span>

htdocs/theme/raw/plugintype/artefact/blog/templates/render/blogpost_renderattachments.tpl

-        <div class="has-attachment card card-secondary collapsible">
+        <div class="has-attachment card card collapsible">
             <h3 class="card-heading">
                 <a class="text-left collapsed" aria-expanded="false" href="#blog-attach-{$postid}" data-toggle="collapse">
                     <span class="icon left icon-paperclip" role="presentation" aria-hidden="true"></span>

htdocs/theme/raw/plugintype/artefact/blog/templates/viewposts.tpl

@@ -27,7 +27,7 @@
         </div>
 
         {if $post->files}
-        <div class="has-attachment card card-secondary collapsible" id="blockpostfiles-{$post->id}">
+        <div class="has-attachment card card collapsible" id="blockpostfiles-{$post->id}">
             <h5 class="card-heading">
                 <a class="text-left collapsed" data-toggle="collapse" href="#post-attach-{$post->id}" aria-expanded="false">
                     <span class="icon icon-paperclip left" role="presentation" aria-hidden="true"></span>

htdocs/theme/raw/plugintype/artefact/comment/templates/commentlist.tpl

@@ -94,7 +94,7 @@
 
         {if !$item->deletedmessage && $item->attachments}
         <div class="comment-attachment">
-            <div class="card card-secondary has-attachment collapsible">
+            <div class="card card has-attachment collapsible">
                 <h4 class="card-heading">
                     <a class="collapsible collapsed" aria-expanded="false" href="#attachments_{$item->id}" data-toggle="collapse">
                         <span class="icon left icon-paperclip" role="presentation" aria-hidden="true"></span>

htdocs/theme/raw/plugintype/artefact/file/templates/form/filebrowser.tpl

@@ -54,7 +54,7 @@
         {/if}
 
         {if $config.upload}
-        <div id="{$prefix}_upload_container" class="clearfix {if $config.selectone || $config.selectmodal} card-fake{else} card card-secondary fileupload {/if} {if ($tabs && !$tabs.upload) || $uploaddisabled} d-none{/if}">
+        <div id="{$prefix}_upload_container" class="clearfix {if $config.selectone || $config.selectmodal} card-fake{else} card card fileupload {/if} {if ($tabs && !$tabs.upload) || $uploaddisabled} d-none{/if}">
             {* config.uploadagreement: disable the file chooser unless the agreement is checked *}
             {* config.simpleupload: the form only contains a file chooser *}
             {* config.submitbutton: add submit button even if js is enabled & don't start uploading as soon as a file is chosen *}
@@ -167,7 +167,7 @@
             </div>
         {/if}
 
-        <div class="filelist-wrapper card card-block">
+        <div class="filelist-wrapper card card-secondary">
             <h3 id="{$prefix}_foldernav" class="card-header">
             {include file="artefact:file:form/folderpath.tpl" path=$path querybase=$querybase owner=$tabs.owner ownerid=$tabs.ownerid}
             </h3>

htdocs/theme/raw/plugintype/artefact/internal/blocktype/textbox/templates/content.tpl

@@ -10,7 +10,7 @@
 
 {if $attachments}
 {* @TODO: this could probably be a reusable template *}
-<div class="has-attachment card card-secondary collapsible">
+<div class="has-attachment card card collapsible">
     <h4 class="card-heading">
         <a class="text-left collapsed" aria-expanded="false" href="#note-attach-{$blockid}" data-toggle="collapse">
             <span class="icon icon-paperclip left" role="presentation" aria-hidden="true"></span>

htdocs/theme/raw/plugintype/artefact/resume/templates/fragments/book.tpl

 {if $controls}
-<div class="card card-secondary">
+<div class="card card">
     {if !$hidetitle}
     <h3 class="resumeh3 card-header">
         {str tag='book' section='artefact.resume'}

htdocs/theme/raw/plugintype/artefact/resume/templates/fragments/certification.tpl

 {if $controls}
-<div class="card card-secondary">
+<div class="card card">
     {if !$hidetitle}
     <h3 class="resumeh3 card-header">
         {str tag='certification' section='artefact.resume'}

htdocs/theme/raw/plugintype/artefact/resume/templates/fragments/educationhistory.tpl

 {if $controls}
-<div class="card card-secondary">
+<div class="card card">
     {if !$hidetitle}
     <h3 class="resumeh3 card-header">
         {str tag='educationhistory' section='artefact.resume'}

htdocs/theme/raw/plugintype/artefact/resume/templates/fragments/employmenthistory.tpl

 {if $controls}
-<div class="card card-secondary">
+<div class="card card">
     {if !$hidetitle}
     <h3 class="resumeh3 card-header">
         {str tag='employmenthistory' section='artefact.resume'}

htdocs/theme/raw/plugintype/artefact/resume/templates/fragments/goals.tpl

@@ -8,7 +8,7 @@
     </h3>{/if}
     <div id="goalslist{$suffix}" class="card-items card-items-no-margin js-masonry" data-masonry-options='{ "itemSelector": ".card" }'>
         {foreach from=$goals item=n, name='default'}
-        <div class="card card-secondary">
+        <div class="card card">
             <h4 class="card-header has-link">
                 {if $n->exists}
                     <a id="goals_edit_{$n->artefacttype}" href="{$WWWROOT}artefact/resume/editgoalsandskills.php?id={$n->id}" title="{str tag=edit$n->artefacttype section=artefact.resume}">

htdocs/theme/raw/plugintype/artefact/resume/templates/fragments/goalsandskills.tpl

@@ -2,7 +2,7 @@
 {$description|clean_html|safe}
 
 {if isset($attachments)}
-<div class="has-attachment card card-secondary collapsible">
+<div class="has-attachment card card collapsible">
     <h4 class="card-heading">
         <a class="text-left collapsed" aria-expanded="false" href="#cv-attach-{$id}{if $artefactid}-{$artefactid}{/if}" data-toggle="collapse">
             <span class="icon left icon-paperclip" role="presentation" aria-hidden="true"></span>

htdocs/theme/raw/plugintype/artefact/resume/templates/fragments/membership.tpl

 {if $controls}
-<div class="card card-secondary">
+<div class="card card">
     {if !$hidetitle}
     <h3 class="resumeh3 card-header">
         {str tag='membership' section='artefact.resume'}

htdocs/theme/raw/plugintype/artefact/resume/templates/fragments/skills.tpl

@@ -9,7 +9,7 @@
 
     <div id="skillslist{$suffix}" class="card-items card-items-no-margin js-masonry" data-masonry-options='{ "itemSelector": ".card" }'>
         {foreach from=$skills item=n}
-        <div class="card card-secondary">
+        <div class="card card">
             <h3 class="card-header has-link">
                 {if $n->exists}
                 <a id="skills_edit_{$n->artefacttype}" href="{$WWWROOT}artefact/resume/editgoalsandskills.php?id={$n->id}" title="{str tag=edit$n->artefacttype section=artefact.resume}">

htdocs/theme/raw/plugintype/auth/webservice/templates/addconnection.tpl

 {include file="header.tpl"}
-<div class="card card-secondary">
+<div class="card card">
     <h3 class="card-heading">{str tag="clientconnections" section="auth.webservice"}</h3>
     <div class="card-body">
     {$form|safe}

htdocs/theme/raw/plugintype/auth/webservice/templates/configform.tpl

@@ -4,7 +4,7 @@
 <div class="collapsible-group" id="accordion" aria-multiselectable="true" role="tablist" >
 {foreach from=$form.elements item=element name=elements}
     {if $element.type == 'fieldset'}
-    <div class="pseudofieldset card card-secondary collapsible collapsible-group{if $.foreach.elements.last} last{/if}">
+    <div class="pseudofieldset card card collapsible collapsible-group{if $.foreach.elements.last} last{/if}">
         <h2 class="pseudolegend card-header has-link">
         <a class="{if !$.foreach.elements.first}collapsed{/if}" href="#{$element.name}_pseudofieldset" data-toggle="collapse" aria-expanded="{if $.foreach.elements.first}true{else}false{/if}" aria-controls="{$element.name}_pseudofieldset" data-parent="#accordion">
         {$element.legend}

htdocs/theme/raw/plugintype/auth/webservice/templates/testclient.tpl

@@ -9,7 +9,7 @@
 {elseif $disabledprotocols}
     <div class="error alert alert-warning">{str tag=nowsprotocolsenabled section='auth.webservice' arg1=$disabledprotocols}</div>
 {else}
-    <div class="card card-secondary card-body">
+    <div class="card card card-body">
     {$form|safe}
     </div>
 {/if}

htdocs/theme/raw/plugintype/auth/webservice/templates/webservicelogs.tpl

 {include file="header.tpl"}
 
-<div id="logsearchformcontainer" class="card card-secondary card-body">
+<div id="logsearchformcontainer" class="card card card-body">
 {$form|safe}
 </div>
-<div id="results" class="section card card-secondary">
+<div id="results" class="section card card">
     <h2 class="card-header" id="resultsheading">{str tag="Results"}</h2>
     {if $results}
     <div class="table-responsive">

htdocs/theme/raw/plugintype/blocktype/inbox/templates/inboxmr.tpl

@@ -5,7 +5,7 @@
 {else}
     <div id="inboxblock" class="inboxblock list-group">
         {foreach from=$items item=i}
-        <div class="has-attachment card-secondary collapsible list-group-item{if !$i->read} js-card-unread{/if}" data-requesturl="{$WWWROOT}module/multirecipientnotification/indexin.json.php">
+        <div class="has-attachment card collapsible list-group-item{if !$i->read} js-card-unread{/if}" data-requesturl="{$WWWROOT}module/multirecipientnotification/indexin.json.php">
             {if $i->message}
                 <a class="collapsed link-block{if !$i->read} unread{/if}" data-toggle="collapse" href="#message_content_{$i->type}_{$i->id}" data-id="{$i->id}" aria-expanded="false">
                     {if $i->type == 'usermessage'}

htdocs/theme/raw/plugintype/blocktype/wall/templates/inlineposts.tpl

@@ -4,7 +4,7 @@
     {/if}
     {if $wallposts}
         {foreach from=$wallposts item=wallpost}
-            <div class="card {if $wallpost->private}card bg-warning{else}card-secondary{/if} wallpost">
+            <div class="card {if $wallpost->private}card bg-warning{else}card{/if} wallpost">
                 <h4 class="card-header has-link">
                     <a href="{$wallpost->profileurl}" class="userinfo has-user-icon">
                         <span class="user-icon left">

htdocs/theme/raw/plugintype/module/multirecipientnotification/templates/activitylistin.tpl

 <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 collapsible notification collapsible-group  {if !$item->read}card bg-primary text-white js-card-unread{else}card{/if} {if $dwoo.foreach.notification.first}first{/if} {if $dwoo.foreach.notification.last}last{/if} ">
         <div class="card-header">
             <label class="card-control">
                 <span class="control {if !$item->read}unread{/if}">

htdocs/theme/raw/plugintype/module/multirecipientnotification/templates/activitylistout.tpl

 <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}">
+    <div class="card card collapsible notification collapsible-group {if $dwoo.foreach.notification.first}first{/if} {if $dwoo.foreach.notification.last}last{/if}">
         <h4 class="card-header">
             <label class="card-control">
                 {if $item->table === 'module_multirecipient_notification'}

htdocs/theme/raw/plugintype/module/multirecipientnotification/templates/sendmessage.tpl

@@ -4,7 +4,7 @@
 <p class="lead">{str tag='labelsubject' section='module.multirecipientnotification'} {$messages.[0]->subject}</p>
 <div id="messagethread" class="collapsible-group">
 {foreach from=$messages item=message name='message'}
-    <div class="message-item card card-secondary collapsible collapsible-group {if $dwoo.foreach.message.first}first{/if}">
+    <div class="message-item card card collapsible collapsible-group {if $dwoo.foreach.message.first}first{/if}">
         <h2 class="message-preview card-heading">
             <span class="user-icon left" role="presentation" aria-hidden="true">
                 <img src="{profile_icon_url user=$message->fromid maxwidth=60 maxheight=60}" alt="{$message->fromusrname}">
@@ -78,7 +78,7 @@
     </div>
 {/foreach}
 </div>
-<div class="form-sendmessage card card-secondary collapsible">
+<div class="form-sendmessage card card collapsible">
     <div class="card-footer">
         {$form|safe}
     </div>

htdocs/theme/raw/plugintype/search/elasticsearch/templates/searchresults.tpl

 {include file="search:elasticsearch:facets.tpl" facets=$facets}
-<div class="subpage universalsearch card card-secondary">
+<div class="subpage universalsearch card card">
     <div id="resultswrap" class="{if $selected eq 'Text' || $selected eq 'Media' || $selected eq 'Portfolio'}filter{else}nofilter{/if}">
         {if $totalresults > 0}
             <div class="elasticsearch-filters clearfix">

htdocs/theme/raw/sass/_custom.scss

@@ -144,8 +144,8 @@
     }
 }
 
-// Specific card-block styling for the edit page layout
-.card-block.blockinstance > .card-header > .blockinstance-header {
+// Specific card-secondary styling for the edit page layout
+.card-secondary.blockinstance > .card-header > .blockinstance-header {
     display: block;
     padding-left: 10px;
     padding-right: 80px;
@@ -371,7 +371,7 @@
     }
 }
 
-.card-secondary > .card-header {
+.card > .card-header {
     font-size: $font-size-base * 1.14285;
 }
 

htdocs/theme/raw/sass/components/_btn.scss

@@ -231,7 +231,7 @@ td.action-list-copy {
     }
 }
 // Edit page configure buttons
-.card-block .blockinstance-controls .btn-group-top {
+.card-secondary .blockinstance-controls .btn-group-top {
     position: absolute;
     top: 11px;
     right: 10px;

htdocs/theme/raw/sass/components/_indicator.scss

@@ -9,7 +9,7 @@
     .card-header:hover & {
         opacity: 1;
     }
-    .card-block & {
+    .card-secondary & {
         float: left;
         margin-top: 5px;
         margin-left: 0;

htdocs/theme/raw/sass/components/_tags.scss

@@ -7,7 +7,7 @@
     }
 }
 
-.card-body, .card-secondary {
+.card-body, .card {
     .tags {
         margin-bottom: 10px;
     }

htdocs/theme/raw/sass/layout/card/_card-block.scss

-// card-secondary is the style used for the user-editable cards used across Mahara
-
-.card-block {
-    &.card {
-        @include box-shadow(none);
-        border-color: transparent;
-    }
-    .admin & {
-        border-color: $card-border-color; // TODO: This might affect other things elsewhere
-    }
-    > .card-header {
-        font-family: $font-family-serif;
-        border-bottom: 2px solid $card-border-color;
-        font-size: $font-size-base * 1.285;
-        margin-top: 0;
-    }
-    &.blockinstance.card {
-        background-color: transparent;
-        .card-header {
-            background-color: $card-header-bg;
-        }
-    }
-    > .card-header, .card-header-nested {
-        border-bottom: 2px solid $card-border-color;
-        padding: 10px 8px;
-        background: transparent;
-
-        // In page builder we can choose to not have a heading,
-        // but we still need a dragable object.
-        // Use a placeholder for visual help
-        // will appear with the no-heading class in view mode
-        &.card-header-placeholder {
-            border: 1px solid scale-color($gray-300, $lightness: -10.93);
-            border-style: dashed;
-            background-color: $card-bg;
-            .blockinstance-header {
-                opacity:0.6;
-            }
-        }
-    }
-    &.card-warning {
-         > .card-header, .card-header-nested {
-            border-left: 4px solid $card-block-border;
-            background-color: $card-warning-header-bg;
-            border-bottom: 1px solid $card-warning-border;
-        }
-    }
-    & .card-warning .card-body {
-            background-color: $card-warning-header-bg;
-    }
-    .card-header-plain {
-        border: 1px solid scale-color($gray-300, $lightness: -10.93);
-    }
-    .list-group .list-group-item {
-        border-left: 0;
-        border-right: 0;
-        &:first-child {
-            border-top:0;
-        }
-    }
-    > .card-body,
-    > .block > .card-body {
-        padding: 15px 8px;
-        &.flush {
-            padding: 15px 0 0 0;
-        }
-    }
-    // If there is no heading we don't want padding on the card-body
-    > .no-heading {
-        > .card-body {
-            padding: 0;
-        }
-        .has-attachment {
-            margin: 0;
-        }
-    }
-}

htdocs/theme/raw/sass/layout/card/_card-collapse.scss

@@ -153,7 +153,7 @@
 }
 
 // @todo: Rethink this, it's too complex
-.card.collapsible:not(.card-block) {
+.card.collapsible:not(.card-secondary) {
     border-width: 0;
     // For attachment collapsible
     &.has-attachment {

htdocs/theme/raw/sass/layout/card/_card-header.scss

@@ -27,10 +27,10 @@
         display: block;
         color: inherit;
         padding: 10px 15px;
-        border: 1px solid $card-border-color;
+        border: 0 solid $card-border-color;
         border-bottom: 0;
         font-size: $font-size-base * 1.14285;
-        .card-block > & {
+        .card-secondary > & {
             padding: 10px 8px;
             border-width: 0;
         }
@@ -42,7 +42,7 @@
             &.outer-link {
                 background: none;
             }
-            .card-block > & {
+            .card-secondary > & {
                 padding: 10px 8px;
             }
         }
@@ -89,7 +89,7 @@ h3 {
 }
 
 .card {
-    &.collapsible:not(.card-block) {
+    &.collapsible:not(.card-secondary) {
         .card-header {
             border: 0;
             a {

htdocs/theme/raw/sass/layout/card/_card-quarter.scss

@@ -22,7 +22,7 @@
             ) !important;
     }
 
-    .card-secondary {
+    .card {
         position: relative;
         height: 100%;
         border: 1px solid $card-border-color;
@@ -44,7 +44,7 @@
         }
     }
 
-    .card-secondary .card-body {
+    .card .card-body {
         padding: 5px;
     }
 

htdocs/theme/raw/sass/layout/card/_card-secondary.scss

-// card-secondary is the style used for the user-editable cards used across Mahara
+// card is the style used for the user-editable cards used across Mahara
 
-.card-secondary {
+.card.card-secondary {
     &.card {
-        // @include box-shadow(none);
+        @include box-shadow(none);
+        border-color: transparent;
     }
     .admin & {
-        border-color: $card-secondary-border;
+        border-color: $card-border-color; // TODO: This might affect other things elsewhere
     }
     > .card-header {
-        font-family: $font-family-sans-serif;
+        font-family: $font-family-serif;
+        border-bottom: 2px solid $card-border-color;
+        font-size: $h4-font-size;
         margin-top: 0;
-        > a.username {
-            border: 0;
-        }
-        > a.user-icon {
-            border: 1px solid $thumbnail-border-color;
-        }
     }
     &.blockinstance.card {
         background-color: transparent;
         .card-header {
-            background-color: $card-secondary-header-bg;
-        }
-        .blockinstance-content {
-            .editor-description {
-                color: $gray-300;
-                font-style: italic;
-                font-size: $font-size-base - 1;
-                display: block;
-                padding: 5px 10px 0 5px;
-                text-align: center;
-            }
+            background-color: $card-header-bg;
         }
     }
     > .card-header, .card-header-nested {
-        border-bottom: 1px solid $card-secondary-border;
+        border-bottom: 2px solid $card-border-color;
+        padding: 10px 8px;
+        background: transparent;
 
-        // In page builder we can choose to not have a header,
+        // In page builder we can choose to not have a heading,
         // but we still need a dragable object.
         // Use a placeholder for visual help
         // will appear with the no-heading class in view mode
         &.card-header-placeholder {
-            border: 1px solid scale-color($gray-100, $lightness: -5.75%);
+            border: 1px solid scale-color($gray-300, $lightness: -10.93);
             border-style: dashed;
-            background-color: $card-secondary-header-bg;
+            background-color: $card-bg;
             .blockinstance-header {
                 opacity:0.6;
             }
@@ -60,7 +49,7 @@
             background-color: $card-warning-header-bg;
     }
     .card-header-plain {
-        border: 1px solid scale-color($gray-100, $lightness: -5.75%);
+        border: 1px solid scale-color($gray-300, $lightness: -10.93);
     }
     .list-group .list-group-item {
         border-left: 0;
@@ -71,7 +60,7 @@
     }
     > .card-body,
     > .block > .card-body {
-        padding: 15px;
+        padding: 15px 8px;
         &.flush {
             padding: 15px 0 0 0;
         }

htdocs/theme/raw/sass/layout/nav/_tabs.scss

@@ -9,7 +9,7 @@
     .tab-content {
         padding: 10px;
         background-color: $card-bg;
-        .card-block {
+        .card-secondary {
             border: none;
         }
     }

htdocs/theme/raw/sass/lib/_draggable.scss

@@ -79,7 +79,7 @@
 .ui-sortable-helper .blockinstance-controls {
     display: none;
 }
-.ui-sortable-helper.card-block.blockinstance > .card-header > .blockinstance-header {
+.ui-sortable-helper.card-secondary.blockinstance > .card-header > .blockinstance-header {
     padding-right: 0;
 }
 

htdocs/theme/raw/sass/utilities/_bootstrap-variables.scss

@@ -978,7 +978,7 @@ $progress-bar-transition:           width .6s ease !default;
 
 $list-group-bg:                             #fff !default;
 $list-group-border-color:           rgba($black, .125) !default;
-$list-group-border-width:           $border-width !default;
+$list-group-border-width:           0 !default;
 $list-group-border-radius:                  $border-radius !default;