Changeset - 11affd72f64c
Parent rev.
Child rev.
[Not reviewed]
default
0 3 0
Mads Kiilerich - 7 years ago 2018-12-11 01:40:17
mads@kiilerich.com
front-end: Drop lessc --relative-urls

The Fontello font paths in kallithea/public/fontello/css/kallithea.css were
adjusted by the relative urls option - instead we now hack the source.

The Bootstrap Glyph icons are not used - set their name to make it clear they
intentionally not are used.
3 files changed with 12 insertions and 8 deletions:
kallithea/bin/kallithea_cli_front_end.py
1
1
kallithea/public/fontello/css/kallithea.css
9
7
kallithea/public/less/kallithea-variables.less
2
0 comments (0 inline, 0 general)
kallithea/bin/kallithea_cli_front_end.py
➞
Show inline comments
 
@@ -38,49 +38,49 @@ def front_end_build(install_deps, genera
 
    is expected to be installed already.
 
    """
 
    front_end_dir = os.path.abspath(os.path.join(kallithea.__file__, '..', 'front-end'))
 
    public_dir = os.path.abspath(os.path.join(kallithea.__file__, '..', 'public'))
 

			




	
	
	
		
 
    if install_deps:

			




	
	
	
		
 
        click.echo("Running 'npm install' to install front-end dependencies from package.json")

			




	
	
	
		
 
        subprocess.check_call(['npm', 'install'], cwd=front_end_dir)

			




	
	
	
		
 

			




	
	
	
		
 
    if generate:

			




	
	
	
		
 
        tmp_dir = os.path.join(front_end_dir, 'tmp')

			




	
	
	
		
 
        if not os.path.isdir(tmp_dir):

			




	
	
	
		
 
            os.mkdir(tmp_dir)

			




	
	
	
		
 

			




	
	
	
		
 
        click.echo("Building CSS styling based on Bootstrap")

			




	
	
	
		
 
        with open(os.path.join(tmp_dir, 'pygments.css'), 'w') as f:

			




	
	
	
		
 
            subprocess.check_call(['pygmentize',

			




	
	
	
		
 
                    '-S', 'default',

			




	
	
	
		
 
                    '-f', 'html',

			




	
	
	
		
 
                    '-a', '.code-highlight'],

			




	
	
	
		
 
                    stdout=f)

			




	
	
	
		
 
        lesscpath = os.path.join(front_end_dir, 'node_modules', '.bin', 'lessc')

			




	
	
	
		
 
        lesspath = os.path.join(public_dir, 'less', 'main.less')

			




	
	
	
		
 
        csspath = os.path.join(public_dir, 'css', 'style.css')

			




	
	
	
		
 
        subprocess.check_call([lesscpath, '--relative-urls', '--source-map',

			




	
	
	
		
 
        subprocess.check_call([lesscpath, '--source-map',

			




	
	
	
		
 
                '--source-map-less-inline', lesspath, csspath],

			




	
	
	
		
 
                cwd=front_end_dir)

			




	
	
	
		
 

			




	
	
	
		
 
        click.echo("Preparing Bootstrap JS")

			




	
	
	
		
 
        shutil.copy(os.path.join(front_end_dir, 'node_modules', 'bootstrap', 'dist', 'js', 'bootstrap.js'), os.path.join(public_dir, 'js', 'bootstrap.js'))

			




	
	
	
		
 

			




	
	
	
		
 
        click.echo("Preparing jQuery JS with Flot, Caret and Atwho")

			




	
	
	
		
 
        shutil.copy(os.path.join(front_end_dir, 'node_modules', 'jquery', 'dist', 'jquery.min.js'), os.path.join(public_dir, 'js', 'jquery.min.js'))

			




	
	
	
		
 
        shutil.copy(os.path.join(front_end_dir, 'node_modules', 'jquery.flot', 'jquery.flot.js'), os.path.join(public_dir, 'js', 'jquery.flot.js'))

			




	
	
	
		
 
        shutil.copy(os.path.join(front_end_dir, 'node_modules', 'jquery.flot', 'jquery.flot.selection.js'), os.path.join(public_dir, 'js', 'jquery.flot.selection.js'))

			




	
	
	
		
 
        shutil.copy(os.path.join(front_end_dir, 'node_modules', 'jquery.flot', 'jquery.flot.time.js'), os.path.join(public_dir, 'js', 'jquery.flot.time.js'))

			




	
	
	
		
 
        shutil.copy(os.path.join(front_end_dir, 'node_modules', 'jquery.caret', 'dist', 'jquery.caret.min.js'), os.path.join(public_dir, 'js', 'jquery.caret.min.js'))

			




	
	
	
		
 
        shutil.copy(os.path.join(front_end_dir, 'node_modules', 'at.js', 'dist', 'js', 'jquery.atwho.min.js'), os.path.join(public_dir, 'js', 'jquery.atwho.min.js'))

			




	
	
	
		
 

			




	
	
	
		
 
        click.echo("Preparing DataTables JS")

			




	
	
	
		
 
        shutil.copy(os.path.join(front_end_dir, 'node_modules', 'datatables.net', 'js', 'jquery.dataTables.js'), os.path.join(public_dir, 'js', 'jquery.dataTables.js'))

			




	
	
	
		
 
        shutil.copy(os.path.join(front_end_dir, 'node_modules', 'datatables.net-bs', 'js', 'dataTables.bootstrap.js'), os.path.join(public_dir, 'js', 'dataTables.bootstrap.js'))

			




	
	
	
		
 

			




	
	
	
		
 
        click.echo("Preparing Select2 JS")

			




	
	
	
		
 
        shutil.copy(os.path.join(front_end_dir, 'node_modules', 'select2', 'select2.js'), os.path.join(public_dir, 'js', 'select2.js'))

			




	
	
	
		
 
        shutil.copy(os.path.join(front_end_dir, 'node_modules', 'select2', 'select2.png'), os.path.join(public_dir, 'css', 'select2.png'))

			




	
	
	
		
 
        shutil.copy(os.path.join(front_end_dir, 'node_modules', 'select2', 'select2x2.png'), os.path.join(public_dir, 'css', 'select2x2.png'))

			




	
	
	
		
 
        shutil.copy(os.path.join(front_end_dir, 'node_modules', 'select2', 'select2-spinner.gif'), os.path.join(public_dir, 'css', 'select2-spinner.gif'))

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/public/fontello/css/kallithea.css
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
@charset "UTF-8";

			




	
	
	
		
 

			




	
	
	
		
 
 @font-face {

			




	
	
	
		
 
  font-family: 'kallithea';

			




	
	
	
		
 
  src: url('../font/kallithea.eot?96450582');

			




	
	
	
		
 
  src: url('../font/kallithea.eot?96450582#iefix') format('embedded-opentype'),

			




	
	
	
		
 
       url('../font/kallithea.woff2?96450582') format('woff2'),

			




	
	
	
		
 
       url('../font/kallithea.woff?96450582') format('woff'),

			




	
	
	
		
 
       url('../font/kallithea.ttf?96450582') format('truetype'),

			




	
	
	
		
 
       url('../font/kallithea.svg?96450582#kallithea') format('svg');

			




	
	
	
		
 
  /* NOTE: relative font paths have been adjusted to compensate for where the */

			




	
	
	
		
 
  /*       content of this CSS file ends up being used */

			




	
	
	
		
 
  src: url('../fontello/font/kallithea.eot?96450582');

			




	
	
	
		
 
  src: url('../fontello/font/kallithea.eot?96450582#iefix') format('embedded-opentype'),

			




	
	
	
		
 
       url('../fontello/font/kallithea.woff2?96450582') format('woff2'),

			




	
	
	
		
 
       url('../fontello/font/kallithea.woff?96450582') format('woff'),

			




	
	
	
		
 
       url('../fontello/font/kallithea.ttf?96450582') format('truetype'),

			




	
	
	
		
 
       url('../fontello/font/kallithea.svg?96450582#kallithea') format('svg');

			




	
	
	
		
 
  font-weight: normal;

			




	
	
	
		
 
  font-style: normal;

			




	
	
	
		
 
}

			




	
	
	
		
 
/* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */

			




	
	
	
		
 
/* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */

			




	
	
	
		
 
/*

			




	
	
	
		
 
@media screen and (-webkit-min-device-pixel-ratio:0) {

			




	
	
	
		
 
  @font-face {

			




	
	
	
		
 
    font-family: 'kallithea';

			




	
	
	
		
 
    src: url('../font/kallithea.svg?96450582#kallithea') format('svg');

			




	
	
	
		
 
    src: url('../fontello/font/kallithea.svg?96450582#kallithea') format('svg');

			




	
	
	
		
 
  }

			




	
	
	
		
 
}

			




	
	
	
		
 
*/

			




	
	
	
		
 
 

			




	
	
	
		
 
 [class^="icon-"]:before, [class*=" icon-"]:before {

			




	
	
	
		
 
  font-family: "kallithea";

			




	
	
	
		
 
  font-style: normal;

			




	
	
	
		
 
  font-weight: normal;

			




	
	
	
		
 
  speak: none;

			




	
	
	
		
 
 

			




	
	
	
		
 
  display: inline-block;

			




	
	
	
		
 
  text-decoration: inherit;

			




	
	
	
		
 
  width: 1em;

			




	
	
	
		
 
  margin-right: .2em;

			




	
	
	
		
 
  text-align: center;

			




	
	
	
		
 
  /* opacity: .8; */

			




	
	
	
		
 
 

			




	
	
	
		
 
  /* For safety - reset parent styles, that can break glyph codes*/

			




	
	
	
		
 
  font-variant: normal;

			




	
	
	
		
 
  text-transform: none;

			




	
	
	
		
 
 

			




	
	
	
		
 
  /* fix buttons height, for twitter bootstrap */

			




	
	
	
		
 
  line-height: 1em;

			




	
	
	
		
 
 

			




        

    


    
    

    

        

                

                    kallithea/public/less/kallithea-variables.less
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -20,31 +20,33 @@

			




	
	
	
		
 
@navbar-inverse-color:              @kallithea-theme-inverse-color;

			




	
	
	
		
 
@navbar-inverse-bg:                 @kallithea-theme-inverse-bg;

			




	
	
	
		
 
@navbar-inverse-border:             @kallithea-theme-inverse-bg;

			




	
	
	
		
 
@navbar-inverse-link-color:         @kallithea-theme-inverse-color;

			




	
	
	
		
 
@navbar-inverse-link-hover-color:   tint(@kallithea-theme-inverse-color, 15.0%);

			




	
	
	
		
 
@navbar-inverse-link-hover-bg:      tint(@kallithea-theme-inverse-bg, 15.0%);

			




	
	
	
		
 
@navbar-inverse-link-active-color:  @navbar-inverse-link-hover-color;

			




	
	
	
		
 
@navbar-inverse-link-active-bg:     @navbar-inverse-link-hover-bg;

			




	
	
	
		
 
@navbar-inverse-toggle-hover-bg:    @navbar-inverse-link-hover-bg;

			




	
	
	
		
 
@navbar-inverse-toggle-border-color:@kallithea-theme-inverse-bg;

			




	
	
	
		
 
@nav-pills-active-link-hover-color: @navbar-inverse-color;

			




	
	
	
		
 
@nav-pills-active-link-hover-bg:    @navbar-inverse-bg;

			




	
	
	
		
 
@nav-link-padding:                  8px 10px; /* default: 10px 15px */

			




	
	
	
		
 
@dropdown-link-color:               @navbar-inverse-color;

			




	
	
	
		
 
@dropdown-bg:                       @navbar-inverse-bg;

			




	
	
	
		
 
@dropdown-link-hover-color:         @navbar-inverse-link-hover-color;

			




	
	
	
		
 
@dropdown-link-hover-bg:            @navbar-inverse-link-hover-bg;

			




	
	
	
		
 
@grid-gutter-width:                 2 * @kallithea-panel-margin; /* default: 30px */

			




	
	
	
		
 
@panel-heading-padding:             5px 15px; /* default: 10px 15px */

			




	
	
	
		
 
@panel-primary-text:                @kallithea-theme-inverse-color;

			




	
	
	
		
 
@panel-primary-heading-bg:          @kallithea-theme-inverse-bg;

			




	
	
	
		
 
@panel-primary-border:              @panel-primary-heading-bg;

			




	
	
	
		
 
@headings-font-weight:              700;

			




	
	
	
		
 
@table-cell-padding:                2px 4px;

			




	
	
	
		
 
@icon-font-path:                    ; /* no glyphicons */

			




	
	
	
		
 
@icon-font-name:                    none;

			




	
	
	
		
 

			




	
	
	
		
 
/* custom variables */

			




	
	
	
		
 
@highlight-color:                   #FAFFA6;

			




	
	
	
		
 
@highlight-line-color:              #DDE7EF;

			




	
	
	
		
 
@add-bg-color:                      #BBFFBB;

			




	
	
	
		
 
@change-bg-color:                   #DDDDDD;

			




	
	
	
		
 
@delete-bg-color:                   #FF8888;

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.