nicolas/jipe_app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of gitlab.quartz.xyz:nbally/jipe_app

Browse Source
This commit is contained in:
Nicolas Bally 2018-02-27 01:35:41 +01:00
commit b0f675716c
6 changed files with 65 additions and 979 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

1036
app/assets/stylesheets/public.scss
View File

File diff suppressed because it is too large Load Diff

3
app/assets/stylesheets/public/menus.css.scss
View File

@ -2,7 +2,7 @@
#menu_top_container{ #menu_top_container{
background:$dark_gray; background:rgb(10,10,10);
z-index:60; z-index:60;
@ -88,7 +88,6 @@
text-align:center; text-align:center;
background:white; background:white;
font-size:0.9em; font-size:0.9em;

2
app/controllers/public/menu_items_controller.rb
View File

@ -73,7 +73,7 @@ class Public::MenuItemsController < ApplicationController
if @menu_item.menu_content.blocks.find_by_lang_site_id(@lang.id).portlets.count == 0 if @menu_item.menu_content.blocks.find_by_lang_site_id(@lang.id).portlets.count == 0
if @menu_item.children.count > 0 if @menu_item.children.count > 0
menu_item_lang = @menu_item.children.first.menu_item_langs.find_by_lang_site_id(@lang.id) menu_item_lang = @menu_item.children.order(:position).first.menu_item_langs.find_by_lang_site_id(@lang.id)
redirect_to menu_item_path(:url => menu_item_lang.url, :lang => @lang.slug) redirect_to menu_item_path(:url => menu_item_lang.url, :lang => @lang.slug)
end end

3
app/views/layouts/public.html.haml
View File

@ -82,6 +82,9 @@
<link href="https://fonts.googleapis.com/css?family=Galada|Lato:400,900|Roboto+Slab:400,700" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Galada|Lato:400,900|Roboto+Slab:400,700" rel="stylesheet">
<script src="https://f.vimeocdn.com/js/froogaloop2.min.js"></script> <script src="https://f.vimeocdn.com/js/froogaloop2.min.js"></script>
<link href="https://fonts.googleapis.com/css?family=Mukta+Malar" rel="stylesheet">
=javascript_include_tag "https://maps.googleapis.com/maps/api/js?libraries=places,geometry&amp;sensor=false" =javascript_include_tag "https://maps.googleapis.com/maps/api/js?libraries=places,geometry&amp;sensor=false"
<!-- Facebook Pixel Code --> <!-- Facebook Pixel Code -->
<script> <script>

BIN
public/.DS_Store vendored
View File

Binary file not shown.