Commit ccc52908 authored by Martin Leblanc's avatar Martin Leblanc
Browse files

ISTWCMS-4866: css for the additional colleges, and fix of merge error in white svg's

parent 3b7956d5
$faculties: 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat', 'org-sci', 'org-school';
$faculties: 'org-default', 'neutral', 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat', 'org-sci', 'org-school', 'org-stp', 'org-cgc', 'org-stj', 'org-ren';
@each $faculty in $faculties {
// Wrapping the element with this class, <body>.
.#{$faculty} {
......
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
<<<<<<< HEAD
viewBox="0 0 19 12" xml:space="preserve">
<style type="text/css">
.st0{fill:#ffffff;}
=======
viewBox="0 0 19 12" style="enable-background:new 0 0 19 12;" xml:space="preserve">
<style type="text/css">
.st0{fill:#FFF;}
>>>>>>> a484a26 (ISTWCMS-4866: additional css for the expand collapse for faculties and defaults)
</style>
<path class="st0" d="M17.6,0.2L9.5,8.3L1.4,0.2L0,1.6l9.6,9.6L19,1.8l-1.7-1.7h0.3V0.2z"/>
</svg>
<<<<<<< HEAD
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 19 12" xml:space="preserve">
<style type="text/css">
.st0{fill:#ffffff;}
=======
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 25.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 19 12" style="enable-background:new 0 0 19 12;" xml:space="preserve">
<style type="text/css">
.st0{fill:#FFF;}
>>>>>>> a484a26 (ISTWCMS-4866: additional css for the expand collapse for faculties and defaults)
</style>
<path class="st0" d="M1.4,11.2l8.1-8.1l8.1,8.1L19,9.8L9.4,0.2L0,9.5l1.7,1.7H1.4z"/>
</svg>
Supports Markdown
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