Commit 219c8e8e authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'fix_charte_prod'

parents f3f6956f fdd11427

public/css/charte.css

+4 −2
Original line number Diff line number Diff line
@@ -6,13 +6,15 @@ body { 
  padding-bottom: 100px; }



body.development .navbar-inverse,

body.test .navbar-inverse {

body.test .navbar-inverse,

body.production .navbar-inverse {

  background-image: none;

  background-color: #006EAD;

  border-color: #006EAD; }



body.development .navbar-inverse .navbar-nav .active a,

body.test .navbar-inverse .navbar-nav .active a {

body.test .navbar-inverse .navbar-nav .active a,

body.production .navbar-inverse .navbar-nav .active a {

  background-image: none;

  background-color: #004980;

  border-color: #004980; }

public/css/charte.css.map

+1 −1
Original line number Diff line number Diff line 
{

"version": 3,

"mappings": ";AAGA;;GAEG;AAEH,IAAK;EACH,cAAc,EAAE,KAAK;;AAGvB;yBAC0B;EACxB,gBAAgB,EAAE,IAAI;EACtB,gBAAgB,EAdM,OAAO;EAe7B,YAAY,EAfU,OAAO;;AAkB/B;+CACgD;EAC9C,gBAAgB,EAAE,IAAI;EACtB,gBAAgB,EApBY,OAAO;EAqBnC,YAAY,EArBgB,OAAO;;AAwBrC,oCAAqC;EACnC,KAAK,EAAE,KAAK;;AAEd,4BAA6B;EAC3B,KAAK,EAAE,KAAK;;AAEd,kCAAmC;EACjC,KAAK,EAAE,KAAK;EACZ,gBAAgB,EAAE,kCAAkC;EACpD,iBAAiB,EAAE,SAAS;EAC5B,eAAe,EAAE,GAAG;EACpB,mBAAmB,EAAE,UAAU;EAC/B,WAAW,EAAE,OAAO;;AAGtB,mBAAoB;EAClB,aAAa,EAAE,IAAI;;AAGrB,OAAQ;EACN,WAAW,EAAE,IAAI;EACjB,aAAa,EAAE,CAAC;EAChB,gBAAgB,EA/CM,OAAO;;AAiD/B,UAAW;EACT,KAAK,EAAE,IAAI;;AAEb,eAAgB;EACd,KAAK,EAAE,KAAK;;AAEd,kCAAmC;EACjC,MAAM,EAAE,IAAI;;AAGd,WAAY;EACV,SAAS,EAAE,KAAK;EAChB,gBAAgB,EAAE,iCAAiC;EACnD,iBAAiB,EAAE,SAAS;EAC5B,eAAe,EAAE,OAAO;EACxB,mBAAmB,EAAE,SAAS;EAC9B,WAAW,EAAE,OAAO;;AAGtB,SAAU;EACR,MAAM,EAAE,IAAI;;AAGd;mBACoB;EAClB,UAAU,EAAE,IAAI;EAChB,aAAa,EAAE,IAAI;EACnB,OAAO,EAAE,GAAG;EACZ,UAAU,EAAE,WAAW;;AAEzB;wBACyB;EACvB,OAAO,EAAE,QAAQ",

"mappings": ";AAGA;;GAEG;AAEH,IAAK;EACH,cAAc,EAAE,KAAK;;AAGvB;;+BAEiC;EAC/B,gBAAgB,EAAE,IAAI;EACtB,gBAAgB,EAfM,OAAO;EAgB7B,YAAY,EAhBU,OAAO;;AAmB/B;;qDAEuD;EACrD,gBAAgB,EAAE,IAAI;EACtB,gBAAgB,EAtBY,OAAO;EAuBnC,YAAY,EAvBgB,OAAO;;AA0BrC,oCAAqC;EACnC,KAAK,EAAE,KAAK;;AAEd,4BAA6B;EAC3B,KAAK,EAAE,KAAK;;AAEd,kCAAmC;EACjC,KAAK,EAAE,KAAK;EACZ,gBAAgB,EAAE,kCAAkC;EACpD,iBAAiB,EAAE,SAAS;EAC5B,eAAe,EAAE,GAAG;EACpB,mBAAmB,EAAE,UAAU;EAC/B,WAAW,EAAE,OAAO;;AAGtB,mBAAoB;EAClB,aAAa,EAAE,IAAI;;AAGrB,OAAQ;EACN,WAAW,EAAE,IAAI;EACjB,aAAa,EAAE,CAAC;EAChB,gBAAgB,EAjDM,OAAO;;AAmD/B,UAAW;EACT,KAAK,EAAE,IAAI;;AAEb,eAAgB;EACd,KAAK,EAAE,KAAK;;AAEd,kCAAmC;EACjC,MAAM,EAAE,IAAI;;AAGd,WAAY;EACV,SAAS,EAAE,KAAK;EAChB,gBAAgB,EAAE,iCAAiC;EACnD,iBAAiB,EAAE,SAAS;EAC5B,eAAe,EAAE,OAAO;EACxB,mBAAmB,EAAE,SAAS;EAC9B,WAAW,EAAE,OAAO;;AAGtB,SAAU;EACR,MAAM,EAAE,IAAI;;AAGd;mBACoB;EAClB,UAAU,EAAE,IAAI;EAChB,aAAa,EAAE,IAAI;EACnB,OAAO,EAAE,GAAG;EACZ,UAAU,EAAE,WAAW;;AAEzB;wBACyB;EACvB,OAAO,EAAE,QAAQ",

"sources": ["charte.scss"],

"names": [],

"file": "charte.css"

public/css/charte.scss

+4 −2
Original line number Diff line number Diff line
@@ -10,14 +10,16 @@ body { 
}



body.development .navbar-inverse,

body.test .navbar-inverse {

body.test        .navbar-inverse,

body.production  .navbar-inverse {

  background-image: none; //linear-gradient(to bottom, #660000 0px, #870a0a 100%);

  background-color: $navbarBackgroundColor;

  border-color: $navbarBackgroundColor;

}



body.development .navbar-inverse .navbar-nav .active a,

body.test .navbar-inverse .navbar-nav .active a {

body.test        .navbar-inverse .navbar-nav .active a,

body.production  .navbar-inverse .navbar-nav .active a {

  background-image: none; //linear-gradient(to bottom, #d22828 0px, #a41212 100%);

  background-color: $navbarBackgroundColorActive;

  border-color: $navbarBackgroundColorActive