Commit c3ea0a8f authored by Liam's avatar Liam Committed by Rebecca Blundell
Browse files

Bug #1765276: Fixing errors from Jaques email (pasted below)

1. Change all 0px references to 0
2. Fix &focus --> &:focus in raw/sass/_buttons.scss
3. why is $navbar-height replaced with 30px in raw/sass/_main-nav.scss
4. Any reason styles commented out are left in see example
raw/sass/_main-nav.scss
5. Why @includes commented out in /sass/components/_arrow-bar.scss
6. Comment?? line 42 of /sass/components/_pagination.scss
7. New file not in master?? sass/features/_features.scss
8. Remove file --> sass/views.scss
9. Remove commented styles --> sass/layout/card/_card-collapse.scss
10. How did you determine hidden-xs should be replaced with d-none
d-sm-block -->https://reviews.mahara.org/#/c/8947/1/htdocs/lib/web.php
10B. What is the reasoning for adding the background: white to -->
https://reviews.mahara.org/#/c/8947/1/htdocs/theme/raw/sass/components/_list-group.scss
11. Confirm if 14px the default $font-size-base we going with -->
https://reviews.mahara.org/#/c/8947/1/htdocs/theme/raw/sass/utilities/_bootstrap-variables.scss
12. how did you determine use of d-md-block for -->
https://reviews.mahara.org/#/c/8947/1/htdocs/theme/raw/templates/styleguide.tpl
13. Why is additional "Roboto Slab" font added -->
https://reviews.mahara.org/#/c/8947/1/htdocs/theme/raw/sass/utilities/_bootstrap-variables.scss
14. Reason for removing @include media breakpoint -->
https://reviews.mahara.org/#/c/8948/1/htdocs/theme/raw/sass/form/_dropdown-group.scss
15. Why is border-radius changed -->
https://reviews.mahara.org/#/c/8948/1/htdocs/theme/raw/sass/utilities/_bootstrap-variables.scss
16. Remove extra indentation -->
https://reviews.mahara.org/#/c/8957/1/htdocs/theme/raw/sass/components/_btn.scss
17. Reason for uncomment of tinymce -->
https://reviews.mahara.org/#/c/8957/1/htdocs/theme/raw/sass/utilities/_index.scss
18. Reason for dropping caret -->
https://reviews.mahara.org/#/c/8987/2/htdocs/theme/raw/sass/lib/bootstrap4/_dropdown.scss
19. Reason why .link-thumb lighten changed to darken
-->https://reviews.mahara.org/#/c/9001/1/htdocs/theme/raw/sass/components/_link-thumb.scss
20. Duplicate &bg-danger {} -->
https://reviews.mahara.org/#/c/9001/1/htdocs/theme/raw/sass/layout/card/_card-colors.scss


behatnotneeded

Change-Id: I0835eca79ef42e8f768a3d1213a3580796d64dcb
parent eae9085b
...@@ -21,9 +21,8 @@ function pieform_element_checkboxes(Pieform $form, $element) {/*{{{*/ ...@@ -21,9 +21,8 @@ function pieform_element_checkboxes(Pieform $form, $element) {/*{{{*/
if (empty($element['hideselectorbuttons']) && count($element['elements']) > 1) { if (empty($element['hideselectorbuttons']) && count($element['elements']) > 1) {
$id = hsc($form->get_name() . '_' . $element['name']) . '_container'; $id = hsc($form->get_name() . '_' . $element['name']) . '_container';
$result .= '<div class="btn-group"><a href="" class="btn btn-secondary btn-xs" onclick="pieform_element_checkboxes_update(\'' . $id . '\', true); return false;">' . get_string('selectall') . '</a>' $result .= '<div class="btn-group"><a href="" class="btn btn-secondary btn-sm" onclick="pieform_element_checkboxes_update(\'' . $id . '\', true); return false;">' . get_string('selectall') . '</a>' .
. '&nbsp;' '<a href="" class="btn btn-secondary btn-sm" onclick="pieform_element_checkboxes_update(\'' . $id . '\', false); return false;">' . get_string('selectnone') . '</a></div>';
. ' <a href="" class="btn btn-secondary btn-xs" onclick="pieform_element_checkboxes_update(\'' . $id . '\', false); return false;">' . get_string('selectnone') . '</a></div>';
} }
$element['name'] .= '[]'; $element['name'] .= '[]';
......
...@@ -203,7 +203,7 @@ div.toolbarhtml { ...@@ -203,7 +203,7 @@ div.toolbarhtml {
} }
th.smartevidencedash, td.smartevidencedash { th.smartevidencedash, td.smartevidencedash {
padding: 0px !important; padding: 0 !important;
vertical-align: middle !important; vertical-align: middle !important;
} }
......
...@@ -116,9 +116,9 @@ $width-sm: 90%; ...@@ -116,9 +116,9 @@ $width-sm: 90%;
@include transition(visibility 0s 0.3s); @include transition(visibility 0s 0.3s);
visibility: hidden; visibility: hidden;
position: fixed; position: fixed;
top: 0px; top: 0;
right: 0px; right: 0;
bottom: 0px; bottom: 0;
.mce-tinymce { .mce-tinymce {
display:none; display:none;
...@@ -153,8 +153,8 @@ $width-sm: 90%; ...@@ -153,8 +153,8 @@ $width-sm: 90%;
width: $width; width: $width;
margin: 0; margin: 0;
position: fixed; position: fixed;
top: 0px; top: 0;
bottom: 0px; bottom: 0;
@include media-breakpoint-down(md) { @include media-breakpoint-down(md) {
width: ($width-sm + 5); width: ($width-sm + 5);
} }
...@@ -171,7 +171,7 @@ $width-sm: 90%; ...@@ -171,7 +171,7 @@ $width-sm: 90%;
margin: 0 0 10px 0; margin: 0 0 10px 0;
} }
.close { .close {
@include box-shadow(-2px 0px 2px rgba(0,0,0,0.3)); @include box-shadow(-2px 0 2px rgba(0,0,0,0.3));
border-radius:3px 0 0 3px; border-radius:3px 0 0 3px;
opacity: 1; opacity: 1;
position: absolute; position: absolute;
......
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
.user-icon-alt { .user-icon-alt {
border-radius: 3px; border-radius: 3px;
.label &{ .label &{
margin: 1px 4px 0px -3px; margin: 1px 4px 0 -3px;
} }
} }
......
...@@ -24,14 +24,14 @@ ...@@ -24,14 +24,14 @@
pre { pre {
background-color: transparent; background-color: transparent;
border: 0px none; border: 0 none;
color: $theme-text-color; color: $theme-text-color;
font-size: $font-size-base; font-size: $font-size-base;
padding: 0; padding: 0;
} }
h1 { h1 {
border-bottom: 0px none; border-bottom: 0 none;
padding: 0; padding: 0;
} }
......
...@@ -351,7 +351,7 @@ ...@@ -351,7 +351,7 @@
margin-left: 5px; margin-left: 5px;
} }
label + select { label + select {
margin-left: 0px; // padding provided by label instead margin-left: 0; // padding provided by label instead
} }
&.multi-label { &.multi-label {
&.customrow { &.customrow {
......
...@@ -165,8 +165,8 @@ textarea.resizable { ...@@ -165,8 +165,8 @@ textarea.resizable {
} }
.form-group { .form-group {
padding: 0; padding: 0;
border-bottom: 0px none; border-bottom: 0 none;
align-items: flex-start; align-items: flex-start;
} }
&.form-inline-align-bottom .form-group{ &.form-inline-align-bottom .form-group{
vertical-align: bottom; vertical-align: bottom;
......
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
.logo, .logo,
.logoxs { .logoxs {
top: 0px; top: 0;
right: 0px; right: 0;
position: relative; position: relative;
img { img {
height: 100%; height: 100%;
......
...@@ -41,7 +41,7 @@ body { ...@@ -41,7 +41,7 @@ body {
background-color: theme-color("secondary"); background-color: theme-color("secondary");
margin-bottom: 40px; margin-bottom: 40px;
margin-top: -109px; margin-top: -109px;
padding: 40px 0px 20px; padding: 40px 0 20px;
} }
.subpage { .subpage {
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
@include transition(opacity 0.5s); @include transition(opacity 0.5s);
@include fa-icon(); @include fa-icon();
border-radius: 3px; border-radius: 3px;
bottom: 0px; bottom: 0;
background: $gray-100; background: $gray-100;
color: $gray-700; color: $gray-700;
padding:3px; padding:3px;
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
display: block; display: block;
opacity:0; opacity:0;
position: absolute; position: absolute;
right: 0px; right: 0;
visibility: hidden; visibility: hidden;
} }
} }
......
...@@ -184,30 +184,6 @@ ...@@ -184,30 +184,6 @@
&.last .card-heading a.collapsed { &.last .card-heading a.collapsed {
border-bottom-width: 1px; border-bottom-width: 1px;
} }
// Style variations
// @each $status, $bgcolor in $card-background {
// &.card-#{$status} {
// .card-heading a {
// background-color: darken($bgcolor, 3%);
// &.collapsed {
// background-color: $bgcolor;
// }
// &:hover,
// &:focus {
// background-color: darken($bgcolor, 3%);
// }
// }
// .card-footer,
// .card-body,
// .card-heading a {
// border: 1px solid darken($bgcolor, 15%);
// }
// .card-heading a,
// .card-body:not(.no-footer) {
// border-bottom-width:0;
// }
// }
// }
} }
.collapse > .collapse { .collapse > .collapse {
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
} }
} }
&.bg-danger { &.bg-warning {
border-color: darken($card-warning-heading-bg, 15%); border-color: darken($card-warning-heading-bg, 15%);
background-color: $card-bg !important; background-color: $card-bg !important;
.card-header { .card-header {
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
margin-bottom: 100px; //buffer margin-bottom: 100px; //buffer
margin-top: 30px; margin-top: 30px;
&.card-items-no-margin { &.card-items-no-margin {
margin-bottom: 0px; margin-bottom: 0;
} }
.card { .card {
width: 30.3%; width: 30.3%;
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
// when lang selector exists or not // when lang selector exists or not
.loggedout .navbar-form.navbar-collapse { .loggedout .navbar-form.navbar-collapse {
@include media-breakpoint-up(md) { @include media-breakpoint-up(md) {
right: 0px; right: 0;
margin-right: 15px; margin-right: 15px;
&.with-langform { &.with-langform {
......
...@@ -27,11 +27,11 @@ ...@@ -27,11 +27,11 @@
text-rendering: auto; text-rendering: auto;
display: block; display: block;
height: 100%; height: 100%;
left: 0px; left: 0;
line-height: 1.3em; line-height: 1.3em;
padding: 10px 15px 5px; padding: 10px 15px 5px;
position: absolute; position: absolute;
top: 0px; top: 0;
width: 22px; width: 22px;
} }
&.checkbox { &.checkbox {
......
...@@ -9,13 +9,13 @@ ...@@ -9,13 +9,13 @@
*/ */
.embedservice_content { .embedservice_content {
padding: 10px 0px; padding: 10px 0;
} }
.embedservice_content table#embedservice_table { .embedservice_content table#embedservice_table {
width: 100%; width: 100%;
} }
.embedservice_content table#embedservice_table td { .embedservice_content table#embedservice_table td {
border: 1px solid transparent; border: 1px solid transparent;
padding: 0px 10px; padding: 0 10px;
font-size: larger; font-size: larger;
} }
...@@ -360,7 +360,7 @@ body.vjs-full-window { ...@@ -360,7 +360,7 @@ body.vjs-full-window {
text-align: center; text-align: center;
width: 300px; width: 300px;
height: 150px; height: 150px;
margin: 0px auto; } margin: 0 auto; }
.vjs-no-js a, .vjs-no-js a,
.vjs-no-js a:visited { .vjs-no-js a:visited {
......
...@@ -239,7 +239,7 @@ $line-height-sm: 1.5 !default; ...@@ -239,7 +239,7 @@ $line-height-sm: 1.5 !default;
$border-width: 1px !default; $border-width: 1px !default;
$border-color: $gray-300 !default; $border-color: $gray-300 !default;
$border-radius: .15rem !default; $border-radius: .1875rem !default;
$border-radius-lg: .25rem !default; $border-radius-lg: .25rem !default;
$border-radius-sm: .2rem !default; $border-radius-sm: .2rem !default;
......
/**
* Views index - for Mahara's Bootstrap theme.
*
* @author Catalyst IT Ltd
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later
* @copyright For copyright information on Mahara, please see the README file distributed with this software.
* This file is licensed under the same terms as Mahara itself
*/
// @todo: remove this file
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
</div> </div>
<p class="lead view-description">{str tag="usersearchinstructions" section="admin"}</p> <p class="lead view-description">{str tag="usersearchinstructions" section="admin"}</p>
<div id="results" class="section card card-secondary view-container"> <div id="results" class="section card card-secondary view-container">
<h2 class="card-heading" id="resultsheading">{str tag="Results"}</h2> <h2 class="card-header" id="resultsheading">{str tag="Results"}</h2>
{if $results} {if $results}
<div class="table-responsive"> <div class="table-responsive">
<table id="searchresults" class="table table-striped fullwidth listing"> <table id="searchresults" class="table table-striped fullwidth listing">
......
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