diff --git a/Makefile b/Makefile index 327de4ad61da13f998a66b144e3b96a83bd4cb93..45327c22ec28b4405d2dfe968343d4c4d9b4243f 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ build: docker build -t kuadradoimg . run: - docker run -p 9000:80 \ + docker run -p 80:80 \ -it \ --name kuadrado \ --mount type=bind,source="$(shell pwd)",target=/usr/share/nginx/html \ @@ -24,4 +24,4 @@ stylesheet: docker exec -it kuadrado bash -c "npm run style" open: - firefox http://localhost:9000/public/ + firefox http://localhost/public/ diff --git a/config.js b/config.js index 34250bf526c49c084653c38200bc77286deb8a82..8c0ef5893b491094758d7fd69e768f4b7c5f335e 100644 --- a/config.js +++ b/config.js @@ -4,7 +4,7 @@ let server_url; switch (ENV) { case "dev": - server_url = "http://localhost:9000"; + server_url = "http://localhost"; break; case "prod": server_url = "http://your_production_server_url:port"; diff --git a/public/education/education.js b/public/education/education.js index 67312bcb380fbbef9978dd9ab92449d9a8531d96..cc605ac8b424e4d8da9c6eed2b96201310af86a1 100644 --- a/public/education/education.js +++ b/public/education/education.js @@ -5,7 +5,7 @@ let server_url; switch (ENV) { case "dev": - server_url = "http://localhost:9000"; + server_url = "http://localhost"; break; case "prod": server_url = "http://your_production_server_url:port"; @@ -645,7 +645,7 @@ const NAV_MENU_ITEMS = [ [ // submenu ["/public/education/#game-studio-club", "Game Studio Club"], - ["/public/education/#popularization", "Animations vulgarisation"], + ["/public/education/#popularization", "Vulgarisation numérique"], ], ], ]; diff --git a/public/games/games.js b/public/games/games.js index 3ffa751f7066aa8197a1ffb0e40dfdb9df86f17c..5ce496502a1b71dfe1f915ca47e53acf7fe3bcc8 100644 --- a/public/games/games.js +++ b/public/games/games.js @@ -5,7 +5,7 @@ let server_url; switch (ENV) { case "dev": - server_url = "http://localhost:9000"; + server_url = "http://localhost"; break; case "prod": server_url = "http://your_production_server_url:port"; @@ -164,7 +164,7 @@ const NAV_MENU_ITEMS = [ [ // submenu ["/public/education/#game-studio-club", "Game Studio Club"], - ["/public/education/#popularization", "Animations vulgarisation"], + ["/public/education/#popularization", "Vulgarisation numérique"], ], ], ]; diff --git a/public/main.js b/public/main.js index a166562d8a74b431f90c85e1b1cf6d646f842145..d3fe1383827936afc7a85ca7264a16aaeeaa6a6f 100644 --- a/public/main.js +++ b/public/main.js @@ -5,7 +5,7 @@ let server_url; switch (ENV) { case "dev": - server_url = "http://localhost:9000"; + server_url = "http://localhost"; break; case "prod": server_url = "http://your_production_server_url:port"; @@ -164,7 +164,7 @@ const NAV_MENU_ITEMS = [ [ // submenu ["/public/education/#game-studio-club", "Game Studio Club"], - ["/public/education/#popularization", "Animations vulgarisation"], + ["/public/education/#popularization", "Vulgarisation numérique"], ], ], ]; diff --git a/public/software-development/software-development.js b/public/software-development/software-development.js index 8348e6ddaa100069854baebfb6d7d4d6d4eb6704..f623e3468cef22a22c7598788e4fae362be0e9a4 100644 --- a/public/software-development/software-development.js +++ b/public/software-development/software-development.js @@ -5,7 +5,7 @@ let server_url; switch (ENV) { case "dev": - server_url = "http://localhost:9000"; + server_url = "http://localhost"; break; case "prod": server_url = "http://your_production_server_url:port"; @@ -164,7 +164,7 @@ const NAV_MENU_ITEMS = [ [ // submenu ["/public/education/#game-studio-club", "Game Studio Club"], - ["/public/education/#popularization", "Animations vulgarisation"], + ["/public/education/#popularization", "Vulgarisation numérique"], ], ], ]; diff --git a/src/pages/education/education.scss b/src/pages/education/education.scss index 9584fbfc5769e2c2c4576fa2257e07f6b167e093..f72d5058b6c02054c6ee54c02bdd2a58251212c7 100644 --- a/src/pages/education/education.scss +++ b/src/pages/education/education.scss @@ -92,8 +92,8 @@ .details { background-color: #fffe; position: absolute; - top: 40px; - left: 40px; + top: 25px; + left: 25px; width: 300px; height: auto; max-height: 0; diff --git a/src/style.scss b/src/style.scss index b3679d07a457e749d7bbf33d474e6a8b3e80065c..a9908237dd8607a4e7cd3fa267a5d7cbf04dbecd 100644 --- a/src/style.scss +++ b/src/style.scss @@ -37,6 +37,7 @@ main { display: flex; align-items: center; height: $navbar_height; + background-color: #fffb; .home { margin: 0 10px; img { diff --git a/src/template/components/navbar.js b/src/template/components/navbar.js index 0ee8bdf0e5f3254585119f516018bbc69f7a6b9a..d32ebdba74325a623b916a049dd44d7976b9eb08 100644 --- a/src/template/components/navbar.js +++ b/src/template/components/navbar.js @@ -12,7 +12,7 @@ const NAV_MENU_ITEMS = [ [ // submenu ["/public/education/#game-studio-club", "Game Studio Club"], - ["/public/education/#popularization", "Animations vulgarisation"], + ["/public/education/#popularization", "Vulgarisation numérique"], ], ], ]; diff --git a/style/style.css b/style/style.css index 4231ecce4e5e09e1c31cb47105e863f9926e585b..d037bbed5264738191dbb77d40b5a8e5d709d6f0 100644 --- a/style/style.css +++ b/style/style.css @@ -36,6 +36,7 @@ main header nav { display: flex; align-items: center; height: 40px; + background-color: #fffb; } main header nav .home { margin: 0 10px; @@ -248,8 +249,8 @@ main #page-container #education-page .section-contents ul.learning-themes li.lea main #page-container #education-page .section-contents ul.learning-themes li.learning-theme .details { background-color: #fffe; position: absolute; - top: 40px; - left: 40px; + top: 25px; + left: 25px; width: 300px; height: auto; max-height: 0; diff --git a/style/style.css.map b/style/style.css.map index 9733d7094b2f4f42531b9a732be3eb126b78f8fe..8b7c7d0c9bc42826cd91fc9265e978af649a646c 100644 --- a/style/style.css.map +++ b/style/style.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["../src/style.scss","../src/theme.scss","../src/pages/education/education.scss"],"names":[],"mappings":"AAEA;EAKI;EACA;;AALA;EACI;EACA,OCLC;;ADSL;EACI;EACA;EACA;;AAEJ;EACI,OCJC;EDKD;;AACA;EACI,OCNH;;ADUL;EACI,OCZC;;;ADgBT;EACI;EACA;EACA;EACA;EACA;;AACA;EACI;;AACA;EACI;EACA;EACA,QCXI;;ADYJ;EACI;;AACA;EACI;;AAGR;EACI;EACA;EACA;EACA;;AACA;EACI;;AACA;EACI;EACA;EACA;EACA;EACA,OCrDd;EDsDc;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGA;EACI,OC5EnB;ED6EmB;;AAIJ;EACI,OClFnB;;ADqFe;EACI;EACA;;AACA;EACI,OCtFtB;EDuFsB;;AAII;EACI,OC/F/B;;ADuGG;EACI;;AAEJ;EAxEJ;IAyEQ;;EACA;IACI;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA,OCvHX;IDwHW;;EAEJ;IACI;;EACA;IACI;IACA;IACA;IACA;IACA;IACA,KCzGR;ID0GQ;IACA;IACA;;EAGQ;IACI;;EAGR;IACI;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IAQA;;EANI;IACI;IACA;IACA,OCvJ9B;;;ADkKN;EACI;EACA;EACA;EACA;;AEzKJ;EACI;EACA;;AAGA;EACI;;AAGR;EACI;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;EACA;EAOA;EACA;EACA;;AARA;EACI;;AAEJ;EACI;;AAKJ;EACI;EACA;EACA;EACA;;AAGR;EACI;EACA;EACA;EACA;EACA;;AACA;EACI;;AAEJ;EACI;EACA;EACA;EACA;EACA;EACA,kBDjDF;ECkDE;;AACA;EACI;EACA;EACA;EACA;;AACA;EACI;;AAEJ;AAAA;EAEI;;AAIZ;EACI;EACA;EACA;EACA;EACA;;AACA;EACI;EACA;EACA;EACA;EACA;;AACA;EACI,ODhFX;ECiFW;EACA;EACA;EACA;;AAEJ;EACI;EACA;;AAEJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACI;;AAEJ;EACI;EACA;EACA;;AAIJ;EACI;EACA;;AAMhB;EACI;EACA;EACA,kBD/HF;ECgIE;;AACA;AAAA;EAEI;EACA;EACA;EACA;;AACA;AAAA;EACI;;AAGA;AAAA;EACI;EACA;;AACA;AAAA;EACI;EACA;;AAOxB;EAEQ;IACI;;EACA;IACI;;EACA;IACI;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;;EACA;IACI;;EAEJ;IACI;IACA;IACA;;EACA;IACI,ODhLvB;;;ACyLL;EACI;IACI;IACA;;EAGA;IACI;;EAGR;IACI;IACA;;EAEJ;IACI;IACA;;EACA;IACI;IACA;IACA;;EAGR;IACI;IACA;;EACA;IACI;;EAEJ;IACI;IACA;IACA;IACA;;EAEJ;IACI;IACA;IACA;;EACA;IACI;;EACA;IACI;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;;EAEI;IACI,OD9OvB;;ECqPG;IACI;IACA;IACA;IACA;;EACA;AAAA;IAEI;IACA;IACA;IACA;;EAEI;AAAA;IACI;;EACA;AAAA;IACI;IACA;;;AF1F5B;EACI;EACA;EACA","file":"style.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["../src/style.scss","../src/theme.scss","../src/pages/education/education.scss"],"names":[],"mappings":"AAEA;EAKI;EACA;;AALA;EACI;EACA,OCLC;;ADSL;EACI;EACA;EACA;;AAEJ;EACI,OCJC;EDKD;;AACA;EACI,OCNH;;ADUL;EACI,OCZC;;;ADgBT;EACI;EACA;EACA;EACA;EACA;;AACA;EACI;;AACA;EACI;EACA;EACA,QCXI;EDYJ;;AACA;EACI;;AACA;EACI;;AAGR;EACI;EACA;EACA;EACA;;AACA;EACI;;AACA;EACI;EACA;EACA;EACA;EACA,OCtDd;EDuDc;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGA;EACI,OC7EnB;ED8EmB;;AAIJ;EACI,OCnFnB;;ADsFe;EACI;EACA;;AACA;EACI,OCvFtB;EDwFsB;;AAII;EACI,OChG/B;;ADwGG;EACI;;AAEJ;EAzEJ;IA0EQ;;EACA;IACI;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA,OCxHX;IDyHW;;EAEJ;IACI;;EACA;IACI;IACA;IACA;IACA;IACA;IACA,KC1GR;ID2GQ;IACA;IACA;;EAGQ;IACI;;EAGR;IACI;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IAQA;;EANI;IACI;IACA;IACA,OCxJ9B;;;ADmKN;EACI;EACA;EACA;EACA;;AE1KJ;EACI;EACA;;AAGA;EACI;;AAGR;EACI;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;EACA;EAOA;EACA;EACA;;AARA;EACI;;AAEJ;EACI;;AAKJ;EACI;EACA;EACA;EACA;;AAGR;EACI;EACA;EACA;EACA;EACA;;AACA;EACI;;AAEJ;EACI;EACA;EACA;EACA;EACA;EACA,kBDjDF;ECkDE;;AACA;EACI;EACA;EACA;EACA;;AACA;EACI;;AAEJ;AAAA;EAEI;;AAIZ;EACI;EACA;EACA;EACA;EACA;;AACA;EACI;EACA;EACA;EACA;EACA;;AACA;EACI,ODhFX;ECiFW;EACA;EACA;EACA;;AAEJ;EACI;EACA;;AAEJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACI;;AAEJ;EACI;EACA;EACA;;AAIJ;EACI;EACA;;AAMhB;EACI;EACA;EACA,kBD/HF;ECgIE;;AACA;AAAA;EAEI;EACA;EACA;EACA;;AACA;AAAA;EACI;;AAGA;AAAA;EACI;EACA;;AACA;AAAA;EACI;EACA;;AAOxB;EAEQ;IACI;;EACA;IACI;;EACA;IACI;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;;EACA;IACI;;EAEJ;IACI;IACA;IACA;;EACA;IACI,ODhLvB;;;ACyLL;EACI;IACI;IACA;;EAGA;IACI;;EAGR;IACI;IACA;;EAEJ;IACI;IACA;;EACA;IACI;IACA;IACA;;EAGR;IACI;IACA;;EACA;IACI;;EAEJ;IACI;IACA;IACA;IACA;;EAEJ;IACI;IACA;IACA;;EACA;IACI;;EACA;IACI;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;;EAEI;IACI,OD9OvB;;ECqPG;IACI;IACA;IACA;IACA;;EACA;AAAA;IAEI;IACA;IACA;IACA;;EAEI;AAAA;IACI;;EACA;AAAA;IACI;IACA;;;AFzF5B;EACI;EACA;EACA","file":"style.css"} \ No newline at end of file