Tweichart has submitted this change and it was merged.
Change subject: BS223: Facelift
......................................................................
BS223: Facelift
* overall font + fontcolor changes
* fixed some positioning
* added new font
Change-Id: I62a23072e11c8d47fba40638c2382385261ad5a1
---
M resources/components/extension.statebar.less
M resources/components/skin.contentActions.less
M resources/components/skin.dataAfterContent.less
M resources/components/skin.font.less
M resources/components/skin.icons.less
M resources/components/skin.menuTop.less
M resources/components/skin.navigationTabs.less
M resources/fonts.css
A resources/fonts/RobotoSlab-Bold.ttf
A resources/fonts/RobotoSlab-Regular.ttf
M resources/variables.less
11 files changed, 85 insertions(+), 19 deletions(-)
Approvals:
Smuggli: Checked; Looks good to me, but someone else must approve
Tweichart: Verified; Looks good to me, approved
diff --git a/resources/components/extension.statebar.less
b/resources/components/extension.statebar.less
index 040c124..af42d97 100644
--- a/resources/components/extension.statebar.less
+++ b/resources/components/extension.statebar.less
@@ -9,3 +9,9 @@
#bs-statebar-viewtoggler span{
font-family: @bs-font-default;
}
+
+#bs-statebar-view{
+ h4{
+ font-weight: normal;
+ }
+}
\ No newline at end of file
diff --git a/resources/components/skin.contentActions.less
b/resources/components/skin.contentActions.less
index 9144ddb..03578c5 100644
--- a/resources/components/skin.contentActions.less
+++ b/resources/components/skin.contentActions.less
@@ -48,6 +48,8 @@
#ca-watch, #ca-unwatch{
margin-top: 7px;
cursor: pointer;
+ margin-right: 8px;
+ color: @bs-color-dark-blue;
a{
width: 13px;
height: 13px;
@@ -86,7 +88,7 @@
#left-navigation ul li a,
#right-navigation ul li a {
- padding: 0.5em;
+ padding: 4px 5px;
display: block;
text-transform: uppercase;
text-decoration: none;
diff --git a/resources/components/skin.dataAfterContent.less
b/resources/components/skin.dataAfterContent.less
index 4fadafb..510fece 100644
--- a/resources/components/skin.dataAfterContent.less
+++ b/resources/components/skin.dataAfterContent.less
@@ -74,6 +74,9 @@
li{
margin-top: -2px;
padding-top: 5px;
+ sup{
+ position: absolute;
+ }
}
li.ui-tabs-selected, li.ui-state-hover{
background: url(images/desktop/footer-marker.png)
no-repeat center top;
diff --git a/resources/components/skin.font.less
b/resources/components/skin.font.less
index 8b5b5e1..cb365c3 100644
--- a/resources/components/skin.font.less
+++ b/resources/components/skin.font.less
@@ -1,8 +1,53 @@
-body.mediawiki {
- font-family: @bs-font-default;
- font-size: 0.8em;
+body.mediawiki, body.x-body{
+ font-family: @bs-font-default !important;
+ font-size: 0.938em; //15px
}
-
+body.mediawiki{
+ p, a, em, ul, ol, li, table, h5, h6, #toc{
+ font-size: 100%;
+ font-family: @bs-font-default;
+ }
+ h1.firstHeading{
+ font-size: 200%;
+ }
+ h1{
+ font-size: 180%;
+ }
+ h2{
+ font-size: 160%;
+ }
+ h3{
+ font-size: 140%
+ }
+ h4{
+ font-size: 120%;
+ }
+ *[class*='icon-']:after,
+ *[class*='icon-']:before{
+ font-family: icomoon;
+ }
+ #content{
+ h1, h2, h3, h4, h5, h6{
+ font-family: @bs-font-roboto;
+ border-bottom: none;
+ font-weight: normal;
+ a.mw-editsection.icon-pencil:before{
+ font-size: 15px;
+ }
+ }
+ *{
+ color: @bs-color-content-default;
+ }
+ *[class*='icon-']:after,
+ *[class*='icon-']:before{
+ color: @bs-color-light-grey;
+ }
+ a[class*='icon-']:hover:after,
+ a[class*='icon-']:hover:before{
+ color: @bs-color-dark-blue;
+ }
+ }
+}
#bs-left-column,
#bs-left-column .ui-widget {
font-size: 90%;
@@ -15,7 +60,7 @@
font-size: 85%;
}
#bs-statebar{
- font-family: @bs-font-actions;
+ font-family: @bs-font-default;
#bs-statebar-viewtoggler{
font-size: 95%;
}
@@ -28,7 +73,7 @@
}
#bs-content-column{
#left-navigation{
- font-family: @bs-font-actions;
+ font-family: @bs-font-default;
li a{
color: @bs-color-dark-grey;
}
@@ -41,7 +86,7 @@
}
}
#right-navigation{
- font-family: @bs-font-actions;
+ font-family: @bs-font-default;
#p-views{
li a{
color: @bs-color-dark-grey;
@@ -55,7 +100,7 @@
}
}
#bs-cactions-button a span{
- font-family: @bs-font-actions;
+ font-family: @bs-font-default;
}
}
}
@@ -65,10 +110,11 @@
#bs-nav-sections a,
#bs-nav-sections .ui-widget-content a{
color: @bs-color-darker-grey;
- font-family: @bs-font-actions;
+ font-family: @bs-font-default;
}
#bs-nav-sections #bs-nav-tabs a{
font-family: icomoon;
+ font-size: 160%;
}
}
#bs-menu-top-right{
@@ -77,7 +123,7 @@
li a{
font-size: 90%;
color: black !important;
- font-family: @bs-font-actions;
+ font-family: @bs-font-default;
}
}
span.bs-personal-not-loggedin a,
@@ -93,26 +139,26 @@
#bs-extendedsearch-autocomplete{
> .ui-menu li.ui-menu-item{
- font-family: @bs-font-actions;
+ font-family: @bs-font-default;
color: @bs-color-dark-blue;
}
}
#bs-nav-sections.ui-tabs.ui-widget.ui-widget-content.ui-corner-all {
h5 {
- font-size: 170%;
+ font-size: 150%;
}
}
#bs-left-column #bs-nav-sections .ui-widget-content a,
#bs-left-column #bs-nav-sections .ui-widget-content em,
#bs-left-column #bs-nav-sections .ui-widget-content strong,
#bs-left-column #bs-nav-sections .ui-widget-content li{
- font-size: 110%;
+ font-size: 105%;
}
#bs-left-column #bs-nav-sections .ui-widget-content a:after{
font-size: 100%;
}
#bs-data-after-content{
- font-family: @bs-font-actions;
+ font-family: @bs-font-default;
#bs-data-after-content-tabs{
font-size: 85%;
}
diff --git a/resources/components/skin.icons.less
b/resources/components/skin.icons.less
index 5c4c379..6f9c82e 100644
--- a/resources/components/skin.icons.less
+++ b/resources/components/skin.icons.less
@@ -60,6 +60,9 @@
li#n-external-contact > a {
background-position: 0 -96px;
}
+ #bs-nav-tabs a{
+ font-size: 210%;
+ }
}
.icon-plus-after:after {
diff --git a/resources/components/skin.menuTop.less
b/resources/components/skin.menuTop.less
index c6c5302..c954eed 100644
--- a/resources/components/skin.menuTop.less
+++ b/resources/components/skin.menuTop.less
@@ -16,7 +16,6 @@
height:32px;
text-align:center;
vertical-align:bottom;
- font-weight:bold;
color:#b4b3b3;
text-decoration:none;
line-height:32px;
diff --git a/resources/components/skin.navigationTabs.less
b/resources/components/skin.navigationTabs.less
index 9875838..8ed354a 100644
--- a/resources/components/skin.navigationTabs.less
+++ b/resources/components/skin.navigationTabs.less
@@ -7,6 +7,7 @@
padding: 0px;
h5 {
margin-top: 0.3em;
+ font-weight: normal;
}
}
diff --git a/resources/fonts.css b/resources/fonts.css
index be9f552..72bcc15 100644
--- a/resources/fonts.css
+++ b/resources/fonts.css
@@ -5,6 +5,10 @@
font-family: Source Sans Pro;
src: url("fonts/SourceSansPro-Regular.ttf");
}
+@font-face{
+ font-family: RobotoSlab;
+ src: url("fonts/RobotoSlab-Regular.ttf");
+}
@font-face{
font-family: Muli;
diff --git a/resources/fonts/RobotoSlab-Bold.ttf
b/resources/fonts/RobotoSlab-Bold.ttf
new file mode 100644
index 0000000..df5d1df
--- /dev/null
+++ b/resources/fonts/RobotoSlab-Bold.ttf
Binary files differ
diff --git a/resources/fonts/RobotoSlab-Regular.ttf
b/resources/fonts/RobotoSlab-Regular.ttf
new file mode 100644
index 0000000..eb52a79
--- /dev/null
+++ b/resources/fonts/RobotoSlab-Regular.ttf
Binary files differ
diff --git a/resources/variables.less b/resources/variables.less
index 0a2e8ff..e694e14 100644
--- a/resources/variables.less
+++ b/resources/variables.less
@@ -13,11 +13,13 @@
@bs-color-bright-blue-a: rgba(205, 223, 242, 0.6);
@bs-color-middle-blue-a: rgba(62, 83, 137, 0.44);
@bs-color-middle-blue: rgba(152, 167, 196);
-@bs-color-light-grey: rgb(238, 238, 238);
+@bs-color-light-grey: rgb(211, 211, 211);
@bs-color-dark-grey: rgb(186, 186, 186);
@bs-color-darker-grey: #494949;
-@bs-font-default: "Neue Helvetica", Helvetica, Arial, sans-serif;
-@bs-font-actions: "Source Sans Pro";
+@bs-color-content-default: #252525;
+//@bs-font-default: "Neue Helvetica", Helvetica, Arial, sans-serif;
+@bs-font-default: "Source Sans Pro", sans-serif;
+@bs-font-roboto: "RobotoSlab";
@bs-box-shadow: 0px 4px 20px 0px rgba(9, 7, 9, 0.45);
@bs-width-page: 1222px;
--
To view, visit https://gerrit.wikimedia.org/r/151851
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I62a23072e11c8d47fba40638c2382385261ad5a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Tweichart <[email protected]>
Gerrit-Reviewer: Mglaser <[email protected]>
Gerrit-Reviewer: Pigpen <[email protected]>
Gerrit-Reviewer: Robert Vogel <[email protected]>
Gerrit-Reviewer: Smuggli <[email protected]>
Gerrit-Reviewer: Tweichart <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
