diff --git a/app/assets/fonts/Ayuma2yk.ttf b/app/assets/fonts/Ayuma2yk.ttf new file mode 100644 index 0000000..9c69123 Binary files /dev/null and b/app/assets/fonts/Ayuma2yk.ttf differ diff --git a/app/assets/stylesheets/themes/darkblue/application.css.scss b/app/assets/stylesheets/themes/darkblue/application.css.scss index 2057e79..36a1c00 100755 --- a/app/assets/stylesheets/themes/darkblue/application.css.scss +++ b/app/assets/stylesheets/themes/darkblue/application.css.scss @@ -51,6 +51,11 @@ $navbarLinkBackgroundHover: darken($navbarBackground,10%); $infoBackground:#65A5D1; $infoText:#03406A; + +@font-face { +font-family: 'ayuma2yk'; +src:font-url('Ayuma2yk.ttf');} + $sansFontFamily: Helvetica, Arial; @import 'bootstrap'; @@ -59,12 +64,16 @@ $sansFontFamily: Helvetica, Arial; @import 'font-awesome'; @import 'neuigkeiten'; +#menudiv { + font-family: ayuma2yk; +} div.header { display: block; // background: url('../../../../header1.png') no-repeat; // background-color:white;// $color_prim; background-position: right; + font-family: ayuma2yk; // border-bottom:1px solid black; float:left; color:#000; @@ -90,4 +99,4 @@ $box-border: lightgray solid 1px; $box-border-radius:0px; $box-background: white; @import 'layout'; -@import 'calendars'; \ No newline at end of file +@import 'calendars'; diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 3841dce..a07ee93 100755 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,14 +9,16 @@ <%= stylesheet_link_tag "themes/"+theme_name+"/application", :media => "all" unless theme_name.empty? %> -<%= stylesheet_link_tag "application", :media=>"all" if theme_name.empty? %> - <%= theme_stylesheet_link_tag "test", :media => "all" %> -<% theme_stylesheet_link_tag "mod", :media=>"all" %> - + <%= stylesheet_link_tag "application", :media=>"all" if theme_name.empty? %> + <%= theme_stylesheet_link_tag "test", :media => "all" %> + <% theme_stylesheet_link_tag "mod", :media=>"all" %> + +--> + + <%= javascript_include_tag "application" %> <%= csrf_meta_tags %>