diff --git a/app/assets/stylesheets/public.scss b/app/assets/stylesheets/public.scss index 2003c4f..6e9fb29 100644 --- a/app/assets/stylesheets/public.scss +++ b/app/assets/stylesheets/public.scss @@ -139,4 +139,30 @@ h1,h2,h3{ .q_counter_holder{ text-align:center; -} \ No newline at end of file +} + +.socials_links{ + text-align:right; + margin-right:10px; + a, .top_link{ + display:inline-block; + padding:10px 0px; + text-align:center; + width:45px; + color:#9d9d9d; + border: 2px solid #9d9d9d; + margin:10px 5px; + cursor:pointer; + &:hover{ + background:#9d9d9d; + color:white; + + } + } + .top_link{ + + //display:inline; + } +} + + diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index 8e9086d..cdc7629 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -106,14 +106,7 @@ }); - -@articles = Article.before(Date.today).recents.joins(:lang_articles).where("lang_articles.enabled = 1 and lang_articles.lang_site_id = 1").limit(2) - .more_articles - -i = 0 - -@articles.each do |article| - -i = i +1 - - =render :partial => "public/articles/article_x2", :object => article, :as => :article, :locals => {:i => i} - .clear + =yield @@ -122,13 +115,15 @@ .socials_links - .top_link - =i(:"arrow-circle-o-up") + =link_to "https://www.facebook.com/sharer/sharer.php?u=#{request.url}", :target => "_blank", :class => "link facebook" do =i(:"facebook") =link_to "https://twitter.com/intent/tweet?url=#{request.url}&via=&text="+CGI::escape(@title.to_s), :target => "_blank", :class => "link twitter" do =i(:"twitter") + + .top_link + =i(:"arrow-up") .bottom =link_to image_tag("/logo-w.png", :class => "logo"),"/" \ No newline at end of file diff --git a/app/views/public/menu_items/show.html.haml b/app/views/public/menu_items/show.html.haml index cb52fb2..ee58eae 100644 --- a/app/views/public/menu_items/show.html.haml +++ b/app/views/public/menu_items/show.html.haml @@ -14,9 +14,7 @@ .menu_item_top.principal{:style => "background-image:url('#{img_url}');"} %h1=@menu_item.menu_content.lang_pages.find_by_lang_site_id(@lang.id).title -@facebook_img = @menu_item.image_file.file.large.medium.url - -if @sidebar - #sidebar - =yield :sidebar + .menu_content_inner{:class => @menu_item_lang.slug} .menu_item_content @@ -47,19 +45,7 @@ - - -if @menu_item.slug != "index" and @menu_item.ancestors.length >= 1 and !@original_menu_item - .breadcrumb - -if @menu_item.ancestors - =link_to i(:home), "/" - > - -for menu_item in @menu_item.ancestors.reverse - =menu_item_link(menu_item) - > - - =@menu_item.menu_item_langs.find_by_lang_site_id(@lang.id).name - - + -if current_admin .admin_panel diff --git a/public/logo.png b/public/logo.png index 632aa0c..b8a1bea 100644 Binary files a/public/logo.png and b/public/logo.png differ