Changeset 93448 in spip-zone


Ignore:
Timestamp:
Dec 8, 2015, 1:41:38 PM (5 years ago)
Author:
cedric@…
Message:

Les variables @font-size-hn du fichier variables.less de BS3 sont exprimees en px
Il ne faut pas changer cela pour conserver la compatibilite avec les generateurs de themes BS3
On introduit les variables equivalentes @font-size-hn-em exprimees en em et on les utilise dans type.less (bruno caillard)

Location:
_plugins_/bootstrap/trunk/bootstrap2spip/css
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • _plugins_/bootstrap/trunk/bootstrap2spip/css/spip.variables.less

    r93446 r93448  
    3131@indentStep768 : (@container-sm / @grid-columns) / 2;
    3232
     33@font-size-large-em : 1em * @font-size-large / @font-size-base;
     34@font-size-small-em : 1em * @font-size-small / @font-size-base;
     35@font-size-h1-em: 1em * @font-size-h1 / @font-size-base;
     36@font-size-h2-em: 1em * @font-size-h2 / @font-size-base;
     37@font-size-h3-em: 1em * @font-size-h3 / @font-size-base;
     38@font-size-h4-em: 1em * @font-size-h4 / @font-size-base;
     39@font-size-h5-em: 1em * @font-size-h5 / @font-size-base;
     40@font-size-h6-em: 1em * @font-size-h6 / @font-size-base;
     41
  • _plugins_/bootstrap/trunk/bootstrap2spip/css/type.less

    r90753 r93448  
    33
    44   typo.css
    5    Base typographique inspirée de squelettes-dist/css/typo.css
     5   Base typographique inspiree de squelettes-dist/css/typo.css
    66   Merge avec les specificites Bootstrap
    77   Annule et remplace la typo native de Bootstrap
     
    3232hr { height: 1px;margin: @emLineHeight 0;border: 0;background: @hr-border; color: @hr-border;}
    3333
    34 h1,.h1,.h1-like { font-size: @font-size-h1; line-height: @headings-line-height; margin-bottom: @emVertMargin / @font-size-h1; small { font-size: 0.65em; }}
    35 h2,.h2,.h2-like { font-size: @font-size-h2; line-height: @emLineHeight / @font-size-h2; margin-bottom: @emVertMargin / @font-size-h2; small { font-size: 0.70em; }}
    36 h3,.h3,.h3-like { font-size: @font-size-h3; line-height: @emLineHeight / @font-size-h3; margin-bottom: @emVertMargin / @font-size-h3; small { font-size: 0.80em; }}
    37 h4,.h4,.h4-like { font-size: @font-size-h4; line-height: @emLineHeight / @font-size-h4; margin-bottom: @emVertMargin / @font-size-h4; }
    38 h5,.h5,.h5-like { font-size: @font-size-h5; line-height: @emLineHeight / @font-size-h5; font-weight: bold; margin-bottom: @emVertMargin; }
    39 h6,.h6,.h6-like { font-size: @font-size-h6; line-height: @emLineHeight / @font-size-h6; font-weight: bold; }
     34h1,.h1,.h1-like { font-size: @font-size-h1-em; line-height: @headings-line-height; margin-bottom: @emVertMargin / @font-size-h1-em; small { font-size: 0.65em; }}
     35h2,.h2,.h2-like { font-size: @font-size-h2-em; line-height: @emLineHeight / @font-size-h2-em; margin-bottom: @emVertMargin / @font-size-h2-em; small { font-size: 0.70em; }}
     36h3,.h3,.h3-like { font-size: @font-size-h3-em; line-height: @emLineHeight / @font-size-h3-em; margin-bottom: @emVertMargin / @font-size-h3-em; small { font-size: 0.80em; }}
     37h4,.h4,.h4-like { font-size: @font-size-h4-em; line-height: @emLineHeight / @font-size-h4-em; margin-bottom: @emVertMargin / @font-size-h4-em; }
     38h5,.h5,.h5-like { font-size: @font-size-h5-em; line-height: @emLineHeight / @font-size-h5-em; font-weight: bold; margin-bottom: @emVertMargin; }
     39h6,.h6,.h6-like { font-size: @font-size-h6-em; line-height: @emLineHeight / @font-size-h6-em; font-weight: bold; }
    4040
    4141// Alignment
  • _plugins_/bootstrap/trunk/bootstrap2spip/css/variables.less

    r93176 r93448  
    5353@font-size-small:         ceil((@font-size-base * 0.85)); // ~12px
    5454
    55 @font-size-h1:            2em;
    56 @font-size-h2:            1.5em;
    57 @font-size-h3:            1.25em;
    58 @font-size-h4:            1.1em;
    59 @font-size-h5:            1em;
    60 @font-size-h6:            1em;
     55@font-size-h1:            floor((@font-size-base * 2));
     56@font-size-h2:            floor((@font-size-base * 1.5));
     57@font-size-h3:            ceil((@font-size-base * 1.25));
     58@font-size-h4:            ceil((@font-size-base * 1.1));
     59@font-size-h5:            @font-size-base;
     60@font-size-h6:            @font-size-base;
    6161
    6262//** Unit-less `line-height` for use in components like buttons.
Note: See TracChangeset for help on using the changeset viewer.