Projet

Général

Profil

0001-fonts-integrate-Abril-Fatface-like-other-fonts-40197.patch

Frédéric Péters, 26 février 2020 08:44

Télécharger (47,2 ko)

Voir les différences: 

Subject: [PATCH] fonts: integrate Abril Fatface like other fonts (#40197)


 README                                          |   9 +++++++++
 debian/50fonts.py                               |   2 --
 debian/control                                  |   2 +-
 debian/publik-base-theme.install                |   1 -
 static/amiens-metropole/_vars.scss              |   2 +-
 static/amiens-metropole/style.scss              |   2 +-
 .../AbrilFatface/abrilfatface-regular.woff      | Bin 0 -> 33460 bytes
 static/includes/_font-abrilfatface-regular.scss |   6 ------
 static/includes/_font-abrilfatface.scss         |   6 ++++++
 templates/variants/amiens-metropole/theme.html  |   2 +-
 10 files changed, 19 insertions(+), 13 deletions(-)
 delete mode 100644 debian/50fonts.py
 delete mode 100644 debian/publik-base-theme.install
 create mode 100644 static/fonts/AbrilFatface/abrilfatface-regular.woff
 delete mode 100644 static/includes/_font-abrilfatface-regular.scss
 create mode 100644 static/includes/_font-abrilfatface.scss
README
256 256 
  #
257 257 
  # https://www.fontsquirrel.com/license/noto-sans
258 258 

  		




  
  259
  
    
* Abril Fatface

  		




  
  260
  
    
  # Copyright (c) 2011, Copyright (c) 2011, TypeTogether

  		




  
  261
  
    
  # (www.type-together.com info@type-together.com),

  		




  
  262
  
    
  # with Reserved Font Names “Abril” and “Abril Fatface”

  		




  
  263
  
    
  #

  		




  
  264
  
    
  # This Font Software is licensed under the SIL Open Font License, Version 1.1.

  		




  
  265
  
    
  #

  		




  
  266
  
    
  # https://www.fontsquirrel.com/license/abril-fatface

  		




  
  267
  
    

  		




  259
  268
  
    
~~~~

  		




  260
  269
  
    

  		




  261
  270
  
    
Some theme variant files have their own specific licenses; refer to

  		












  

    
      debian/50fonts.py
    
  





  1
  
  
    
# add xstatics with fonts

  		




  2
  
  
    
INSTALLED_APPS += ('xstatic.pkg.abril_fatface',)

  		












  

    
      debian/control
    
  





  8
  8
  
    

  		




  9
  9
  
    
Package: publik-base-theme

  		




  10
  10
  
    
Architecture: all

  		




  11
  
  
    
Depends: ${shlibs:Depends}, ${misc:Depends}, python-gadjo, python-xstatic-abrilfatface, python3-xstatic-abrilfatface

  		




  
  11
  
    
Depends: ${shlibs:Depends}, ${misc:Depends}, python-gadjo

  		




  12
  12
  
    
Conflicts: python-authentic2 (< 2.1.20.742.gb6ee096-0),

  		




  13
  13
  
    
           python-django (<= 1:1.11),

  		




  14
  14
  
    
           python-xstatic-roboto-fontface (< 0.5.0.0),

  		












  

    
      debian/publik-base-theme.install
    
  





  1
  
  
    
debian/50fonts.py        /etc/combo/settings.d

  		












  

    
      static/amiens-metropole/_vars.scss
    
  





  16
  16
  
    
$nav-item-hover-color: white;

  		




  17
  17
  
    
$nav-after-image: false;

  		




  18
  18
  
    
$button-background: darken($primary-color, 10%);

  		




  19
  
  
    
$title-font-family: 'AbrilFatface-Regular', Arial, Helvetica, sans-serif;

  		




  
  19
  
    
$title-font-family: 'Abril Fatface', Arial, Helvetica, sans-serif;

  		




  20
  20
  
    
$title-background: $primary-color;

  		




  21
  21
  
    
$title-weight: regular;

  		




  22
  22
  
    
$title-color: #CF0D8A;

  		












  

    
      static/amiens-metropole/style.scss
    
  





  1
  1
  
    
@charset "UTF-8";

  		




  2
  2
  
    

  		




  3
  
  
    
@import '../includes/font-abrilfatface-regular';

  		




  
  3
  
    
@import '../includes/font-abrilfatface';

  		




  4
  4
  
    
@import 'vars';

  		




  5
  5
  
    
@import '../includes/publik';

  		




  6
  6
  
    
@import '../includes/categories';

  		












  

    
      static/includes/_font-abrilfatface-regular.scss
    
  





  1
  
  
    
$font-path: '/static/xstatic/fonts' !default;

  		




  2
  
  
    

  		




  3
  
  
    
@font-face {

  		




  4
  
  
    
	font-family: 'AbrilFatface-Regular';

  		




  5
  
  
    
	src: url('#{$font-path}/Regular/abrilfatface-regular.woff') format('woff');

  		




  6
  
  
    
}

  		












  

    
      static/includes/_font-abrilfatface.scss
    
  





  
  1
  
    
@font-face {

  		




  
  2
  
    
	font-family: 'Abril Fatface';

  		




  
  3
  
    
	src: url(/static/fonts/AbrilFatface/abrilfatface-regular.woff) format('woff');

  		




  
  4
  
    
	font-weight: normal;

  		




  
  5
  
    
	font-style: normal;

  		




  
  6
  
    
}

  		












  

    
      templates/variants/amiens-metropole/theme.html
    
  





  2
  2
  
    
{% load static i18n combo gadjo %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block extra_top_head %}

  		




  5
  
  
    
<link rel="preload" href="{{site_base}}/static/xstatic/fonts/Regular/abrilfatface-regular.woff" as="font" type="font/woff2" crossorigin>

  		




  
  5
  
    
<link rel="preload" href="{{site_base}}/static/fonts/AbrilFatface/abrilfatface-regular.woff" as="font" type="font/woff" crossorigin>

  		




  6
  6
  
    
{% endblock %}

  		




  7
  7
  
    

  		




  8
  8
  
    
{% block header-title %}

  		




  9
  
  
    
-