rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-21 15:54:22 +01:00
Code Issues Releases Activity

update fonts

Browse Source
This commit is contained in:
cyril 2015-09-18 10:32:25 +02:00
parent 1dc86f1827
commit e8037beaca
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/app.plugins.scss
View File

@ -217,7 +217,7 @@
border: 2px solid $yellow; border: 2px solid $yellow;
background-color: transparent; background-color: transparent;
text-transform: uppercase; text-transform: uppercase;
font-family: "proxima-nova-condensed"; font-family: $font-proxima-condensed;
font-weight: 600; font-weight: 600;
&:hover { &:hover {
background-color: $yellow; background-color: $yellow;

6
app/assets/stylesheets/bootstrap_and_overrides.scss vendored
View File

@ -78,10 +78,10 @@ $link-hover-decoration: underline;
// Semibold = 600, Bold = 700, ExtraB = 800 // Semibold = 600, Bold = 700, ExtraB = 800
$font-family-sans-serif: "proxima-nova", Helvetica, Arial, sans-serif !default; $font-family-sans-serif: "Open Sans", Helvetica, Arial, sans-serif !default;
$font-proxima-condensed: "proxima-nova-condensed", Helvetica, Arial, sans-serif !default; $font-proxima-condensed: "Open Sans Condensed", Helvetica, Arial, sans-serif !default;
$font-family-serif: Georgia, "Times New Roman", Times, serif !default; $font-family-serif: Georgia, "Times New Roman", Times, serif !default;
$font-felt: "felt-tip-roman", sans-serif; $font-felt: "Loved by the King", sans-serif;
//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`. //** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
// $font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace !default; // $font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace !default;

8
app/views/application/index.html.erb
View File

@ -7,11 +7,11 @@
<meta name="description" content=""> <meta name="description" content="">
<meta name="author" content="sleede"> <meta name="author" content="sleede">
<title>Fab Lab Manager</title> <title>Fab-Manager</title>
<script type="text/javascript" src="//use.typekit.net/rih5zfr.js"></script>
<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
<link href='https://fonts.googleapis.com/css?family=Open+Sans:400,400italic,600,600italic,700,800,700italic' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Open+Sans+Condensed:300,700,300italic' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Loved+by+the+King' rel='stylesheet' type='text/css'>
<%= stylesheet_link_tag "application", media: 'all' %> <%= stylesheet_link_tag "application", media: 'all' %>
<%= stylesheet_link_tag "app.printer", media: 'print' %> <%= stylesheet_link_tag "app.printer", media: 'print' %>