diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-10-21 11:38:46 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-10-21 11:38:46 +0200 |
| commit | 719cda157b81fcebdeb35a9c5d8c075e112c4e40 (patch) | |
| tree | b751ae1b465e6fc945af09cda5ab383ba72403f0 /data/home.html | |
| parent | Me stupid.. fixing tab previews! (diff) | |
| parent | fix button (diff) | |
| download | rekonq-719cda157b81fcebdeb35a9c5d8c075e112c4e40.tar.xz | |
Fixing merge due to recent changes in master
Merge commit 'refs/merge-requests/1836' of git://gitorious.org/rekonq/mainline into NewHomePageSytle
Conflicts:
src/homepage.cpp
Diffstat (limited to 'data/home.html')
| -rw-r--r-- | data/home.html | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/data/home.html b/data/home.html index 15cb3b34..893f5d76 100644 --- a/data/home.html +++ b/data/home.html @@ -66,9 +66,12 @@ width: 100%; } #navigation { -margin-top: 1%; -margin-bottom: 4%; +display: inline-block; +margin-top: 2%; +margin-bottom: 3%; text-align: center; +border-width: 5px; +-webkit-border-image: url(%2/bg2.png) 12 12 12 12 stretch stretch; } #content { @@ -81,24 +84,28 @@ margin: 2%; .link{ display: inline-block; -padding: 0 2%; } .link img{ -float:left; +vertical-align: middle; +margin-right: 5px; } .link a{ color: black; text-decoration:none; -font: normal bold 1.2em/2.5em sans-serif; -vertical-align: middle; +font: normal 1em sans-serif; } -#navigation .link:not(.current):not(.link:hover){ --webkit-opacity: 0.3; +.current{ +border-width: 6px; +-webkit-border-image: url(%2/button.png) 6 stretch stretch; } +#navigation .link:not(.current){ +margin-right: 4px; +margin-left: 4px; +} /* -------------------------------------------------------- */ /* Thumbnail class */ |