Merge remote-tracking branch 'upstream/dev' into dev

4 files changed, 11 insertions, 6 deletions

diff --git a/themes/baggy/_head.twig b/themes/baggy/_head.twig
index 0079b228..206d5aae 100644
--- a/themes/baggy/_head.twig
+++ b/themes/baggy/_head.twig
@@ -2,7 +2,6 @@
         <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-144x144-precomposed.png">
         <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-72x72-precomposed.png">
         <link rel="apple-touch-icon-precomposed" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-precomposed.png">
-        <link href='http://fonts.googleapis.com/css?family=PT+Sans:700' rel='stylesheet' type='text/css'>
         <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/ratatouille.css" media="all">
         <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/font.css" media="all">
         <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/main.css" media="all">
@@ -10,4 +9,4 @@
         <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/print.css" media="print">
         <script src="{{ poche_url }}/themes/{{theme}}/js/jquery-2.0.3.min.js"></script>
         <script src="{{ poche_url }}/themes/{{theme}}/js/init.js"></script>
-        <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/closeMessage.js"></script>
\ No newline at end of file
+        <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/closeMessage.js"></script>
diff --git a/themes/baggy/css/font.css b/themes/baggy/css/font.css
index e69de29b..ec662158 100755
--- a/themes/baggy/css/font.css
+++ b/themes/baggy/css/font.css
@@ -0,0 +1,6 @@
+@font-face {
+  font-family: 'PT Sans';
+  font-style: normal;
+  font-weight: 700;
+  src: local('PT Sans Bold'), local('PTSans-Bold'), url(/themes/baggy/fonts/ptsans.woff) format('woff');
+}
diff --git a/themes/baggy/css/messages.css b/themes/baggy/css/messages.css
index 85a0dbc1..42da70b3 100755
--- a/themes/baggy/css/messages.css
+++ b/themes/baggy/css/messages.css
@@ -1,19 +1,19 @@
-.install .messages.error {
+.messages.error.install {
     border: 1px solid #c42608;
     color: #c00 !important;
     background: #fff0ef;
     text-align: left;
 }
 
-.install .messages.notice {
+.messages.notice.install {
     border: 1px solid #ebcd41;
     color: #000;
     background: #fffcd3;
     text-align: left;
 }
 
-.install .messages.success {
+.messages.success.install {
     border: 1px solid #6dc70c;
-    background: #e0fbcc;
+    background: #e0fbcc !important;
     text-align: left;
 }
\ No newline at end of file
diff --git a/themes/baggy/font/ptsans.woff b/themes/baggy/font/ptsans.woff
new file mode 100644
index 00000000..cf7c62e1
--- /dev/null
+++ b/themes/baggy/font/ptsans.woff