From 0febcb72cd552095f5f7f1b94df7e574a768d11b Mon Sep 17 00:00:00 2001 From: David Rosca Date: Sun, 7 Jan 2018 18:16:40 +0100 Subject: [PATCH] Fix theme issues with RTL --- .../chrome/images/navigation-tools-rtl.png | Bin 0 -> 3276 bytes bin/themes/linux/images/tools-rtl.svg | 13 ++++ .../mac/images/navigation-tools-rtl.png | Bin 0 -> 359 bytes .../mac/images/tabs-closed-button-rtl.png | Bin 0 -> 344 bytes bin/themes/windows/images/tools-rtl.svg | 13 ++++ bin/themes/windows/images/tools.svg | 13 ++++ themes/chrome/main.css | 5 -- themes/chrome/rtl.css | 5 ++ themes/linux/rtl.css | 6 ++ themes/mac/rtl.css | 11 +++ themes/windows/main.css | 1 + themes/windows/rtl.css | 63 ++++++++++++++---- 12 files changed, 113 insertions(+), 17 deletions(-) create mode 100644 bin/themes/chrome/images/navigation-tools-rtl.png create mode 100644 bin/themes/linux/images/tools-rtl.svg create mode 100644 bin/themes/mac/images/navigation-tools-rtl.png create mode 100644 bin/themes/mac/images/tabs-closed-button-rtl.png create mode 100644 bin/themes/windows/images/tools-rtl.svg create mode 100644 bin/themes/windows/images/tools.svg diff --git a/bin/themes/chrome/images/navigation-tools-rtl.png b/bin/themes/chrome/images/navigation-tools-rtl.png new file mode 100644 index 0000000000000000000000000000000000000000..0bf8f7741cdf4d9b008b66ede3064d7a1c6ec9a0 GIT binary patch literal 3276 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 KMNUMnLSTaRRZ + + + + + diff --git a/bin/themes/mac/images/navigation-tools-rtl.png b/bin/themes/mac/images/navigation-tools-rtl.png new file mode 100644 index 0000000000000000000000000000000000000000..891db94ff961e319f51df897f34c02e84004d280 GIT binary patch literal 359 zcmV-t0hs=YP)c*omiXv7=HZzYPxluf#LBwhGY zxwIP}*io5)l9%&Z2OJc_Q)a!a9e!uwE_y+^)Y2M_f==lHu002ovPDHLk FV1n#(kNyAv literal 0 HcmV?d00001 diff --git a/bin/themes/mac/images/tabs-closed-button-rtl.png b/bin/themes/mac/images/tabs-closed-button-rtl.png new file mode 100644 index 0000000000000000000000000000000000000000..558b1b310bd17162c1002e9d2fad52ea1ed3ce48 GIT binary patch literal 344 zcmeAS@N?(olHy`uVBq!ia0vp^Qb3%;!3HEt3>OIjDYhhUcNc~i4Eq_D2?TUZ1d4DL zctjR6FmMZlFeAgPITAoY_7YEDSN2DY>;l$iHxAzT2o!qi>EalYaqsOl`>sO{5^W#V z7Y9aOG5T-Nmpa*B4%t zH(*aY;NJ7`>S+XI n_8!TX>s0leq~du=IhMidu18qoE5&<24>NeW`njxgN@xNAVkCuP literal 0 HcmV?d00001 diff --git a/bin/themes/windows/images/tools-rtl.svg b/bin/themes/windows/images/tools-rtl.svg new file mode 100644 index 000000000..c2bdba6b6 --- /dev/null +++ b/bin/themes/windows/images/tools-rtl.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/bin/themes/windows/images/tools.svg b/bin/themes/windows/images/tools.svg new file mode 100644 index 000000000..29a1753f3 --- /dev/null +++ b/bin/themes/windows/images/tools.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/themes/chrome/main.css b/themes/chrome/main.css index 2f01df296..87223b634 100644 --- a/themes/chrome/main.css +++ b/themes/chrome/main.css @@ -91,11 +91,6 @@ qproperty-multiIcon: url(images/navigation-addtab.png); } -#navigation-button-tools -{ - qproperty-themeIcon: "arrow-right-double"; -} - #navigation-button-tools { qproperty-icon: url(images/navigation-tools.png); diff --git a/themes/chrome/rtl.css b/themes/chrome/rtl.css index e90f8f59d..7f2701efb 100644 --- a/themes/chrome/rtl.css +++ b/themes/chrome/rtl.css @@ -8,6 +8,11 @@ qproperty-multiIcon: url(images/navigation-forward.png); } +#navigation-button-tools +{ + qproperty-icon: url(images/navigation-tools-rtl.png); +} + #tabbar-button-right { qproperty-icon: url(images/tab-left-arrow.png); diff --git a/themes/linux/rtl.css b/themes/linux/rtl.css index af0afd488..24113a537 100644 --- a/themes/linux/rtl.css +++ b/themes/linux/rtl.css @@ -8,6 +8,12 @@ qproperty-themeIcon: "go-next"; } +#navigation-button-tools +{ + qproperty-themeIcon: "arrow-left-double"; + qproperty-fallbackIcon: url(images/tools-rtl.svg); +} + #tabbar-button-right { qproperty-themeIcon: "arrow-left"; diff --git a/themes/mac/rtl.css b/themes/mac/rtl.css index f68b11056..d130fe484 100644 --- a/themes/mac/rtl.css +++ b/themes/mac/rtl.css @@ -8,11 +8,22 @@ qproperty-multiIcon: url(images/navigation-forward.png); } +#navigation-button-tools +{ + qproperty-icon: url(images/navigation-tools-rtl.png); +} + + #tabwidget-button-opentabs { qproperty-multiIcon: url(images/tabs-list-button_rtl.png); } +#tabwidget-button-closedtabs +{ + qproperty-multiIcon: url(images/tabs-closed-button-rtl.png); +} + #tabbar-button-right { qproperty-icon: url(images/tab-left-arrow.png); diff --git a/themes/windows/main.css b/themes/windows/main.css index 84bf4b858..8d6162c2a 100644 --- a/themes/windows/main.css +++ b/themes/windows/main.css @@ -71,6 +71,7 @@ #navigation-button-tools { qproperty-themeIcon: "arrow-right-double"; + qproperty-fallbackIcon: url(images/tools.svg); } #navigation-button-supermenu diff --git a/themes/windows/rtl.css b/themes/windows/rtl.css index c1e71ff50..fde964041 100644 --- a/themes/windows/rtl.css +++ b/themes/windows/rtl.css @@ -1,29 +1,68 @@ -#navigation-button-next -{ - qproperty-multiIcon: url(images/navigation-back.png); -} - #navigation-button-back { - qproperty-multiIcon: url(images/navigation-forward.png); + qproperty-themeIcon: "go-next"; } -#tabwidget-button-addtab +#navigation-button-next { - qproperty-multiIcon: url(images/tabbar-addtab_rtl.png); + qproperty-themeIcon: "go-previous"; } -#tabbar::tab:last +#navigation-button-tools { - margin-left: 1px; + qproperty-themeIcon: "arrow-left-double"; + qproperty-fallbackIcon: url(images/tools-rtl.svg); } #tabbar-button-right { - qproperty-icon: url(images/tab-left-arrow.png); + qproperty-themeIcon: "arrow-left"; + qproperty-fallbackIcon: url(images/tab-left-arrow.svg); + qproperty-fixedsize: 15px 25px; } #tabbar-button-left { - qproperty-icon: url(images/tab-right-arrow.png); + qproperty-themeIcon: "arrow-right"; + qproperty-fallbackIcon: url(images/tab-right-arrow.svg); + qproperty-fixedsize: 15px 25px; +} + +#locationbar +{ + background: transparent; + border: 1px solid #b2b2b2; + min-height: 25px; + qproperty-leftMargin: 27; + margin-right: 1px; /* Why ??? */ +} + +#tabbar::tab:selected:!first +{ + margin-right: -1px; +} + +#tabbar::tab:!selected:!first +{ + margin-right: -1px; +} + +#tabbar::tab:!selected:!first:hover +{ + margin-right: -1px; +} + +#tabbar::tab:selected:first +{ + margin-right: 0; +} + +#tabbar::tab:!selected:first +{ + margin-right: 0; +} + +#tabbar::tab:selected:only-one +{ + margin-right: 0; }