Swidmann has submitted this change and it was merged. Change subject: several skin changes according to HW#2014082710000113 note #9 ......................................................................
several skin changes according to HW#2014082710000113 note #9 Change-Id: Ibc7cf842d87d13e014426002cd05336ce940ebb5 --- M resources/components/extension.extendedSearch.less M resources/components/extension.widgetbar.less M resources/components/skin.content.less M resources/components/skin.dataAfterContent.less M resources/components/skin.font.less M resources/components/skin.menuTop.js M resources/components/skin.navigationTabs.less 7 files changed, 133 insertions(+), 5 deletions(-) Approvals: Swidmann: Verified; Looks good to me, approved diff --git a/resources/components/extension.extendedSearch.less b/resources/components/extension.extendedSearch.less index dcac99f..d337f1a 100644 --- a/resources/components/extension.extendedSearch.less +++ b/resources/components/extension.extendedSearch.less @@ -52,12 +52,32 @@ } } } +#bs-extendedsearch-form-specialpage{ + #bs-extendedsearch-inputfieldtext-specialpage{ + height: 16px; + } + .bs-extendedsearch-domaindiv{ + .bs-extendedsearch-multivaluefield{ + margin: 9px; + } + } +} #bs-extendedsearch-specialpage-body{ #bs-extendedsearch-filters-results-paging{ + .bs-extendedsearch-paging-no:hover{ + color: #666; + } + .bs-extendedsearch-paging-no-active{ + padding-top: 0px; + } + .bs-extendedsearch-sorting-bar bs-extendedsearch-default-textspacing{ + font-size: 0.75em; + } #bs-extendedsearch-results-paging{ #bs-extendedsearch-results{ .bs-search-result-info{ - margin-top: 0; + margin-top: -5px; + margin-bottom: 5px; line-height: 1.4em; } .bs-search-hit-text{ @@ -68,9 +88,9 @@ #bs-extendedsearch-filters{ #bs-extendedsearch-all-filter-boxes{ .bs-facet-title, .bs-extendedsearch-facetbox{ - font-size: 1em !important; .facetBarEntry{ - font-size: 0.8em !important; + font-size: 90% !important; + line-height: normal; } } } diff --git a/resources/components/extension.widgetbar.less b/resources/components/extension.widgetbar.less index 00b342c..8215ab4 100644 --- a/resources/components/extension.widgetbar.less +++ b/resources/components/extension.widgetbar.less @@ -73,6 +73,8 @@ display: table-caption; #bs-widgetbar-edit{ margin-right: 5px; + font-size: 80%; + padding-top: 5px; } } .bs-widget { diff --git a/resources/components/skin.content.less b/resources/components/skin.content.less index 60c9bf7..94c0a57 100644 --- a/resources/components/skin.content.less +++ b/resources/components/skin.content.less @@ -18,4 +18,34 @@ #bs-bodytext pre, #bs-bodytext .mw-code { overflow-x: auto; +} + +#bodyContent{ + #bs-bodytext{ + #mw-content-text{ + .bs-admincontrolbtn { + float:left; + margin-bottom:5px; + margin-right:5px; + text-align:center; + a { + border:1px solid #F0F0F0; + color:#C9D6DE; + display:block; + float:left; + height:90px; + text-decoration:none; + vertical-align:middle; + width:160px; + } + a:hover { + background:#F9F9F9 none repeat scroll 0 0; + color:#0B55C4; + border-color:#EEE #CCC #CCC #EEE; + border-style:solid; + border-width:1px; + } + } + } + } } \ No newline at end of file diff --git a/resources/components/skin.dataAfterContent.less b/resources/components/skin.dataAfterContent.less index 510fece..9da0eb2 100644 --- a/resources/components/skin.dataAfterContent.less +++ b/resources/components/skin.dataAfterContent.less @@ -89,19 +89,43 @@ .bs-authors-originator{ background-image: none; } + .bs-readers, .bs-readers{ + .bs-userminiprofile img{ + padding: 0 0.35em; + } + } #bs-shoutbox{ #bs-sb-form, #bs-sb-content{ width: 75%; } #bs-sb-message{ width: 100%; + height: 75px; + } + #bs-sb-form{ + .bs-sb-textarea-additionalinfo{ + margin-top: 0.25em; + } } #bs-sb-content{ + ul, li{ + list-style-type: none; + } li.bs-sb-more{ list-style-type: none; } .bs-sb-message{ width: 90%; + color: @bs-color-neutral; + } + .bs-sb-archive{ + background-image: none; + } + .bs-sb-archive:before{ + color: @bs-color-light-grey; + } + .bs-sb-archive:hover:before{ + color: @bs-color-primary; } .bs-sb-listitem{ width: 100%; diff --git a/resources/components/skin.font.less b/resources/components/skin.font.less index dfa8eff..79de5b3 100644 --- a/resources/components/skin.font.less +++ b/resources/components/skin.font.less @@ -35,7 +35,14 @@ font-size: 15px; } } - a{ + h1{ + margin-bottom: 5px; + } + h2{ + border-bottom: 1px solid; + margin-top: 10px; + } + a, #toc a span{ color: @bs-color-dark-blue; } a.new{ @@ -62,6 +69,27 @@ text-decoration: none; } } + #bs-data-after-content{ + #bs-shoutbox{ + form#bs-sb-form{ + #bs-sb-send{ + font-size: 0.85em; + } + .bs-sb-textarea-additionalinfo{ + #bs-sb-charactercounter{ + font-size: 75%; + } + } + } + #bs-sb-content{ + .bs-sb-message{ + .bs-sb-message-text, .bs-sb-message-head{ + font-size: 90%; + } + } + } + } + } } #bs-left-column, #bs-left-column .ui-widget { @@ -79,7 +107,17 @@ #bs-statebar-viewtoggler{ font-size: 95%; } + #bs-statebar-viewtoggler:after{ + display: table-cell; + vertical-align: middle; + } #bs-statebar-view{ + h4{ + font-size: 100%; + } + .bs-statebar-body-itembody{ + font-size: 80%; + } #footer-info{ color: @bs-color-dark-grey; font-size: 85%; @@ -91,6 +129,7 @@ font-family: @bs-font-default; li a{ color: @bs-color-dark-grey; + font-size: 75%; } li.selected a{ color: @bs-color-dark-blue; @@ -105,6 +144,7 @@ #p-views{ li a{ color: @bs-color-dark-grey; + font-size: 75%; } li.selected a{ color: @bs-color-dark-blue; @@ -116,6 +156,7 @@ } #bs-cactions-button a span{ font-family: @bs-font-default; + font-size: 75%; } } } @@ -129,7 +170,7 @@ } #bs-nav-sections #bs-nav-tabs a{ font-family: icomoon; - font-size: 160%; + font-size: 140%; } } #bs-menu-top-right{ diff --git a/resources/components/skin.menuTop.js b/resources/components/skin.menuTop.js index caeddf3..c3f3695 100644 --- a/resources/components/skin.menuTop.js +++ b/resources/components/skin.menuTop.js @@ -1,6 +1,7 @@ $(document).ready(function(){ $("#bs-button-user div.bs-userminiprofile, #bs-personal-name").click(function(e) { e.preventDefault(); + var event = e; $('#bs-personal-menu-container').fadeToggle(200); //needs to be done here, bs-personal-menu-top got a width of 0px before the click due to display none if ($("#bs-button-user div.bs-personal-menu-top").css('margin-left') === "0px"){ @@ -11,6 +12,13 @@ } }); + $(document).click(function(e){ + if ($(e.target).attr("id") !== "bs-personal-name" && $(e.target).parent().parent().parent().attr('id') !== "bs-button-user" && $(e.target).parent().attr('id') !== 'bs-cactions-button'){ + $('#bs-personal-menu-container').fadeOut(200); + $('#bs-flyout').fadeOut(200); + $("#bs-cactions-button > a").removeClass("open"); + } + }); var menuTop = $("<div>"); menuTop.addClass("bs-personal-menu-top"); $("#bs-personal-menu-container").prepend(menuTop); diff --git a/resources/components/skin.navigationTabs.less b/resources/components/skin.navigationTabs.less index 8ed354a..18e5adb 100644 --- a/resources/components/skin.navigationTabs.less +++ b/resources/components/skin.navigationTabs.less @@ -126,3 +126,6 @@ #bs-usersidebar-edit { float: right; } +#bs-left-column ul{ + margin-left: 15px; +} \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/158102 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibc7cf842d87d13e014426002cd05336ce940ebb5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/BlueSpiceSkin Gerrit-Branch: master Gerrit-Owner: Tweichart <weich...@hallowelt.biz> Gerrit-Reviewer: Mglaser <gla...@hallowelt.biz> Gerrit-Reviewer: Pigpen <reym...@hallowelt.biz> Gerrit-Reviewer: Robert Vogel <vo...@hallowelt.biz> Gerrit-Reviewer: Smuggli <mug...@hallowelt.biz> Gerrit-Reviewer: Swidmann <widm...@hallowelt.biz> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits