Commit 68791d82 authored by Evonne Cheung's avatar Evonne Cheung Committed by Robert Lyon
Browse files

Bug 1845053 Theme updates for Raw theme 

Removed dashboard boxes hide link.

Corrected style for import form button.

Reset headings for SmartEvidence popovers.

Removed line between customised theme color selector form.

Increase gap between dashboard boxes and edit button.

Changes collection title from h2 to div.collection-title.

Realign left when two select boxes are vertically after one another,
rather than horizontally after one another.

Took away smaller font sizes in skins, put default as medium.

Brought back .card-half to make managing collection pages side by
side. Icon on add pages button changed to a plus, and turned to
secondary button.

behatnotneeded

Change-Id: I114d1b022300b075d2df26a14d3b55cc255cc3af
parent 7715a2ba

htdocs/collection/views.php

+2 −2
Original line number Diff line number Diff line
@@ -148,10 +148,10 @@ if ($available = Collection::available_views($owner, $groupid, $institutionname) 
    );



    $elements['submit'] = array(

        'class' => 'btn-primary float-right add-pages',

        'class' => 'btn-secondary float-right add-pages',

        'type' => 'button',

        'usebuttontag' => true,

        'value' => '<span class="icon icon-arrow-right left" role="presentation" aria-hidden="true"></span>' . get_string('addviews','collection'),

        'value' => '<span class="icon icon-plus left" role="presentation" aria-hidden="true"></span>' . get_string('addviews','collection'),

        'goto' => get_config('wwwroot') . 'collection/views.php?id='.$id,

    );

htdocs/group/index.php

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ if (get_config('allowgroupcategories') 


    $searchfield = array(

        'type' => 'submit',

        'class' => 'btn-primary input-group-append no-label button',

        'class' => 'btn-secondary input-group-append no-label button',

        'value' => get_string('search')

    );

htdocs/import/leap/lib.php

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ class PluginImportLeap extends PluginImport { 
        $html .=

            '<div class="submitcancel form-group">'.

            '<input type="hidden" value="' . DOIMPORT_ACT . '" name="action">

            <input type="submit" value="' . get_string('Import', 'import') . '" name="import_submit" id="import_submit" class="btn-primary submitcancel submit">

            <input type="submit" value="' . get_string('Import', 'import') . '" name="import_submit" id="import_submit" class="btn btn-primary submitcancel submit">

            <input type="submit" value="' . get_string('cancel') . '" name="cancel_import_submit" id="cancel_import_submit" class="submitcancel cancel"></div>

        </form>';

        return $html;

htdocs/lang/en.utf8/skin.php

+0 −2
Original line number Diff line number Diff line
@@ -138,8 +138,6 @@ $string['viewwidth'] = 'Page width'; 
$string['textfontfamily'] = 'Text font';

$string['headingfontfamily'] = 'Heading font';

$string['fontsize'] = 'Font size';

$string['fontsizesmallest'] = 'smallest';

$string['fontsizesmaller'] = 'smaller';

$string['fontsizesmall'] = 'small';

$string['fontsizemedium'] = 'medium';

$string['fontsizelarge'] = 'large';

htdocs/lib/skin.php

+2 −8
Original line number Diff line number Diff line
@@ -778,7 +778,7 @@ class Skin { 


    /**

     * Gets font sizes for heading, sub-heading and normal text from given relative size (as in CSS).

     * Relative size can be one of following: xx-small, x-small, small, medium, large, x-large or xx-large

     * Relative size can be one of following: small, medium, large, x-large or xx-large

     * The font size of a page header is not affected by user chosen font size

     *

     * @param string $font_size
@@ -786,12 +786,6 @@ class Skin { 
     */

    private static function get_font_sizes($font_size) {

        switch ($font_size) {

            case 'xx-small':

                return array(9, 5, 3);

                break;

            case 'x-small':

                return array(9, 6, 4);

                break;

            case 'small':

                return array(9, 7, 5);

                break;
@@ -808,7 +802,7 @@ class Skin { 
                return array(9, 14, 12);

                break;

            default:

                return array(9, 7, 5);

                return array(9, 8, 6);

                break;

        }

    }