Commit 3b881010 authored by Rebecca Blundell's avatar Rebecca Blundell Committed by Robert Lyon
Browse files

Bug 1811904: Fontawesome - change variable names in sass files 

- changing existing sass varaibles to the new fa 5 names
- changing css prefix to icon, which we use
- adding css to over-ride fa classes with our own

behatnotneeded

Change-Id: Ic4908d800c702b2f47f6a0406d0847e4d507d34b
parent 90e4d5d7

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

+12 −12
Original line number Diff line number Diff line
@@ -132,21 +132,21 @@ 
    padding-right: 5px;

}

.bt-gallery .card-header:before {

    content: $fa-var-picture-o;

    content: $fa-var-file-image;

    font-family: FontAwesome;

    font-weight: 300;

    color: rgba(255, 255, 255, 0.6);

    padding-right: 5px;

}

.bt-internalmedia .card-header:before {

    content: $fa-var-video-camera;

    content: $fa-var-video;

    font-family: FontAwesome;

    font-weight: 300;

    color: rgba(255, 255, 255, 0.6);

    padding-right: 5px;

}

.bt-pdf .card-header:before {

    content: $fa-var-file-pdf-o;

    content: $fa-var-file-pdf;

    font-family: FontAwesome;

    font-weight: 300;

    color: rgba(255, 255, 255, 0.6);
@@ -160,21 +160,21 @@ 
    padding-right: 5px;

}

.bt-blog .card-header:before {

    content: $fa-var-pencil;

    content: $fa-var-pen;

    font-family: FontAwesome;

    font-weight: 300;

    color: rgba(255, 255, 255, 0.6);

    padding-right: 5px;

}

.bt-blogpost .card-header:before {

    content: $fa-var-file-text;

    content: $fa-var-file-alt;

    font-family: FontAwesome;

    font-weight: 300;

    color: rgba(255, 255, 255, 0.6);

    padding-right: 5px;

}

.bt-recentposts .card-header:before {

    content: $fa-var-clock-o;

    content: $fa-var-clock;

    font-family: FontAwesome;

    font-weight: 300;

    color: rgba(255, 255, 255, 0.6);
@@ -195,7 +195,7 @@ 
    padding-right: 5px;

}

.bt-annotation .card-header:before {

    content: $fa-var-pencil-square-o;

    content: $fa-var-pen-square;

    font-family: FontAwesome;

    font-weight: 300;

    color: rgba(255, 255, 255, 0.6);
@@ -216,7 +216,7 @@ 
    padding-right: 5px;

}

.bt-plans .card-header:before {

    content: $fa-var-check-square-o;

    content: $fa-var-check-square;

    font-family: FontAwesome;

    font-weight: 300;

    color: rgba(255, 255, 255, 0.6);
@@ -230,7 +230,7 @@ 
    padding-right: 5px;

}

.bt-textbox .card-header:before {

    content: $fa-var-pencil-square-o;

    content: $fa-var-pen-square;

    font-family: FontAwesome;

    font-weight: 300;

    color: rgba(255, 255, 255, 0.6);
@@ -258,7 +258,7 @@ 
    padding-right: 5px;

}

.bt-resumefield .card-header:before {

    content: $fa-var-star-o;

    content: $fa-var-star;

    font-family: FontAwesome;

    font-weight: 300;

    color: rgba(255, 255, 255, 0.6);
@@ -272,7 +272,7 @@ 
    padding-right: 5px;

}

.bt-externalvideo .card-header:before {

    content: $fa-var-youtube-play;

    content: $fa-var-youtube;

    font-family: FontAwesome;

    font-weight: 300;

    color: rgba(255, 255, 255, 0.6);
@@ -307,7 +307,7 @@ 
    padding-right: 5px;

}

.bt-image .card-header:before {

    content: $fa-var-picture-o;

    content: $fa-var-file-image;

    font-family: FontAwesome;

    font-weight: 300;

    color: rgba(255, 255, 255, 0.6);

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

+4 −4
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
    }

    &.star-rating-off {

        a {

            @extend .icon-star-o;

            @extend .icon-star;

             color: $gray-300;

        }

    }
@@ -67,7 +67,7 @@ 
    }

    &.heart-rating-off {

        a {

            @extend .icon-heart-o;

            @extend .icon-heart;

            color: $gray-300;

        }

    }
@@ -79,7 +79,7 @@ 
    }

    &.thumbs-up-rating-off {

        a {

            @extend .icon-thumbs-o-up;

            @extend .icon-thumbs-up;

            color: $gray-300;

        }

    }
@@ -91,7 +91,7 @@ 
    }

    &.check-circle-rating-off {

        a {

            @extend .icon-check-circle-o;

            @extend .icon-check-circle;

            color: $gray-300;

        }

    }

htdocs/theme/raw/sass/lib/font-awesome/_variables.scss

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
$fa-font-path:                "./../raw/fonts/font-awesome" !default;

$fa-font-size-base:           16px !default;

$fa-font-display:             auto !default;

$fa-css-prefix:               fa !default;

$fa-css-prefix:               icon !default;

$fa-version:                  "5.8.1" !default;

$fa-border-color:             #eee !default;

$fa-inverse:                  #fff !default;

htdocs/theme/raw/sass/typography/_icons.scss

+62 −52
Original line number Diff line number Diff line 
// Extra icons to fit db defiend tyopes (cf pagebuilder)

.icon {

.icon { //fontawesome solid is the default

    font-family: "Font Awesome 5 Free Solid", "Font Awesome 5 Free" !important;

    font-weight: 900;

    &.icon-regular {

        font-family: "Font Awesome 5 Free Regular", "Font Awesome 5 Free" !important;

        font-weight: 400;

    }

    &.icon-brand {

        font-family: "Font Awesome 5 Free Brands", "Font Awesome 5 Free" !important;

        font-weight: 400;

    }

    &.right {

        padding-left: 5px;

    }
@@ -19,69 +29,69 @@ 
}



.icon-annotation:before {

    content: $fa-var-pencil-square-o;

    content: fa-content($fa-var-pen-square);

}

.icon-peerassessment:before {

    content: $fa-var-list-alt;

    content: fa-content($fa-var-list-alt);

}

.icon-signoff:before {

    content: $fa-var-check-square-o;

    content: fa-content($fa-var-check-square);

}

.icon-fileimagevideo:before,

.icon-video:before {

    content: $fa-var-film;

    content: fa-content($fa-var-film);

}

.icon-blog:before {

    content: $fa-var-pencil;

    content: fa-content($fa-var-pen);

}



.icon-general:before,

.icon-occupation:before {

    content: $fa-var-briefcase;

    content: fa-content($fa-var-briefcase);

}



.icon-internal:before {

    content: $fa-var-user;

    content: fa-content($fa-var-user);

}



.icon-external:before {

    content: $fa-var-external-link;

    content: fa-content($fa-var-external-link-alt);

}



.icon-text:before {

    content: $fa-var-font;

    content: fa-content($fa-var-font);

}



.icon-filedownload:before {

    content: $fa-var-download;

    content: fa-content($fa-var-download);

}



.icon-gallery:before {

    content: $fa-var-image;

    content: fa-content($fa-var-image);

}



.icon-internalmedia:before {

    content: $fa-var-video-camera;

    content: fa-content($fa-var-video);

}



.icon-pdf:before {

    content: $fa-var-file-pdf-o;

    content: fa-content($fa-var-file-pdf);

}



.icon-blogaddress:before,

.icon-officialwebsite:before,

.icon-personalwebsite:before {

    content: $fa-var-rss;

    content: fa-content($fa-var-rss);

}



.icon-html:before {

    content: $fa-var-code;

    content: fa-content($fa-var-code);

}



.icon-view:before,

.icon-myviews:before,

.icon-groupviews:before {

    content: $fa-var-file;

    content: fa-content($fa-var-file);

}



.icon-personalskill:before,
@@ -97,146 +107,146 @@ 
.icon-educationhistory:before,

.icon-interest:before,

.icon-blogpost:before {

    content: $fa-var-file-text;

    content: fa-content($fa-var-file-alt);

}



.icon-certification:before {

    content: $fa-var-certificate;

    content: fa-content($fa-var-certificate);

}



.icon-recentposts:before {

    content: $fa-var-clock-o;

    content: fa-content($fa-var-clock);

}



.icon-taggedposts:before {

    content: $fa-var-tags;

    content: fa-content($fa-var-tags);

}



.icon-creativecommons:before {

    content: $fa-var-creative-commons;

    content: fa-content($fa-var-creative-commons);

}



.icon-navigation:before {

    content: $fa-var-location-arrow;

    content: fa-content($fa-var-location-arrow);

}



.icon-newviews:before {

    content: $fa-var-file;

    content: fa-content($fa-var-file);

}



.icon-plans:before {

    content: $fa-var-map-o;

    content: fa-content($fa-var-map);

}



.icon-tasks:before {

    content: $fa-var-tasks;

    content: fa-content($fa-var-tasks);

}



.icon-recentforumposts:before {

    content: $fa-var-comments;

    content: fa-content($fa-var-comments);

}



.icon-textbox:before {

    content: $fa-var-pencil-square-o;

    content: fa-content($fa-var-pen-square);

}



.icon-watchlist:before {

    content: $fa-var-eye;

    content: fa-content($fa-var-eye);

}



.icon-groupinfo:before,

.icon-profileinfo:before {

    content: $fa-var-info;

    content: fa-content($fa-var-info);

}



.icon-socialprofile:before {

    content: $fa-var-thumbs-up;

    content: fa-content($fa-var-thumbs-up);

}



.icon-entireresume:before {

    content: $fa-var-star;

    content: fa-content($fa-var-star);

}



.icon-resumefield:before {

    content: $fa-var-star-half-o;

    content: fa-content($fa-var-star-half);

}



.icon-myfriends:before {

    content: $fa-var-user-plus;

    content: fa-content($fa-var-user-plus);

}



.icon-groupmembers:before,

.icon-mygroups:before {

    content: $fa-var-users;

    content: fa-content($fa-var-users);

}



.icon-externalfeed:before {

    content: $fa-var-rss;

    content: fa-content($fa-var-rss);

}



.icon-externalvideo:before {

    content: $fa-var-youtube-play;

    content: fa-content($fa-var-youtube);

}



.icon-googleapps:before {

    content: $fa-var-google;

    content: fa-content($fa-var-google);

}



.icon-wall:before {

    content: $fa-var-quote-left;

    content: fa-content($fa-var-quote-left);

}



.icon-audio:before {

    content: $fa-var-music;

    content: fa-content($fa-var-music);

}



.icon-task:before {

    content: $fa-var-tasks;

    content: fa-content($fa-var-tasks);

}



.icon-plan:before {

    content: $fa-var-calendar-check-o;

    content: fa-content($fa-var-calendar-check);

}



.icon-collection:before {

    content: $fa-var-folder-open;

    content: fa-content($fa-var-folder-open);

}



.icon-introduction:before {

    content: $fa-var-file-text-o;

    content: fa-content($fa-var-file-alt);

}



.icon-homenumber:before,

.icon-businessnumber:before {

    content: $fa-var-phone;

    content: fa-content($fa-var-phone);

}



.icon-address:before {

    content: $fa-var-road;

    content: fa-content($fa-var-road);

}



.icon-town:before {

    content: $fa-var-home;

    content: fa-content($fa-var-home);

}



.icon-city:before {

    content: $fa-var-building;

    content: fa-content($fa-var-building);

}



.icon-country:before {

    content: $fa-var-globe;

    content: fa-content($fa-var-globe);

}



.icon-personalinformation:before {

    content: $fa-var-sticky-note-o;

    content: fa-content($fa-var-sticky-note);

}



.icon-studentid:before {

    content: $fa-var-graduation-cap;

    content: fa-content($fa-var-graduation-cap);

}



.icon-mobilenumber:before {

    content: $fa-var-mobile;

    content: fa-content($fa-var-mobile);

}



.icon-on-hover {

htdocs/theme/raw/sass/utilities/_index.scss

+1 −1
Original line number Diff line number Diff line 
// Core variables and mixins



// Libraries (Please, do not amend content of these folders)

@import "../lib/font-awesome/font-awesome";

@import "../lib/font-awesome/fontawesome";

@import "../lib/select2/core";



@import "mixins";