diff --git a/.gitignore b/.gitignore index 9133068..0a8cce1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ .sass-cache node_modules bower_components -css/creative.css -css/creative.css.map diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..d398f1e --- /dev/null +++ b/Dockerfile @@ -0,0 +1,20 @@ +FROM nginx:alpine +RUN sed -i 's/#gzip/gzip/g' /etc/nginx/nginx.conf && \ + sed -i '/gzip *on/ a gzip_types text/css application/javascript image/svg+xml;' /etc/nginx/nginx.conf && \ + apk add --no-cache sassc nodejs build-base ffmpeg git coreutils bash && \ + npm install -g svg-sprite-generator && \ + + git clone https://github.com/gpac/gpac.git && \ + cd gpac && \ + ./configure --static-mp4box --use-zlib=no && \ + make && \ + make install + +COPY video/ /usr/share/nginx/html/video/ +WORKDIR /usr/share/nginx/html/video +RUN ./mpd_generate.sh 1_Compilation_Graphique.webm + +COPY . /usr/share/nginx/html +WORKDIR /usr/share/nginx/html +RUN sassc -m -t compressed scss/creative.scss css/creative.css && \ + svg-sprite-generate -d vector/ -o vector/sprite.svg diff --git a/css/font/Gravity-Light.woff b/css/font/Gravity-Light.woff deleted file mode 100644 index 80cedf7..0000000 Binary files a/css/font/Gravity-Light.woff and /dev/null differ diff --git a/css/font/Gravity-Light.woff2 b/css/font/Gravity-Light.woff2 deleted file mode 100644 index dc1c890..0000000 Binary files a/css/font/Gravity-Light.woff2 and /dev/null differ diff --git a/css/font/NEOTERIC.woff b/css/font/NEOTERIC.woff deleted file mode 100644 index afb23d6..0000000 Binary files a/css/font/NEOTERIC.woff and /dev/null differ diff --git a/css/font/NEOTERIC.woff2 b/css/font/NEOTERIC.woff2 deleted file mode 100644 index d89ce5e..0000000 Binary files a/css/font/NEOTERIC.woff2 and /dev/null differ diff --git a/default.nix b/default.nix deleted file mode 100644 index 05300e9..0000000 --- a/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ pkgs ? import {} }: - -pkgs.stdenv.mkDerivation rec { - name= "site-max"; - - inherit (pkgs) sassc; - inherit (pkgs) stdenv; - - src = ./.; - - buildPhase = '' - ${sassc}/bin/sassc --sourcemap=auto --style compressed scss/creative.scss css/creative.css - ''; - - installPhase = '' - mkdir -p $out/ - cp -R . $out/ - ''; -} diff --git a/img/Carousel/stage/1.jpg b/img/Carousel/stage/1.jpg deleted file mode 100644 index 11a8a47..0000000 Binary files a/img/Carousel/stage/1.jpg and /dev/null differ diff --git a/img/Carousel/stage/10.jpg b/img/Carousel/stage/10.jpg deleted file mode 100644 index aa60874..0000000 Binary files a/img/Carousel/stage/10.jpg and /dev/null differ diff --git a/img/Carousel/stage/11.jpg b/img/Carousel/stage/11.jpg deleted file mode 100644 index 5f998b4..0000000 Binary files a/img/Carousel/stage/11.jpg and /dev/null differ diff --git a/img/Carousel/stage/12.jpg b/img/Carousel/stage/12.jpg deleted file mode 100644 index 0014ed2..0000000 Binary files a/img/Carousel/stage/12.jpg and /dev/null differ diff --git a/img/Carousel/stage/13.jpg b/img/Carousel/stage/13.jpg deleted file mode 100644 index 56f6bfb..0000000 Binary files a/img/Carousel/stage/13.jpg and /dev/null differ diff --git a/img/Carousel/stage/2.jpg b/img/Carousel/stage/2.jpg deleted file mode 100644 index 39a6fc5..0000000 Binary files a/img/Carousel/stage/2.jpg and /dev/null differ diff --git a/img/Carousel/stage/3.jpg b/img/Carousel/stage/3.jpg deleted file mode 100644 index 58d6792..0000000 Binary files a/img/Carousel/stage/3.jpg and /dev/null differ diff --git a/img/Carousel/stage/4.jpg b/img/Carousel/stage/4.jpg deleted file mode 100644 index c105b96..0000000 Binary files a/img/Carousel/stage/4.jpg and /dev/null differ diff --git a/img/Carousel/stage/5.jpg b/img/Carousel/stage/5.jpg deleted file mode 100644 index 0a24c6a..0000000 Binary files a/img/Carousel/stage/5.jpg and /dev/null differ diff --git a/img/Carousel/stage/6.jpg b/img/Carousel/stage/6.jpg deleted file mode 100644 index 2daf85a..0000000 Binary files a/img/Carousel/stage/6.jpg and /dev/null differ diff --git a/img/Carousel/stage/7.jpg b/img/Carousel/stage/7.jpg deleted file mode 100644 index c21298a..0000000 Binary files a/img/Carousel/stage/7.jpg and /dev/null differ diff --git a/img/Carousel/stage/8.jpg b/img/Carousel/stage/8.jpg deleted file mode 100644 index e2442de..0000000 Binary files a/img/Carousel/stage/8.jpg and /dev/null differ diff --git a/img/Carousel/stage/9.jpg b/img/Carousel/stage/9.jpg deleted file mode 100644 index 663adef..0000000 Binary files a/img/Carousel/stage/9.jpg and /dev/null differ diff --git a/img/portfolio/1.jpg b/img/portfolio/1.jpg new file mode 100644 index 0000000..8d3e8a8 Binary files /dev/null and b/img/portfolio/1.jpg differ diff --git a/img/portfolio/Metal Carrot1.jpg b/img/portfolio/Metal Carrot1.jpg deleted file mode 100644 index 6aecca6..0000000 Binary files a/img/portfolio/Metal Carrot1.jpg and /dev/null differ diff --git a/img/portfolio/amp.jpg b/img/portfolio/amp.jpg deleted file mode 100644 index 489f9f4..0000000 Binary files a/img/portfolio/amp.jpg and /dev/null differ diff --git a/img/portfolio/an.jpg b/img/portfolio/an.jpg deleted file mode 100644 index 39eb9d1..0000000 Binary files a/img/portfolio/an.jpg and /dev/null differ diff --git a/img/portfolio/candle.jpg b/img/portfolio/candle.jpg deleted file mode 100644 index 20f48da..0000000 Binary files a/img/portfolio/candle.jpg and /dev/null differ diff --git a/img/portfolio/cliff.jpg b/img/portfolio/cliff.jpg deleted file mode 100644 index 3d50625..0000000 Binary files a/img/portfolio/cliff.jpg and /dev/null differ diff --git a/img/portfolio/fen.jpg b/img/portfolio/fen.jpg deleted file mode 100644 index d8286fa..0000000 Binary files a/img/portfolio/fen.jpg and /dev/null differ diff --git a/img/portfolio/final.jpg b/img/portfolio/final.jpg deleted file mode 100644 index 927f558..0000000 Binary files a/img/portfolio/final.jpg and /dev/null differ diff --git a/img/portfolio/flo.jpg b/img/portfolio/flo.jpg deleted file mode 100644 index 84a3460..0000000 Binary files a/img/portfolio/flo.jpg and /dev/null differ diff --git a/img/portfolio/fullsize/1.jpg b/img/portfolio/fullsize/1.jpg new file mode 100644 index 0000000..62080da Binary files /dev/null and b/img/portfolio/fullsize/1.jpg differ diff --git a/img/portfolio/fullsize/2.jpg b/img/portfolio/fullsize/2.jpg new file mode 100644 index 0000000..0df8fde Binary files /dev/null and b/img/portfolio/fullsize/2.jpg differ diff --git a/img/portfolio/fullsize/3.jpg b/img/portfolio/fullsize/3.jpg new file mode 100644 index 0000000..3b08627 Binary files /dev/null and b/img/portfolio/fullsize/3.jpg differ diff --git a/img/portfolio/fullsize/4.jpg b/img/portfolio/fullsize/4.jpg new file mode 100644 index 0000000..82243f2 Binary files /dev/null and b/img/portfolio/fullsize/4.jpg differ diff --git a/img/portfolio/fullsize/5.jpg b/img/portfolio/fullsize/5.jpg new file mode 100644 index 0000000..cd87077 Binary files /dev/null and b/img/portfolio/fullsize/5.jpg differ diff --git a/img/portfolio/fullsize/6.jpg b/img/portfolio/fullsize/6.jpg new file mode 100644 index 0000000..9be6c5e Binary files /dev/null and b/img/portfolio/fullsize/6.jpg differ diff --git a/img/portfolio/girl.jpg b/img/portfolio/girl.jpg deleted file mode 100644 index 7b2d9d6..0000000 Binary files a/img/portfolio/girl.jpg and /dev/null differ diff --git a/img/portfolio/hand.jpg b/img/portfolio/hand.jpg deleted file mode 100644 index 40191b3..0000000 Binary files a/img/portfolio/hand.jpg and /dev/null differ diff --git a/img/portfolio/home.jpg b/img/portfolio/home.jpg deleted file mode 100644 index 8982a05..0000000 Binary files a/img/portfolio/home.jpg and /dev/null differ diff --git a/img/portfolio/jar.jpg b/img/portfolio/jar.jpg deleted file mode 100644 index faabe8a..0000000 Binary files a/img/portfolio/jar.jpg and /dev/null differ diff --git a/img/portfolio/land.jpg b/img/portfolio/land.jpg deleted file mode 100644 index dd83237..0000000 Binary files a/img/portfolio/land.jpg and /dev/null differ diff --git a/img/portfolio/lant.jpg b/img/portfolio/lant.jpg deleted file mode 100644 index 7694b3d..0000000 Binary files a/img/portfolio/lant.jpg and /dev/null differ diff --git a/img/portfolio/loco.jpg b/img/portfolio/loco.jpg deleted file mode 100644 index d15e3f6..0000000 Binary files a/img/portfolio/loco.jpg and /dev/null differ diff --git a/img/portfolio/mist.jpg b/img/portfolio/mist.jpg deleted file mode 100644 index 9b6b3ef..0000000 Binary files a/img/portfolio/mist.jpg and /dev/null differ diff --git a/img/portfolio/mush.jpg b/img/portfolio/mush.jpg deleted file mode 100644 index 1c22af4..0000000 Binary files a/img/portfolio/mush.jpg and /dev/null differ diff --git a/img/portfolio/out.jpg b/img/portfolio/out.jpg deleted file mode 100644 index 8eb4e0a..0000000 Binary files a/img/portfolio/out.jpg and /dev/null differ diff --git a/img/portfolio/roy.jpg b/img/portfolio/roy.jpg deleted file mode 100644 index a420ad2..0000000 Binary files a/img/portfolio/roy.jpg and /dev/null differ diff --git a/img/portfolio/roy2.jpg b/img/portfolio/roy2.jpg deleted file mode 100644 index df4cea6..0000000 Binary files a/img/portfolio/roy2.jpg and /dev/null differ diff --git a/img/portfolio/st.jpg b/img/portfolio/st.jpg deleted file mode 100644 index dbd9c9a..0000000 Binary files a/img/portfolio/st.jpg and /dev/null differ diff --git a/img/portfolio/swamp.jpg b/img/portfolio/swamp.jpg deleted file mode 100644 index f1c7424..0000000 Binary files a/img/portfolio/swamp.jpg and /dev/null differ diff --git a/img/portfolio/thumbnails/1.jpg b/img/portfolio/thumbnails/1.jpg new file mode 100644 index 0000000..62080da Binary files /dev/null and b/img/portfolio/thumbnails/1.jpg differ diff --git a/img/portfolio/thumbnails/2.jpg b/img/portfolio/thumbnails/2.jpg new file mode 100644 index 0000000..0df8fde Binary files /dev/null and b/img/portfolio/thumbnails/2.jpg differ diff --git a/img/portfolio/thumbnails/3.jpg b/img/portfolio/thumbnails/3.jpg new file mode 100644 index 0000000..3b08627 Binary files /dev/null and b/img/portfolio/thumbnails/3.jpg differ diff --git a/img/portfolio/thumbnails/4.jpg b/img/portfolio/thumbnails/4.jpg new file mode 100644 index 0000000..82243f2 Binary files /dev/null and b/img/portfolio/thumbnails/4.jpg differ diff --git a/img/portfolio/thumbnails/5.jpg b/img/portfolio/thumbnails/5.jpg new file mode 100644 index 0000000..cd87077 Binary files /dev/null and b/img/portfolio/thumbnails/5.jpg differ diff --git a/img/portfolio/thumbnails/6.jpg b/img/portfolio/thumbnails/6.jpg new file mode 100644 index 0000000..9be6c5e Binary files /dev/null and b/img/portfolio/thumbnails/6.jpg differ diff --git a/img/portfolio/thund.jpg b/img/portfolio/thund.jpg deleted file mode 100644 index 9501993..0000000 Binary files a/img/portfolio/thund.jpg and /dev/null differ diff --git a/img/portfolio/tmp.jpg b/img/portfolio/tmp.jpg deleted file mode 100644 index 7ae080c..0000000 Binary files a/img/portfolio/tmp.jpg and /dev/null differ diff --git a/img/portfolio/venise.jpg b/img/portfolio/venise.jpg deleted file mode 100644 index 02c4e05..0000000 Binary files a/img/portfolio/venise.jpg and /dev/null differ diff --git a/img/portfolio/watch.jpg b/img/portfolio/watch.jpg deleted file mode 100644 index 2094e24..0000000 Binary files a/img/portfolio/watch.jpg and /dev/null differ diff --git a/img/portfolio/wo.jpg b/img/portfolio/wo.jpg deleted file mode 100644 index 24591e4..0000000 Binary files a/img/portfolio/wo.jpg and /dev/null differ diff --git a/img/whitfoxvecto.svg b/img/whitfoxvecto.svg deleted file mode 100644 index 0a6a999..0000000 --- a/img/whitfoxvecto.svg +++ /dev/null @@ -1,143 +0,0 @@ - - - -image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/index.html b/index.html index d566f27..ef82385 100644 --- a/index.html +++ b/index.html @@ -1,15 +1,14 @@ - + - - - + + - Max SPIEGEL - CG Artist + Max SPIEGEL - Motion Designer @@ -17,7 +16,7 @@ - + @@ -27,59 +26,68 @@ + + + -
-
-
-
+ - + - - + + - - + + - - -
- -
-
+ +
-
-
+
+

Portfolio

@@ -87,265 +95,92 @@
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
- +
+
+
+ +
+
+ +
+
+
-
- +
+
+ +
+
+ +
+
+ +
+
+
+
+ +
-
-
-

Contact

+
+
+

Contactez moi !

+

Je m'appelle pelle

-
-
-
- -

0033 (0) 6 44 26 78 84

+
+ +

07 22 22 22 22

- -

spiegel.max1996@gmail.com

+ +

max@swag.fr

-