Skip to content
This repository has been archived by the owner on Mar 10, 2018. It is now read-only.

Commit

Permalink
tweak font style
Browse files Browse the repository at this point in the history
  • Loading branch information
@dialex
dialex committed Dec 1, 2013
1 parent b4454e4 commit 58648e6
Show file tree
Hide file tree
Showing 4 changed files with 78 additions and 77 deletions.
84 changes: 42 additions & 42 deletions app/views/base.scala.html
View file
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
@(title: String="DCID")(description: String="")(navbar: Html)(content: Html)

<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="@description">
<title>@title</title>
<link rel="shortcut icon" href="@routes.Assets.at("img/favicon.png")">
<link rel="stylesheet" href="@routes.Assets.at("css/bootstrap.min.css")">
<link rel="stylesheet" href="@routes.Assets.at("css/font-awesome.min.css")">
<link rel="stylesheet" href="@routes.Assets.at("css/fonts.css")">
<link rel="stylesheet" href="@routes.Assets.at("css/main.css")">
</head>

<body>

<!-- top navbar -->
@navbar

<!-- the actual content of the page -->
<div class="container">
<div class="body-content">
<!-- goes here -->
@content
</div>
<!-- the footer -->
<footer>
<hr>
<small>This is still a WORK IN PROGRESS! &copy; Diogo Nunes 2013</small>
</footer>
</div>

<!-- JavaScript, at the end so the pages load faster -->
<script src="@routes.Assets.at("js/jquery-1.9.0.min.js")"></script>
<script src="@routes.Assets.at("js/bootstrap.min.js")"></script>

</body>

</html>
@(title: String="DCID")(description: String="")(navbar: Html)(content: Html)

<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="@description">
<title>@title</title>
<link rel="shortcut icon" href="@routes.Assets.at("img/favicon.png")">
<link rel="stylesheet" href="@routes.Assets.at("css/bootstrap.min.css")">
<link rel="stylesheet" href="@routes.Assets.at("css/font-awesome.min.css")">
<link rel="stylesheet" href="@routes.Assets.at("css/fonts.css")">
<link rel="stylesheet" href="@routes.Assets.at("css/main.css")">
</head>

<body>

<!-- top navbar -->
@navbar

<!-- the actual content of the page -->
<div class="container">
<div class="body-content">
<!-- goes here -->
@content
</div>
<!-- the footer -->
<footer>
<hr>
<small>This is still a WORK IN PROGRESS! &copy; Diogo Nunes 2013</small>
</footer>
</div>

<!-- JavaScript, at the end so the pages load faster -->
<script src="@routes.Assets.at("js/jquery-1.9.0.min.js")"></script>
<script src="@routes.Assets.at("js/bootstrap.min.js")"></script>

</body>

</html>
6 changes: 3 additions & 3 deletions app/views/index.scala.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<div class="col-md-12 text-center">
<h1><img src="@routes.Assets.at("img/logo-dcid.png")" width="300" height="auto" alt="DCID logo" /></h1>
<br/>
<h2><strong>PROPOSE</strong></h2>
<h2><strong>DISCUSS</strong></h2>
<h2><a href="@routes.Application.proposalList()"><button class="btn btn-success btn-lg"><strong>DCID</strong></button></a></h2>
<h1><strong>PROPOSE</strong></h1>
<h1><strong>DISCUSS</strong></h1>
<h1><a href="@routes.Application.proposalList()"><button class="btn btn-success btn-lg">DCID</button></a></h1>
</div>
<br/><br/>
</div>
Expand Down
46 changes: 23 additions & 23 deletions public/css/fonts.css
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
@font-face {
font-family: 'BebasNeueRegular';
src: url('../fonts/BebasNeue-webfont.eot');
src: url('../fonts/BebasNeue-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/BebasNeue-webfont.woff') format('woff'),
url('../fonts/BebasNeue-webfont.ttf') format('truetype'),
url('../fonts/BebasNeue-webfont.svg#bebas_neueregular') format('svg');
font-weight: normal;
font-style: normal;
}
.bebasneue-font {font-family: 'BebasNeueRegular', Tahoma, sans-serif;}

@font-face {
font-family: 'PtSansRegular';
src: url('../fonts/PTS55F-webfont.eot');
src: url('../fonts/PTS55F-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/PTS55F-webfont.woff') format('woff'),
url('../fonts/PTS55F-webfont.ttf') format('truetype'),
url('../fonts/PTS55F-webfont.svg#pt_sansregular') format('svg');
font-weight: normal;
font-style: normal;
}
.ptsans-font {font-family: 'PtSansRegular', Calibri, Tahoma, sans-serif;}
@font-face {
font-family: 'BebasNeueRegular';
src: url('../fonts/BebasNeue-webfont.eot');
src: url('../fonts/BebasNeue-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/BebasNeue-webfont.woff') format('woff'),
url('../fonts/BebasNeue-webfont.ttf') format('truetype'),
url('../fonts/BebasNeue-webfont.svg#bebas_neueregular') format('svg');
font-weight: normal;
font-style: normal;
}
.bebasneue-font {font-family: 'BebasNeueRegular', Tahoma, sans-serif;}

@font-face {
font-family: 'PtSansRegular';
src: url('../fonts/PTS55F-webfont.eot');
src: url('../fonts/PTS55F-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/PTS55F-webfont.woff') format('woff'),
url('../fonts/PTS55F-webfont.ttf') format('truetype'),
url('../fonts/PTS55F-webfont.svg#pt_sansregular') format('svg');
font-weight: normal;
font-style: normal;
}
.ptsans-font {font-family: 'PtSansRegular', Calibri, Tahoma, sans-serif;}
19 changes: 10 additions & 9 deletions public/css/main.css
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
body {
font-family: PtSansRegular;
padding-top: 40px;
padding-bottom: 40px;
}

h1, h2, h3, h4, h5, h6 {
font-family: BebasNeueRegular;
}
body {
font-family: PtSansRegular;
font-size: 1.6em;
padding-top: 40px;
padding-bottom: 40px;
}

h1, h2, h3, h4, h5, h6 {
font-family: BebasNeueRegular;
}

0 comments on commit 58648e6

Please sign in to comment.