From c684953fe21d97e03d78598e8dc974957ee035c7 Mon Sep 17 00:00:00 2001 From: pginer Date: Thu, 15 Nov 2012 10:35:40 +0100 Subject: [PATCH 1/4] CSS to avoid style clash with link color on map labels Map labels are shown as blue when the ULS is integrated with MediaWiki. This commit: * Changes the hidding label strategy to be based on modifying the opacity (not the color of links). * Specifis the label color explicitly to avoid CSS conflicts. --- css/jquery.uls.css | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/css/jquery.uls.css b/css/jquery.uls.css index 31a3450..cf08ece 100644 --- a/css/jquery.uls.css +++ b/css/jquery.uls.css @@ -118,14 +118,19 @@ div.uls-region { padding-right: 0; float: right; overflow: hidden; - color: rgba(0,0,0,0); opacity: 0.7; - transition: color 0.15s linear; - -moz-transition: color 0.15s linear; - -webkit-transition: color 0.15s linear; + transition: opacity 0.2s linear; + -moz-transition: opacity 0.2s linear; + -webkit-transition: opacity 0.2s linear; } -#map-block:hover { +#map-block a{ + opacity:0; + transition: opacity 0.15s linear; + -moz-transition: opacity 0.15s linear; + -webkit-transition: opacity 0.15s linear; +} +#map-block:hover, #map-block:hover a { opacity: 1; color: #333; } From b609c455c20c4f89a03939fec1b393b35480bb48 Mon Sep 17 00:00:00 2001 From: pginer Date: Thu, 15 Nov 2012 11:51:35 +0100 Subject: [PATCH 2/4] Fix little spacing issues To comply with our code guidelines, a newline has been added to separate two css rules as noted by Nikerabbit. --- css/jquery.uls.css | 1 + 1 file changed, 1 insertion(+) diff --git a/css/jquery.uls.css b/css/jquery.uls.css index cf08ece..7485ec0 100644 --- a/css/jquery.uls.css +++ b/css/jquery.uls.css @@ -130,6 +130,7 @@ div.uls-region { -moz-transition: opacity 0.15s linear; -webkit-transition: opacity 0.15s linear; } + #map-block:hover, #map-block:hover a { opacity: 1; color: #333; From de0a2427f34f24d455faf6f4a45e934b8abdf2bb Mon Sep 17 00:00:00 2001 From: pginer Date: Thu, 15 Nov 2012 11:54:30 +0100 Subject: [PATCH 3/4] Another spacing fix Spacing CSS fix about the lack of space before a bracket. --- css/jquery.uls.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/jquery.uls.css b/css/jquery.uls.css index 7485ec0..2b7a779 100644 --- a/css/jquery.uls.css +++ b/css/jquery.uls.css @@ -124,7 +124,7 @@ div.uls-region { -webkit-transition: opacity 0.2s linear; } -#map-block a{ +#map-block a { opacity:0; transition: opacity 0.15s linear; -moz-transition: opacity 0.15s linear; From 6a9771e4f11d76192adca8dd68b490e9a07a35e4 Mon Sep 17 00:00:00 2001 From: pginer Date: Fri, 16 Nov 2012 13:28:47 +0100 Subject: [PATCH 4/4] Added prefixes and reorder transition properties Vendor prefixes and proper order is set for the transition property. --- css/jquery.uls.css | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/css/jquery.uls.css b/css/jquery.uls.css index 2b7a779..773ff0f 100644 --- a/css/jquery.uls.css +++ b/css/jquery.uls.css @@ -119,16 +119,18 @@ div.uls-region { float: right; overflow: hidden; opacity: 0.7; - transition: opacity 0.2s linear; -moz-transition: opacity 0.2s linear; + -o-transition: opacity 0.2s linear; -webkit-transition: opacity 0.2s linear; + transition: opacity 0.2s linear; } #map-block a { opacity:0; - transition: opacity 0.15s linear; -moz-transition: opacity 0.15s linear; + -o-transition: opacity 0.15s linear; -webkit-transition: opacity 0.15s linear; + transition: opacity 0.15s linear; } #map-block:hover, #map-block:hover a { @@ -159,12 +161,16 @@ div.uls-region { input#languagefilter { border: 1px solid #c9c9c9; - -moz-transition: all 0.15s linear 0s; border-radius: 2px 2px 2px 2px; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1) inset; color: #333; display: block; background-color: transparent !important; + -moz-transition: all 0.15s linear 0s; + -o-transition: all 0.15s linear 0s; + -webkit-transition: all 0.15s linear 0s; + transition: all 0.15s linear 0s; + } input:focus#languagefilter {