Commit 29816f61 authored by Liam's avatar Liam
Browse files

Bug #1765276: Upgrading to bootstrap 4.3.1 from 4.2.1 

Replaces raw/scss/lib/ files and the lib/bootstrap/assets/javascripts with the new ones
Involved adding some more variables to the bootstrap_variabes file

behatnotneeded

Change-Id: I0440edcbdf53e8ff3994d2e52ce123a2df9ce182
parent b4764131

htdocs/lib/bootstrap/assets/javascripts/README.Mahara

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ Bootstrap for Sass 
==================



Website: https://getbootstrap.com/

Version: 4.2.1

Version: 4.3.1



The most popular HTML, CSS, and JavaScript framework for developing responsive, mobile first projects on the web.

htdocs/lib/bootstrap/assets/javascripts/bootstrap.min.js

+3 −3

File changed.

Preview size limit exceeded, changes collapsed.

htdocs/lib/bootstrap/assets/javascripts/bootstrap.min.js.map

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

htdocs/theme/raw/sass/lib/bootstrap4/_badge.scss

+2 −1
Original line number Diff line number Diff line
@@ -6,13 +6,14 @@ 
.badge {

  display: inline-block;

  padding: $badge-padding-y $badge-padding-x;

  font-size: $badge-font-size;

  @include font-size($badge-font-size);

  font-weight: $badge-font-weight;

  line-height: 1;

  text-align: center;

  white-space: nowrap;

  vertical-align: baseline;

  @include border-radius($badge-border-radius);

  @include transition($badge-transition);



  @at-root a#{&} {

    @include hover-focus {

htdocs/theme/raw/sass/lib/bootstrap4/_buttons.scss

+3 −6
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 


.btn {

  display: inline-block;

  font-family: $btn-font-family;

  font-weight: $btn-font-weight;

  color: $body-color;

  text-align: center;
@@ -34,11 +35,6 @@ 
    @include box-shadow(none);

  }



  // Opinionated: add "hand" cursor to non-disabled .btn elements

  &:not(:disabled):not(.disabled) {

    cursor: pointer;

  }



  &:not(:disabled):not(.disabled):active,

  &:not(:disabled):not(.disabled).active {

    @include box-shadow($btn-active-box-shadow);
@@ -81,6 +77,7 @@ fieldset:disabled a.btn { 
.btn-link {

  font-weight: $font-weight-normal;

  color: $link-color;

  text-decoration: $link-decoration;



  @include hover {

    color: $link-hover-color;
@@ -95,7 +92,7 @@ fieldset:disabled a.btn { 


  &:disabled,

  &.disabled {

    color: $gray-300;

    color: $btn-link-disabled-color;

    pointer-events: none;

  }