Redesign prototype merge #18

Merged
MrPetovan merged 50 commits from feature/redesign-prototype into master 2017-05-06 08:10:18 +02:00
20 changed files with 4 additions and 16 deletions
Showing only changes of commit a35dab70b8 - Show all commits

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -1,13 +1,3 @@
@font-face {
font-family: "LatoHairline";
src: url("fonts/Lato-Hairline.ttf") format("truetype");
}
@font-face {
font-family: "LatoLight";
src: url("fonts/Lato-Light.ttf") format("truetype");
}
*{
box-sizing:border-box;
}
@ -18,7 +8,7 @@ html,body{
}
html{
font-family:'LatoLight', 'Lato', sans-serif;
font-family:'Open Sans', sans-serif;
font-weight:300;
font-size:100%;
}
@ -115,7 +105,6 @@ nav#links a{
.homepage-wrapper .header{
font-size:68px;
font-family:'LatoHairline', 'Lato', sans-serif;
font-weight:100;
line-height:0.9em;
background:url('/images/friendica.svg') top left no-repeat;

View file

@ -4,15 +4,14 @@
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="viewport" content="width=device-width,minimum-scale=1,maximum-scale=1">
<link rel="search" type="application/opensearchdescription+xml" title="Friendica Directory" href="/opensearch" />
<title>Friendica Directory</title>
<link rel="shortcut icon" href="/images/friendica-32.png" />
<link rel="apple-touch-icon" href="/images/friendica-128.png"/>
<link href="//fonts.googleapis.com/css?family=Lato:100,300" rel="stylesheet" type="text/css">
<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" type="text/css">
<link href="/assets/style.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="//code.jquery.com/jquery-1.11.2.min.js"></script>
<script type="text/javascript" src="/assets/js/main.js"></script>
</head>