[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 03/04: Merge commit '2ea0bdbe5b7ba1d99c1921d8
|
From: |
Dany De Bontridder |
|
Subject: |
[Noalyss-commit] [noalyss] 03/04: Merge commit '2ea0bdbe5b7ba1d99c1921d8c7d2c1505efbe372' |
|
Date: |
Wed, 20 May 2015 22:38:36 +0000 |
sparkyx pushed a commit to branch master
in repository noalyss.
commit d1a7cfca1ed688480d27d7fef675ca4d90d17885
Author: Dany De Bontridder <address@hidden>
Date: Mon May 18 22:56:17 2015 +0200
Merge commit '2ea0bdbe5b7ba1d99c1921d8c7d2c1505efbe372'
Conflicts:
html/style-classic.css
---
html/style-classic.css | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/html/style-classic.css b/html/style-classic.css
index 63be56f..8cb965a 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;
}
}