Commit a6614bd0168e42bd1d6b9414eed9c6524f4f4559

Authored by William Daniau
1 parent 7664ca37c2
Exists in master

Changement de nom pour les variables underlined

et ajout d'une variable pour la largeur de texte en sod

Showing 6 changed files with 18 additions and 16 deletions Side-by-side Diff

... ... @@ -16,8 +16,8 @@
16 16 style=PANGO_STYLE_ITALIC
17 17  
18 18 [Tag mark]
19   -underline=%%--main-menu-u-decoration%%
20   -background=%%--main-menu-u-background-color%%
  19 +underline=%%--main-u-decoration%%
  20 +background=%%--main-u-background-color%%
21 21  
22 22 [Tag strike]
23 23 strikethrough=True
templates/html/Wize_with_index_sod.html
... ... @@ -24,7 +24,7 @@
24 24 /* Comme on a le menu sur le côté */
25 25 /* On augmente la taille de la page */
26 26 :root {
27   - --main-page-width: 80em;
  27 + --main-page-width: var(--main-page-width-sod);
28 28 }
29 29  
30 30 * { font-family: sans-serif }
templates/html/common-blue/zim-variables.css
... ... @@ -27,12 +27,13 @@
27 27  
28 28 --main-menu-background-color: #fafafa; /* Backroung color of side menu */
29 29 /* Underline really underlined */
30   - --main-menu-u-decoration: underline;
31   - --main-menu-u-background-color: white;
  30 + --main-u-decoration: underline;
  31 + --main-u-background-color: white;
32 32 /* Underline Stabilo Version */
33   - /*--main-menu-u-decoration: none;
34   - --main-menu-u-background-color: yellow;*/
  33 + /*--main-u-decoration: none;
  34 + --main-u-background-color: yellow;*/
35 35 --main-page-width: 72em; /* Page width */
  36 + --main-page-width-sod: 80em; /* Page width for sod version */
36 37  
37 38  
38 39 /* Tables */
templates/html/common-wize/zim-variables.css
... ... @@ -26,12 +26,13 @@
26 26  
27 27 --main-menu-background-color: #fafafa; /* Backroung color of side menu */
28 28 /* Underline really underlined */
29   - --main-menu-u-decoration: underline;
30   - --main-menu-u-background-color: white;
  29 + --main-u-decoration: underline;
  30 + --main-u-background-color: white;
31 31 /* Underline Stabilo Version */
32   - /*--main-menu-u-decoration: none;
33   - --main-menu-u-background-color: yellow;*/
  32 + /*--main-u-decoration: none;
  33 + --main-u-background-color: yellow;*/
34 34 --main-page-width: 72em; /* Page width */
  35 + --main-page-width-sod: 80em; /* Page width for sod version */
35 36  
36 37  
37 38 /* Tables */
templates/html/common/zim-style.css
... ... @@ -13,8 +13,8 @@
13 13  
14 14 strike { color: var(--main-strike-color);}
15 15  
16   - u { text-decoration: var(--main-menu-u-decoration);
17   - background-color: var(--main-menu-u-background-color);}
  16 + u { text-decoration: var(--main-u-decoration);
  17 + background-color: var(--main-u-background-color);}
18 18  
19 19 tt { color: var(--main-tt-color);
20 20 font-family: monospace;
... ... @@ -163,8 +163,8 @@
163 163 # Create style-name.conf according to common-name/zim-variables.css
164 164 def createStyleFile(name)
165 165 lfTags = ["--main-header-color",
166   - "--main-menu-u-decoration",
167   - "--main-menu-u-background-color",
  166 + "--main-u-decoration",
  167 + "--main-u-background-color",
168 168 "--main-strike-color",
169 169 "--main-tt-color",
170 170 "--main-pre-color",
... ... @@ -188,7 +188,7 @@
188 188 sCSS =~ reg
189 189 sTags[tag] = $1
190 190 # On traite le cas particulier du u-decoration
191   - if tag == "--main-menu-u-decoration"
  191 + if tag == "--main-u-decoration"
192 192 sTags[tag] = sTags[tag] == 'underline' ? 'PANGO_UNDERLINE_SINGLE' : ''
193 193 end
194 194 }