summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2012-01-04 19:04:14 +0100
committerAndrea Diamantini <adjam7@gmail.com>2012-01-04 19:04:14 +0100
commit3f3553ff77a5e429a4527a9ad2f7ff8863226161 (patch)
tree2720ab0aa8b7a3d35d092de2d18bfe2b5e915829 /src
parentManage rekonq pages in "current" NOT "main" frame (diff)
downloadrekonq-3f3553ff77a5e429a4527a9ad2f7ff8863226161.tar.xz
Finally fix problems with unset background
WARNING: This fix works just with qtwebkit 2.2.x!!! BUG: 287782
Diffstat (limited to 'src')
-rw-r--r--src/application.cpp9
-rw-r--r--src/application.h2
-rw-r--r--src/data/default_rekonq.css10
3 files changed, 4 insertions, 17 deletions
diff --git a/src/application.cpp b/src/application.cpp
index fb67c236..a09fc26e 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2008-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2012 by Andrea Diamantini <adjam7 at gmail dot com>
* Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com>
* Copyright (C) 2009-2011 by Lionel Chauvin <megabigbug@yahoo.fr>
*
@@ -659,11 +659,8 @@ void Application::updateConfiguration()
defaultSettings->setAttribute(QWebSettings::WebGLEnabled, ReKonfig::webGL());
defaultSettings->setAttribute(QWebSettings::AcceleratedCompositingEnabled, ReKonfig::webGL());
- // Applies user/system defined CSS to all open webpages.
- ReKonfig::userCSS().isEmpty()
- ? defaultSettings->setUserStyleSheetUrl(KUrl(KStandardDirs::locate("appdata" , "default_rekonq.css")))
- : defaultSettings->setUserStyleSheetUrl(ReKonfig::userCSS())
- ;
+ // Applies user defined CSS to all open webpages.
+ defaultSettings->setUserStyleSheetUrl(ReKonfig::userCSS());
// ====== load Settings on main classes
historyManager()->loadSettings();
diff --git a/src/application.h b/src/application.h
index ea271427..2689e3f5 100644
--- a/src/application.h
+++ b/src/application.h
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2008-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2012 by Andrea Diamantini <adjam7 at gmail dot com>
* Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com>
* Copyright (C) 2009-2011 by Lionel Chauvin <megabigbug@yahoo.fr>
*
diff --git a/src/data/default_rekonq.css b/src/data/default_rekonq.css
deleted file mode 100644
index 0ba6036c..00000000
--- a/src/data/default_rekonq.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * rekonq default css properties
- * this file will not be considered
- * setting a local stylesheet in rekonq config
- */
-
-/* Set background color to white for sites forgetting this */
-body{
-background-color:#FFFFFF;
-}