jenkins-bot has submitted this change and it was merged.

Change subject: Updated sitelinkview styling
......................................................................


Updated sitelinkview styling

Updates sitelinkview styling as to the direction given by the UI mock-ups.

Change-Id: Ifaeb6e93280610f2372a849f2a55eb2fdae66276
---
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js
M 
lib/resources/jquery.wikibase/themes/default/jquery.wikibase.sitelinkgroupview.css
M lib/resources/jquery.wikibase/themes/default/jquery.wikibase.sitelinkview.css
M 
lib/resources/jquery.wikibase/toolbar/themes/default/jquery.wikibase.toolbarbutton.css
4 files changed, 35 insertions(+), 3 deletions(-)

Approvals:
  Tobias Gritschacher: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js
index 0eaf996..a3de41d 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js
@@ -239,8 +239,13 @@
 
                var pagesuggester = $pageNameInput.data( 'pagesuggester' );
 
-               // Disable initially and wait for valid site input:
+               // Disable and hide initially and wait for valid site input:
                pagesuggester.disable();
+               $pageNameInput.hide();
+
+               if( !this.options.value || 
!this.options.value.getBadges().length ) {
+                       this._badgeselector.element.hide();
+               }
 
                $siteIdInput
                .on( 'siteselectorselected.' + this.widgetName, function( 
event, siteId ) {
@@ -249,7 +254,12 @@
                        if( site ) {
                                $pageNameInput
                                .attr( 'lang', site.getLanguageCode() )
-                               .attr( 'dir', site.getLanguageDirection() );
+                               .attr( 'dir', site.getLanguageDirection() )
+                               .show();
+                               self._badgeselector.element.show();
+                       } else {
+                               $pageNameInput.hide();
+                               self._badgeselector.element.hide();
                        }
 
                        pagesuggester[site ? 'enable' : 'disable']();
diff --git 
a/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.sitelinkgroupview.css
 
b/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.sitelinkgroupview.css
index 74c2219..7a9675c 100644
--- 
a/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.sitelinkgroupview.css
+++ 
b/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.sitelinkgroupview.css
@@ -6,6 +6,7 @@
        border: 1px solid #C9C9C9;
        float: left;
        margin: 0 2em 2em 0;
+       padding-bottom: 0.6em;
        width: 30em;
 }
 
@@ -17,7 +18,11 @@
 }
 
 .wikibase-sitelinkgroupview.wb-edit {
-       background-color: #D6F3FF;
+       border-color: #2779aa;
+}
+
+.wikibase-sitelinkgroupview .wikibase-sitelinkgroupview-heading-section {
+       margin-bottom: 0.3em;
 }
 
 .wikibase-sitelinkgroupview .wikibase-sitelinkgroupview-heading-container {
diff --git 
a/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.sitelinkview.css 
b/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.sitelinkview.css
index d918b45..26cd215 100644
--- 
a/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.sitelinkview.css
+++ 
b/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.sitelinkview.css
@@ -28,10 +28,19 @@
 }
 
 .wikibase-sitelinkview input {
+       background-color: transparent;
+       border-left: 0;
+       border-right: 0;
+       border-top: 0;
        margin: 0;
        font-family: inherit;
        font-size: 1em; /* prevent font size rounding errors */
        box-sizing: border-box;
        -moz-box-sizing: border-box;
        -webkit-box-sizing: border-box;
+       outline: none;
+}
+
+.wikibase-sitelinkview input:focus {
+       border-color: #0b0080;
 }
diff --git 
a/lib/resources/jquery.wikibase/toolbar/themes/default/jquery.wikibase.toolbarbutton.css
 
b/lib/resources/jquery.wikibase/toolbar/themes/default/jquery.wikibase.toolbarbutton.css
index 6f59e1e..c78c03a 100644
--- 
a/lib/resources/jquery.wikibase/toolbar/themes/default/jquery.wikibase.toolbarbutton.css
+++ 
b/lib/resources/jquery.wikibase/toolbar/themes/default/jquery.wikibase.toolbarbutton.css
@@ -27,3 +27,11 @@
        height: 1em;
        width: 1em;
 }
+
+.wikibase-toolbarbutton.ui-state-disabled.oo-ui-buttonElement > 
.oo-ui-buttonElement-button > .oo-ui-iconElement-icon {
+       opacity: 0.33;
+}
+
+.wikibase-toolbarbutton.ui-state-disabled.oo-ui-buttonElement > 
.oo-ui-buttonElement-button {
+       cursor: default;
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/179913
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifaeb6e93280610f2372a849f2a55eb2fdae66276
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to