Skip to content

Commit

Permalink
Rework outline and brand icons to load from overrides, not define ico…
Browse files Browse the repository at this point in the history
…ns if not loaded (except brand which would require a refactor) #6226
  • Loading branch information
jlukic committed Mar 18, 2018
1 parent cf70177 commit 7fab797
Show file tree
Hide file tree
Showing 12 changed files with 524 additions and 467 deletions.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
946 changes: 497 additions & 449 deletions src/themes/default/elements/icon.overrides

Large diffs are not rendered by default.

45 changes: 27 additions & 18 deletions src/themes/default/elements/icon.variables
Original file line number Diff line number Diff line change
Expand Up @@ -2,51 +2,60 @@
Icon
*******************************/

/*-------------------
Icon Variables
--------------------*/
/*--------------
Font Files
---------------*/

@importSolidIcons: true;
@fontName: 'solid-icons';
@solidFallbackSRC: url("@{fontPath}/@{fontName}.eot");
@solidSrc:
@fontName: 'icons';
@src:
url("@{fontPath}/@{fontName}.eot?#iefix") format('embedded-opentype'),
url("@{fontPath}/@{fontName}.woff2") format('woff2'),
url("@{fontPath}/@{fontName}.woff") format('woff'),
url("@{fontPath}/@{fontName}.ttf") format('truetype'),
url("@{fontPath}/@{fontName}.svg#icons") format('svg')
;
@fallbackSRC: url("@{fontPath}/@{fontName}.eot");

@importRegularIcons: true;
@regularFontName: 'regular-icons';
@regularFallbackSRC: url("@{fontPath}/@{regularFontName}.eot");
@regularSrc:
url("@{fontPath}/@{regularFontName}.eot?#iefix") format('embedded-opentype'),
url("@{fontPath}/@{regularFontName}.woff2") format('woff2'),
url("@{fontPath}/@{regularFontName}.woff") format('woff'),
url("@{fontPath}/@{regularFontName}.ttf") format('truetype'),
url("@{fontPath}/@{regularFontName}.svg#icons") format('svg')
/*--------------
Optional Files
---------------*/

/* Outline Icons */
@importOutlineIcons: false;
@outlineFontName: 'outline-icons';
@outlineSrc:
url("@{fontPath}/@{outlineFontName}.eot?#iefix") format('embedded-opentype'),
url("@{fontPath}/@{outlineFontName}.woff2") format('woff2'),
url("@{fontPath}/@{outlineFontName}.woff") format('woff'),
url("@{fontPath}/@{outlineFontName}.ttf") format('truetype'),
url("@{fontPath}/@{outlineFontName}.svg#icons") format('svg')
;
@outlineFallbackSRC: url("@{fontPath}/@{outlineFontName}.eot");

/* Brand Icons */
@importBrandIcons: true;
@brandFontName: 'brand-icons';
@brandFallbackSRC: url("@{fontPath}/@{brandFontName}.eot");
@brandSrc:
url("@{fontPath}/@{brandFontName}.eot?#iefix") format('embedded-opentype'),
url("@{fontPath}/@{brandFontName}.woff2") format('woff2'),
url("@{fontPath}/@{brandFontName}.woff") format('woff'),
url("@{fontPath}/@{brandFontName}.ttf") format('truetype'),
url("@{fontPath}/@{brandFontName}.svg#icons") format('svg')
;
@brandFallbackSRC: url("@{fontPath}/@{brandFontName}.eot");

/*--------------
Definition
---------------*/

/* Icon Variables */
@opacity: 1;
@width: @iconWidth;
@height: 1em;
@distanceFromText: 0.25rem;


/* Variations */

@linkOpacity: 0.8;
@linkDuration: 0.3s;
@loadingDuration: 2s;
Expand Down

0 comments on commit 7fab797

Please sign in to comment.