Tweichart has submitted this change and it was merged.
Change subject: BS 223: Facelift
......................................................................
BS 223: Facelift
* made several improvements to fonts + colors
* added some padding and margin
* added new font
Change-Id: Iab85d294bf621f07ffb3b1182fe0c9e623140a51
---
M resources/components/extension.extendedSearch.less
M resources/components/extension.statebar.less
M resources/components/skin.content.less
M resources/components/skin.contentActions.less
M resources/components/skin.dataAfterContent.less
M resources/components/skin.font.less
M resources/components/skin.menuTop.less
M resources/components/skin.navigationTabs.less
M resources/fonts.css
A resources/fonts/SourceSansPro-Bold.ttf
A resources/fonts/SourceSansPro-Regular.ttf
D resources/fonts/source_sans_pro_300.ttf
D resources/fonts/source_sans_pro_600.ttf
M resources/screen.layout.less
M resources/variables.less
15 files changed, 87 insertions(+), 18 deletions(-)
Approvals:
Smuggli: Checked; Looks good to me, but someone else must approve
Tweichart: Verified; Looks good to me, approved
Objections:
Robert Vogel: There's a problem with this change, please improve
diff --git a/resources/components/extension.extendedSearch.less
b/resources/components/extension.extendedSearch.less
index 025bf7e..73654af 100644
--- a/resources/components/extension.extendedSearch.less
+++ b/resources/components/extension.extendedSearch.less
@@ -23,6 +23,9 @@
li.ui-menu-item a{
padding: 2px 10px;
}
+ li.ui-menu-item a{
+ margin: 3px 0;
+ }
li.ui-menu-item a:hover{
background-color: @bs-color-light-grey;
}
@@ -38,6 +41,9 @@
border-top: none;
}
}
+ .ui-widget-content a{
+ color: @bs-color-darker-grey;
+ }
}
#p-search{
form#searchform{
diff --git a/resources/components/extension.statebar.less
b/resources/components/extension.statebar.less
index 303dd69..040c124 100644
--- a/resources/components/extension.statebar.less
+++ b/resources/components/extension.statebar.less
@@ -8,4 +8,4 @@
#bs-statebar-viewtoggler span{
font-family: @bs-font-default;
-}
\ No newline at end of file
+}
diff --git a/resources/components/skin.content.less
b/resources/components/skin.content.less
index 68a5386..60c9bf7 100644
--- a/resources/components/skin.content.less
+++ b/resources/components/skin.content.less
@@ -2,7 +2,7 @@
background-color: #FFF;
padding: 1em;
line-height: 1.5em;
- margin: 0.4em 0 0.5em;
+ margin: 0 0 0 0;
}
table.wikitable{
diff --git a/resources/components/skin.contentActions.less
b/resources/components/skin.contentActions.less
index 770d311..9144ddb 100644
--- a/resources/components/skin.contentActions.less
+++ b/resources/components/skin.contentActions.less
@@ -7,6 +7,7 @@
#left-navigation,
#right-navigation {
+ min-height: 30px;
> div {
float: left;
}
diff --git a/resources/components/skin.dataAfterContent.less
b/resources/components/skin.dataAfterContent.less
index 16e43f6..741330c 100644
--- a/resources/components/skin.dataAfterContent.less
+++ b/resources/components/skin.dataAfterContent.less
@@ -44,6 +44,9 @@
text-decoration:none;
padding:0;
}
+#bs-data-after-content li.ui-state-active a{
+ font-weight: bold;
+}
#bs-data-after-content div > fieldset {
border: none;
diff --git a/resources/components/skin.font.less
b/resources/components/skin.font.less
index ad17537..8b5b5e1 100644
--- a/resources/components/skin.font.less
+++ b/resources/components/skin.font.less
@@ -14,29 +14,44 @@
#bs-personal-name{
font-size: 85%;
}
-#bs-statebar-viewtoggler{
- font-size: 95%;
+#bs-statebar{
+ font-family: @bs-font-actions;
+ #bs-statebar-viewtoggler{
+ font-size: 95%;
+ }
+ #bs-statebar-view{
+ #footer-info{
+ color: @bs-color-dark-grey;
+ font-size: 85%;
+ }
+ }
}
#bs-content-column{
#left-navigation{
font-family: @bs-font-actions;
li a{
- color: @bs-color-dark-blue;
+ color: @bs-color-dark-grey;
}
li.selected a{
- color: rgb(73, 73, 73);
+ color: @bs-color-dark-blue;
font-weight: bold;
+ }
+ li a:hover{
+ color: @bs-color-dark-blue;
}
}
#right-navigation{
font-family: @bs-font-actions;
#p-views{
li a{
- color: @bs-color-dark-blue;
+ color: @bs-color-dark-grey;
}
li.selected a{
- color: rgb(73, 73, 73);
+ color: @bs-color-dark-blue;
font-weight: bold;
+ }
+ li a:hover{
+ color: @bs-color-dark-blue;
}
}
#bs-cactions-button a span{
@@ -44,7 +59,18 @@
}
}
}
-
+#bs-left-column{
+ #bs-nav-sections,
+ #bs-nav-sections h5,
+ #bs-nav-sections a,
+ #bs-nav-sections .ui-widget-content a{
+ color: @bs-color-darker-grey;
+ font-family: @bs-font-actions;
+ }
+ #bs-nav-sections #bs-nav-tabs a{
+ font-family: icomoon;
+ }
+}
#bs-menu-top-right{
#bs-user-container{
#bs-personal-menu{
@@ -54,6 +80,14 @@
font-family: @bs-font-actions;
}
}
+ span.bs-personal-not-loggedin a,
+ span.bs-personal-not-loggedin a:hover,
+ span.bs-personal-not-loggedin a:active,
+ span.bs-personal-not-loggedin a:visited{
+ font-size: 85%;
+ color: black;
+ text-decoration: none;
+ }
}
}
@@ -62,4 +96,24 @@
font-family: @bs-font-actions;
color: @bs-color-dark-blue;
}
+}
+#bs-nav-sections.ui-tabs.ui-widget.ui-widget-content.ui-corner-all {
+ h5 {
+ font-size: 170%;
+ }
+}
+#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%;
+}
+#bs-left-column #bs-nav-sections .ui-widget-content a:after{
+ font-size: 100%;
+}
+#bs-data-after-content{
+ font-family: @bs-font-actions;
+ #bs-data-after-content-tabs{
+ font-size: 85%;
+ }
}
\ No newline at end of file
diff --git a/resources/components/skin.menuTop.less
b/resources/components/skin.menuTop.less
index 39433a1..c6c5302 100644
--- a/resources/components/skin.menuTop.less
+++ b/resources/components/skin.menuTop.less
@@ -124,7 +124,7 @@
#bs-personal-name{
height: 24px;
background-color: @bs-color-dark-grey;
- padding: 5px 10px 0 10px;
+ padding: 9px 10px 4px 10px;
}
div.bs-userminiprofile{
padding: 0px 5px 5px 5px;
@@ -134,7 +134,7 @@
margin-top: 0px;
> li{
height: 19px;
- padding: 5px 5px 0px 5px;
+ padding: 8px 5px 0px 5px;
> a{
height: 24px;
min-width: 24px;
@@ -148,6 +148,12 @@
}
}
}
+ span.bs-personal-not-loggedin{
+ display: block;
+ height: 24px;
+ padding: 9px 10px 4px 10px;
+ background-color: @bs-color-dark-grey;
+ }
#bs-personal-menu-container{
margin-top: 29px;
background-color: transparent;
diff --git a/resources/components/skin.navigationTabs.less
b/resources/components/skin.navigationTabs.less
index 00984ef..9875838 100644
--- a/resources/components/skin.navigationTabs.less
+++ b/resources/components/skin.navigationTabs.less
@@ -6,7 +6,7 @@
#bs-nav-sections.ui-tabs.ui-widget.ui-widget-content.ui-corner-all {
padding: 0px;
h5 {
- border-bottom: 1px solid #999;
+ margin-top: 0.3em;
}
}
@@ -17,9 +17,6 @@
h5 {
margin-top: 1em;
text-transform: uppercase;
- }
- #bs-nav-section-navigation{
- padding: 10px;
}
}
@@ -107,6 +104,7 @@
#bs-left-column .ui-tabs .ui-tabs-panel {
background:none;
border:none;
+ padding: 20px 25px;
}
#bs-left-column .ui-widget-header {
diff --git a/resources/fonts.css b/resources/fonts.css
index 046b3a0..be9f552 100644
--- a/resources/fonts.css
+++ b/resources/fonts.css
@@ -3,7 +3,7 @@
@font-face{
font-family: Source Sans Pro;
- src: url("fonts/source_sans_pro_600.ttf");
+ src: url("fonts/SourceSansPro-Regular.ttf");
}
@font-face{
diff --git a/resources/fonts/SourceSansPro-Bold.ttf
b/resources/fonts/SourceSansPro-Bold.ttf
new file mode 100644
index 0000000..50d81bd
--- /dev/null
+++ b/resources/fonts/SourceSansPro-Bold.ttf
Binary files differ
diff --git a/resources/fonts/SourceSansPro-Regular.ttf
b/resources/fonts/SourceSansPro-Regular.ttf
new file mode 100644
index 0000000..91e9ea5
--- /dev/null
+++ b/resources/fonts/SourceSansPro-Regular.ttf
Binary files differ
diff --git a/resources/fonts/source_sans_pro_300.ttf
b/resources/fonts/source_sans_pro_300.ttf
deleted file mode 100644
index c6a8f84..0000000
--- a/resources/fonts/source_sans_pro_300.ttf
+++ /dev/null
Binary files differ
diff --git a/resources/fonts/source_sans_pro_600.ttf
b/resources/fonts/source_sans_pro_600.ttf
deleted file mode 100644
index ef803d5..0000000
--- a/resources/fonts/source_sans_pro_600.ttf
+++ /dev/null
Binary files differ
diff --git a/resources/screen.layout.less b/resources/screen.layout.less
index c3654c5..57f4f6b 100644
--- a/resources/screen.layout.less
+++ b/resources/screen.layout.less
@@ -149,12 +149,12 @@
#bs-menu-top-left > div,
#bs-menu-top-right > div {
display:inline-block;
- height:40px;
+ height:50px;
}
#bs-menu-top-right {
float:right;
- height:32px;
+ height:37px;
width:260px;
}
diff --git a/resources/variables.less b/resources/variables.less
index 5151e95..0a2e8ff 100644
--- a/resources/variables.less
+++ b/resources/variables.less
@@ -15,6 +15,7 @@
@bs-color-middle-blue: rgba(152, 167, 196);
@bs-color-light-grey: rgb(238, 238, 238);
@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-box-shadow: 0px 4px 20px 0px rgba(9, 7, 9, 0.45);
--
To view, visit https://gerrit.wikimedia.org/r/151655
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iab85d294bf621f07ffb3b1182fe0c9e623140a51
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: Pwirth <[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
