Projet

Général

Profil

0001-style-switch-to-Open-Sans-14574.patch

Frédéric Péters, 18 janvier 2017 17:53

Télécharger (2,68 ko)

Voir les différences: 

Subject: [PATCH] style: switch to Open Sans (#14574)


 gadjo/finders.py                |  2 +-
 gadjo/static/css/_opensans.scss | 13 +++++++++++++
 gadjo/static/css/gadjo.scss     |  3 ++-
 setup.py                        |  1 +
 4 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 gadjo/static/css/_opensans.scss
gadjo/finders.py
36 36 
class XStaticFinder(BaseFinder):
37 37 
    storage_class = XStaticStorage
38 38 

  		




  39
  
  
    
    gadjo_deps = ['jquery', 'jquery_ui', 'font_awesome']

  		




  
  39
  
    
    gadjo_deps = ['jquery', 'jquery_ui', 'font_awesome', 'opensans']

  		




  40
  40
  
    

  		




  41
  41
  
    
    def __init__(self, apps=None, *args, **kwargs):

  		




  42
  42
  
    
        # The list of apps that are handled

  		












  

    
      gadjo/static/css/_opensans.scss
    
  





  
  1
  
    
@font-face {

  		




  
  2
  
    
  font-family: 'Open Sans';

  		




  
  3
  
    
  src: url('../xstatic/fonts/Regular/OpenSans-Regular.eot?#iefix') format('embedded-opentype'), url('../xstatic/fonts/Regular/OpenSans-Regular.woff') format('woff'), url('../xstatic/fonts/Regular/OpenSans-Regular.ttf') format('truetype'), url('../xstatic/fonts/Regular/OpenSans-Regular.svg#fontawesomeregular') format('svg');

  		




  
  4
  
    
  font-weight: normal;

  		




  
  5
  
    
  font-style: normal;

  		




  
  6
  
    
}

  		




  
  7
  
    

  		




  
  8
  
    
@font-face {

  		




  
  9
  
    
  font-family: 'Open Sans';

  		




  
  10
  
    
  src: url('../xstatic/fonts/Bold/OpenSans-Bold.eot?#iefix') format('embedded-opentype'), url('../xstatic/fonts/Bold/OpenSans-Bold.woff') format('woff'), url('../xstatic/fonts/Bold/OpenSans-Bold.ttf') format('truetype'), url('../xstatic/fonts/Bold/OpenSans-Bold.svg#fontawesomeregular') format('svg');

  		




  
  11
  
    
  font-weight: bold;

  		




  
  12
  
    
  font-style: normal;

  		




  
  13
  
    
}

  		












  

    
      gadjo/static/css/gadjo.scss
    
  





  
  1
  
    
@import 'opensans';

  		




  1
  2
  
    
@import 'utils';

  		




  2
  3
  
    

  		




  3
  4
  
    
/* generalities */

  		




  4
  5
  
    

  		




  5
  6
  
    
html, body {

  		




  6
  7
  
    
	margin: 0;

  		




  7
  
  
    
	font-family: "Bitstream Vera Sans", "Verdana", sans-serif;

  		




  
  8
  
    
	font-family: "Open Sans", sans-serif;

  		




  8
  9
  
    
	background: #f2f2f2;

  		




  9
  10
  
    
	color: #3c3c33;

  		




  10
  11
  
    
}

  		












  

    
      setup.py
    
  





  208
  208
  
    
        'XStatic_Font_Awesome',

  		




  209
  209
  
    
        'XStatic_jQuery',

  		




  210
  210
  
    
        'XStatic_jquery_ui',

  		




  
  211
  
    
        'XStatic_OpenSans',

  		




  211
  212
  
    
        ],

  		




  212
  213
  
    
    setup_requires=[

  		




  213
  214
  
    
        'Pillow',

  		




  214
  
  
    
-