diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 82e6f0f..504211e 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -11,6 +11,4 @@ // about supported directives. // //= require rails-ujs -//= require activestorage -//= require turbolinks //= require_tree . diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js deleted file mode 100644 index 739aa5f..0000000 --- a/app/assets/javascripts/cable.js +++ /dev/null @@ -1,13 +0,0 @@ -// Action Cable provides the framework to deal with WebSockets in Rails. -// You can generate new channels where WebSocket features live using the `rails generate channel` command. -// -//= require action_cable -//= require_self -//= require_tree ./channels - -(function() { - this.App || (this.App = {}); - - App.cable = ActionCable.createConsumer(); - -}).call(this); diff --git a/app/assets/javascripts/channels/.keep b/app/assets/javascripts/channels/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb deleted file mode 100644 index 414a880..0000000 --- a/app/views/layouts/application.html.erb +++ /dev/null @@ -1,15 +0,0 @@ - - - - RubyxWebpage - <%= csrf_meta_tags %> - <%= csp_meta_tag %> - - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> - <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> - - - - <%= yield %> - - diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 45e0770..c658e11 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -5,7 +5,41 @@ %title RubyxWebpage = csrf_meta_tags = csp_meta_tag - = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' - = javascript_include_tag 'application', 'data-turbolinks-track': 'reload' + = stylesheet_link_tag 'application', media: 'all' + = javascript_include_tag 'application' + %script{:async => "", :defer => "defer", :src => "https://buttons.github.io/buttons.js"} %body - = yield + %link{:href => "http://fonts.googleapis.com/css?family=Roboto:400,300,100,100italic,300italic,500,700", :rel => "stylesheet", :type => "text/css"}/ + %header + .container + %a{:href => "https://github.com/ruby-x"} + %img{:alt => "Fork me on GitHub", "data-canonical-src" => "https://s3.amazonaws.com/github/ribbons/forkme_left_orange_ff7600.png", :src => "https://camo.githubusercontent.com/8b6b8ccc6da3aa5722903da7b58eb5ab1081adee/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f6c6566745f6f72616e67655f6666373630302e706e67", :style => "position: absolute; top: 0; left: 0; border: 0;"}/ + %ul.nav + %li + %a{:href => "/"} Home + %li + %a{:href => "/rubyx/layers.html"} Architecture + %li + %a{:href => "/typed/typed.html"} Typed layer + %li + %a{:href => "/arm/overview.html"} Arm Resources + %li + %a{:href => "/project/motivation.html"} About + %li + %a{:href => "{{site.posts.first.url}}"} News + %a{:href => "https://github.com/ruby-x"} + %img{:alt => "Logo", :src => "/assets/images/x-small.png", :style => "position: absolute; top: 15px; right: 15px; border: 0; width: 70px"}/ + .container + = yield + %footer + .container + .row.center + %p © Copyright Torsten Ruger 2013-7 + :javascript + (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ + (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), + m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) + })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); + var the_id = 'UA-61481839-1'; + ga('create', the_id.replace("-1" , "-2") , 'auto'); + ga('send', 'pageview'); diff --git a/app/views/layouts/mailer.html.haml b/app/views/layouts/mailer.html.haml deleted file mode 100644 index cbf6b8e..0000000 --- a/app/views/layouts/mailer.html.haml +++ /dev/null @@ -1,8 +0,0 @@ -!!! -%html - %head - %meta{:content => "text/html; charset=utf-8", "http-equiv" => "Content-Type"}/ - :css - /* Email styles need to be inline */ - %body - = yield diff --git a/app/views/layouts/mailer.text.haml b/app/views/layouts/mailer.text.haml deleted file mode 100644 index 0a90f09..0000000 --- a/app/views/layouts/mailer.text.haml +++ /dev/null @@ -1 +0,0 @@ -= yield diff --git a/log/development.log b/log/development.log deleted file mode 100644 index e69de29..0000000