jenkins-bot has submitted this change and it was merged. Change subject: Add icon for 'View Source' menu item ......................................................................
Add icon for 'View Source' menu item Adding icon for 'View Source' menu item. Also putting image files in 'img' sub-folder for cleaner directory structure, renaming icon to unify file names and removing superflous `background-repeat` value repetition. Bug: T104213 Change-Id: If6f4a75baa2784fb09bdecee83211f24c4176d7c --- R resources/img/caret-down.svg A resources/img/edit-locked.svg R resources/img/edit.svg R resources/img/history.svg R resources/img/menu-clicked.svg R resources/img/menu.svg R resources/img/search-active.svg R resources/img/talk.svg R resources/img/user.svg R resources/img/view.svg M resources/master.less 11 files changed, 31 insertions(+), 8 deletions(-) Approvals: JGirault: Looks good to me, but someone else must approve VolkerE: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/caret-down.svg b/resources/img/caret-down.svg similarity index 100% rename from resources/caret-down.svg rename to resources/img/caret-down.svg diff --git a/resources/img/edit-locked.svg b/resources/img/edit-locked.svg new file mode 100755 index 0000000..4aaeeab --- /dev/null +++ b/resources/img/edit-locked.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px" + viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve"> +<g id="Layer_1_1_" display="none"> + <g transform="matrix(1 0 0 -1 0 1638)" display="inline"> + <path fill="#fff" d="M17.2,1634.1c-0.7,0-1-0.4-1-1.2v-1h2.1v1C18.2,1633.7,17.9,1634.1,17.2,1634.1z M17.2,1635.4c0.6,0,1.2-0.2,1.6-0.7 + s0.7-1.1,0.7-1.8v-1.1h1v-4.6h-6.6v4.6h1v1.1c0,0.7,0.2,1.3,0.7,1.8C16,1635.2,16.6,1635.4,17.2,1635.4z M12.8,1626.1h1.6 + l-7.5-6.8l-4.8-0.5l1,4.7l9.7,8.7v-1.6l-8.5-7.6c0.2-0.1,0.5-0.4,0.9-0.8l7.5,6.8L12.8,1626.1L12.8,1626.1z"/> + </g> +</g> +<g id="Layer_2"> + <g> + <path fill="#fff" d="M21,4V3c0,0,0-3-3-3s-3,3-3,3v1h-1v6h8V4H21z M19.5,4h-3V3c0,0,0-1.5,1.5-1.5S19.5,3,19.5,3V4z"/> + <path fill="#fff" d="M13,9.6l-6.8,6.9c-0.3-0.3-0.7-0.6-1-0.8c1.4-1.4,5-5,7.8-7.9V6l-9,9l-1,5l5-1l8-8h-3V9.6z"/> + </g> +</g> +</svg> diff --git a/resources/edit.svg b/resources/img/edit.svg similarity index 100% rename from resources/edit.svg rename to resources/img/edit.svg diff --git a/resources/history.svg b/resources/img/history.svg similarity index 100% rename from resources/history.svg rename to resources/img/history.svg diff --git a/resources/menu-clicked.svg b/resources/img/menu-clicked.svg similarity index 100% rename from resources/menu-clicked.svg rename to resources/img/menu-clicked.svg diff --git a/resources/menu.svg b/resources/img/menu.svg similarity index 100% rename from resources/menu.svg rename to resources/img/menu.svg diff --git a/resources/search_active.svg b/resources/img/search-active.svg similarity index 100% rename from resources/search_active.svg rename to resources/img/search-active.svg diff --git a/resources/talk.svg b/resources/img/talk.svg similarity index 100% rename from resources/talk.svg rename to resources/img/talk.svg diff --git a/resources/user.svg b/resources/img/user.svg similarity index 100% rename from resources/user.svg rename to resources/img/user.svg diff --git a/resources/view.svg b/resources/img/view.svg similarity index 100% rename from resources/view.svg rename to resources/img/view.svg diff --git a/resources/master.less b/resources/master.less index e6cd761..a8917f8 100644 --- a/resources/master.less +++ b/resources/master.less @@ -214,19 +214,23 @@ } #ca-view { - background-image: url( view.svg ); + background-image: url( img/view.svg ); } #ca-edit { - background-image: url( edit.svg ); + background-image: url( img/edit.svg ); + } + + #ca-viewsource { + background-image: url( img/edit-locked.svg ); } #ca-history { - background-image: url( history.svg ); + background-image: url( img/history.svg ); } #ca-talk { - background-image: url( talk.svg ); + background-image: url( img/talk.svg ); } @@ -281,7 +285,7 @@ } } .search-input-label { - background-image: url( search_active.svg ); + background-image: url( img/search-active.svg ); background-position: center left; background-repeat: no-repeat; background-size: 3em; @@ -307,9 +311,9 @@ } .account-menu { - background-image: url( user.svg ), url( caret-down.svg ); + background-image: url( img/user.svg ), url( img/caret-down.svg ); background-position: center left 20px, center right 20px; - background-repeat: no-repeat, no-repeat; + background-repeat: no-repeat; min-width: 200px; margin-right: 15px; border-left: 1px solid #eee; @@ -320,7 +324,7 @@ #toc-toggle { background-color: @bgc-contrast; - background-image: url( menu-clicked.svg ); + background-image: url( img/menu-clicked.svg ); background-position: center center; background-repeat: no-repeat; border-right: 1px solid @bdc-contrast; -- To view, visit https://gerrit.wikimedia.org/r/252973 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If6f4a75baa2784fb09bdecee83211f24c4176d7c Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/skins/Blueprint Gerrit-Branch: master Gerrit-Owner: VolkerE <[email protected]> Gerrit-Reviewer: JGirault <[email protected]> Gerrit-Reviewer: Pastakhov <[email protected]> Gerrit-Reviewer: Prtksxna <[email protected]> Gerrit-Reviewer: Spage <[email protected]> Gerrit-Reviewer: VolkerE <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
