From d1a7cfca1ed688480d27d7fef675ca4d90d17885 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Mon, 18 May 2015 22:56:17 +0200
Subject: [PATCH] Merge commit '2ea0bdbe5b7ba1d99c1921d8c7d2c1505efbe372'

Conflicts:
	html/style-classic.css
---
 html/style-classic.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/html/style-classic.css b/html/style-classic.css
index 63be56f01..8cb965a70 100644
--- a/html/style-classic.css
+++ b/html/style-classic.css
@@ -1,4 +1,7 @@
  /* <style type="text/css"> */
+ /**
+  * Use a font
+  */
 @font-face {
 	font-family: 'OpenSansRegular';
 	src: url('image/OpenSansRegular.eot');
@@ -1451,7 +1454,6 @@ div#modele_op_div{
     left: 4%;
     border:1px solid #00008B;
     min-width: 75%;
-    width: 100%;
     box-shadow: 10px 10px 5px #888888;
 }
 }