From c1f9b1f7b1b77776192048005dcc66dcf3df2bfb Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 27 Dec 2014 15:41:37 +0100 Subject: Update to MediaWiki 1.24.1 --- resources/mediawiki.ui/sourcefiles/Makefile | 24 ----- resources/mediawiki.ui/sourcefiles/config.rb | 27 ----- .../sourcefiles/scss/components/_default.scss | 3 - .../sourcefiles/scss/components/_utilities.scss | 17 --- .../sourcefiles/scss/components/_vector.scss | 4 - .../scss/components/default/_buttons.scss | 69 ------------- .../scss/components/default/_forms.scss | 114 --------------------- .../scss/components/vector/_buttons.scss | 19 ---- .../scss/components/vector/_containers.scss | 5 - .../sourcefiles/scss/components/vector/_forms.scss | 7 -- .../sourcefiles/scss/mediawiki.ui.default.scss | 16 --- .../sourcefiles/scss/mediawiki.ui.vector.scss | 15 --- .../mediawiki.ui/sourcefiles/scss/mixins/_all.scss | 4 - .../sourcefiles/scss/mixins/_effects.scss | 62 ----------- .../sourcefiles/scss/mixins/_forms.scss | 66 ------------ .../sourcefiles/scss/mixins/_type.scss | 6 -- .../sourcefiles/scss/mixins/_utilities.scss | 19 ---- .../sourcefiles/scss/settings/_all.scss | 2 - .../sourcefiles/scss/settings/_colors.scss | 17 --- .../sourcefiles/scss/settings/_typography.scss | 5 - 20 files changed, 501 deletions(-) delete mode 100644 resources/mediawiki.ui/sourcefiles/Makefile delete mode 100644 resources/mediawiki.ui/sourcefiles/config.rb delete mode 100644 resources/mediawiki.ui/sourcefiles/scss/components/_default.scss delete mode 100644 resources/mediawiki.ui/sourcefiles/scss/components/_utilities.scss delete mode 100644 resources/mediawiki.ui/sourcefiles/scss/components/_vector.scss delete mode 100644 resources/mediawiki.ui/sourcefiles/scss/components/default/_buttons.scss delete mode 100644 resources/mediawiki.ui/sourcefiles/scss/components/default/_forms.scss delete mode 100644 resources/mediawiki.ui/sourcefiles/scss/components/vector/_buttons.scss delete mode 100644 resources/mediawiki.ui/sourcefiles/scss/components/vector/_containers.scss delete mode 100644 resources/mediawiki.ui/sourcefiles/scss/components/vector/_forms.scss delete mode 100644 resources/mediawiki.ui/sourcefiles/scss/mediawiki.ui.default.scss delete mode 100644 resources/mediawiki.ui/sourcefiles/scss/mediawiki.ui.vector.scss delete mode 100644 resources/mediawiki.ui/sourcefiles/scss/mixins/_all.scss delete mode 100644 resources/mediawiki.ui/sourcefiles/scss/mixins/_effects.scss delete mode 100644 resources/mediawiki.ui/sourcefiles/scss/mixins/_forms.scss delete mode 100644 resources/mediawiki.ui/sourcefiles/scss/mixins/_type.scss delete mode 100644 resources/mediawiki.ui/sourcefiles/scss/mixins/_utilities.scss delete mode 100644 resources/mediawiki.ui/sourcefiles/scss/settings/_all.scss delete mode 100644 resources/mediawiki.ui/sourcefiles/scss/settings/_colors.scss delete mode 100644 resources/mediawiki.ui/sourcefiles/scss/settings/_typography.scss (limited to 'resources/mediawiki.ui/sourcefiles') diff --git a/resources/mediawiki.ui/sourcefiles/Makefile b/resources/mediawiki.ui/sourcefiles/Makefile deleted file mode 100644 index dea90139..00000000 --- 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 28c65240..00000000 --- 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 e7090ebc..00000000 --- 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/components/_utilities.scss b/resources/mediawiki.ui/sourcefiles/scss/components/_utilities.scss deleted file mode 100644 index 4f1dba2f..00000000 --- a/resources/mediawiki.ui/sourcefiles/scss/components/_utilities.scss +++ /dev/null @@ -1,17 +0,0 @@ -// Generic helper classes that could be used in many elements/layouts - -// -------------------------------------------------------------------------- -// Positioning -// -------------------------------------------------------------------------- - -.mw-ui-flush-left { - @include agora-flush-left; -} - -.mw-ui-flush-right { - @include agora-flush-right; -} - -.mw-ui-center-block { - @include agora-center-block; -} \ No newline at end of file diff --git a/resources/mediawiki.ui/sourcefiles/scss/components/_vector.scss b/resources/mediawiki.ui/sourcefiles/scss/components/_vector.scss deleted file mode 100644 index d7cb34ae..00000000 --- a/resources/mediawiki.ui/sourcefiles/scss/components/_vector.scss +++ /dev/null @@ -1,4 +0,0 @@ -@import "utilities"; -@import "vector/buttons"; -@import "vector/forms"; -@import "vector/containers"; diff --git a/resources/mediawiki.ui/sourcefiles/scss/components/default/_buttons.scss b/resources/mediawiki.ui/sourcefiles/scss/components/default/_buttons.scss deleted file mode 100644 index d67810f7..00000000 --- a/resources/mediawiki.ui/sourcefiles/scss/components/default/_buttons.scss +++ /dev/null @@ -1,69 +0,0 @@ -$buttonBorderRadius: 3px; - -// Button styling -.mw-ui-button { - // Container layout - @include inline-block; - padding: 0.4em 1em 0.4em 1em; - margin: 0; - - // Container styling - @include buttonColors($agoraGray); - @include border-radius($buttonBorderRadius); - - // Content styling - vertical-align: middle; - - text: { - align: center; - decoration: none; - } - - font: { - weight: bold; - } - - // Interaction styling - cursor: pointer; - - &:disabled, - &.mw-ui-disabled { - cursor: default; - } - - // Button sizes and displays - // ----------------------------------------- - &.mw-ui-big { - font: { - size: $baseFontSize * 1.3; - } - } - &.mw-ui-block { - display: block; - width: 100%; - } -} - -// This overrides an underline declaration on a:hover and a:focus in commonElements.css, which the -// class alone isn't specific enough to do -a.mw-ui-button { - text: { - decoration: none; - } -} - -// Button groups -.mw-ui-button-group > * { - @include border-radius(0); - float: left; - - &:first-child{ - @include border-top-left-radius($buttonBorderRadius); - @include border-bottom-left-radius($buttonBorderRadius); - } - - &:last-child{ - @include border-top-right-radius($buttonBorderRadius); - @include border-bottom-right-radius($buttonBorderRadius); - } -} diff --git a/resources/mediawiki.ui/sourcefiles/scss/components/default/_forms.scss b/resources/mediawiki.ui/sourcefiles/scss/components/default/_forms.scss deleted file mode 100644 index a9cec39a..00000000 --- a/resources/mediawiki.ui/sourcefiles/scss/components/default/_forms.scss +++ /dev/null @@ -1,114 +0,0 @@ -// Form elements and layouts - -// -------------------------------------------------------------------------- -// Layouts -// -------------------------------------------------------------------------- - -// The FancyCaptcha image CAPTCHA used on WMF wikis drives the width of the -// 'VForm' design, the form can't be narrower than this. -$captchaContainerWidth: 290px; -$defaultFormWidth: $captchaContainerWidth; - -// Style a compact vertical stacked form ("VForm") and the elements in divs -// within it. -.mw-ui-vform { - @include box-sizing(border-box); - - width: $defaultFormWidth; - - // Immediate divs in a vform are block and spaced-out. - & > div { - display: block; - margin: 0 0 15px 0; - padding: 0; - width: 100%; - - // MW currently doesn't use the type attribute everywhere on inputs. - input, - .mw-ui-button { - display: block; - @include box-sizing(border-box); - margin: 0; - width: 100%; - } - - // We exclude these because they'll generally use mw-ui-button. - // Otherwise, we'll unintentionally override that. - input:not([type=button]):not([type=submit]):not([type=file]), { - @include agora-field-styling; // mixins/_forms.scss - } - - label { - display: block; - @include box-sizing(border-box); - @include agora-label-styling; - width: auto; - margin: 0 0 0.2em 0; - padding: 0; - } - - // Override input styling just for checkboxes and radio inputs. - input[type="checkbox"], - input[type="radio"] { - display: inline; - @include box-sizing(content-box); - width: auto; - } - - } - - // HTMLForm uses error, SpecialUserlogin (login and create account) uses - // errorbox. - // TODO move errorbox from mediawiki.special.vforms.css into here. - .error { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - font-size: 0.9em; - margin: 0 0 1em 0; - padding: 0.5em; - color: #cc0000; - border: 1px solid #fac5c5; - background-color: #fae3e3; - text-shadow: 0 1px #fae3e3; - word-wrap: break-word; - } -} - -// -------------------------------------------------------------------------- -// Elements -// -------------------------------------------------------------------------- - -// Apply this to individual elements to style them. -// You generally don't need to use this class on divs within an Agora -// form container such as mw-ui-vform -// XXX DRY: This repeats earlier styling, use an @include agora-div-styling ? -.mw-ui-vform-div { - display: block; - margin: 0 0 15px 0; - padding: 0; - width: 100%; -} - -// Apply mw-ui-input to individual input fields to style them. -// You generally don't need to use this class if is within an Agora -// form container such as mw-ui-vform -.mw-ui-input { - @include agora-field-styling; // mixins/_forms.scss -} - -// Apply mw-ui-label to individual elements to style them. -// You generally don't need to use this class if