(no commit message)

diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js
index a500a8376e0356cf2bf0aba5197d7933af7aadab..438045be9737d33ee7e2c4e12f6580417bf3812d 100644 (file)
--- a/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@ -11,7 +11,7 @@ Fluidbook.REPEAT = 1;
 // Horizontal alignments\r
 Fluidbook.CENTER = 4;\r
 Fluidbook.LEFT = 5;\r
-Fluidbook.RIGHT = 6;\r
+Fluidbook.RIGHT = 6; \r
 // Vertical alignments\r
 Fluidbook.MIDDLE = 7;\r
 Fluidbook.TOP = 8;\r

diff --git a/style/fluidbook.css b/style/fluidbook.css
index 5dabe07b32ec1ba88c872ce3205efc750d9c6fbb..42348ab10d34a801ec05637e94fadb79c7466c4b 100644 (file)
--- a/style/fluidbook.css
+++ b/style/fluidbook.css
@@ -613,7 +613,7 @@ footer.hidden,header.hidden,#interface.hidden{
        font-size:20px;\r
        line-height: 22px;\r
        text-align: center;\r
-       font-weight: 500;\r
+       font-weight: 600;\r
        margin:0 auto;\r
        overflow: hidden;\r
        text-overflow: ellipsis;\r
@@ -986,7 +986,7 @@ ul.chapters a.level0,ul.chapters a.level1,ul.chapters a.level2,ul.chapters a.lev
 ul.chapters a.level0{\r
        font-size:150%;\r
        font-family: Ubuntu;\r
-       font-weight: 500;\r
+       font-weight: 600;\r
 }\r
 \r
 ul.chapters a.level1{\r
@@ -1273,48 +1273,20 @@ a.button{
 @font-face {\r
     font-family: 'Silkscreen';\r
     src: url('fonts/slkscr-webfont.ttf') format('truetype');\r
-    font-weight: normal;\r
-    font-style: normal;\r
-}\r
-\r
-@font-face {\r
-    font-family: 'Ubuntu';\r
-    src: url('fonts/Ubuntu-R-webfont.ttf') format('truetype');\r
     font-weight: 400;\r
     font-style: normal;\r
 }\r
 \r
 @font-face {\r
     font-family: 'Ubuntu';\r
-    src: url('fonts/Ubuntu-RI-webfont.ttf') format('truetype');\r
+    src: url('fonts/Ubuntu-R-webfont.ttf') format('truetype');\r
     font-weight: 400;\r
-    font-style: italic;\r
-}\r
-\r
-@font-face {\r
-    font-family: 'Ubuntu';\r
-    src: url('fonts/Ubuntu-L-webfont.ttf') format('truetype');\r
-    font-weight:300;\r
     font-style: normal;\r
 }\r
 \r
-@font-face {\r
-    font-family: 'Ubuntu';\r
-    src: url('fonts/Ubuntu-LI-webfont.ttf') format('truetype');\r
-    font-weight: 300;\r
-    font-style: italic;\r
-}\r
-\r
 @font-face {\r
     font-family: 'Ubuntu';\r
     src:url('fonts/Ubuntu-M-webfont.ttf') format('truetype');\r
     font-weight: 600;\r
     font-style: normal;\r
 }\r
-\r
-@font-face {\r
-    font-family: 'Ubuntu';\r
-    src:url('fonts/Ubuntu-MI-webfont.ttf') format('truetype');\r
-    font-weight: 600;\r
-    font-style: italic;\r
-}\r