From 894b79f5ffd816962fe38207d40bf05274490498 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 6 Jun 2013 19:34:38 +0200
Subject: Use webkit general font to render rekonq pages

BUG: 320318
---
 src/data/CMakeLists.txt     |   7 -------
 src/data/Nunito-Regular.ttf | Bin 49792 -> 0 bytes
 src/data/home.html          |  13 ++++---------
 src/data/rekonqinfo.html    |  11 +++--------
 4 files changed, 7 insertions(+), 24 deletions(-)
 delete mode 100644 src/data/Nunito-Regular.ttf

(limited to 'src/data')

diff --git a/src/data/CMakeLists.txt b/src/data/CMakeLists.txt
index f3609634..ea7d05c7 100644
--- a/src/data/CMakeLists.txt
+++ b/src/data/CMakeLists.txt
@@ -13,13 +13,6 @@ INSTALL(
     DESTINATION ${DATA_INSTALL_DIR}/rekonq/pics
 )
 
-# fonts files
-INSTALL(
-    FILES
-    Nunito-Regular.ttf
-    DESTINATION ${DATA_INSTALL_DIR}/rekonq/fonts
-)
-
 # default bookmarks
 INSTALL(
     FILES
diff --git a/src/data/Nunito-Regular.ttf b/src/data/Nunito-Regular.ttf
deleted file mode 100644
index 3b0f067c..00000000
Binary files a/src/data/Nunito-Regular.ttf and /dev/null differ
diff --git a/src/data/home.html b/src/data/home.html
index 4f4eb7ba..428030c6 100644
--- a/src/data/home.html
+++ b/src/data/home.html
@@ -8,6 +8,7 @@ To let it work you need to set also some variables
 about (prepend a $ to actually use them):
 
 DEFAULT_PATH = rekonq default installation files path
+GENERAL_FONT = general font family
 ...
 
 -->
@@ -23,20 +24,14 @@ DEFAULT_PATH = rekonq default installation files path
 /* -------------------------------------------------------- */
 /* generic styles */
 
-@font-face {
-    font-family: 'Nunito';
-    src: url($DEFAULT_PATH/fonts/Nunito-Regular.ttf);
-    font-weight: normal;
-    font-style: normal;
-}
-
 html {
     height:100%;
 }
 
 body {
     background: url($DEFAULT_PATH/pics/background.png) repeat-y center #fff;
-    font-family: 'Nunito', sans-serif;
+    font-family: $GENERAL_FONT;
+    font-weight: 500;
     font-size: 0.9em;
 }
 
@@ -65,7 +60,7 @@ a:hover {
 
 input {
     min-width: 180px;
-    font-family: 'Nunito', sans-serif;
+    font-family: $GENERAL_FONT;
     font-size: 0.8em;
 }
 
diff --git a/src/data/rekonqinfo.html b/src/data/rekonqinfo.html
index 1bf77ac1..861b6f35 100644
--- a/src/data/rekonqinfo.html
+++ b/src/data/rekonqinfo.html
@@ -10,6 +10,7 @@ about (prepend a $ to actually use them):
 DEFAULT_PATH = rekonq default installation files path
 PAGE_TITLE = page title
 MAIN_CONTENT = page main content
+GENERAL_FONT = general font family
 ...
 
 -->
@@ -27,18 +28,12 @@ html{
     padding:0;
 }
 
-@font-face {
-    font-family: 'Nunito';
-    src: url($DEFAULT_PATH/fonts/Nunito-Regular.ttf);
-    font-weight: normal;
-    font-style: normal;
-}
-
 body{
     background: url($DEFAULT_PATH/pics/background.png) repeat-y center #bbb;
     margin:0;
     padding:0;
-    font-family: 'Nunito', sans-serif;
+    font-family: $GENERAL_FONT;
+    font-weight: 500;
     font-size: 0.9em;
 }
 
-- 
cgit v1.2.1