Gitlab CSE Unil

Commit 60de123d authored by Julien Furrer's avatar Julien Furrer
Browse files

Merge branch 'master' into sharing

parents 78e871b5 810610d8
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>Font Face Demo</title>
<link rel="stylesheet" href="stylesheet.css" type="text/css" charset="utf-8">
<style type="text/css" media="screen">
h1.fontface {font: 60px/68px 'OpenSansRegular', Arial, sans-serif;letter-spacing: 0;}
p.style1 {font: 18px/27px 'OpenSansLight', Arial, sans-serif;}
p.style2 {font: 18px/27px 'OpenSansLightItalic', Arial, sans-serif;}
p.style3 {font: 18px/27px 'OpenSansRegular', Arial, sans-serif;}
p.style4 {font: 18px/27px 'OpenSansItalic', Arial, sans-serif;}
p.style5 {font: 18px/27px 'OpenSansSemibold', Arial, sans-serif;}
p.style6 {font: 18px/27px 'OpenSansSemiboldItalic', Arial, sans-serif;}
p.style7 {font: 18px/27px 'OpenSansBold', Arial, sans-serif;}
p.style8 {font: 18px/27px 'OpenSansBoldItalic', Arial, sans-serif;}
p.style9 {font: 18px/27px 'OpenSansExtrabold', Arial, sans-serif;}
p.style10 {font: 18px/27px 'OpenSansExtraboldItalic', Arial, sans-serif;}
#container {
width: 800px;
margin-left: auto;
margin-right: auto;
}
</style>
</head>
<body>
<div id="container">
<h1 class="fontface">Font-face Demo for the Open Sans Font</h1>
<p class="style1">Open Sans Light - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
<p class="style2">Open Sans Light Italic - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
<p class="style3">Open Sans Regular - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
<p class="style4">Open Sans Italic - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
<p class="style5">Open Sans Semibold - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
<p class="style6">Open Sans Semibold Italic - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
<p class="style7">Open Sans Bold - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
<p class="style8">Open Sans Bold Italic - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
<p class="style9">Open Sans Extrabold - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
<p class="style10">Open Sans Extrabold Italic - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
</div>
</body>
</html>
/* Generated by Font Squirrel (http://www.fontsquirrel.com) on August 2, 2011 09:54:41 AM America/New_York */
@font-face {
font-family: 'OpenSansLight';
src: url('OpenSans-Light-webfont.eot');
src: url('OpenSans-Light-webfont.eot?#iefix') format('embedded-opentype'),
url('OpenSans-Light-webfont.woff') format('woff'),
url('OpenSans-Light-webfont.ttf') format('truetype'),
url('OpenSans-Light-webfont.svg#OpenSansLight') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'OpenSansLightItalic';
src: url('OpenSans-LightItalic-webfont.eot');
src: url('OpenSans-LightItalic-webfont.eot?#iefix') format('embedded-opentype'),
url('OpenSans-LightItalic-webfont.woff') format('woff'),
url('OpenSans-LightItalic-webfont.ttf') format('truetype'),
url('OpenSans-LightItalic-webfont.svg#OpenSansLightItalic') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'OpenSansRegular';
src: url('OpenSans-Regular-webfont.eot');
src: url('OpenSans-Regular-webfont.eot?#iefix') format('embedded-opentype'),
url('OpenSans-Regular-webfont.woff') format('woff'),
url('OpenSans-Regular-webfont.ttf') format('truetype'),
url('OpenSans-Regular-webfont.svg#OpenSansRegular') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'OpenSansItalic';
src: url('OpenSans-Italic-webfont.eot');
src: url('OpenSans-Italic-webfont.eot?#iefix') format('embedded-opentype'),
url('OpenSans-Italic-webfont.woff') format('woff'),
url('OpenSans-Italic-webfont.ttf') format('truetype'),
url('OpenSans-Italic-webfont.svg#OpenSansItalic') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'OpenSansSemibold';
src: url('OpenSans-Semibold-webfont.eot');
src: url('OpenSans-Semibold-webfont.eot?#iefix') format('embedded-opentype'),
url('OpenSans-Semibold-webfont.woff') format('woff'),
url('OpenSans-Semibold-webfont.ttf') format('truetype'),
url('OpenSans-Semibold-webfont.svg#OpenSansSemibold') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'OpenSansSemiboldItalic';
src: url('OpenSans-SemiboldItalic-webfont.eot');
src: url('OpenSans-SemiboldItalic-webfont.eot?#iefix') format('embedded-opentype'),
url('OpenSans-SemiboldItalic-webfont.woff') format('woff'),
url('OpenSans-SemiboldItalic-webfont.ttf') format('truetype'),
url('OpenSans-SemiboldItalic-webfont.svg#OpenSansSemiboldItalic') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'OpenSansBold';
src: url('OpenSans-Bold-webfont.eot');
src: url('OpenSans-Bold-webfont.eot?#iefix') format('embedded-opentype'),
url('OpenSans-Bold-webfont.woff') format('woff'),
url('OpenSans-Bold-webfont.ttf') format('truetype'),
url('OpenSans-Bold-webfont.svg#OpenSansBold') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'OpenSansBoldItalic';
src: url('OpenSans-BoldItalic-webfont.eot');
src: url('OpenSans-BoldItalic-webfont.eot?#iefix') format('embedded-opentype'),
url('OpenSans-BoldItalic-webfont.woff') format('woff'),
url('OpenSans-BoldItalic-webfont.ttf') format('truetype'),
url('OpenSans-BoldItalic-webfont.svg#OpenSansBoldItalic') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'OpenSansExtrabold';
src: url('OpenSans-ExtraBold-webfont.eot');
src: url('OpenSans-ExtraBold-webfont.eot?#iefix') format('embedded-opentype'),
url('OpenSans-ExtraBold-webfont.woff') format('woff'),
url('OpenSans-ExtraBold-webfont.ttf') format('truetype'),
url('OpenSans-ExtraBold-webfont.svg#OpenSansExtrabold') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'OpenSansExtraboldItalic';
src: url('OpenSans-ExtraBoldItalic-webfont.eot');
src: url('OpenSans-ExtraBoldItalic-webfont.eot?#iefix') format('embedded-opentype'),
url('OpenSans-ExtraBoldItalic-webfont.woff') format('woff'),
url('OpenSans-ExtraBoldItalic-webfont.ttf') format('truetype'),
url('OpenSans-ExtraBoldItalic-webfont.svg#OpenSansExtraboldItalic') format('svg');
font-weight: normal;
font-style: normal;
}
......@@ -47,6 +47,7 @@
@property-panel-light-color: #888;
@import "fonts";
@import "adim-mixins";
@import "unilogo";
@import "adim-footer";
......@@ -56,6 +57,7 @@
body {
background-color: @x-bodyBg;
overflow: hidden;
font-family: OpenSans, "Helvetica Neue", Helvetica, Arial, sans-serif;
&.theme-light {
background-color: @x-bodyBg-light;
......
@font-face {
font-family: 'OpenSans';
src: url('../fonts/open-sans/OpenSans-Light-webfont.eot?nc=a123');
src: url('../fonts/open-sans/OpenSans-Light-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/open-sans/OpenSans-Light-webfont.woff?nc=a123') format('woff'), url('../fonts/open-sans/OpenSans-Light-webfont.ttf?nc=a123') format('truetype'), url('../fonts/open-sans/OpenSans-Light-webfont.svg?nc=a123#OpenSans') format('svg');
font-weight: 300;
font-style: normal;
}
@font-face {
font-family: 'OpenSans';
src: url('../fonts/open-sans/OpenSans-Light-webfont.eot?nc=a123');
src: url('../fonts/open-sans/OpenSans-Light-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/open-sans/OpenSans-Light-webfont.woff?nc=a123') format('woff'), url('../fonts/open-sans/OpenSans-Light-webfont.ttf?nc=a123') format('truetype'), url('../fonts/open-sans/OpenSans-Light-webfont.svg?nc=a123#OpenSans') format('svg');
font-weight: 300;
font-style: italic;
}
@font-face {
font-family: 'OpenSans';
src: url('../fonts/open-sans/OpenSans-Regular-webfont.eot?nc=a123');
src: url('../fonts/open-sans/OpenSans-Regular-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/open-sans/OpenSans-Regular-webfont.woff?nc=a123') format('woff'), url('../fonts/open-sans/OpenSans-Regular-webfont.ttf?nc=a123') format('truetype'), url('../fonts/open-sans/OpenSans-Regular-webfont.svg?nc=a123#OpenSans') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'OpenSans';
src: url('../fonts/open-sans/OpenSans-Italic-webfont.eot?nc=a123');
src: url('../fonts/open-sans/OpenSans-Italic-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/open-sans/OpenSans-Italic-webfont.woff?nc=a123') format('woff'), url('../fonts/open-sans/OpenSans-Italic-webfont.ttf?nc=a123') format('truetype'), url('../fonts/open-sans/OpenSans-Italic-webfont.svg?nc=a123#OpenSans') format('svg');
font-weight: normal;
font-style: italic;
}
@font-face {
font-family: 'OpenSans';
src: url('../fonts/open-sans/OpenSans-Semibold-webfont.eot?nc=a123');
src: url('../fonts/open-sans/OpenSans-Semibold-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/open-sans/OpenSans-Semibold-webfont.woff?nc=a123') format('woff'), url('../fonts/open-sans/OpenSans-Semibold-webfont.ttf?nc=a123') format('truetype'), url('../fonts/open-sans/OpenSans-Semibold-webfont.svg?nc=a123#OpenSans') format('svg');
font-weight: 600;
font-style: normal;
}
@font-face {
font-family: 'OpenSans';
src: url('../fonts/open-sans/OpenSans-SemiboldItalic-webfont.eot?nc=a123');
src: url('../fonts/open-sans/OpenSans-SemiboldItalic-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/open-sans/OpenSans-SemiboldItalic-webfont.woff?nc=a123') format('woff'), url('../fonts/open-sans/OpenSans-SemiboldItalic-webfont.ttf?nc=a123') format('truetype'), url('../fonts/open-sans/OpenSans-SemiboldItalic-webfont.svg?nc=a123#OpenSans') format('svg');
font-weight: 600;
font-style: italic;
}
@font-face {
font-family: 'OpenSans';
src: url('../fonts/open-sans/OpenSans-Bold-webfont.eot?nc=a123');
src: url('../fonts/open-sans/OpenSans-Bold-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/open-sans/OpenSans-Bold-webfont.woff?nc=a123') format('woff'), url('../fonts/open-sans/OpenSans-Bold-webfont.ttf?nc=a123') format('truetype'), url('../fonts/open-sans/OpenSans-Bold-webfont.svg?nc=a123#OpenSans') format('svg');
font-weight: 700;
font-style: normal;
}
@font-face {
font-family: 'OpenSans';
src: url('../fonts/open-sans/OpenSans-BoldItalic-webfont.eot?nc=a123');
src: url('../fonts/open-sans/OpenSans-BoldItalic-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/open-sans/OpenSans-BoldItalic-webfont.woff?nc=a123') format('woff'), url('../fonts/open-sans/OpenSans-BoldItalic-webfont.ttf?nc=a123') format('truetype'), url('../fonts/open-sans/OpenSans-BoldItalic-webfont.svg?nc=a123#OpenSans') format('svg');
font-weight: 700;
font-style: italic;
}
@nc: 'a123';
.set-font-face(@family; @base-path; @base-name; @weight: normal; @style: normal; @nc: @nc) {
@font-face {
font-family: @family;
src: url('@{base-path}@{base-name}.eot?nc=@{nc}');
src: url('@{base-path}@{base-name}.eot?#iefix') format('embedded-opentype'),
url('@{base-path}@{base-name}.woff?nc=@{nc}') format('woff'),
url('@{base-path}@{base-name}.ttf?nc=@{nc}') format('truetype'),
url('@{base-path}@{base-name}.svg?nc=@{nc}#@{family}') format('svg');
font-weight: @weight;
font-style: @style;
}
}
@font-family: 'OpenSans';
@base-path: '../fonts/open-sans/';
// Light (300)
.set-font-face(@base-name: 'OpenSans-Light-webfont'; @weight: 300; @family: @font-family; @base-path: @base-path);
.set-font-face(@base-name: 'OpenSans-Light-webfont'; @weight: 300; @style: italic; @family: @font-family; @base-path: @base-path);
// Normal (400)
.set-font-face(@base-name: 'OpenSans-Regular-webfont'; @family: @font-family; @base-path: @base-path);
.set-font-face(@base-name: 'OpenSans-Italic-webfont'; @style: italic; @family: @font-family; @base-path: @base-path);
// Semi-Bold (500)
.set-font-face(@base-name: 'OpenSans-Semibold-webfont'; @weight: 600; @family: @font-family; @base-path: @base-path);
.set-font-face(@base-name: 'OpenSans-SemiboldItalic-webfont'; @weight: 600; @style: italic; @family: @font-family; @base-path: @base-path);
// Bold (600)
.set-font-face(@base-name: 'OpenSans-Bold-webfont'; @weight: 700; @family: @font-family; @base-path: @base-path);
.set-font-face(@base-name: 'OpenSans-BoldItalic-webfont'; @weight: 700; @style: italic; @family: @font-family; @base-path: @base-path);
// ============================================================================================
//@font-face {
// font-family: 'OpenSansExtrabold';
// src: url('../fonts/open-sans/OpenSans-ExtraBold-webfont.eot');
// src: url('../fonts/open-sans/OpenSans-ExtraBold-webfont.eot?#iefix') format('embedded-opentype'),
// url('../fonts/open-sans/OpenSans-ExtraBold-webfont.woff') format('woff'),
// url('../fonts/open-sans/OpenSans-ExtraBold-webfont.ttf') format('truetype'),
// url('../fonts/open-sans/OpenSans-ExtraBold-webfont.svg#OpenSansExtrabold') format('svg');
// font-weight: normal;
// font-style: normal;
//
//}
//
//@font-face {
// font-family: 'OpenSansExtraboldItalic';
// src: url('../fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.eot');
// src: url('../fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.eot?#iefix') format('embedded-opentype'),
// url('../fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.woff') format('woff'),
// url('../fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.ttf') format('truetype'),
// url('../fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.svg#OpenSansExtraboldItalic') format('svg');
// font-weight: normal;
// font-style: normal;
//
//}
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment