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

Compare commits

base: nicolas:5084aa8c90a58bedc7dacd3a5141ee55b3ed2316
Branches Tags
nicolas:master
...
compare: nicolas:746f1c4456b8aad5dbb58ffab9ef52b8d4e93a11
Branches Tags
nicolas:master

3 Commits
5084aa8c90 ... 746f1c4456

Author SHA1 Message Date
Nicolas Bally
746f1c4456 Merge branch 'master' of quartz.snlab.fr:nicolas/payre3p_app 2019-01-26 18:48:30 +01:00
Nicolas Bally
268324a1a3 suite 2019-01-26 18:46:50 +01:00
Nicolas Bally
8b38f3ce46 suite 2019-01-26 18:34:09 +01:00
2 changed files with 15 additions and 4 deletions
Show Stats Expand all files Collapse all files

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

@ -312,13 +312,24 @@ h2{
top:0; top:0;
left:0; left:0;
height:190px; height:190px;
z-index:2; z-index:3;
} }
#menu_top{ #menu_top{
position:absolute; position:absolute;
top:30px; top:0px;
right:20px; left:0;
right:0;
min-height:100px;
background:black;
padding-right:20px;
padding-top:30px;
background: linear-gradient(to bottom, rgba(0,0,0,0.4) 0%, rgba(0,0,0,0.25) 30%,rgba(0,0,0,0) 100%);
z-index:2; z-index:2;
color:white; color:white;

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

@ -16,7 +16,7 @@
%html{:lang => "fr", "xml:lang" => "fr", :xmlns => "http://www.w3.org/1999/xhtml"} %html{:lang => "fr", "xml:lang" => "fr", :xmlns => "http://www.w3.org/1999/xhtml"}
%head %head
-@title = strip_tags(@title.to_s) -@title = strip_tags(@title.to_s)
%title=@title.to_s %title="Payre Energie - "+@title.to_s+ " - Payre Produits Pétroliers"
<link rel="apple-touch-icon" sizes="57x57" href="/apple-touch-icon-57x57.png"> <link rel="apple-touch-icon" sizes="57x57" href="/apple-touch-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="/apple-touch-icon-60x60.png"> <link rel="apple-touch-icon" sizes="60x60" href="/apple-touch-icon-60x60.png">
<link rel="apple-touch-icon" sizes="72x72" href="/apple-touch-icon-72x72.png"> <link rel="apple-touch-icon" sizes="72x72" href="/apple-touch-icon-72x72.png">