Projet

Général

Profil

0001-scss-fix-declaration-of-Asap-font-27728.patch

Frédéric Péters, 04 novembre 2018 10:41

Télécharger (2,93 ko)

Voir les différences: 

Subject: [PATCH 1/2] scss: fix declaration of Asap font (#27728)


 ...Asap-Italic.otf => Asap-RegularItalic.otf} | Bin
 static/hautes-alpes-2018/_vars.scss           |  10 ++++----
 static/includes/_font-asap.scss               |  23 ++++++++++--------
 3 files changed, 18 insertions(+), 15 deletions(-)
 rename static/fonts/asap/{Asap-Italic.otf => Asap-RegularItalic.otf} (100%)
static/hautes-alpes-2018/_vars.scss
5 5 
$mobile-limit: 768px;
6 6 
$tablet-limit: 1024px;
7 7 
$font-color: #202020;
8 
$font-family: Asap-Regular, sans-serif;
8 
$font-family: Asap, sans-serif;
9 9 
$font-size: 62.5%;
10 10 
$footer-color: #FFFFFF;
11 11 
$footer-background: #2B2B2B;
......
15 15 

  		




  16
  16
  
    
$title-background: transparent;

  		




  17
  17
  
    
$title-color: $font-color;

  		




  18
  
  
    
$title-font-family: Asap-Regular, sans-serif;

  		




  
  18
  
    
$title-font-family: Asap, sans-serif;

  		




  19
  19
  
    
$title-font-size: 2.5rem;

  		




  20
  20
  
    
$title-padding: 1ex 0.5rem;

  		




  21
  21
  
    
$title-margin: 0;

  		




  ......




  78
  78
  
    

  		




  79
  79
  
    
%title-style {

  		




  80
  80
  
    
	margin: $title-margin;

  		




  81
  
  
    
	font-family: Asap-Medium, sans-serif;

  		




  82
  
  
    
	font-weight: 600;

  		




  
  81
  
    
	font-family: Asap, sans-serif;

  		




  
  82
  
    
	font-weight: 500;

  		




  83
  83
  
    
	font-size: $title-font-size;

  		




  84
  84
  
    
	line-height: 1.2;

  		




  85
  85
  
    
	padding: $title-padding;

  		




  86
  
  
    
}

  		




  
  86
  
    
}

  		












  

    
      static/includes/_font-asap.scss
    
  





  1
  1
  
    
$asap-font-path: '../fonts/asap' !default;

  		




  2
  2
  
    

  		




  3
  
  
    
@mixin asap-font($type, $weight, $style) {

  		




  
  3
  
    
@mixin asap-font($type, $weight) {

  		




  4
  4
  
    
	@font-face {

  		




  5
  
  
    
		font-family: 'Asap-#{$type}';

  		




  
  5
  
    
		font-family: 'Asap';

  		




  6
  6
  
    
		src: url('#{$asap-font-path}/Asap-#{$type}.otf') format('opentype');

  		




  7
  7
  
    
		font-weight: $weight;

  		




  8
  
  
    
		font-style: $style;

  		




  
  8
  
    
		font-style: normal;

  		




  9
  9
  
    
	}

  		




  
  10
  
    
	@font-face {

  		




  
  11
  
    
		font-family: 'Asap';

  		




  
  12
  
    
		src: url('#{$asap-font-path}/Asap-#{$type}Italic.otf') format('opentype');

  		




  
  13
  
    
		font-weight: $weight;

  		




  
  14
  
    
		font-style: italic;

  		




  
  15
  
    
	}

  		




  
  16
  
    

  		




  10
  17
  
    
}

  		




  11
  18
  
    

  		




  12
  
  
    
@include asap-font('Italic', 400, italic);

  		




  13
  
  
    
@include asap-font('MediumItalic', 600, italic);

  		




  14
  
  
    
@include asap-font('BoldItalic', 700, italic);

  		




  15
  
  
    
@include asap-font('Regular', 400, normal);

  		




  16
  
  
    
@include asap-font('Medium', 500, normal);

  		




  17
  
  
    
@include asap-font('Medium', 600, normal);

  		




  18
  
  
    
@include asap-font('Bold', 700, normal);

  		




  
  19
  
    
@include asap-font('Regular', 400);

  		




  
  20
  
    
@include asap-font('Medium', 600);

  		




  
  21
  
    
@include asap-font('Bold', 700);

  		




  19
  
  
    
-