andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

verschiedene Schriftarten css

Browse Source
This commit is contained in:
Andreas Stephanides
2014-04-17 15:17:31 +02:00
parent 65df35f6cc
commit 78197f54b8
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/assets/fonts/Ayuma2yk.ttf Normal file
View File

Binary file not shown.

11
app/assets/stylesheets/themes/darkblue/application.css.scss
View File

@@ -51,6 +51,11 @@ $navbarLinkBackgroundHover: darken($navbarBackground,10%);
$infoBackground:#65A5D1; $infoBackground:#65A5D1;
$infoText:#03406A; $infoText:#03406A;
@font-face {
font-family: 'ayuma2yk';
src:font-url('Ayuma2yk.ttf');}
$sansFontFamily: Helvetica, Arial; $sansFontFamily: Helvetica, Arial;
@import 'bootstrap'; @import 'bootstrap';
@@ -59,12 +64,16 @@ $sansFontFamily: Helvetica, Arial;
@import 'font-awesome'; @import 'font-awesome';
@import 'neuigkeiten'; @import 'neuigkeiten';
#menudiv {
font-family: ayuma2yk;
}
div.header { div.header {
display: block; display: block;
// background: url('../../../../header1.png') no-repeat; // background: url('../../../../header1.png') no-repeat;
// background-color:white;// $color_prim; // background-color:white;// $color_prim;
background-position: right; background-position: right;
font-family: ayuma2yk;
// border-bottom:1px solid black; // border-bottom:1px solid black;
float:left; float:left;
color:#000; color:#000;
@@ -90,4 +99,4 @@ $box-border: lightgray solid 1px;
$box-border-radius:0px; $box-border-radius:0px;
$box-background: white; $box-background: white;
@import 'layout'; @import 'layout';
@import 'calendars'; @import 'calendars';

12
app/views/layouts/application.html.erb
View File

@@ -9,14 +9,16 @@
<%= stylesheet_link_tag "themes/"+theme_name+"/application", :media => "all" unless theme_name.empty? %> <%= stylesheet_link_tag "themes/"+theme_name+"/application", :media => "all" unless theme_name.empty? %>
<%= stylesheet_link_tag "application", :media=>"all" if theme_name.empty? %> <%= stylesheet_link_tag "application", :media=>"all" if theme_name.empty? %>
<%= theme_stylesheet_link_tag "test", :media => "all" %> <%= theme_stylesheet_link_tag "test", :media => "all" %>
<% theme_stylesheet_link_tag "mod", :media=>"all" %> <% theme_stylesheet_link_tag "mod", :media=>"all" %>
<link rel="stylesheet" href="css/bootstrap.css"> <!-- <link rel="stylesheet" href="css/bootstrap.css">
<link rel="stylesheet" href="css/style.css"> <link rel="stylesheet" href="css/style.css">
<link rel="stylesheet" href="css/bootstrap-responsive.css"> <link rel="stylesheet" href="css/bootstrap-responsive.css">
<!--[if lt IE 7]><link rel="stylesheet" href="css/bootstrap-ie6.css"><![endif]-->
<link rel="stylesheet" href="css/bootstrap-image-gallery.css"> <link rel="stylesheet" href="css/bootstrap-image-gallery.css">
-->
<!--[if lt IE 7]><link rel="stylesheet" href="css/bootstrap-ie6.css"><![endif]-->
<%= javascript_include_tag "application" %> <%= javascript_include_tag "application" %>
<%= csrf_meta_tags %> <%= csrf_meta_tags %>