DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Ajust global css

Browse source
This commit is contained in:
Xavier J 2016-11-30 11:04:50 +01:00
parent 409ce10c65
commit ea18a6f7dd
9 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/assets/stylesheets/application.scss
View file

@ -32,7 +32,7 @@ html, body {
} }
body { body {
padding-top: 60px; padding-top: 70px;
} }
form { form {
@ -60,9 +60,12 @@ form {
#footer { #footer {
background-color: rgb(240, 240, 240); background-color: rgb(240, 240, 240);
text-align: center; text-align: center;
margin-top: 1em; //margin-top: 1em;
padding: 0;
p { p {
line-height: 50px; line-height: 40px;
padding: 0;
} }
} }

9
app/assets/stylesheets/navbar.scss
View file

@ -120,11 +120,11 @@
#beta { #beta {
text-align: center; text-align: center;
text-transform: uppercase; text-transform: uppercase;
position: absolute; position: fixed;
top: 26px; bottom: 26px;
right: -35px; right: -35px;
-webkit-transform: rotate(45deg); -webkit-transform: rotate(-45deg);
transform: rotate(45deg); transform: rotate(-45deg);
width: 150px; width: 150px;
background-color: #008cba; background-color: #008cba;
color: #fff; color: #fff;
@ -160,4 +160,3 @@
.button_navbar:hover, .button-navbar-action:hover { .button_navbar:hover, .button-navbar-action:hover {
text-decoration: none; text-decoration: none;
} }

2
app/views/layouts/_footer.html.haml
View file

@ -1,4 +1,4 @@
%div.row#footer %div#footer
%p{class: "copyright col-md-push-2 col-md-10 col-lg-push-2 col-lg-10 text-muted small"} %p{class: "copyright col-md-push-2 col-md-10 col-lg-push-2 col-lg-10 text-muted small"}
=link_to 'SGMAP', "http://etatplateforme.modernisation.gouv.fr" =link_to 'SGMAP', "http://etatplateforme.modernisation.gouv.fr"

6
app/views/layouts/_navbar.html.haml
View file

@ -1,9 +1,3 @@
#beta{class:(Rails.env == 'production' ? '' : 'beta_staging')}
- if Rails.env == 'production'
Beta
- else
Env Test
%div.col-lg-2.col-md-2.no-padding %div.col-lg-2.col-md-2.no-padding
%a#title_navbar{href: '/'} %a#title_navbar{href: '/'}
%div.row#home %div.row#home

6
app/views/layouts/application.html.haml
View file

@ -10,6 +10,12 @@
= csrf_meta_tags = csrf_meta_tags
%body %body
#beta{class:(Rails.env == 'production' ? '' : 'beta_staging')}
- if Rails.env == 'production'
Beta
- else
Env Test
- if Rails.env == 'test' - if Rails.env == 'test'
%script{type: 'text/javascript'} %script{type: 'text/javascript'}
(typeof jQuery !== 'undefined') && (jQuery.fx.off = true); (typeof jQuery !== 'undefined') && (jQuery.fx.off = true);

2
app/views/layouts/navbars/_navbar_backoffice_dossierscontroller_index.html.haml
View file

@ -1,4 +1,4 @@
%div.col-lg-7.col-md-7.main-info %div.col-lg-8.col-md-8.main-info
=@facade_data_view.procedure_id.nil? ? "Tous les dossiers" : truncate(@facade_data_view.procedure.libelle, {length: 50}) =@facade_data_view.procedure_id.nil? ? "Tous les dossiers" : truncate(@facade_data_view.procedure.libelle, {length: 50})
%div.col-lg-3.col-md-3.options %div.col-lg-3.col-md-3.options
%div.row %div.row

2
app/views/layouts/navbars/_navbar_backoffice_dossierscontroller_search.html.haml
View file

@ -1,2 +1,2 @@
%div.col-lg-10.col-md-10.main-info %div.col-lg-11.col-md-11.main-info
Recherche dans tous les dossiers Recherche dans tous les dossiers

2
app/views/layouts/navbars/_navbar_backoffice_dossierscontroller_show.html.haml
View file

@ -1,4 +1,4 @@
%div.col-lg-7.col-md-7.main-info %div.col-lg-8.col-md-8.main-info
%span{ 'data-toggle' => :tooltip, "data-placement" => :bottom, title: @facade.dossier.procedure.libelle } %span{ 'data-toggle' => :tooltip, "data-placement" => :bottom, title: @facade.dossier.procedure.libelle }
= @facade.dossier.procedure.libelle.truncate(60) = @facade.dossier.procedure.libelle.truncate(60)
%div.col-lg-3.col-md-3.options %div.col-lg-3.col-md-3.options

2
app/views/layouts/navbars/_navbar_default.html.haml
View file

@ -1,2 +1,2 @@
.col-lg-10.col-md-10 .col-lg-11.col-md-11
Default navbar Default navbar