Foxtrott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/159216
Change subject: Rework of styles
......................................................................
Rework of styles
Still a lot left to do
Change-Id: I02f63eebd2bdd393b0a36acebb9134e6d24085fd
---
M src/Hooks/SetupAfterCache.php
A styles/core.less
M styles/screen.less
M styles/thumbnails.less
A styles/variables.less
5 files changed, 80 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/chameleon
refs/changes/16/159216/1
diff --git a/src/Hooks/SetupAfterCache.php b/src/Hooks/SetupAfterCache.php
index d4fe93f..af5084b 100644
--- a/src/Hooks/SetupAfterCache.php
+++ b/src/Hooks/SetupAfterCache.php
@@ -86,7 +86,7 @@
$this->bootstrapManager->addAllBootstrapModules();
$this->bootstrapManager->addExternalModule(
- $this->configuration['wgStyleDirectory'] .
'/chameleon/styles/' . 'screen.less',
+ $this->configuration['wgStyleDirectory'] .
'/chameleon/styles/' . 'core.less',
$this->configuration['wgStylePath'] .
'/chameleon/styles/'
);
}
diff --git a/styles/core.less b/styles/core.less
new file mode 100644
index 0000000..19f2865
--- /dev/null
+++ b/styles/core.less
@@ -0,0 +1,24 @@
+/**
+ * Central Chameleon style file
+ *
+ * @copyright (C) 2014, Stephan Gambke
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GNU General Public
License, version 3 (or later)
+ *
+ * This file is part of the MediaWiki extension Chameleon.
+ * The Chameleon extension is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The Chameleon extension is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+@import "variables.less";
+@import "thumbnails.less";
+@import "screen.less";
diff --git a/styles/screen.less b/styles/screen.less
index 0882d78..e8c18fb 100644
--- a/styles/screen.less
+++ b/styles/screen.less
@@ -1,5 +1,7 @@
-/*
- * Style file for the Chameleon skin
+/**
+ * Styles dump for the Chameleon skin
+ *
+ * @todo This is a mess. Needs rework.
*
* @copyright (C) 2013, Stephan Gambke
* @license http://www.gnu.org/licenses/gpl-3.0.html GNU General Public
License, version 3 (or later)
@@ -17,12 +19,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * @file
- * @ingroup Skins
*/
-
-@import "./thumbnails.less";
.center {
text-align: center;
@@ -33,15 +30,6 @@
margin-right: auto;
}
}
-
-// logo will be scaled down to this height to fit into the navbar (should be
<= navbar-height)
-@navbar-logo-height: .9 * @navbar-height;
-
-@navbar-user-loggedin : @brand-primary;
-@navbar-user-loggedin-hover: darken(@navbar-newtalk-available, 20%);
-
-@navbar-newtalk-available: @brand-primary;
-@navbar-newtalk-available-hover: darken(@navbar-newtalk-available, 20%);
// if the navbar is in the first row (i.e. at the top of the page), but inside
a container (i.e. not a fixed head),
// add some margin at the top
diff --git a/styles/thumbnails.less b/styles/thumbnails.less
index e00da7a..db99244 100644
--- a/styles/thumbnails.less
+++ b/styles/thumbnails.less
@@ -1,6 +1,24 @@
-/* Thumbnails */
+/**
+ * MediaWiki Thumbnails
+ *
+ * @copyright (C) 2014, Stephan Gambke
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GNU General Public
License, version 3 (or later)
+ *
+ * This file is part of the MediaWiki extension Chameleon.
+ * The Chameleon extension is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The Chameleon extension is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
-@thumbnail-caption-padding: 3px;
.thumbinner {
.thumbnail;
diff --git a/styles/variables.less b/styles/variables.less
new file mode 100644
index 0000000..21ffed3
--- /dev/null
+++ b/styles/variables.less
@@ -0,0 +1,31 @@
+/**
+ * LESS variables modified or introduced for the Chameleon skin
+ *
+ * @copyright (C) 2014, Stephan Gambke
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GNU General Public
License, version 3 (or later)
+ *
+ * This file is part of the MediaWiki extension Chameleon.
+ * The Chameleon extension is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The Chameleon extension is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+@thumbnail-caption-padding: 3px;
+
+// logo will be scaled down to this height to fit into the navbar (should be
<= navbar-height)
+@navbar-logo-height: .9 * @navbar-height;
+
+@navbar-user-loggedin : @brand-primary;
+@navbar-user-loggedin-hover: darken(@navbar-newtalk-available, 20%);
+
+@navbar-newtalk-available: @brand-primary;
+@navbar-newtalk-available-hover: darken(@navbar-newtalk-available, 20%);
--
To view, visit https://gerrit.wikimedia.org/r/159216
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I02f63eebd2bdd393b0a36acebb9134e6d24085fd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/chameleon
Gerrit-Branch: master
Gerrit-Owner: Foxtrott <s7ep...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
