Isarra has uploaded a new change for review. https://gerrit.wikimedia.org/r/315147
Change subject: Clean up style, and some style bugs
......................................................................
Clean up style, and some style bugs
More coding style and some random css, redid subpage toc structure to be
distinct from mainpage everything structure
Change-Id: Ib0fcd9803011494edf782fc6d8aa0125ebfe2c8d
---
M includes/content/CollaborationHubContent.php
M includes/content/CollaborationHubContentSchema.php
M includes/content/CollaborationHubTOC.php
M includes/content/CollaborationListContentSchema.php
M modules/ext.CollaborationKit.hub.styles.less
M modules/ext.CollaborationKit.hub.subpage.styles.less
M modules/ext.CollaborationKit.mixins.less
7 files changed, 84 insertions(+), 98 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit
refs/changes/47/315147/1
diff --git a/includes/content/CollaborationHubContent.php
b/includes/content/CollaborationHubContent.php
index f85d132..cbadc7b 100644
--- a/includes/content/CollaborationHubContent.php
+++ b/includes/content/CollaborationHubContent.php
@@ -327,7 +327,7 @@
// rawElement is used because we don't want [edit]
links or usual header behavior
$membersHeader = Html::rawElement(
'h3',
- [ 'style' => 'text-align: center;
padding-bottom: 1em;' ],
+ [],
wfMessage(
'collaborationkit-hub-members-header' )
);
diff --git a/includes/content/CollaborationHubContentSchema.php
b/includes/content/CollaborationHubContentSchema.php
index 1509e4c..ee959c4 100644
--- a/includes/content/CollaborationHubContentSchema.php
+++ b/includes/content/CollaborationHubContentSchema.php
@@ -61,74 +61,50 @@
],
] ],
],
- 'scope' =>
- [
+ 'scope' => [
'type' => 'object',
- 'properties' =>
- [
- 'included_categories' =>
- [
+ 'properties' => [
+ 'included_categories' => [
'type' => 'array',
- 'items' =>
- [
- [
- 'type' => 'object',
- 'properties' =>
- [
- 'category_name'
=>
- [
- 'type'
=> 'string'
- ],
-
'category_depth' =>
- [
- 'type'
=> 'number',
-
'default' => 9
- ]
+ 'items' => [ [
+ 'type' => 'object',
+ 'properties' => [
+ 'category_name' => [
+ 'type' =>
'string'
+ ],
+ 'category_depth' => [
+ 'type' =>
'number',
+ 'default' => 9
]
]
- ]
+ ] ]
],
- 'excluded_categories' =>
- [
+ 'excluded_categories' => [
'type' => 'array',
- 'items' =>
- [
- [
- 'type' => 'object',
- 'properties' =>
- [
- 'category_name'
=>
- [
- 'type'
=> 'string'
- ],
-
'category_depth' =>
- [
- 'type'
=> 'number',
-
'default' => 9
- ]
+ 'items' => [ [
+ 'type' => 'object',
+ 'properties' => [
+ 'category_name' => [
+ 'type' =>
'string'
+ ],
+ 'category_depth' => [
+ 'type' =>
'number',
+ 'default' => 9
]
]
- ]
+ ] ]
],
- 'included_pages' =>
- [
+ 'included_pages' => [
'type' => 'array',
- 'items' =>
- [
- [
- 'type' => 'string'
- ]
- ]
+ 'items' => [ [
+ 'type' => 'string'
+ ] ]
],
- 'excluded_pages' =>
- [
+ 'excluded_pages' => [
'type' => 'array',
- 'items' =>
- [
- [
- 'type' => 'string'
- ]
- ]
+ 'items' => [ [
+ 'type' => 'string'
+ ] ]
]
]
]
diff --git a/includes/content/CollaborationHubTOC.php
b/includes/content/CollaborationHubTOC.php
index 525158b..d3e6075 100644
--- a/includes/content/CollaborationHubTOC.php
+++ b/includes/content/CollaborationHubTOC.php
@@ -86,7 +86,8 @@
$colour = $content->getThemeColour();
$image = $content->getImage();
- $html = Html::openElement( 'div', [ 'class' => "wp-subpage-toc
mw-cktheme-$colour" ] );
+ $html = Html::openElement( 'div', [ 'class' =>
"mw-cktheme-$colour" ] );
+ $html .= Html::openElement( 'div', [ 'class' =>
"wp-subpage-toc" ] );
// ToC label
$html .= Html::rawElement(
@@ -131,6 +132,7 @@
$html .= Html::closeElement( 'ul' );
$html .= Html::closeElement( 'div' );
+ $html .= Html::closeElement( 'div' );
return $html;
}
diff --git a/includes/content/CollaborationListContentSchema.php
b/includes/content/CollaborationListContentSchema.php
index 5e7cb9d..0766013 100644
--- a/includes/content/CollaborationListContentSchema.php
+++ b/includes/content/CollaborationListContentSchema.php
@@ -9,46 +9,42 @@
'items' => [
'type' => 'array',
'maxItems' => 2000,
- 'items' => [
- [
- 'type' => 'object',
- 'required' => [ 'title' ],
- 'properties' => [
- 'title' => [
- 'type' => 'string'
- ],
- 'link' => [
- 'type' => 'string'
- ],
- 'notes' => [
- 'type' => 'string'
- ],
- 'image' => [
- 'type' => 'string'
- ],
- 'sortkey' => [
- 'type' => 'object',
- 'properties' => [
- 'criterianame'
=> [
- 'type'
=> 'string'
- ],
- 'value' => [
- 'type'
=> 'string'
- ]
- ]
- ],
- 'tags' => [
- 'type' => 'array',
- 'maxItems' => 50,
- 'items' => [
- [
- 'type'
=> 'string'
- ]
+ 'items' => [ [
+ 'type' => 'object',
+ 'required' => [ 'title' ],
+ 'properties' => [
+ 'title' => [
+ 'type' => 'string'
+ ],
+ 'link' => [
+ 'type' => 'string'
+ ],
+ 'notes' => [
+ 'type' => 'string'
+ ],
+ 'image' => [
+ 'type' => 'string'
+ ],
+ 'sortkey' => [
+ 'type' => 'object',
+ 'properties' => [
+ 'criterianame' => [
+ 'type' =>
'string'
+ ],
+ 'value' => [
+ 'type' =>
'string'
]
]
+ ],
+ 'tags' => [
+ 'type' => 'array',
+ 'maxItems' => 50,
+ 'items' => [ [
+ 'type' => 'string'
+ ] ]
]
]
- ]
+ ] ]
],
'options' => [
'type' => 'object',
diff --git a/modules/ext.CollaborationKit.hub.styles.less
b/modules/ext.CollaborationKit.hub.styles.less
index 79dbb4b..45b6240 100644
--- a/modules/ext.CollaborationKit.hub.styles.less
+++ b/modules/ext.CollaborationKit.hub.styles.less
@@ -95,6 +95,12 @@
max-width: 15em;
min-width: 10em;
width: 25%;
+
+ h3 {
+ margin: 0 0 .75em;
+ padding: 0;
+ text-align: center;
+ }
}
.wp-members-buttons {
margin-top: 1em;
diff --git a/modules/ext.CollaborationKit.hub.subpage.styles.less
b/modules/ext.CollaborationKit.hub.subpage.styles.less
index 3176dad..8360af3 100644
--- a/modules/ext.CollaborationKit.hub.subpage.styles.less
+++ b/modules/ext.CollaborationKit.hub.subpage.styles.less
@@ -46,7 +46,7 @@
span {
padding: .15em .5em .15em 0;
- background: #fff;
+ background: #fff; // TODO make this actually follow skin
background
font-weight: bold;
}
}
diff --git a/modules/ext.CollaborationKit.mixins.less
b/modules/ext.CollaborationKit.mixins.less
index 72434b1..89b0942 100644
--- a/modules/ext.CollaborationKit.mixins.less
+++ b/modules/ext.CollaborationKit.mixins.less
@@ -15,14 +15,20 @@
}
.chsubtheme( @colour ) {
- border-color: @colour;
- color: @colour;
-
+ .wp-subpage-toc {
+ border-color: @colour;
+ color: @colour;
+ }
.toc-label {
color: darken( @colour, 25% );
}
}
+// Fix issue with floats near lists
+ul {
+ display: inline-block;
+}
+
// Members block, random actiony blocks, etc
.grey() {
border: solid 1px #ddd;
--
To view, visit https://gerrit.wikimedia.org/r/315147
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0fcd9803011494edf782fc6d8aa0125ebfe2c8d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Isarra <zhoris...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
