jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/366828 )
Change subject: Add icons to save an cancel buttons
......................................................................
Add icons to save an cancel buttons
Also fixed bug: edit button was not disappearing when was switching to
edit mode
Change-Id: I201e7621ae120db45a1a38f0c4b3df2f46deae7c
---
M resources/lexeme.less
M src/View/LexemeView.php
2 files changed, 39 insertions(+), 23 deletions(-)
Approvals:
Jonas Kress (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/lexeme.less b/resources/lexeme.less
index 1c74abf..de287ca 100644
--- a/resources/lexeme.less
+++ b/resources/lexeme.less
@@ -146,25 +146,43 @@
text-decoration: underline;
}
-.wb-lexeme .lemma-widget_edit-icon {
- /* Copied from .wikibase-toolbar-button .wb-icon */
- background-size: 20px 20px;
- width: 20px;
- height: 20px;
- display: inline-block;
- vertical-align: middle;
- opacity: .7;
- /* @embed */
- background-image:
url(../../Wikibase/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/oojs-ui/edit-ltr.png);
- /* @embed */
- background-image: -webkit-linear-gradient(transparent, transparent),
url(../../Wikibase/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/oojs-ui/edit-ltr.svg);
- /* @embed */
- background-image: linear-gradient(transparent, transparent),
url(../../Wikibase/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/oojs-ui/edit-ltr.svg);
- background-position: 0 40%;
+.prepend-with-wikibase-oojs-icon(@image) {
+ &:before {
+ content:'';
+
+ /* Copied from .wikibase-toolbar-button .wb-icon */
+ background-size: 20px 20px;
+ width: 20px;
+ height: 20px;
+ display: inline-block;
+ vertical-align: middle;
+ background-position: center;
+
+ @wikibase-root: "../../Wikibase";
+ @wb-oojs-icon-path:
"view/resources/jquery/wikibase/toolbar/themes/default/images/icons/oojs-ui";
+ @icon-path: "@{wikibase-root}/@{wb-oojs-icon-path}/@{image}";
+ /* @embed */
+ background-image: url(@icon-path);
+ /* @embed */
+ background-image: -webkit-linear-gradient(transparent,
transparent), url(@icon-path);
+ /* @embed */
+ background-image: linear-gradient(transparent, transparent),
url(@icon-path);
+
+ opacity: .7;
+ }
+ &:hover:before {
+ opacity: 1;
+ }
}
-.wb-lexeme *:hover > .lemma-widget_edit-icon {
- opacity: 1;
+.wb-lexeme .lemma-widget_edit {
+ .prepend-with-wikibase-oojs-icon('edit-ltr.png');
+}
+.wb-lexeme .lemma-widget_save {
+ .prepend-with-wikibase-oojs-icon('check.png');
+}
+.wb-lexeme .lemma-widget_cancel {
+ .prepend-with-wikibase-oojs-icon('close-ltr.png');
}
.wb-lexeme .lemma-widget_lemma-edit-box {
diff --git a/src/View/LexemeView.php b/src/View/LexemeView.php
index 70351fe..6b00945 100644
--- a/src/View/LexemeView.php
+++ b/src/View/LexemeView.php
@@ -272,13 +272,11 @@
</ul>
</div>
<div class="lemma-widget_controls">
- <button type="button" class="lemma-widget_control"
vif="!inEditMode"
- :disabled="isSaving" v-on:click="edit">
- <span
class="lemma-widget_edit-icon"></span>{{'wikibase-edit'|message}}
- </button>
- <button type="button" class="lemma-widget_control"
v-if="inEditMode"
+ <button type="button" class="lemma-widget_control
lemma-widget_edit" v-if="!inEditMode"
+ :disabled="isSaving"
v-on:click="edit">{{'wikibase-edit'|message}}</button>
+ <button type="button" class="lemma-widget_control
lemma-widget_save" v-if="inEditMode"
:disabled="isSaving"
v-on:click="save">{{'wikibase-save'|message}}</button>
- <button type="button" class="lemma-widget_control"
v-if="inEditMode"
+ <button type="button" class="lemma-widget_control
lemma-widget_cancel" v-if="inEditMode"
:disabled="isSaving"
v-on:click="cancel">{{'wikibase-cancel'|message}}</button>
</div>
</div>
--
To view, visit https://gerrit.wikimedia.org/r/366828
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I201e7621ae120db45a1a38f0c4b3df2f46deae7c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseLexeme
Gerrit-Branch: master
Gerrit-Owner: Aleksey Bekh-Ivanov (WMDE) <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
