From 718aed7ddbfdc74f53a4b8cc05345c5d460525cc Mon Sep 17 00:00:00 2001 From: Olivier Lumineau <olivier.lumineau@renater.fr> Date: Tue, 24 Jul 2018 12:22:35 +0200 Subject: [PATCH] Renaming and adding new files (css, images, font-awesome) --- resources/Makefile.am | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/resources/Makefile.am b/resources/Makefile.am index 4ab3517..e01cb83 100644 --- a/resources/Makefile.am +++ b/resources/Makefile.am @@ -1,13 +1,13 @@ nobase_www_DATA = \ css/style.css \ css/edugain.css \ - css/et-menu-master.css \ - css/et-menu-min-600.css \ - css/min-800.css \ + css/edugain-menu-master.css \ + css/edugain-menu-min-600.css \ + css/edugain-min-800.css \ css/renater.css \ - css/fonts.css \ - css/header.css \ - css/footer.css \ + css/renater-fonts.css \ + css/renater-header.css \ + css/renater-footer.css \ js/menu.js \ js/startup.js \ font/Lato/Lato-BoldItalic.woff \ @@ -45,11 +45,19 @@ nobase_www_DATA = \ foundation/js/vendor/foundation.min.js \ foundation/js/vendor/jquery.js \ foundation/js/vendor/what-input.js \ + font-awesome/css/font-awesome.min.css \ + font-awesome/fonts/FontAwesome.otf \ + font-awesome/fonts/fontawesome-webfont.eot \ + font-awesome/fonts/fontawesome-webfont.svg \ + font-awesome/fonts/fontawesome-webfont.ttf \ + font-awesome/fonts/fontawesome-webfont.woff \ + font-awesome/fonts/fontawesome-webfont.woff2 \ images/edugain_favicon.png \ images/edugain_logo.png \ images/edugain_test_idp_basics.png \ images/favicon_geant.ico \ images/favicon.png \ + images/favicon-federation.png \ images/geant_logo_rgb_300dpi.jpg \ images/geant_logo1.png \ images/edugain_logo1.png \ @@ -60,6 +68,7 @@ nobase_www_DATA = \ images/contact.svg \ images/home.svg \ images/logo_renater.svg \ + images/logo-federation.svg \ images/logo_renater_blanc.png \ images/facebook.svg \ images/twitter.svg \ -- GitLab