Skip to content

Commit

Permalink
fixed layout
Browse files Browse the repository at this point in the history
  • Loading branch information
aivils committed May 20, 2015
1 parent 2a1ec89 commit 12fcc0b
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
44 changes: 22 additions & 22 deletions app/views/layouts/lolita/application.html.haml
Expand Up @@ -3,28 +3,28 @@

%head
%meta{:charset => "utf-8"}
%meta{:content => "IE=edge,chrome=1", "http-equiv" => "X-UA-Compatible"}
%title= Lolita.application.name
%meta{:content => "", :name => "description"}
%meta{:content => "", :name => "author"}
= favicon_link_tag "lolita/favicon.ico" rescue ""
= stylesheet_link_tag "lolita/application.css"
= yield :style
= javascript_include_tag "lolita/application.js"
= yield :script
= include_application_assets
= raw csrf_meta_tag
- if flash[:lolita_notice]
:javascript
$(function(){
show_notice_msg(Base64.decode('#{flash[:lolita_notice]}'));
})
- elsif flash[:lolita_alert]
:javascript
$(function(){
show_alert_msg(Base64.decode('#{flash[:lolita_alert]}'));
})
%body
%meta{:content => "IE=edge,chrome=1", "http-equiv" => "X-UA-Compatible"}
%title= Lolita.application.name
%meta{:content => "", :name => "description"}
%meta{:content => "", :name => "author"}
= favicon_link_tag "lolita/favicon.ico" rescue ""
= stylesheet_link_tag "lolita/application.css"
= yield :style
= javascript_include_tag "lolita/application.js"
= yield :script
= include_application_assets
= raw csrf_meta_tag
- if flash[:lolita_notice]
:javascript
$(function(){
show_notice_msg(Base64.decode('#{flash[:lolita_notice]}'));
})
- elsif flash[:lolita_alert]
:javascript
$(function(){
show_alert_msg(Base64.decode('#{flash[:lolita_alert]}'));
})
%body
= render_component :"lolita/shared", :flash
#container
= render_component :"lolita/shared", :header
Expand Down
2 changes: 1 addition & 1 deletion lib/lolita/version.rb
Expand Up @@ -2,7 +2,7 @@ module Lolita
module Version
MAJOR = 4
MINOR = 0
PATCH = 7
PATCH = 8
BUILD = nil

STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
Expand Down

0 comments on commit 12fcc0b

Please sign in to comment.