Fixing merge operation

Merge commit 'refs/merge-requests/1715' of git://gitorious.org/rekonq/mainline into matgicMerge

Conflicts:
	data/home.html
	src/homepage.cpp

1 files changed, 66 insertions, 28 deletions

diff --git a/data/home.html b/data/home.html
index 8ad4a7ce..1a193b07 100644
--- a/data/home.html
+++ b/data/home.html
@@ -9,26 +9,26 @@
 /* ------------------------------------------------------- */
 /* generic styles */
 
-html{
+html, body, div, h1, h2, h3, h4, a, p{
 margin:0;
 padding:0;
+border:0;
 }
 
 body{
 background: url(%1/tile.gif) repeat-x #fff;
-margin:0;
-padding:0;
 font-family: sans-serif;
-font-size: 100%;
+font-size: 90%;
 text-align: center;
 }
 
 h1{
 font: normal bold 1.5em sans-serif;
 text-align:right;
-color: #FFF;
-margin-right:1%;
-margin-bottom: 15px;
+color: #3F7AB7;
+margin-right:3%;
+margin-top: 0.5%;
+float:right;
 }
 
 h2{
@@ -38,6 +38,27 @@ text-align: left;
 margin: 20px 20px 20px 22px;
 }
 
+h3{
+background: url(%1/category.png) no-repeat;
+padding: 0.2em;
+margin-top: 1em;
+margin-bottom: 0.5em;
+padding-left: 0.4em;
+}
+
+h4{
+font-size: 1em;
+margin-top: 0.5em;
+}
+
+a{
+color: #3F7AB7;
+text-decoration: none;
+}
+a:hover{
+color: black;
+}
+
 /* ------------------------------------------------------- */
 /* page sections */
 
@@ -46,47 +67,56 @@ width: 100%;
 }
 
 #navigation {
-float: right;
-width: 20%;
-text-align:center;
+margin-top: 1%;
+text-align: center;
 }
 
 #content {
-width: 80%;
 text-align: left;
-margin: 20px;
+margin: 2%;
 }
 
-.link {
-text-align:left;
-margin: 10px;
-background-color:#6096CF;
-padding: 10px 10px 20px 10px;
-border-width: 10px;
-}
 /* -------------------------------------------------------- */
 /* div navigations styles */
 
-div.link a{
-color:#FFF;
+.link{
+display: inline-block;
+padding: 0 2%;
+}
+
+.link img{
+float:left;
+}
+
+.link a{
+color: black;
 text-decoration:none;
-font: normal bold 1em sans-serif;
+font: normal bold 1.2em/2.5em sans-serif;
+vertical-align: middle;
 }
 
-div.link a:hover{
-color: #ff0;
+#navigation .link:not(.current):not(.link:hover){
+-webkit-opacity: 0.3;
 }
 
+
 /* -------------------------------------------------------- */
 /* Thumbnail class */
 
 .thumbnail {
-background: url(%1/bg.png) no-repeat;
 text-align: center;
 float:left;
-width:228px;
-padding: 11px 0px 0px 0px;
-margin: 10px 10px 10px 0;
+width: 25%;
+min-width: 235px;
+margin-bottom: 3%;
+}
+
+.thumbnail object{
+background: url(%1/bg.png) no-repeat;
+text-align: center;
+padding: 14px 16px;
+-webkit-background-size: 100% 100%;
+-webkit-background-clip: padding;
 cursor: pointer;
 }
 
@@ -99,6 +129,14 @@ text-decoration:none;
 }
 
 /* -------------------------------------------------------- */
+/* Bookmarks page*/
+
+.bookfolder{
+margin-left: 2em;
+margin-bottom: 0.5em;
+}
+
+/* -------------------------------------------------------- */
 </style>
 </head>