Download as
Browse Code »

Commit 05d48b466e6e833d91ce2500a5adbf6999d1fc36

Authored by Augusto dos Anjos Almeida
1 parent c4dc7f55
Exists in master and in 10 other branches build, build2, capa, captcha, contigency_plan_recaptcha, jasmine-testing, make_harder_to_vote_twice, production, refactory-sass, staging

Changed font links to cdn.

Showing 3 changed files with 9 additions and 27 deletions   Show diff stats
index.html
  Diff comments   View file @05d48b4
... ... @@ -7,8 +7,9 @@
7 7 <meta name="viewport" content="width=device-width, initial-scale=1">
8 8  
9 9 <link rel="stylesheet" href="css/bootstrap.min.css" />
10   - <link rel="stylesheet" href="css/font-awesome.min.css">
11   - <link rel="stylesheet" href="css/open-sans.min.css">
  10 + <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
  11 + <link href='http://fonts.googleapis.com/css?family=Open+Sans:400,300,700' rel='stylesheet' type='text/css'>
  12 + <link href='http://fonts.googleapis.com/css?family=Asap:400,700' rel='stylesheet' type='text/css'>
12 13 <link rel="stylesheet" href="style.css" />
13 14  
14 15 </head>
... ...
sass/_proposal_categories.scss
  Diff comments   View file @05d48b4
... ... @@ -27,8 +27,8 @@
27 27 height: 40px;
28 28 display: inline-block;
29 29 font-size: 14px;
30   - font-family: asap_bold, sans;
31   - font-weight: bolder;
  30 + font-family: 'Asap', sans;
  31 + font-weight: 700;
32 32 text-align: center;
33 33 padding-top: 100px;
34 34 overflow: hidden;
... ... @@ -44,7 +44,8 @@
44 44 .category > li {
45 45 color: #FFFFFF;
46 46 text-align: left;
47   - font-family: asap_bold;
  47 + font-family: 'Asap';
  48 + font-weight: 700;
48 49 font-size: 16px;
49 50 padding: 5px 12px 5px 32px;
50 51 margin-bottom: 10px;
... ... @@ -76,9 +77,9 @@
76 77 margin: 0;
77 78 color: #335277;
78 79 text-align: left;
79   - font-family: asap_bold;
  80 + font-family: 'Asap';
  81 + font-weight: 700;
80 82 font-size: 18pt;
81   - font-weight: bold;
82 83 text-decoration: none;
83 84 }
84 85  
... ...
sass/style.scss
  Diff comments   View file @05d48b4
1   -@font-face {
2   - font-family: asap_bold_italic;
3   - src: url(./fonts/Asap-BoldItalic.ttf);
4   -}
5   -
6   -@font-face {
7   - font-family: asap_bold;
8   - src: url(./fonts/Asap-Bold.ttf);
9   -}
10   -
11   -@font-face {
12   - font-family: asap_italic;
13   - src: url(./fonts/Asap-Italic.ttf);
14   -}
15   -
16   -@font-face {
17   - font-family: asap;
18   - src: url(./fonts/Asap-Regular.ttf);
19   -}
20   -
21 1 @import 'utilities/variables';
22 2  
23 3 @import 'nav';
... ...