From 6b39525fa47a7fe637ce06d0e7f7c850d0d0a5c3 Mon Sep 17 00:00:00 2001 From: Olivier DOSSMANN Date: Fri, 31 Jan 2020 15:31:49 +0100 Subject: [PATCH] Pilot preparation: use SVG files --- Makefile | 14 +- ils/css/aoste.css | 2 +- ils/css/bulle.css | 2 +- ils/css/fictive.css | 2 +- ils/css/global.css | 2 +- ils/css/highlands.css | 2 +- ils/css/mvs.css | 2 +- ils/css/rbnj.css | 2 +- ils/images/logo-aoste.svg | 266 ++++++++++++++++++++++++++++++++++ ils/images/logo-bulle.svg | 44 ++++++ ils/images/logo-fictive.svg | 210 +++++++++++++++++++++++++++ ils/images/logo-global.svg | 130 +++++++++++++++++ ils/images/logo-highlands.svg | 196 +++++++++++++++++++++++++ ils/images/logo-mvs.svg | 190 ++++++++++++++++++++++++ ils/images/logo-rbnj.svg | 171 ++++++++++++++++++++++ logo-global.pilot.svg | 178 +++++++++++++++++++++++ 16 files changed, 1399 insertions(+), 14 deletions(-) create mode 100644 ils/images/logo-aoste.svg create mode 100644 ils/images/logo-bulle.svg create mode 100644 ils/images/logo-fictive.svg create mode 100644 ils/images/logo-global.svg create mode 100644 ils/images/logo-highlands.svg create mode 100644 ils/images/logo-mvs.svg create mode 100644 ils/images/logo-rbnj.svg create mode 100644 logo-global.pilot.svg diff --git a/Makefile b/Makefile index f1d1108..79721bd 100644 --- a/Makefile +++ b/Makefile @@ -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 "$<" "$@" diff --git a/ils/css/aoste.css b/ils/css/aoste.css index 873f711..c6f9d93 100644 --- a/ils/css/aoste.css +++ b/ils/css/aoste.css @@ -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; } diff --git a/ils/css/bulle.css b/ils/css/bulle.css index 2cb9484..c1a933a 100644 --- a/ils/css/bulle.css +++ b/ils/css/bulle.css @@ -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; } diff --git a/ils/css/fictive.css b/ils/css/fictive.css index abbc05c..eb6a251 100644 --- a/ils/css/fictive.css +++ b/ils/css/fictive.css @@ -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; } diff --git a/ils/css/global.css b/ils/css/global.css index 44b4619..40388b2 100644 --- a/ils/css/global.css +++ b/ils/css/global.css @@ -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; } diff --git a/ils/css/highlands.css b/ils/css/highlands.css index fe3e59a..1d20e0b 100644 --- a/ils/css/highlands.css +++ b/ils/css/highlands.css @@ -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; } diff --git a/ils/css/mvs.css b/ils/css/mvs.css index 3c1edd3..6ea8ef9 100644 --- a/ils/css/mvs.css +++ b/ils/css/mvs.css @@ -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; } diff --git a/ils/css/rbnj.css b/ils/css/rbnj.css index 11a7c3c..4530d98 100644 --- a/ils/css/rbnj.css +++ b/ils/css/rbnj.css @@ -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; } diff --git a/ils/images/logo-aoste.svg b/ils/images/logo-aoste.svg new file mode 100644 index 0000000..1daf9be --- /dev/null +++ b/ils/images/logo-aoste.svg @@ -0,0 +1,266 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ils/images/logo-bulle.svg b/ils/images/logo-bulle.svg new file mode 100644 index 0000000..8c43d14 --- /dev/null +++ b/ils/images/logo-bulle.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ils/images/logo-fictive.svg b/ils/images/logo-fictive.svg new file mode 100644 index 0000000..64f7710 --- /dev/null +++ b/ils/images/logo-fictive.svg @@ -0,0 +1,210 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ils/images/logo-global.svg b/ils/images/logo-global.svg new file mode 100644 index 0000000..e51a3a9 --- /dev/null +++ b/ils/images/logo-global.svg @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ils/images/logo-highlands.svg b/ils/images/logo-highlands.svg new file mode 100644 index 0000000..fc4c061 --- /dev/null +++ b/ils/images/logo-highlands.svg @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ils/images/logo-mvs.svg b/ils/images/logo-mvs.svg new file mode 100644 index 0000000..5c0b14f --- /dev/null +++ b/ils/images/logo-mvs.svg @@ -0,0 +1,190 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ils/images/logo-rbnj.svg b/ils/images/logo-rbnj.svg new file mode 100644 index 0000000..024e063 --- /dev/null +++ b/ils/images/logo-rbnj.svg @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + RBNJ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/logo-global.pilot.svg b/logo-global.pilot.svg new file mode 100644 index 0000000..fba1b32 --- /dev/null +++ b/logo-global.pilot.svg @@ -0,0 +1,178 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file