Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/93584
Change subject: WIP - Port mediawiki.ui SASS to LESS
......................................................................
WIP - Port mediawiki.ui SASS to LESS
This is the only SASS in core.
Change-Id: I81d8d0c9f6705aef8bdb8a28e1154f2de4301235
---
M resources/Resources.php
R resources/mediawiki.ui/components/_forms.scss
R resources/mediawiki.ui/components/_vector.scss
R resources/mediawiki.ui/components/buttons.scss
R resources/mediawiki.ui/components/positioning.less
R resources/mediawiki.ui/components/vector/_buttons.scss
R resources/mediawiki.ui/components/vector/_containers.scss
R resources/mediawiki.ui/components/vector/_forms.scss
R resources/mediawiki.ui/mediawiki.ui.default.scss
R resources/mediawiki.ui/mediawiki.ui.vector.scss
R resources/mediawiki.ui/mixins/_effects.scss
R resources/mediawiki.ui/mixins/_forms.scss
R resources/mediawiki.ui/mixins/_type.scss
R resources/mediawiki.ui/mixins/_utilities.scss
R resources/mediawiki.ui/settings/_colors.scss
R resources/mediawiki.ui/settings/_typography.scss
D resources/mediawiki.ui/sourcefiles/Makefile
D resources/mediawiki.ui/sourcefiles/config.rb
D resources/mediawiki.ui/sourcefiles/scss/components/_default.scss
D resources/mediawiki.ui/sourcefiles/scss/mixins/_all.scss
D resources/mediawiki.ui/sourcefiles/scss/settings/_all.scss
21 files changed, 16 insertions(+), 62 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/84/93584/1
diff --git a/resources/Resources.php b/resources/Resources.php
index 463dec8..d26de6b 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1161,9 +1161,23 @@
'position' => 'top',
),
'mediawiki.ui' => array(
+ 'styles' => array(
+ 'resources/mediawiki.ui/mixins/utilities.less',
+ 'resources/mediawiki.ui/mixins/type.less',
+ 'resources/mediawiki.ui/mixins/effects.less',
+ 'resources/mediawiki.ui/mixins/forms.less',
+ 'resources/mediawiki.ui/components/positioning.less',
+ 'resources/mediawiki.ui/components/buttons.less',
+ 'resources/mediawiki.ui/components/forms.less',
+
+ ),
'skinStyles' => array(
- 'default' =>
'resources/mediawiki.ui/mediawiki.ui.default.css',
- 'vector' =>
'resources/mediawiki.ui/mediawiki.ui.vector.css',
+ 'default' =>
'resources/mediawiki.ui/components/default.less',
+ 'vector' => array(
+
'resources/mediawiki.ui/components/vector/buttons.less',
+
'resources/mediawiki.ui/components/vector/forms.less',
+
'resources/mediawiki.ui/components/vector/containers.less',
+ ),
),
'position' => 'top',
),
diff --git
a/resources/mediawiki.ui/sourcefiles/scss/components/default/_forms.scss
b/resources/mediawiki.ui/components/_forms.scss
similarity index 100%
rename from
resources/mediawiki.ui/sourcefiles/scss/components/default/_forms.scss
rename to resources/mediawiki.ui/components/_forms.scss
diff --git a/resources/mediawiki.ui/sourcefiles/scss/components/_vector.scss
b/resources/mediawiki.ui/components/_vector.scss
similarity index 100%
rename from resources/mediawiki.ui/sourcefiles/scss/components/_vector.scss
rename to resources/mediawiki.ui/components/_vector.scss
diff --git
a/resources/mediawiki.ui/sourcefiles/scss/components/default/_buttons.scss
b/resources/mediawiki.ui/components/buttons.scss
similarity index 100%
rename from
resources/mediawiki.ui/sourcefiles/scss/components/default/_buttons.scss
rename to resources/mediawiki.ui/components/buttons.scss
diff --git a/resources/mediawiki.ui/sourcefiles/scss/components/_utilities.scss
b/resources/mediawiki.ui/components/positioning.less
similarity index 100%
rename from resources/mediawiki.ui/sourcefiles/scss/components/_utilities.scss
rename to resources/mediawiki.ui/components/positioning.less
diff --git
a/resources/mediawiki.ui/sourcefiles/scss/components/vector/_buttons.scss
b/resources/mediawiki.ui/components/vector/_buttons.scss
similarity index 100%
rename from
resources/mediawiki.ui/sourcefiles/scss/components/vector/_buttons.scss
rename to resources/mediawiki.ui/components/vector/_buttons.scss
diff --git
a/resources/mediawiki.ui/sourcefiles/scss/components/vector/_containers.scss
b/resources/mediawiki.ui/components/vector/_containers.scss
similarity index 100%
rename from
resources/mediawiki.ui/sourcefiles/scss/components/vector/_containers.scss
rename to resources/mediawiki.ui/components/vector/_containers.scss
diff --git
a/resources/mediawiki.ui/sourcefiles/scss/components/vector/_forms.scss
b/resources/mediawiki.ui/components/vector/_forms.scss
similarity index 100%
rename from
resources/mediawiki.ui/sourcefiles/scss/components/vector/_forms.scss
rename to resources/mediawiki.ui/components/vector/_forms.scss
diff --git a/resources/mediawiki.ui/sourcefiles/scss/mediawiki.ui.default.scss
b/resources/mediawiki.ui/mediawiki.ui.default.scss
similarity index 100%
rename from resources/mediawiki.ui/sourcefiles/scss/mediawiki.ui.default.scss
rename to resources/mediawiki.ui/mediawiki.ui.default.scss
diff --git a/resources/mediawiki.ui/sourcefiles/scss/mediawiki.ui.vector.scss
b/resources/mediawiki.ui/mediawiki.ui.vector.scss
similarity index 100%
rename from resources/mediawiki.ui/sourcefiles/scss/mediawiki.ui.vector.scss
rename to resources/mediawiki.ui/mediawiki.ui.vector.scss
diff --git a/resources/mediawiki.ui/sourcefiles/scss/mixins/_effects.scss
b/resources/mediawiki.ui/mixins/_effects.scss
similarity index 100%
rename from resources/mediawiki.ui/sourcefiles/scss/mixins/_effects.scss
rename to resources/mediawiki.ui/mixins/_effects.scss
diff --git a/resources/mediawiki.ui/sourcefiles/scss/mixins/_forms.scss
b/resources/mediawiki.ui/mixins/_forms.scss
similarity index 100%
rename from resources/mediawiki.ui/sourcefiles/scss/mixins/_forms.scss
rename to resources/mediawiki.ui/mixins/_forms.scss
diff --git a/resources/mediawiki.ui/sourcefiles/scss/mixins/_type.scss
b/resources/mediawiki.ui/mixins/_type.scss
similarity index 100%
rename from resources/mediawiki.ui/sourcefiles/scss/mixins/_type.scss
rename to resources/mediawiki.ui/mixins/_type.scss
diff --git a/resources/mediawiki.ui/sourcefiles/scss/mixins/_utilities.scss
b/resources/mediawiki.ui/mixins/_utilities.scss
similarity index 100%
rename from resources/mediawiki.ui/sourcefiles/scss/mixins/_utilities.scss
rename to resources/mediawiki.ui/mixins/_utilities.scss
diff --git a/resources/mediawiki.ui/sourcefiles/scss/settings/_colors.scss
b/resources/mediawiki.ui/settings/_colors.scss
similarity index 100%
rename from resources/mediawiki.ui/sourcefiles/scss/settings/_colors.scss
rename to resources/mediawiki.ui/settings/_colors.scss
diff --git a/resources/mediawiki.ui/sourcefiles/scss/settings/_typography.scss
b/resources/mediawiki.ui/settings/_typography.scss
similarity index 100%
rename from resources/mediawiki.ui/sourcefiles/scss/settings/_typography.scss
rename to resources/mediawiki.ui/settings/_typography.scss
diff --git a/resources/mediawiki.ui/sourcefiles/Makefile
b/resources/mediawiki.ui/sourcefiles/Makefile
deleted file mode 100644
index dea9013..0000000
--- a/resources/mediawiki.ui/sourcefiles/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-DATE=$(shell date +%I:%M%p)
-CHECK=\033[32m✔\033[39m
-HR=\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#
-
-build:
- @echo "\n${HR}"
- @echo "Building Agora..."
- @echo "${HR}\n"
- @compass compile
- @echo "Compiling Compass project... ${CHECK} Done"
- @rm -rf .sass-cache
- @echo "Removing .sass-cache... ${CHECK} Done"
- @echo "\n${HR}"
- @echo "Agora successfully built at ${DATE}."
- @echo "${HR}\n"
-
-all: build
-
-watch:
- @echo "\n${HR}"
- @echo "Watching SCSS files for Agora..."
- @echo "${HR}\n"
- @compass watch
- @echo "Started watching modules/scss at ${DATE}..."
diff --git a/resources/mediawiki.ui/sourcefiles/config.rb
b/resources/mediawiki.ui/sourcefiles/config.rb
deleted file mode 100644
index 28c6524..0000000
--- a/resources/mediawiki.ui/sourcefiles/config.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# Require any additional compass plugins here.
-
-# Set this to the root of your project when deployed:
-# (unused so far): http_path = "/"
-
-# Output to parent of build directory
-css_dir = ".."
-sass_dir = "scss"
-# (unused so far): images_dir = "modules/img"
-# (unused so far): javascripts_dir = "modules/js"
-
-# You can select your preferred output style here (can be overridden via the
command line):
-# output_style = :expanded or :nested or :compact or :compressed
-output_style = :expanded
-
-# To enable relative paths to assets via compass helper functions. Uncomment:
-relative_assets = true
-
-# To disable debugging comments that display the original location of your
selectors. Uncomment:
-line_comments = true
-
-
-# If you prefer the indented syntax, you might want to regenerate this
-# project again passing --syntax sass, or you can uncomment this:
-# preferred_syntax = :sass
-# and then run:
-# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss
sass
diff --git a/resources/mediawiki.ui/sourcefiles/scss/components/_default.scss
b/resources/mediawiki.ui/sourcefiles/scss/components/_default.scss
deleted file mode 100644
index e7090eb..0000000
--- a/resources/mediawiki.ui/sourcefiles/scss/components/_default.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-@import "utilities";
-@import "default/buttons";
-@import "default/forms";
\ No newline at end of file
diff --git a/resources/mediawiki.ui/sourcefiles/scss/mixins/_all.scss
b/resources/mediawiki.ui/sourcefiles/scss/mixins/_all.scss
deleted file mode 100644
index adc48cd..0000000
--- a/resources/mediawiki.ui/sourcefiles/scss/mixins/_all.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@import "utilities";
-@import "type";
-@import "effects";
-@import "forms";
\ No newline at end of file
diff --git a/resources/mediawiki.ui/sourcefiles/scss/settings/_all.scss
b/resources/mediawiki.ui/sourcefiles/scss/settings/_all.scss
deleted file mode 100644
index 21ac292..0000000
--- a/resources/mediawiki.ui/sourcefiles/scss/settings/_all.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import "colors";
-@import "typography";
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/93584
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I81d8d0c9f6705aef8bdb8a28e1154f2de4301235
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <mflasc...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
