[Noalyss-commit] [noalyss] 02/04: Merge commit '2ea0bdbe5b7ba1d99c1921d8c7d2c1505efbe372'

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 217fcae7329e5dd090a514e0028d2247aa6f6f0f
Merge: eec7628 2ea0bdb
Author: Dany De Bontridder <address@hidden>
Date:   Mon May 18 22:56:07 2015 +0200

    Merge commit '2ea0bdbe5b7ba1d99c1921d8c7d2c1505efbe372'
    
    Conflicts:
        html/style-classic.css

 html/image/OpenSansRegular.eot  |  Bin 0 -> 217534 bytes
 html/image/OpenSansRegular.ttf  |  Bin 0 -> 217360 bytes
 html/image/OpenSansRegular.woff |  Bin 0 -> 109000 bytes
 html/style-classic.css          |   45 ++++++++++++++++++++++++++++++++++----
 4 files changed, 40 insertions(+), 5 deletions(-)

diff --cc html/style-classic.css
index 4e6552a,7a0f285..63be56f
--- a/html/style-classic.css
+++ b/html/style-classic.css
@@@ -1418,10 -1448,9 +1448,11 @@@ div#modele_op_div
      overflow:hidden;
      z-index:3;
      position:absolute;
 -    left: 17.5%;
 +    left: 4%;
      border:1px solid #00008B;
+     min-width: 75%;
 +    width: 100%;
 +    box-shadow: 10px 10px 5px #888888;
  }
  }
  @media only screen and (max-width: 955px) {
@@@ -1910,4 -1942,4 +1945,4 @@@ ul.aligned-block li 
      margin-right: 150px;
      background: snow;
      margin-top: 50px;
--}
++}