Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/190240
Change subject: Convert .css to .less
......................................................................
Convert .css to .less
* This patch convert .css to .less.
Change-Id: I432b217ba6059ce727698aba6ee70bdaa8e7cf89
---
M WikiEditor.php
D modules/ext.wikiEditor.css
A modules/ext.wikiEditor.less
R modules/ext.wikiEditor.toolbar.styles.less
D modules/jquery.wikiEditor.css
D modules/jquery.wikiEditor.dialogs.config.css
A modules/jquery.wikiEditor.dialogs.config.less
D modules/jquery.wikiEditor.dialogs.css
A modules/jquery.wikiEditor.dialogs.less
A modules/jquery.wikiEditor.less
R modules/jquery.wikiEditor.preview.less
D modules/jquery.wikiEditor.toolbar.css
A modules/jquery.wikiEditor.toolbar.less
13 files changed, 886 insertions(+), 718 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor
refs/changes/40/190240/1
diff --git a/WikiEditor.php b/WikiEditor.php
index f685ad0..070a128 100644
--- a/WikiEditor.php
+++ b/WikiEditor.php
@@ -47,9 +47,11 @@
$GLOBALS['wgAutoloadClasses']['WikiEditorHooks'] = __DIR__ .
'/WikiEditor.hooks.php';
$GLOBALS['wgMessagesDirs']['WikiEditor'] = __DIR__ . '/i18n';
$GLOBALS['wgExtensionMessagesFiles']['WikiEditor'] = __DIR__ .
'/WikiEditor.i18n.php';
-$GLOBALS['wgHooks']['EditPage::showEditForm:initial'][] =
'WikiEditorHooks::editPageShowEditFormInitial';
+$GLOBALS['wgHooks']['EditPage::showEditForm:initial'][] =
+ 'WikiEditorHooks::editPageShowEditFormInitial';
$GLOBALS['wgHooks']['GetPreferences'][] = 'WikiEditorHooks::getPreferences';
-$GLOBALS['wgHooks']['ResourceLoaderGetConfigVars'][] =
'WikiEditorHooks::resourceLoaderGetConfigVars';
+$GLOBALS['wgHooks']['ResourceLoaderGetConfigVars'][] =
+ 'WikiEditorHooks::resourceLoaderGetConfigVars';
$GLOBALS['wgHooks']['ResourceLoaderTestModules'][] =
'WikiEditorHooks::resourceLoaderTestModules';
$GLOBALS['wgHooks']['MakeGlobalVariablesScript'][] =
'WikiEditorHooks::makeGlobalVariablesScript';
$GLOBALS['wgHooks']['EditPageBeforeEditToolbar'][] =
'WikiEditorHooks::EditPageBeforeEditToolbar';
@@ -66,7 +68,7 @@
'jquery.wikiEditor' => $wikiEditorTpl + array(
'scripts' => 'jquery.wikiEditor.js',
- 'styles' => 'jquery.wikiEditor.css',
+ 'styles' => 'jquery.wikiEditor.less',
'dependencies' => array(
'jquery.client',
'jquery.textSelection',
@@ -78,7 +80,7 @@
),
'jquery.wikiEditor.dialogs' => $wikiEditorTpl + array(
'scripts' => 'jquery.wikiEditor.dialogs.js',
- 'styles' => 'jquery.wikiEditor.dialogs.css',
+ 'styles' => 'jquery.wikiEditor.dialogs.less',
'dependencies' => array(
'jquery.wikiEditor',
'jquery.wikiEditor.toolbar',
@@ -91,7 +93,7 @@
),
'jquery.wikiEditor.dialogs.config' => $wikiEditorTpl + array(
'scripts' => 'jquery.wikiEditor.dialogs.config.js',
- 'styles' => 'jquery.wikiEditor.dialogs.config.css',
+ 'styles' => 'jquery.wikiEditor.dialogs.config.less',
'dependencies' => array(
'jquery.mwExtension',
'jquery.wikiEditor',
@@ -117,7 +119,7 @@
),
'jquery.wikiEditor.preview' => $wikiEditorTpl + array(
'scripts' => 'jquery.wikiEditor.preview.js',
- 'styles' => 'jquery.wikiEditor.preview.css',
+ 'styles' => 'jquery.wikiEditor.preview.less',
'dependencies' => array(
'jquery.wikiEditor',
'mediawiki.api',
@@ -132,7 +134,7 @@
),
'jquery.wikiEditor.toolbar' => $wikiEditorTpl + array(
'scripts' => 'jquery.wikiEditor.toolbar.js',
- 'styles' => 'jquery.wikiEditor.toolbar.css',
+ 'styles' => 'jquery.wikiEditor.toolbar.less',
'dependencies' => array(
'jquery.wikiEditor',
'jquery.wikiEditor.toolbar.i18n',
@@ -356,7 +358,7 @@
'ext.wikiEditor' => $wikiEditorTpl + array(
'scripts' => 'ext.wikiEditor.js',
- 'styles' => 'ext.wikiEditor.css',
+ 'styles' => 'ext.wikiEditor.less',
'dependencies' => 'jquery.wikiEditor',
),
'ext.wikiEditor.dialogs' => $wikiEditorTpl + array(
@@ -406,7 +408,7 @@
)
),
'ext.wikiEditor.toolbar.styles' => $wikiEditorTpl + array(
- 'styles' => 'ext.wikiEditor.toolbar.styles.css',
+ 'styles' => 'ext.wikiEditor.toolbar.styles.less',
),
'ext.wikiEditor.toolbar.hideSig' => $wikiEditorTpl + array(
'scripts' => 'ext.wikiEditor.toolbar.hideSig.js',
diff --git a/modules/ext.wikiEditor.css b/modules/ext.wikiEditor.css
deleted file mode 100644
index 6ea7e63..0000000
--- a/modules/ext.wikiEditor.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * CSS for WikiEditor
- */
-
-/* Hide vanilla MediaWiki's "Editing help" link, as we provide it in the
toolbar */
-.editButtons .editHelp,
-.editButtons .mw-editButtons-pipe-separator {
- display: none;
-}
diff --git a/modules/ext.wikiEditor.less b/modules/ext.wikiEditor.less
new file mode 100644
index 0000000..0163242
--- /dev/null
+++ b/modules/ext.wikiEditor.less
@@ -0,0 +1,11 @@
+/**
+ * CSS for WikiEditor
+ */
+
+/* Hide vanilla MediaWiki's "Editing help" link, as we provide it in the
toolbar */
+.editButtons {
+ .editHelp,
+ .mw-editButtons-pipe-separator {
+ display: none;
+ }
+}
diff --git a/modules/ext.wikiEditor.toolbar.styles.css
b/modules/ext.wikiEditor.toolbar.styles.less
similarity index 100%
rename from modules/ext.wikiEditor.toolbar.styles.css
rename to modules/ext.wikiEditor.toolbar.styles.less
diff --git a/modules/jquery.wikiEditor.css b/modules/jquery.wikiEditor.css
deleted file mode 100644
index cabe6a9..0000000
--- a/modules/jquery.wikiEditor.css
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * CSS for WikiEditor jQuery plugin
- */
-
-.wikiEditor-ui {
- position: relative;
- clear: both;
- width: 100%;
- background-color: #E0EEf7;
-}
-.wikiEditor-ui textarea {
- width: 100%;
- border: 0;
-}
-.wikiEditor-ui textarea:focus {
- outline: none;
-}
-.wikiEditor-ui .wikiEditor-ui-clear {
- clear: both;
-}
-.wikiEditor-ui .wikiEditor-ui-view {
- border: 1px solid silver;
-}
-.wikiEditor-ui .wikiEditor-ui-top {
- position: relative;
- border-bottom: 1px solid silver;
-}
-.wikiEditor-ui .wikiEditor-ui-left {
- float: left;
- width: 100%;
-}
-.wikiEditor-ui .wikiEditor-ui-right {
- float: right;
- background: #F3F3F3;
- overflow: hidden;
-}
-.wikiEditor-wikitext {
- float: left;
- width: 100%;
-}
-.wikiEditor-ui-controls {
- float: left;
- width: 100%;
- background-color: white;
-}
-.wikiEditor-ui-tabs {
- float: left;
- height: 2.5em;
- margin-right: -1px;
- background-color: white;
- border-left: 1px solid silver;
- border-top: 1px solid silver;
-}
-.wikiEditor-ui-buttons {
- float: right;
- height: 2.5em;
- margin-right: -1px;
- background-color: white;
- padding-left: 1em;
- border-top: 1px solid white;
-}
-.wikiEditor-ui-buttons button {
- margin-left: 0.5em;
-}
-.wikiEditor-ui-tabs div {
- float: left;
- height: 2.5em;
- background-color: #f3f3f3;
- border-right: 1px solid silver;
- border-bottom: 1px solid silver;
-}
-.wikiEditor-ui-tabs div.current {
- border-bottom: 1px solid white;
- background-color: white;
-}
-.wikiEditor-ui-tabs div a {
- display: inline-block;
- padding: 0 0.75em;
- line-height: 2.5em;
- color: #0645AD;
-}
-.wikiEditor-ui-tabs div.current a {
- color: #333333;
-}
-.wikiEditor-ui-tabs div.current a:hover {
- text-decoration: none;
-}
-
-.wikiEditor-view-wikitext {
- line-height: 1em;
-}
-.wikiEditor-ui-loading {
- background: #f3f3f3;
- z-index: 10;
- position: absolute;
- top: 0;
- left: 0;
- text-align: center;
- height: 100%;
- width: 100%;
- border: 1px solid silver;
- margin: -1px;
-}
-.wikiEditor-ui-loading span {
- display: block;
- height: 24px;
- width: 24px;
- /* @embed */
- background: url(images/toolbar/loading.gif) 0 0 no-repeat;
- text-indent: -9999px;
- margin: 0 auto;
-}
diff --git a/modules/jquery.wikiEditor.dialogs.config.css
b/modules/jquery.wikiEditor.dialogs.config.css
deleted file mode 100644
index f34e7f0..0000000
--- a/modules/jquery.wikiEditor.dialogs.config.css
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * CSS for WikiEditor Dialogs
- */
-
-/* Replace Dialog */
-#wikieditor-toolbar-replace-search,
-#wikieditor-toolbar-replace-replace {
- width: 100%;
-}
-
-/* Table Dialog */
-#wikieditor-toolbar-table-dialog fieldset {
- width: 218px;
- padding: 0;
- float: left;
-}
-
-#wikieditor-toolbar-table-dialog .wikieditor-toolbar-table-preview-wrapper {
- width: 330px;
- padding: 0;
- float: right;
-}
-
-.wikieditor-toolbar-table-preview-content * {
- cursor: default;
-}
-.wikiEditor-toolbar-dialog .wikieditor-toolbar-table-preview-wrapper table {
- width: 100% !important;
-}
-.wikiEditor-toolbar-dialog .wikieditor-toolbar-table-preview-content table td {
- padding: 10px 4px !important;
- height: auto !important;
-}
-.wikiEditor-toolbar-dialog .wikieditor-toolbar-table-preview-content table th {
- padding: 7px 3px !important;
-}
-.wikieditor-toolbar-table-dimension-fields .wikieditor-toolbar-field-wrapper {
- float: left;
- margin-right: 20px;
- vertical-align: bottom;
-}
-
-.wikiEditor-toolbar-dialog .ui-dialog-content {
- padding: 30px 20px 0 !important;
-}
-.wikieditor-toolbar-dialog-wrapper {
- width: 100%;
-}
-/* Insert Link Dialog */
-#wikieditor-toolbar-link-int-target-status {
- float: right;
-}
-#wikieditor-toolbar-link-int-target,
-#wikieditor-toolbar-link-int-text {
- width: 100%;
-}
-#wikieditor-toolbar-tool-link-int-target-label {
- float: left;
- line-height: 1.7em;
-}
-#wikieditor-toolbar-link-int-target-status-exists,
-#wikieditor-toolbar-link-int-target-status-notexists,
-#wikieditor-toolbar-link-int-target-status-invalid,
-#wikieditor-toolbar-link-int-target-status-external,
-#wikieditor-toolbar-link-int-target-status-disambig {
- padding-left: 30px;
- background-position: 0 50%;
- background-repeat: no-repeat;
-}
-#wikieditor-toolbar-link-int-target-status-exists {
- /* @embed */
- background-image: url(images/dialogs/insert-link-exists.png);
- background-position: left;
-}
-#wikieditor-toolbar-link-int-target-status-notexists {
- /* @embed */
- background-image: url(images/dialogs/insert-link-notexists.png);
- background-position: left;
-}
-#wikieditor-toolbar-link-int-target-status-invalid {
- /* @embed */
- background-image: url(images/dialogs/insert-link-invalid.png);
- background-position: left;
-}
-#wikieditor-toolbar-link-int-target-status-external {
- /* @embed */
- background-image: url(images/dialogs/insert-link-external.png);
- background-position: left;
-}
-#wikieditor-toolbar-link-int-target-status-disambig {
- /* @embed */
- background-image: url(images/dialogs/insert-disambiguation.png);
- background-position: left;
-}
-/* File dialog */
-#wikieditor-toolbar-file-target,
-#wikieditor-toolbar-file-caption {
- width: 100%;
-}
-.wikieditor-toolbar-file-options .wikieditor-toolbar-field-wrapper {
- float: left;
- margin: 0 20px 0 0;
-}
-/* Reference Dialog */
-#wikieditor-toolbar-reference-dialog label {
- float: left;
- line-height: 1.7em;
-}
-#wikieditor-toolbar-reference-text {
- width: 100%;
-}
-/* RTL Changes */
-
-body.rtl #wikieditor-toolbar-link-int-target-status-external {
- /* @embed */
- background-image: url(images/dialogs/insert-link-external-rtl.png);
-}
-
-body.rtl .wikiEditor-toolbar-dialog .ui-dialog-buttonpane button {
- float: left;
- margin: 0.5em 0.4em 0.5em 0 !important;
-}
-/* Template Editor Dialogs */
-.wikiEditor-template-dialog-fields label {
- text-transform: capitalize;
- float: left;
- width: 25%;
- line-height: 2.25em;
-}
-.wikiEditor-template-dialog-fields textarea {
- float: right;
- width: 70%;
- line-height: 1.5em;
- height: 1.5em;
-}
-.wikiEditor-template-dialog-fields .wikiEditor-template-dialog-field-wrapper {
- padding: 0.75em 0.33em;
- border-bottom: 1px dashed silver;
- clear: both;
-}
-.wikiEditor-template-dialog-fields
.wikiEditor-template-dialog-field-wrapper:first-child {
- padding-top: 0;
-}
-.wikiEditor-template-dialog-fields
.wikiEditor-template-dialog-field-wrapper:last-child {
- border-bottom: none;
-}
-/* Self Clearing Floats */
-.wikieditor-toolbar-table-dimension-fields:after,
-.wikieditor-toolbar-dialog-wrapper:after {
- visibility: hidden;
- display: block;
- font-size: 0;
- content: " ";
- clear: both;
- height: 0;
-}
-.wikieditor-toolbar-table-dimension-fields,
-.wikieditor-toolbar-dialog-wrapper {
- display: inline-table;
-}
-/* Hides from IE-mac \*/
-* html .wikieditor-toolbar-table-dimension-fields,
-* html .wikieditor-toolbar-dialog-wrapper {
- height: 1%;
-}
-.wikieditor-toolbar-table-dimension-fields,
-.wikieditor-toolbar-dialog-wrapper {
- display: block;
-}
-/* End hide from IE-mac */
-.wikiEditor-toolbar-dialog .ui-dialog-buttonpane {
- border-top: 1px solid #cccccc !important;
-}
-.wikiEditor-toolbar-dialog .ui-dialog-content {
- padding-bottom: 1em !important;
-}
-/* Edit dialog */
-.wikiEditor-dialog-editoptions {
- margin-top: 15px;
-}
-/* Publish dialog */
-.wikiEditor-publish-dialog-copywarn {
- margin-top: 0.5em;
-}
-.wikiEditor-publish-dialog-summary {
- margin-top: 1.5em;
-}
-.wikiEditor-publish-dialog-options {
- margin-top: 1.5em;
-}
diff --git a/modules/jquery.wikiEditor.dialogs.config.less
b/modules/jquery.wikiEditor.dialogs.config.less
new file mode 100644
index 0000000..4e86afd
--- /dev/null
+++ b/modules/jquery.wikiEditor.dialogs.config.less
@@ -0,0 +1,233 @@
+@import "mediawiki.mixins";
+
+/*
+ * CSS for WikiEditor Dialogs
+ */
+
+/* Replace Dialog */
+#wikieditor-toolbar-replace-search,
+#wikieditor-toolbar-replace-replace {
+ width: 100%;
+}
+
+/* Table Dialog */
+#wikieditor-toolbar-table-dialog {
+ fieldset {
+ width: 218px;
+ padding: 0;
+ float: left;
+ }
+
+ .wikieditor-toolbar-table-preview-wrapper {
+ width: 330px;
+ padding: 0;
+ float: right;
+ }
+}
+
+.wikieditor-toolbar-table-preview-content * {
+ cursor: default;
+}
+
+.wikiEditor-toolbar-dialog {
+ .wikieditor-toolbar-table-preview-wrapper {
+ table {
+ width: 100% !important;
+ }
+ }
+
+ .wikieditor-toolbar-table-preview-content {
+ table {
+ td {
+ padding: 10px 4px !important;
+ height: auto !important;
+ }
+
+ th {
+ padding: 7px 3px !important;
+ }
+ }
+ }
+
+ .ui-dialog-content {
+ padding: 30px 20px 0 !important;
+ padding-bottom: 1em !important;
+ }
+
+ .ui-dialog-buttonpane {
+ border-top: 1px solid #cccccc !important;
+ }
+}
+
+.wikieditor-toolbar-table-dimension-fields {
+ .wikieditor-toolbar-field-wrapper {
+ float: left;
+ margin-right: 20px;
+ vertical-align: bottom;
+ }
+}
+
+.wikieditor-toolbar-dialog-wrapper {
+ width: 100%;
+}
+
+/* Insert Link Dialog */
+#wikieditor-toolbar-link-int-target-status {
+ float: right;
+}
+
+#wikieditor-toolbar-link-int-target,
+#wikieditor-toolbar-link-int-text {
+ width: 100%;
+}
+
+#wikieditor-toolbar-tool-link-int-target-label {
+ float: left;
+ line-height: 1.7em;
+}
+
+#wikieditor-toolbar-link-int-target-status-exists,
+#wikieditor-toolbar-link-int-target-status-notexists,
+#wikieditor-toolbar-link-int-target-status-invalid,
+#wikieditor-toolbar-link-int-target-status-external,
+#wikieditor-toolbar-link-int-target-status-disambig {
+ padding-left: 30px;
+ background-position: 0 50%;
+ background-repeat: no-repeat;
+}
+
+#wikieditor-toolbar-link-int-target-status-exists {
+ .background-image('images/dialogs/insert-link-exists.png');
+ background-position: left;
+}
+
+#wikieditor-toolbar-link-int-target-status-notexists {
+ .background-image('images/dialogs/insert-link-notexists.png');
+ background-position: left;
+}
+
+#wikieditor-toolbar-link-int-target-status-invalid {
+ .background-image('images/dialogs/insert-link-invalid.png');
+ background-position: left;
+}
+
+#wikieditor-toolbar-link-int-target-status-external {
+ .background-image('images/dialogs/insert-link-external.png');
+ background-position: left;
+}
+
+#wikieditor-toolbar-link-int-target-status-disambig {
+ .background-image('images/dialogs/insert-disambiguation.png');
+ background-position: left;
+}
+
+/* File dialog */
+#wikieditor-toolbar-file-target,
+#wikieditor-toolbar-file-caption {
+ width: 100%;
+}
+
+.wikieditor-toolbar-file-options {
+ .wikieditor-toolbar-field-wrapper {
+ float: left;
+ margin: 0 20px 0 0;
+ }
+}
+
+/* Reference Dialog */
+#wikieditor-toolbar-reference-dialog {
+ label {
+ float: left;
+ line-height: 1.7em;
+ }
+}
+
+#wikieditor-toolbar-reference-text {
+ width: 100%;
+}
+
+/* RTL Changes */
+
+body.rtl {
+ .wikiEditor-toolbar-dialog {
+ .ui-dialog-buttonpane {
+ button {
+ float: left;
+ margin: 0.5em 0.4em 0.5em 0 !important;
+ }
+ }
+ }
+}
+
+/* Template Editor Dialogs */
+.wikiEditor-template-dialog-fields {
+ label {
+ text-transform: capitalize;
+ float: left;
+ width: 25%;
+ line-height: 2.25em;
+ }
+
+ textarea {
+ float: right;
+ width: 70%;
+ line-height: 1.5em;
+ height: 1.5em;
+ }
+
+ .wikiEditor-template-dialog-field-wrapper {
+ padding: 0.75em 0.33em;
+ border-bottom: 1px dashed silver;
+ clear: both;
+
+ &:first-child {
+ padding-top: 0;
+ }
+
+ &:last-child {
+ border-bottom: none;
+ }
+ }
+}
+
+/* Self Clearing Floats */
+.wikieditor-toolbar-table-dimension-fields:after,
+.wikieditor-toolbar-dialog-wrapper:after {
+ visibility: hidden;
+ display: block;
+ font-size: 0;
+ content: " ";
+ clear: both;
+ height: 0;
+}
+
+/* Hides from IE-mac \*/
+* html .wikieditor-toolbar-table-dimension-fields,
+* html .wikieditor-toolbar-dialog-wrapper {
+ height: 1%;
+}
+
+.wikieditor-toolbar-table-dimension-fields,
+.wikieditor-toolbar-dialog-wrapper {
+ display: inline-table;
+ display: block;
+}
+
+/* End hide from IE-mac */
+/* Edit dialog */
+.wikiEditor-dialog-editoptions {
+ margin-top: 15px;
+}
+
+/* Publish dialog */
+.wikiEditor-publish-dialog-copywarn {
+ margin-top: 0.5em;
+}
+
+.wikiEditor-publish-dialog-summary {
+ margin-top: 1.5em;
+}
+
+.wikiEditor-publish-dialog-options {
+ margin-top: 1.5em;
+}
diff --git a/modules/jquery.wikiEditor.dialogs.css
b/modules/jquery.wikiEditor.dialogs.css
deleted file mode 100644
index 942c66f..0000000
--- a/modules/jquery.wikiEditor.dialogs.css
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * CSS for WikiEditor Dialogs jQuery plugin
- */
-
-.wikiEditor-toolbar-dialog table {
- margin-top: 0.75em;
-}
-
-.wikiEditor-toolbar-dialog table td {
- padding: 0.5em;
- height: 3em;
- overflow: visible;
-}
-
-/* Put suggestions (default z-index 99) on top of dialogs (z-index 1002) */
-div.suggestions {
- z-index: 1099;
-}
-
-.wikiEditor-toolbar-dialog table td {
- padding: 0 !important;
-}
-
-.wikiEditor-toolbar-dialog .ui-dialog-content fieldset {
- border: none !important;
- margin: 0 !important;
- padding: 0 !important;
-}
-
-.wikiEditor-toolbar-dialog .ui-widget-header {
- border-bottom:1px solid #6bc8f3 !important;
-}
-
-.wikiEditor-toolbar-dialog .ui-dialog-content input[type=text] {
- -moz-box-sizing: border-box;
- -ms-box-sizing: border-box;
- -webkit-box-sizing: border-box;
- -khtml-box-sizing: border-box;
- box-sizing: border-box;
-}
-
-.wikiEditor-toolbar-dialog .ui-dialog-content input[type="radio"],
-.wikiEditor-toolbar-dialog .ui-dialog-content input[type="checkbox"] {
- margin-left: 0;
-}
-
-.wikiEditor-toolbar-dialog .ui-dialog-titlebar-close {
- padding: 0;
-}
-body .wikiEditor-toolbar-dialog .ui-dialog-titlebar-close {
- right: 0.9em;
-}
-
-.wikieditor-toolbar-field-wrapper {
- padding: 0 0 25px 0;
-}
-
-.wikieditor-toolbar-floated-field-wrapper {
- float: left;
- margin-right: 2em;
-}
-
-.wikieditor-toolbar-dialog-hint {
- color: #999999;
-}
-
-.wikiEditor-toolbar-dialog {
- border: none;
-}
\ No newline at end of file
diff --git a/modules/jquery.wikiEditor.dialogs.less
b/modules/jquery.wikiEditor.dialogs.less
new file mode 100644
index 0000000..6b1f17f
--- /dev/null
+++ b/modules/jquery.wikiEditor.dialogs.less
@@ -0,0 +1,80 @@
+/**
+ * CSS for WikiEditor Dialogs jQuery plugin
+ */
+
+.wikiEditor-toolbar-dialog {
+ border: none;
+
+ table {
+ margin-top: 0.75em;
+
+ td {
+ padding: 0.5em;
+ height: 3em;
+ overflow: visible;
+ padding: 0 !important;
+ }
+ }
+
+ .ui-dialog-content {
+ fieldset {
+ border: none !important;
+ margin: 0 !important;
+ padding: 0 !important;
+ }
+
+ input[type=text] {
+ -moz-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ -khtml-box-sizing: border-box;
+ box-sizing: border-box;
+ }
+ }
+
+ .ui-widget-header {
+ border-bottom:1px solid #6bc8f3 !important;
+ }
+
+ .ui-dialog-titlebar-close {
+ padding: 0;
+ }
+}
+
+/* Put suggestions (default z-index 99) on top of dialogs (z-index 1002) */
+div.suggestions {
+ z-index: 1099;
+}
+
+.wikiEditor-toolbar-dialog {
+ .ui-dialog-content {
+ input{
+ &[type="radio {
+ &[type="checkbox"] {
+ margin-left: 0;
+ }
+ }
+ }
+ }
+}
+
+body {
+ .wikiEditor-toolbar-dialog {
+ .ui-dialog-titlebar-close {
+ right: 0.9em;
+ }
+ }
+}
+
+.wikieditor-toolbar-field-wrapper {
+ padding: 0 0 25px 0;
+}
+
+.wikieditor-toolbar-floated-field-wrapper {
+ float: left;
+ margin-right: 2em;
+}
+
+.wikieditor-toolbar-dialog-hint {
+ color: #999999;
+}
diff --git a/modules/jquery.wikiEditor.less b/modules/jquery.wikiEditor.less
new file mode 100644
index 0000000..2cc0e3b
--- /dev/null
+++ b/modules/jquery.wikiEditor.less
@@ -0,0 +1,132 @@
+@import "mediawiki.mixins";
+
+/*
+ * CSS for WikiEditor jQuery plugin
+ */
+
+.wikiEditor-ui {
+ position: relative;
+ clear: both;
+ width: 100%;
+ background-color: #E0EEf7;
+
+ textarea {
+ width: 100%;
+ border: 0;
+
+ &:focus {
+ outline: none;
+ }
+ }
+
+ .wikiEditor-ui-clear {
+ clear: both;
+ }
+
+ .wikiEditor-ui-view {
+ border: 1px solid silver;
+ }
+
+ .wikiEditor-ui-top {
+ position: relative;
+ border-bottom: 1px solid silver;
+ }
+
+ .wikiEditor-ui-left {
+ float: left;
+ width: 100%;
+ }
+
+ .wikiEditor-ui-right {
+ float: right;
+ background: #F3F3F3;
+ overflow: hidden;
+ }
+}
+
+.wikiEditor-wikitext {
+ float: left;
+ width: 100%;
+}
+
+.wikiEditor-ui-controls {
+ float: left;
+ width: 100%;
+ background-color: white;
+}
+
+.wikiEditor-ui-tabs {
+ float: left;
+ height: 2.5em;
+ margin-right: -1px;
+ background-color: white;
+ border-left: 1px solid silver;
+ border-top: 1px solid silver;
+
+ div {
+ float: left;
+ height: 2.5em;
+ background-color: #f3f3f3;
+ border-right: 1px solid silver;
+ border-bottom: 1px solid silver;
+
+ a {
+ display: inline-block;
+ padding: 0 0.75em;
+ line-height: 2.5em;
+ color: #0645AD;
+ }
+
+ &.current {
+ border-bottom: 1px solid white;
+ background-color: white;
+
+ a {
+ color: #333333;
+
+ &:hover {
+ text-decoration: none;
+ }
+ }
+ }
+ }
+}
+
+.wikiEditor-ui-buttons {
+ float: right;
+ height: 2.5em;
+ margin-right: -1px;
+ background-color: white;
+ padding-left: 1em;
+ border-top: 1px solid white;
+
+ button {
+ margin-left: 0.5em;
+ }
+}
+
+.wikiEditor-view-wikitext {
+ line-height: 1em;
+}
+
+.wikiEditor-ui-loading {
+ background: #f3f3f3;
+ z-index: 10;
+ position: absolute;
+ top: 0;
+ left: 0;
+ text-align: center;
+ height: 100%;
+ width: 100%;
+ border: 1px solid silver;
+ margin: -1px;
+
+ span {
+ display: block;
+ height: 24px;
+ width: 24px;
+ .background-image('images/toolbar/loading.gif');
+ text-indent: -9999px;
+ margin: 0 auto;
+ }
+}
diff --git a/modules/jquery.wikiEditor.preview.css
b/modules/jquery.wikiEditor.preview.less
similarity index 62%
rename from modules/jquery.wikiEditor.preview.css
rename to modules/jquery.wikiEditor.preview.less
index 6b026a1..fc8155b 100644
--- a/modules/jquery.wikiEditor.preview.css
+++ b/modules/jquery.wikiEditor.preview.less
@@ -5,10 +5,10 @@
.wikiEditor-preview-loading {
padding: 1em;
background-color: white;
-}
-.wikiEditor-preview-loading span {
- color: #666666;
+ span {
+ color: #666666;
+ }
}
.wikiEditor-preview-spinner {
@@ -21,11 +21,15 @@
}
/* FIXME: This only works for the first wikiEditor on the page! */
-#wikiEditor-0-preview-dialog .wikiEditor-ui-loading {
- overflow: hidden;
- border: none;
+#wikiEditor-0-preview-dialog {
+ .wikiEditor-ui-loading {
+ overflow: hidden;
+ border: none;
+ }
}
-.ui-dialog .ui-dialog-buttonpane {
- margin: 0 !important;
+.ui-dialog {
+ .ui-dialog-buttonpane {
+ margin: 0 !important;
+ }
}
diff --git a/modules/jquery.wikiEditor.toolbar.css
b/modules/jquery.wikiEditor.toolbar.css
deleted file mode 100644
index 83afbe3..0000000
--- a/modules/jquery.wikiEditor.toolbar.css
+++ /dev/null
@@ -1,321 +0,0 @@
-/**
- * CSS for WikiEditor Toolbar jQuery plugin
- */
-
-.wikiEditor-ui-toolbar {
- position: relative;
- display: block;
-}
-
-.wikiEditor-ui-toolbar .empty {
- display: none;
-}
-
-/* Expandable Sections */
-.wikiEditor-ui-toolbar .sections {
- float: left;
- width: 100%;
- clear: both;
- height: 0;
-}
-.wikiEditor-ui-toolbar .sections .section {
- float: left;
- width: 100%;
- border-top: 1px solid #DDDDDD;
- background-color: #E0EEf7;
-}
-
-.wikiEditor-ui-toolbar .sections .section-hidden {
- display: none;
-}
-
-.wikiEditor-ui-toolbar {
- /* @embed */
- background-image: url(images/toolbar/base.png);
- background-position: left top;
- background-repeat: repeat-x;
-}
-/* Gets overridden when the section div is in class loading - see below */
-.wikiEditor-ui-toolbar .sections div .spinner {
- display: none;
-}
-.wikiEditor-ui-toolbar .sections .loading .spinner {
- display: block;
- float: left;
- /* @embed */
- background-image: url(images/toolbar/loading.gif);
- background-position: left center;
- background-repeat: no-repeat;
- padding-left: 32px;
- margin-left: 0.5em;
- height: 32px;
- color: #666666;
-}
-/* Top Level Containers */
-.wikiEditor-ui-toolbar .tabs,
-.wikiEditor-ui-toolbar .section-main {
- position: relative;
- float: left;
- min-height: 26px;
- height: 100%;
-}
-/* Groups */
-.wikiEditor-ui-toolbar .group {
- float: left;
- height: 26px;
- padding-right: 6px;
- border-right: 1px solid #DDDDDD;
- margin: 3px;
-}
-.wikiEditor-ui-toolbar .group-search {
- float: right;
- padding: 0 0 0 6px;
- border-right: none;
- border-left: 1px solid #DDDDDD;
-}
-.wikiEditor-ui-toolbar .group-insert {
- border-right: none;
-}
-/* Sprited Buttons */
-.wikiEditor-toolbar-spritedButton {
- /* @embed */
- background: url(images/toolbar/button-sprite.png) 0 0 no-repeat;
- display: block;
- float: left;
- height: 22px;
- text-indent: -9999px;
- width: 22px;
- padding: 2px;
- cursor: pointer;
- overflow: hidden;
-}
-/* Tabs */
-.wikiEditor-ui-toolbar .tabs {
- list-style: none;
- margin: 3px;
-}
-.wikiEditor-ui-toolbar .tabs span.tab {
- display: block;
- float: left;
- line-height: 26px;
-}
-.wikiEditor-ui-toolbar .tabs span.tab a,
-.wikiEditor-ui-toolbar .tabs span.tab a:visited {
- display: inline-block;
- float: left;
- padding-left: 18px;
- padding-right: 12px;
- height: 26px;
- cursor: pointer;
- color: #0645ad;
- /* @embed */
- background-image: url(images/toolbar/arrow-ltr.png);
- background-position: left center;
- background-repeat: no-repeat;
-}
-.wikiEditor-ui-toolbar .tabs span.tab a.current,
-.wikiEditor-ui-toolbar .tabs span.tab a.current:visited {
- color: #333333;
- /* @embed */
- background-image: url(images/toolbar/arrow-down.png);
-}
-.wikiEditor-ui-toolbar .tabs span.tab a.current:hover {
- text-decoration: none;
-}
-.wikiEditor-ui-toolbar .tabs span.tab a.loading {
- /* @embed */
- background-image: url(images/toolbar/loading-small.gif);
-}
-/* Toolbar */
-.wikiEditor-ui-toolbar .group .label {
- float: left;
- border: 0;
- height: 22px;
- line-height: 22px;
- margin: 2px;
- margin-left: 5px;
- margin-right: 8px;
- color: #777777;
- cursor: default;
-}
-.wikiEditor-ui-toolbar .group img.tool {
- float: left;
- border: 0;
- height: 22px;
- width: 22px;
- padding: 2px;
- cursor: pointer;
-}
-.wikiEditor-ui-toolbar .group .tool-select {
- float: left;
- margin: 2px;
- height: 22px;
- cursor: pointer;
- border: 1px solid silver;
- padding: 0;
- margin-right: 0;
- cursor: pointer;
- background-color: #ffffff;
-}
-.wikiEditor-ui-toolbar .group .tool-select .label {
- /* @embed */
- background-image: url(images/toolbar/arrow-down.png);
- background-position: center right;
- background-repeat: no-repeat;
- padding: 0;
- margin: 0;
- padding-left: 4px;
- padding-right: 22px;
- margin-right: 4px;
- cursor: pointer;
- text-decoration: none;
- color: #333333;
-}
-.wikiEditor-ui-toolbar .group .tool-select .menu .options {
- position: absolute;
- display: none;
- margin-left: -1px;
- margin-top: 22px;
- border: 1px solid silver;
- background-color: #ffffff;
-}
-.wikiEditor-ui-toolbar .group .tool-select .options .option {
- display: block;
- padding: 0.5em;
- text-decoration: none;
- color: black;
- white-space: nowrap;
-}
-.wikiEditor-ui-toolbar .group .tool-select .options .option:hover {
- background-color: #E0EEf7;
-}
-.wikiEditor-ui-toolbar .group .tool-select .options .option[rel=heading-2] {
- font-size: 150%;
- font-weight: normal;
-}
-.wikiEditor-ui-toolbar .group .tool-select .options .option[rel=heading-3] {
- font-size: 132%;
- font-weight: normal;
-}
-.wikiEditor-ui-toolbar .group .tool-select .options .option[rel=heading-4] {
- font-size: 116%;
- font-weight: normal;
-}
-.wikiEditor-ui-toolbar .group .tool-select .options .option[rel=heading-5] {
- font-size: 100%;
- font-weight: bold;
-}
-/* Booklet */
-.wikiEditor-ui-toolbar .booklet .index {
- float: left;
- width: 20%;
- height: 125px;
- overflow: auto;
- resize: horizontal;
-}
-.wikiEditor-ui-toolbar .booklet .index div {
- padding: 4px;
- padding-left: 6px;
- cursor: pointer;
- color: #0645ad;
-}
-.wikiEditor-ui-toolbar .booklet .index .current {
- background-color: #FAFAFA;
- color: #333333;
- cursor: default;
-}
-.wikiEditor-ui-toolbar .booklet .pages {
- height: 125px;
- overflow: auto;
- background-color: #FAFAFA;
-}
-/* Help Pages */
-.wikiEditor-ui-toolbar .page-table {
- padding-left: 5px;
- padding-right: 5px;
-}
-.wikiEditor-ui-toolbar .page-table table {
- background: none;
- border-collapse: collapse;
- width: 100%;
-}
-.wikiEditor-ui-toolbar .page-table th {
- color: #999999;
-}
-.wikiEditor-ui-toolbar .page-table td {
- color: black;
- border-top: 1px solid #EEEEEE;
-}
-.wikiEditor-ui-toolbar .page-table th,
-.wikiEditor-ui-toolbar .page-table td {
- text-align: left;
- padding: 5px;
- margin: 0;
-}
-.wikiEditor-ui-toolbar .section-help .page-table .cell {
- vertical-align: top;
-}
-.wikiEditor-ui-toolbar .section-help .page-table td.cell-syntax {
- font-family: monospace, Courier;
-}
-.wikiEditor-ui-toolbar .section-help .page-table td.cell-syntax,
-.wikiEditor-ui-toolbar .section-help .page-table td.cell-result {
- width: 40%;
-}
-.wikiEditor-ui-toolbar .section-help .page-table td.cell-description {
- width: 20%;
-}
-/* T33649 */
-.wikiEditor-ui-toolbar .section-help .page-table .table-link td.cell-syntax {
- white-space: pre;
-}
-
-/* Characters Pages */
-.wikiEditor-ui-toolbar .page-characters div span {
- border: 1px solid #DDDDDD;
- padding: 5px;
- padding-left: 8px;
- padding-right: 8px;
- margin-left: 5px;
- margin-top: 5px;
- height: 1em;
- float: left;
- display: block;
- color: black;
- text-decoration: none;
- cursor: pointer;
- font-family: monospace, Courier;
- font-size: 1.25em;
- line-height: 1;
-}
-.wikiEditor-ui-toolbar .page-characters div[dir=rtl] span {
- /* @noflip */ direction: rtl;
-}
-.wikiEditor-ui-toolbar .page-characters div span:hover {
- background-color: white;
- text-decoration: none;
- border-color: #a8d7f9;
-}
-.ui-widget table td.wikieditor-toolbar-table-preview-wrapper span {
- padding: 4px 6px 0;
- display: block;
-}
-.ui-widget table .wikieditor-toolbar-table-preview-frame {
- width: 340px;
- background: #fff;
- padding: 10px;
- overflow: hidden;
- display: block;
- position: relative;
-}
-.ui-widget table .wikieditor-toolbar-table-preview-content {
- width: 375px;
- display: block;
-}
-.ui-widget table .wikieditor-toolbar-table-preview {
- width: 340px;
-}
-.ui-widget table td.wikieditor-toolbar-table-preview-wrapper {
- background: #e5e5e5;
- padding: 10px;
-}
diff --git a/modules/jquery.wikiEditor.toolbar.less
b/modules/jquery.wikiEditor.toolbar.less
new file mode 100644
index 0000000..0ef9c10
--- /dev/null
+++ b/modules/jquery.wikiEditor.toolbar.less
@@ -0,0 +1,407 @@
+@import "mediawiki.mixins";
+
+/**
+ * CSS for WikiEditor Toolbar jQuery plugin
+ */
+
+.wikiEditor-ui-toolbar {
+ position: relative;
+ display: block;
+ .background-image('images/toolbar/base.png');
+ background-position: left top;
+ background-repeat: repeat-x;
+
+ .empty {
+ display: none;
+ }
+
+ /* Expandable Sections */
+ .sections {
+ float: left;
+ width: 100%;
+ clear: both;
+ height: 0;
+
+ .section {
+ float: left;
+ width: 100%;
+ border-top: 1px solid #DDDDDD;
+ background-color: #E0EEF7;
+ }
+
+ .section-hidden {
+ display: none;
+ }
+
+ /* Gets overridden when the section div is in class loading -
see below */
+ div {
+ .spinner {
+ display: none;
+ }
+ }
+
+ .loading {
+ .spinner {
+ display: block;
+ float: left;
+ .background-image('images/toolbar/loading.gif');
+ background-position: left center;
+ background-repeat: no-repeat;
+ padding-left: 32px;
+ margin-left: 0.5em;
+ height: 32px;
+ color: #666666;
+ }
+ }
+
+ /* Groups */
+ .group {
+ float: left;
+ height: 26px;
+ padding-right: 6px;
+ border-right: 1px solid #DDDDDD;
+ margin: 3px;
+
+ /* Toolbar */
+ .label {
+ float: left;
+ border: 0;
+ height: 22px;
+ line-height: 22px;
+ margin: 2px;
+ margin-left: 5px;
+ margin-right: 8px;
+ color: #777777;
+ cursor: default;
+ }
+
+ img.tool {
+ float: left;
+ border: 0;
+ height: 22px;
+ width: 22px;
+ padding: 2px;
+ cursor: pointer;
+ }
+
+ .tool-select {
+ float: left;
+ margin: 2px;
+ height: 22px;
+ cursor: pointer;
+ border: 1px solid silver;
+ padding: 0;
+ margin-right: 0;
+ cursor: pointer;
+ background-color: #ffffff;
+
+ .label {
+
.background-image('images/toolbar/arrow-down.png');
+ background-position: center right;
+ background-repeat: no-repeat;
+ padding: 0;
+ margin: 0;
+ padding-left: 4px;
+ padding-right: 22px;
+ margin-right: 4px;
+ cursor: pointer;
+ text-decoration: none;
+ color: #333333;
+ }
+
+ .menu {
+ .options {
+ position: absolute;
+ display: none;
+ margin-left: -1px;
+ margin-top: 22px;
+ border: 1px solid silver;
+ background-color: #ffffff;
+ }
+ }
+
+ .options {
+ .option {
+ display: block;
+ padding: 0.5em;
+ text-decoration: none;
+ color: black;
+ white-space: nowrap;
+
+ &:hover {
+ background-color: #E0EEf7;
+ }
+
+ &[rel=heading-2] {
+ font-size: 150%;
+ font-weight: normal;
+ }
+
+ &[rel=heading-3] {
+ font-size: 132%;
+ font-weight: normal;
+ }
+
+ &[rel=heading-4] {
+ font-size: 116%;
+ font-weight: normal;
+ }
+
+ &[rel=heading-5] {
+ font-size: 100%;
+ font-weight: bold;
+ }
+ }
+ }
+ }
+ }
+
+ .group-search {
+ float: right;
+ padding: 0 0 0 6px;
+ border-right: none;
+ border-left: 1px solid #DDDDDD;
+ }
+
+ .group-insert {
+ border-right: none;
+ }
+
+ /* Tabs */
+ .tabs {
+ list-style: none;
+ margin: 3px;
+
+ span.tab {
+ display: block;
+ float: left;
+ line-height: 26px;
+
+ a.current:hover {
+ text-decoration: none;
+ }
+
+ a.loading {
+
.background-image('images/toolbar/loading-small.gif');
+ }
+ }
+ }
+
+ /* Booklet */
+ .booklet {
+ .index {
+ float: left;
+ width: 20%;
+ height: 125px;
+ overflow: auto;
+ resize: horizontal;
+
+ div {
+ padding: 4px;
+ padding-left: 6px;
+ cursor: pointer;
+ color: #0645ad;
+ }
+
+ .current {
+ background-color: #FAFAFA;
+ color: #333333;
+ cursor: default;
+ }
+ }
+
+ .pages {
+ float: right;
+ width: 80%;
+ height: 125px;
+ overflow: auto;
+ background-color: #FAFAFA;
+ }
+ }
+
+ /* Help Pages */
+ .page-table {
+ padding-left: 5px;
+ padding-right: 5px;
+
+ table {
+ background: none;
+ border-collapse: collapse;
+ width: 100%;
+ }
+
+ th {
+ color: #999999;
+ }
+
+ td {
+ color: black;
+ border-top: 1px solid #EEEEEE;
+ }
+ }
+
+ .section-help {
+ .page-table {
+ .cell {
+ vertical-align: top;
+ }
+ }
+ }
+
+ /* Characters Pages */
+ .page-characters {
+ div {
+ span {
+ border: 1px solid #DDDDDD;
+ padding: 5px;
+ padding-left: 8px;
+ padding-right: 8px;
+ margin-left: 5px;
+ margin-top: 5px;
+ height: 1em;
+ float: left;
+ display: block;
+ color: black;
+ text-decoration: none;
+ cursor: pointer;
+ font-family: monospace, Courier;
+ font-size: 1.25em;
+ line-height: 1;
+
+ &:hover {
+ background-color: white;
+ text-decoration: none;
+ border-color: #a8d7f9;
+ }
+ }
+ }
+
+ div[dir=rtl] {
+ span {
+ /* @noflip */
+ direction: rtl;
+ }
+ }
+ }
+}
+
+/* T33649 */
+.wikiEditor-ui-toolbar {
+ .section-help {
+ .page-table {
+ td.cell-description {
+ width: 20%;
+ }
+
+ td.cell-syntax {
+ font-family: monospace, Courier;
+ }
+
+ td.cell-syntax {
+ td.cell-result {
+ width: 40%;
+ }
+ }
+
+ .table-link {
+ td.cell-syntax {
+ white-space: pre;
+ }
+ }
+ }
+ }
+
+ /* Top Level Containers */
+ .tabs {
+ .section-main {
+ position: relative;
+ float: left;
+ min-height: 26px;
+ height: 100%;
+ }
+ }
+}
+
+/* Sprited Buttons */
+.wikiEditor-toolbar-spritedButton {
+ .background-image('images/toolbar/button-sprite.png');
+ background-position: 0 0;
+ background-repeat: no-repeat;
+ display: block;
+ float: left;
+ height: 22px;
+ text-indent: -9999px;
+ width: 22px;
+ padding: 2px;
+ cursor: pointer;
+ overflow: hidden;
+}
+
+.wikiEditor-ui-toolbar {
+ .tabs {
+ span.tab {
+ a {
+ &:visited {
+ display: inline-block;
+ float: left;
+ padding-left: 18px;
+ padding-right: 12px;
+ height: 26px;
+ cursor: pointer;
+ color: #0645ad;
+
.background-image('images/toolbar/arrow-ltr.png');
+ background-position: left center;
+ background-repeat: no-repeat;
+ }
+
+ &.current {
+ &:visited {
+ color: #333333;
+
.background-image('images/toolbar/arrow-down.png');
+ }
+ }
+ }
+ }
+ }
+
+ .page-table {
+ th {
+ td {
+ text-align: left;
+ padding: 5px;
+ margin: 0;
+ }
+ }
+ }
+}
+
+.ui-widget {
+ table {
+ td.wikieditor-toolbar-table-preview-wrapper {
+ background: #e5e5e5;
+ padding: 10px;
+ span {
+ padding: 4px 6px 0;
+ display: block;
+ }
+ }
+
+ .wikieditor-toolbar-table-preview-frame {
+ width: 340px;
+ background: #fff;
+ padding: 10px;
+ overflow: hidden;
+ display: block;
+ position: relative;
+ }
+
+ .wikieditor-toolbar-table-preview-content {
+ width: 375px;
+ display: block;
+ }
+
+ .wikieditor-toolbar-table-preview {
+ width: 340px;
+ }
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/190240
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I432b217ba6059ce727698aba6ee70bdaa8e7cf89
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
