diff --git a/bin/themes/chrome/main.css b/bin/themes/chrome/main.css index cac09feaa..2ac50693e 100644 --- a/bin/themes/chrome/main.css +++ b/bin/themes/chrome/main.css @@ -124,11 +124,12 @@ IconProvider { background: transparent; border-image: url(images/lineedit-bg.png); - border-width:4; + border-width: 3px; color:black; padding-right: 0px; padding-left: 0px; padding-top: -2px; + padding-bottom: -2px; qproperty-fixedheight: 27; qproperty-leftMargin: 28; } diff --git a/bin/themes/default/main.css b/bin/themes/default/main.css index 9f8b2eee1..33a2d568a 100644 --- a/bin/themes/default/main.css +++ b/bin/themes/default/main.css @@ -134,10 +134,12 @@ IconProvider { background: transparent; border-image: url(images/lineedit-bg.png); - border-width:4; + border-width: 4px; color:black; padding-right: -2px; padding-left: -2px; + padding-top: -2px; + padding-bottom: -2px; qproperty-fixedheight: 25; qproperty-leftMargin: 35; } diff --git a/bin/themes/linux/main.css b/bin/themes/linux/main.css index 20f8ea77b..7f70587be 100644 --- a/bin/themes/linux/main.css +++ b/bin/themes/linux/main.css @@ -115,10 +115,11 @@ IconProvider /*LocationBar*/ #locationbar { - border-width:4; + border-width: 4px; padding-right: -4px; padding-left: -4px; padding-top: -2px; + padding-bottom: -2px; qproperty-fixedheight: 27; qproperty-leftMargin: 26; } diff --git a/bin/themes/mac/images/siteicon-bg.png b/bin/themes/mac/images/siteicon-bg.png index 5f689a965..ae0817550 100644 Binary files a/bin/themes/mac/images/siteicon-bg.png and b/bin/themes/mac/images/siteicon-bg.png differ diff --git a/bin/themes/mac/images/siteicon-secure-bg.png b/bin/themes/mac/images/siteicon-secure-bg.png index e7b09b46b..406246159 100644 Binary files a/bin/themes/mac/images/siteicon-secure-bg.png and b/bin/themes/mac/images/siteicon-secure-bg.png differ diff --git a/bin/themes/mac/main.css b/bin/themes/mac/main.css index 632082ef6..be854b629 100644 --- a/bin/themes/mac/main.css +++ b/bin/themes/mac/main.css @@ -119,11 +119,12 @@ IconProvider { background: transparent; border-image: url(images/lineedit-bg.png); - border-width:4; + border-width: 4px; color:black; padding-right: -5px; padding-left: -5px; padding-top: -2px; + padding-bottom: -2px; qproperty-fixedheight: 23; qproperty-leftMargin: 40; } diff --git a/bin/themes/windows/main.css b/bin/themes/windows/main.css index f3ec97621..0a0b87859 100644 --- a/bin/themes/windows/main.css +++ b/bin/themes/windows/main.css @@ -129,10 +129,12 @@ IconProvider { background: transparent; border-image: url(images/lineedit-bg.png); - border-width:4; + border-width: 3px; color:black; padding-right: -4px; padding-left: -4px; + padding-top: -2px; + padding-bottom: -2px; qproperty-fixedheight: 22; qproperty-leftMargin: 29; } diff --git a/src/lib/navigation/locationbar.cpp b/src/lib/navigation/locationbar.cpp index 1832d5120..e5deb8720 100644 --- a/src/lib/navigation/locationbar.cpp +++ b/src/lib/navigation/locationbar.cpp @@ -631,7 +631,8 @@ void LocationBar::paintEvent(QPaintEvent* event) switch (m_progressStyle) { case ProgressFilled: { - QRect bar = textRect.adjusted(-3, 0, 6 - (textRect.width() * (100.0 - m_loadProgress) / 100), 0); + QRect bar = contentsRect.adjusted(0, 1, 0, -1); + bar.setWidth(bar.width()*m_loadProgress/100); const int roundness = bar.height() / 4.0; p.drawRoundedRect(bar, roundness, roundness); break; @@ -640,7 +641,7 @@ void LocationBar::paintEvent(QPaintEvent* event) outlinePen.setWidthF(0.3); outlinePen.setColor(outlinePen.color().darker(130)); p.setPen(outlinePen); - QRect bar(contentsRect.x(), contentsRect.bottom() - 2, + QRect bar(contentsRect.x(), contentsRect.bottom() - 3, contentsRect.width()*m_loadProgress / 100.0, 3); p.drawRoundedRect(bar, 1, 1); break;