Browse Source

Pilot preparation: use SVG files

master
Olivier DOSSMANN 7 months ago
parent
commit
6b39525fa4
16 changed files with 1399 additions and 14 deletions
  1. +7
    -7
      Makefile
  2. +1
    -1
      ils/css/aoste.css
  3. +1
    -1
      ils/css/bulle.css
  4. +1
    -1
      ils/css/fictive.css
  5. +1
    -1
      ils/css/global.css
  6. +1
    -1
      ils/css/highlands.css
  7. +1
    -1
      ils/css/mvs.css
  8. +1
    -1
      ils/css/rbnj.css
  9. +266
    -0
      ils/images/logo-aoste.svg
  10. +44
    -0
      ils/images/logo-bulle.svg
  11. +210
    -0
      ils/images/logo-fictive.svg
  12. +130
    -0
      ils/images/logo-global.svg
  13. +196
    -0
      ils/images/logo-highlands.svg
  14. +190
    -0
      ils/images/logo-mvs.svg
  15. +171
    -0
      ils/images/logo-rbnj.svg
  16. +178
    -0
      logo-global.pilot.svg

+ 7
- 7
Makefile View File

@@ -7,7 +7,7 @@ SRC_IMG = $(SRC_DIR)/images

# Source files
CSS_FILES := $(wildcard ils/css/*.css)
IMG_FILES := $(wildcard ils/images/*.png)
IMG_FILES := $(wildcard ils/images/*.svg)

# Those we want to keep (some on /test directory, other on /pilot)
TEST_ORGS = global aoste fictive highlands
@@ -20,9 +20,9 @@ O9_DIR = static-o9

# Destination files
TEST_CSS_FILES = $(TEST_ORGS:%=$(TEST_DIR)/css/%.css)
TEST_IMG_FILES = $(TEST_ORGS:%=$(TEST_DIR)/images/logo-%.png)
TEST_IMG_FILES = $(TEST_ORGS:%=$(TEST_DIR)/images/logo-%.svg)
PILOT_CSS_FILES = $(PILOT_ORGS:%=$(PILOT_DIR)/css/%.css)
PILOT_IMG_FILES = $(PILOT_ORGS:%=$(PILOT_DIR)/images/logo-%.png)
PILOT_IMG_FILES = $(PILOT_ORGS:%=$(PILOT_DIR)/images/logo-%.svg)
O9_CSS_FILES = $(CSS_FILES:%=$(O9_DIR)/%)
O9_IMG_FILES = $(IMG_FILES:%=$(O9_DIR)/%)

@@ -42,7 +42,7 @@ $(TEST_DIR)/css/%.css : $(SRC_CSS)/%.css
$(TEST_DIR)/images : $(TEST_IMG_FILES)
$Qmkdir -p $(@D)

$(TEST_DIR)/images/logo-%.png : $(SRC_IMG)/logo-%.png
$(TEST_DIR)/images/logo-%.svg : $(SRC_IMG)/logo-%.svg
$Qmkdir -p $(@D)
$Qcp "$<" "$@"

@@ -59,11 +59,11 @@ $(PILOT_DIR)/css/%.css : $(SRC_CSS)/%.css
$(PILOT_DIR)/images : $(PILOT_IMG_FILES)
$Qmkdir -p $(@D)

$(PILOT_DIR)/images/logo-global.png: logo-global.pilot.png
$(PILOT_DIR)/images/logo-global.svg: logo-global.pilot.svg
$Qmkdir -p $(@D)
$Qcp "$<" "$@"

$(PILOT_DIR)/images/logo-%.png : $(SRC_IMG)/logo-%.png
$(PILOT_DIR)/images/logo-%.svg : $(SRC_IMG)/logo-%.svg
$Qmkdir -p $(@D)
$Qcp "$<" "$@"

@@ -84,7 +84,7 @@ $(O9_DIR)/ils/css/%.css : $(SRC_CSS)/%.css

$(O9_DIR)/images : $(O9_IMG_FILES)

$(O9_DIR)/ils/images/%.png : $(SRC_IMG)/%.png
$(O9_DIR)/ils/images/%.svg : $(SRC_IMG)/%.svg
$Qmkdir -p $(@D)
$Qcp "$<" "$@"



+ 1
- 1
ils/css/aoste.css View File

@@ -7,6 +7,6 @@ body#view-aoste nav.rero-ils-header img.rero-ils-logo {
}

div#aoste-logo {
content: url('https://resources.rero.ch/ils/images/logo-aoste.png');
content: url('https://resources.rero.ch/ils/images/logo-aoste.svg');
max-height: 44px !important;
}

+ 1
- 1
ils/css/bulle.css View File

@@ -7,6 +7,6 @@ body#view-bulle nav.rero-ils-header img.rero-ils-logo {
}

div#bulle-logo {
content: url('https://resources.rero.ch/ils/images/logo-bulle.png');
content: url('https://resources.rero.ch/ils/images/logo-bulle.svg');
max-height: 44px !important;
}

+ 1
- 1
ils/css/fictive.css View File

@@ -7,6 +7,6 @@ body#view-fictive nav.rero-ils-header img.rero-ils-logo {
}

div#fictive-logo {
content: url('https://resources.rero.ch/ils/images/logo-fictive.png');
content: url('https://resources.rero.ch/ils/images/logo-fictive.svg');
max-height: 44px !important;
}

+ 1
- 1
ils/css/global.css View File

@@ -7,6 +7,6 @@ body#view-global nav.rero-ils-header img.rero-ils-logo {
}

div#global-logo {
content: url('https://resources.rero.ch/ils/images/logo-global.png');
content: url('https://resources.rero.ch/ils/images/logo-global.svg');
max-height: 44px !important;
}

+ 1
- 1
ils/css/highlands.css View File

@@ -7,6 +7,6 @@ body#view-highlands nav.rero-ils-header img.rero-ils-logo {
}

div#highlands-logo {
content: url('https://resources.rero.ch/ils/images/logo-highlands.png');
content: url('https://resources.rero.ch/ils/images/logo-highlands.svg');
max-height: 44px !important;
}

+ 1
- 1
ils/css/mvs.css View File

@@ -7,6 +7,6 @@ body#view-mvs nav.rero-ils-header img.rero-ils-logo {
}

div#mvs-logo {
content: url('https://resources.rero.ch/ils/images/logo-mvs.png');
content: url('https://resources.rero.ch/ils/images/logo-mvs.svg');
max-height: 44px !important;
}

+ 1
- 1
ils/css/rbnj.css View File

@@ -7,6 +7,6 @@ body#view-rbnj nav.rero-ils-header img.rero-ils-logo {
}

div#rbnj-logo {
content: url('https://resources.rero.ch/ils/images/logo-rbnj.png');
content: url('https://resources.rero.ch/ils/images/logo-rbnj.svg');
max-height: 44px !important;
}

+ 266
- 0
ils/images/logo-aoste.svg
File diff suppressed because it is too large
View File


+ 44
- 0
ils/images/logo-bulle.svg
File diff suppressed because it is too large
View File


+ 210
- 0
ils/images/logo-fictive.svg
File diff suppressed because it is too large
View File


+ 130
- 0
ils/images/logo-global.svg
File diff suppressed because it is too large
View File


+ 196
- 0
ils/images/logo-highlands.svg
File diff suppressed because it is too large
View File


+ 190
- 0
ils/images/logo-mvs.svg
File diff suppressed because it is too large
View File


+ 171
- 0
ils/images/logo-rbnj.svg
File diff suppressed because it is too large
View File


+ 178
- 0
logo-global.pilot.svg
File diff suppressed because it is too large
View File