From 0f5cead0d953146a3bce5885a1f2deb15c507dc0 Mon Sep 17 00:00:00 2001 From: Gaspard Jankowiak Date: Thu, 4 Oct 2018 16:16:16 +0200 Subject: [PATCH] refactor css --- _layouts/default.html | 4 +- _sass/ie.scss | 5 --- _sass/print.scss | 3 -- .../fonts/OpenSans-Italic.woff | Bin .../fonts/OpenSans-Light.woff | Bin .../fonts/OpenSans-LightItalic.woff | Bin .../fonts/OpenSans-Semibold.woff | Bin .../fonts/OpenSans-SemiboldItalic.woff | Bin {stylesheets => css}/fonts/OpenSans.woff | Bin {stylesheets => css}/friendly.css | 0 {_sass => css}/screen.scss | 35 +++++++++++++----- stylesheets/ie.css | 0 stylesheets/screen.css | 1 - 13 files changed, 27 insertions(+), 21 deletions(-) delete mode 100644 _sass/ie.scss delete mode 100644 _sass/print.scss rename {stylesheets => css}/fonts/OpenSans-Italic.woff (100%) rename {stylesheets => css}/fonts/OpenSans-Light.woff (100%) rename {stylesheets => css}/fonts/OpenSans-LightItalic.woff (100%) rename {stylesheets => css}/fonts/OpenSans-Semibold.woff (100%) rename {stylesheets => css}/fonts/OpenSans-SemiboldItalic.woff (100%) rename {stylesheets => css}/fonts/OpenSans.woff (100%) rename {stylesheets => css}/friendly.css (100%) rename {_sass => css}/screen.scss (82%) delete mode 100644 stylesheets/ie.css delete mode 100644 stylesheets/screen.css diff --git a/_layouts/default.html b/_layouts/default.html index 4f44ec8..c1a20f5 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -31,8 +31,8 @@ {% endif %} - - + + diff --git a/_sass/ie.scss b/_sass/ie.scss deleted file mode 100644 index 5cd5b6c..0000000 --- a/_sass/ie.scss +++ /dev/null @@ -1,5 +0,0 @@ -/* Welcome to Compass. Use this file to write IE specific override styles. - * Import this file using the following HTML or equivalent: - * */ diff --git a/_sass/print.scss b/_sass/print.scss deleted file mode 100644 index b0e9e45..0000000 --- a/_sass/print.scss +++ /dev/null @@ -1,3 +0,0 @@ -/* Welcome to Compass. Use this file to define print styles. - * Import this file using the following HTML or equivalent: - * */ diff --git a/stylesheets/fonts/OpenSans-Italic.woff b/css/fonts/OpenSans-Italic.woff similarity index 100% rename from stylesheets/fonts/OpenSans-Italic.woff rename to css/fonts/OpenSans-Italic.woff diff --git a/stylesheets/fonts/OpenSans-Light.woff b/css/fonts/OpenSans-Light.woff similarity index 100% rename from stylesheets/fonts/OpenSans-Light.woff rename to css/fonts/OpenSans-Light.woff diff --git a/stylesheets/fonts/OpenSans-LightItalic.woff b/css/fonts/OpenSans-LightItalic.woff similarity index 100% rename from stylesheets/fonts/OpenSans-LightItalic.woff rename to css/fonts/OpenSans-LightItalic.woff diff --git a/stylesheets/fonts/OpenSans-Semibold.woff b/css/fonts/OpenSans-Semibold.woff similarity index 100% rename from stylesheets/fonts/OpenSans-Semibold.woff rename to css/fonts/OpenSans-Semibold.woff diff --git a/stylesheets/fonts/OpenSans-SemiboldItalic.woff b/css/fonts/OpenSans-SemiboldItalic.woff similarity index 100% rename from stylesheets/fonts/OpenSans-SemiboldItalic.woff rename to css/fonts/OpenSans-SemiboldItalic.woff diff --git a/stylesheets/fonts/OpenSans.woff b/css/fonts/OpenSans.woff similarity index 100% rename from stylesheets/fonts/OpenSans.woff rename to css/fonts/OpenSans.woff diff --git a/stylesheets/friendly.css b/css/friendly.css similarity index 100% rename from stylesheets/friendly.css rename to css/friendly.css diff --git a/_sass/screen.scss b/css/screen.scss similarity index 82% rename from _sass/screen.scss rename to css/screen.scss index 89740e3..3de79c8 100644 --- a/_sass/screen.scss +++ b/css/screen.scss @@ -1,7 +1,5 @@ -/* Welcome to Compass. - * In this file you should write your main styles. (or centralize your imports) - * Import this file using the following HTML or equivalent: - * */ +--- +--- $bg: #eee; $text: #444; @@ -17,12 +15,29 @@ $margin: 17px; $in_width: $width - $margin; $small-width: 500px; -@import "compass/reset"; -@import "compass/css3"; +/* reset */ +html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video { + margin:0; + padding:0; + border:0; + font:inherit; + font-size:100%; + vertical-align:baseline +} -@include font-face("OpenSans", font-files("OpenSans.woff")); -@include font-face("OpenSansLight", font-files("OpenSans-Light.woff")); -@include font-face("OpenSans", font-files("OpenSans-Italic.woff"), $style:italic); +@font-face { + font-family:"OpenSans"; + src:url('/css/fonts/OpenSans.woff') format('woff') +} +@font-face { + font-family:"OpenSansLight"; + src:url('/css/fonts/OpenSans-Light.woff') format('woff') +} +@font-face { + font-family:"OpenSans"; + src:url('/css/fonts/OpenSans-Italic.woff') format('woff'); + font-style:italic +} html, body { height: 100%; text-align: justify; background-color: $bg; color: $text; @@ -82,7 +97,7 @@ ol li:nth-child(n+2) { border-top: 1px solid #ddd; } ol li:hover { border-right: 3px solid $links; padding-right: 7px; } .float-left { float: left; } -.right, .float-right { float: right; } +.right, .float-right { float: right; margin-left: 1em; } .clear { clear: both; } .switcher { float: left; } diff --git a/stylesheets/ie.css b/stylesheets/ie.css deleted file mode 100644 index e69de29..0000000 diff --git a/stylesheets/screen.css b/stylesheets/screen.css deleted file mode 100644 index 2cac216..0000000 --- a/stylesheets/screen.css +++ /dev/null @@ -1 +0,0 @@ -html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video{margin:0;padding:0;border:0;font:inherit;font-size:100%;vertical-align:baseline}html{line-height:1}ol,ul{list-style:none}table{border-collapse:collapse;border-spacing:0}caption,th,td{text-align:left;font-weight:normal;vertical-align:middle}q,blockquote{quotes:none}q:before,q:after,blockquote:before,blockquote:after{content:"";content:none}a img{border:none}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section,summary{display:block}@font-face{font-family:"OpenSans";src:url('/stylesheets/fonts/OpenSans.woff') format('woff')}@font-face{font-family:"OpenSansLight";src:url('/stylesheets/fonts/OpenSans-Light.woff') format('woff')}@font-face{font-family:"OpenSans";src:url('/stylesheets/fonts/OpenSans-Italic.woff') format('woff');font-style:italic}html,body{height:100%;text-align:justify;background-color:#eee;color:#444;font-family:"OpenSans", sans;line-height:1.4em}a{text-decoration:none;color:#55f}a:hover{text-decoration:underline}strong{font-weight:bold}hr{height:1px;border:none;background-color:#999;margin-top:1em}section h1{font-size:150%;border-left:4px solid #55f;padding-left:11px;margin-left:-17px}section h2{font-size:120%;font-weight:bold}section h3{font-size:100%;font-weight:bold}h1,h2,h3,h4,h5{margin:0.7em 0 0.5em 0}header{text-align:center;font-family:"OpenSansLight", sans;line-height:1.3em;font-weight:400;font-size:1.2em;padding-top:1em}header h1{font-size:1.5em;margin:0 0 0.3em 0}header a{color:#444}pre{background-color:#f5f5f5;padding:0.5em;margin:0.5em 0}code{font-family:mono}nav{text-align:center;font-size:120%;margin:1em 0}nav ul li{display:inline;margin:0;clear:both;padding:0 10px 0 11px}nav ul li:nth-child(n+2){border-left:1px solid #999}footer{font-size:75%;padding-bottom:175px}em{font-style:italic}table{width:100%}thead{color:#999}th,td{padding:0.3em}tr{border-bottom:1px dotted #ccc}.publi_table td:nth-child(1){width:30%}.publi_table td:nth-child(2){width:60%}.publi_table td:nth-child(3){width:10%}ul{list-style-image:url("/images/bullet_dark.png")}ul li{margin-left:1em}ol{list-style-type:decimal}ol li{padding:0.5em 10px 0.5em 0}ol li:nth-child(n+2){border-top:1px solid #ddd}ol li:hover{border-right:3px solid #55f;padding-right:7px}.float-left{float:left}.right,.float-right{float:right}.clear{clear:both}.switcher{float:left}.credits{color:#999}.centered_img{display:block;margin:1em auto}#wrapper{max-width:783px;margin:auto}#outter-wrapper{width:100%;height:auto;min-height:100%;position:relative}#foot_image{height:150px;background:linear-gradient(to top, #ffffff 0%,#ffffff 50%,#eeeeee 100%);position:absolute;bottom:0px;width:100%;text-align:center;overflow:hidden}#clouds{background-image:url("../images/clouds.png");height:150px;width:200%;position:relative;top:-150px;margin-bottom:-150px}#foot_image:active #ski{visibility:visible;animation:ski 3s linear}#clouds:hover{animation:clouds 100s infinite linear}#ski{position:relative;visibility:hidden;top:-107px;left:-210px}#portrait{margin:0 15px 15px 0;padding:23px 0 18px 0;width:150px;display:inline-block;vertical-align:middle}#info span{display:inline-block;width:100%;max-width:618px;vertical-align:middle}#cv_title{font-family:"OpenSansLight",sans;font-size:2em;margin:1em}#http_code{text-align:center;font-size:10em;line-height:1em}@media (max-width: 500px){body{font-size:80%}.switcher{float:none}}@media (max-width: 800px){#outter-wrapper{width:100%}header h1{font-size:1.2em}header{font-size:1em}body{padding:0 17px}#foot_image{display:none}footer{display:none}}@keyframes clouds{0%{transform:translate(0, 0)}100%{transform:translate(-774px, 0)}}@keyframes ski{0%{transform:translate(0, 0) rotate(0deg)}10%{transform:translate(10px, 0) rotate(0deg)}20%{transform:translate(10px, 8px) rotate(45deg)}25%{transform:translate(25px, 16px) rotate(15deg)}30%{transform:translate(55px, 32px) rotate(0deg)}40%{transform:translate(90px, 20px) rotate(-20deg)}50%{transform:translate(110px, 15px) rotate(-200deg)}60%{transform:translate(130px, 35px) rotate(-380deg)}68%{transform:translate(164px, 27px) rotate(-360deg)}100%{transform:translate(300px, 66px) rotate(20deg)}}