jenkins-bot has submitted this change and it was merged.
Change subject: [BREAKING CHANGE] Remove deprecated Minerva theme
......................................................................
[BREAKING CHANGE] Remove deprecated Minerva theme
Downstream users should switch to the MediaWiki theme instead for a more
thorough implementation of the same styling concepts.
Change-Id: I21015c5bff6d8170e86286678333be50eebd0ce2
---
M Gruntfile.js
M build/modules.json
M demos/demo.js
M demos/index.html
D src/themes/minerva/MinervaTheme.js
D src/themes/minerva/common.less
D src/themes/minerva/core.less
D src/themes/minerva/elements.less
D src/themes/minerva/images.json
D src/themes/minerva/images.less
D src/themes/minerva/images/icons/check.svg
D src/themes/minerva/layouts.less
D src/themes/minerva/tools.less
D src/themes/minerva/widgets.less
D src/themes/minerva/windows.less
15 files changed, 1 insertion(+), 1,007 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Gruntfile.js b/Gruntfile.js
index 34732c4..41669ce 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -24,7 +24,6 @@
var modules = grunt.file.readJSON( 'build/modules.json' ),
styleTargets = {
'oojs-ui-apex': modules['oojs-ui-apex'].styles,
- 'oojs-ui-minerva': modules['oojs-ui-minerva'].styles,
'oojs-ui-mediawiki': modules['oojs-ui-mediawiki'].styles
},
lessFiles = {
@@ -91,8 +90,6 @@
src: modules['oojs-ui'].scripts.concat(
originalLessFiles['dist/oojs-ui-apex.css'],
originalLessFiles['dist/oojs-ui-apex.svg.css'],
- originalLessFiles['dist/oojs-ui-minerva.css'],
-
originalLessFiles['dist/oojs-ui-minerva.svg.css'],
originalLessFiles['dist/oojs-ui-mediawiki.css'],
originalLessFiles['dist/oojs-ui-mediawiki.svg.css']
)
@@ -105,7 +102,6 @@
files: {
'dist/oojs-ui.js':
modules['oojs-ui'].scripts,
'dist/oojs-ui-apex.js':
modules['oojs-ui-apex'].scripts,
- 'dist/oojs-ui-minerva.js':
modules['oojs-ui-minerva'].scripts,
'dist/oojs-ui-mediawiki.js':
modules['oojs-ui-mediawiki'].scripts
}
},
@@ -170,11 +166,6 @@
strip: 'src/themes/apex/images',
dest: 'dist/themes/apex/images'
},
- imagesMinerva: {
- src: 'src/themes/minerva/images/**/*.{png,gif}',
- strip: 'src/themes/minerva/images',
- dest: 'dist/themes/minerva/images'
- },
imagesMediaWiki: {
src:
'src/themes/mediawiki/images/**/*.{png,gif}',
strip: 'src/themes/mediawiki/images',
@@ -203,14 +194,6 @@
),
srcDir: 'src/themes/apex/images',
destDir: 'dist/tmp/themes/apex/images'
- },
- minerva: {
- options: merge(
- grunt.file.readJSON(
'build/images.json' ),
- grunt.file.readJSON(
'src/themes/minerva/images.json' )
- ),
- srcDir: 'src/themes/minerva/images',
- destDir: 'dist/tmp/themes/minerva/images'
},
mediawiki: {
options: merge(
@@ -340,7 +323,7 @@
grunt.registerTask( 'build-code', [ 'concat:js', 'uglify' ] );
grunt.registerTask( 'build-styling', [
'copy:lessTemp', 'colorizeSvg', 'less', 'copy:svg',
- 'copy:imagesApex', 'copy:imagesMinerva',
'copy:imagesMediaWiki', 'svg2png',
+ 'copy:imagesApex', 'copy:imagesMediaWiki', 'svg2png',
'concat:css', 'cssjanus', 'csscomb', 'cssmin'
] );
grunt.registerTask( 'build-i18n', [ 'copy:i18n' ] );
diff --git a/build/modules.json b/build/modules.json
index e9b2dbf..ca68cc0 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -98,15 +98,6 @@
"src/themes/apex/images.less"
]
},
- "oojs-ui-minerva": {
- "scripts": [
- "src/themes/minerva/MinervaTheme.js"
- ],
- "styles": [
- "src/themes/minerva/core.less",
- "src/themes/minerva/images.less"
- ]
- },
"oojs-ui-mediawiki": {
"scripts": [
"src/themes/mediawiki/MediaWikiTheme.js"
diff --git a/demos/demo.js b/demos/demo.js
index fc21735..a1a23b1 100644
--- a/demos/demo.js
+++ b/demos/demo.js
@@ -29,7 +29,6 @@
this.pageMenuMenu = this.pageMenu.getMenu();
this.themeSelect = new OO.ui.ButtonSelectWidget( { $: this.$ }
).addItems( [
new OO.ui.ButtonOptionWidget( 'apex', { $: this.$, label:
'Apex' } ),
- new OO.ui.ButtonOptionWidget( 'minerva', { $: this.$, label:
'Minerva' } ),
new OO.ui.ButtonOptionWidget( 'mediawiki', { $: this.$, label:
'MediaWiki' } )
] );
this.graphicsSelect = new OO.ui.ButtonSelectWidget( { $: this.$ }
).addItems( [
@@ -103,10 +102,6 @@
mediawiki: {
fileSuffix: '-mediawiki',
theme: OO.ui.MediaWikiTheme || OO.ui.Theme
- },
- minerva: {
- fileSuffix: '-minerva',
- theme: OO.ui.MinervaTheme || OO.ui.Theme
}
};
diff --git a/demos/index.html b/demos/index.html
index e5865e1..fc280b2 100644
--- a/demos/index.html
+++ b/demos/index.html
@@ -12,7 +12,6 @@
<script src="../dist/oojs-ui.js"></script>
<script src="../dist/oojs-ui-apex.js"></script>
<script src="../dist/oojs-ui-mediawiki.js"></script>
- <script src="../dist/oojs-ui-minerva.js"></script>
<script src="demo.js"></script>
<script src="pages/dialogs.js"></script>
<script src="pages/icons.js"></script>
diff --git a/src/themes/minerva/MinervaTheme.js
b/src/themes/minerva/MinervaTheme.js
deleted file mode 100644
index ac58a4a..0000000
--- a/src/themes/minerva/MinervaTheme.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/* Instantiation */
-
-OO.ui.theme = new OO.ui.Theme();
diff --git a/src/themes/minerva/common.less b/src/themes/minerva/common.less
deleted file mode 100644
index 5760689..0000000
--- a/src/themes/minerva/common.less
+++ /dev/null
@@ -1,23 +0,0 @@
-// Base variables and mixins
-@import '../../styles/common';
-
-// Theme variables
-
-@oo-ui-default-image-path: 'themes/minerva/images';
-
-@color-progressive: #347BFF;
-@color-destructive: #D11D13;
-@color-white: #FFF;
-@color-shadow: #DDD;
-@color-neutral: #777;
-@window-header-height: 3.35em;
-
-// (add variables here)
-
-// Theme mixins
-
-.icon () {
- width: @window-header-height;
- height: @window-header-height;
- background-size: 2em auto;
-}
diff --git a/src/themes/minerva/core.less b/src/themes/minerva/core.less
deleted file mode 100644
index 1c83a94..0000000
--- a/src/themes/minerva/core.less
+++ /dev/null
@@ -1,12 +0,0 @@
-// Base and theme variables and mixins
-@import 'common';
-
-// Theme rules
-@import 'elements';
-@import 'layouts';
-@import 'tools';
-@import 'widgets';
-@import 'windows';
-
-// Base rules
-@import '../../styles/core';
diff --git a/src/themes/minerva/elements.less b/src/themes/minerva/elements.less
deleted file mode 100644
index b4b9d12..0000000
--- a/src/themes/minerva/elements.less
+++ /dev/null
@@ -1,46 +0,0 @@
-@import 'common';
-
-.theme-oo-ui-buttonElement () {
- > .oo-ui-buttonElement-button {
- > .oo-ui-iconElement-icon {
- margin-left: 0;
- }
-
- > .oo-ui-indicatorElement-indicator {
- margin-right: -0.75em;
- }
- }
-
- &.oo-ui-indicatorElement .oo-ui-buttonElement-button >
.oo-ui-indicatorElement-indicator,
- &.oo-ui-iconElement .oo-ui-buttonElement-button >
.oo-ui-iconElement-icon {
- .icon();
- }
-
- &-frameless {
- > .oo-ui-buttonElement-button > .oo-ui-labelElement-label {
- margin-left: 0.25em;
- }
- }
-
- &-framed {
- > .oo-ui-buttonElement-button > .oo-ui-labelElement-label {
- line-height: 1.9em;
- }
- }
-}
-
-.theme-oo-ui-clippableElement () {}
-
-.theme-oo-ui-flaggedElement () {}
-
-.theme-oo-ui-groupElement () {}
-
-.theme-oo-ui-iconElement () {}
-
-.theme-oo-ui-indicatorElement () {}
-
-.theme-oo-ui-labelElement () {}
-
-.theme-oo-ui-popupElement () {}
-
-.theme-oo-ui-titledElement () {}
diff --git a/src/themes/minerva/images.json b/src/themes/minerva/images.json
deleted file mode 100644
index 1f8772d..0000000
--- a/src/themes/minerva/images.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "variants": {
- "icons": {
- "invert": {
- "color": "#FFFFFF"
- }
- }
- },
- "images": {
- "icons": {
- "check": {
- "file": "check.svg",
- "variants": [ "invert" ]
- }
- },
- "indicators": {},
- "textures": {}
- }
-}
diff --git a/src/themes/minerva/images.less b/src/themes/minerva/images.less
deleted file mode 100644
index a62a5b3..0000000
--- a/src/themes/minerva/images.less
+++ /dev/null
@@ -1,6 +0,0 @@
-@import 'common';
-
-// These files are generated from images.json during the build
-@import 'images/icons/icons';
-@import 'images/indicators/indicators';
-@import 'images/textures/textures';
diff --git a/src/themes/minerva/images/icons/check.svg
b/src/themes/minerva/images/icons/check.svg
deleted file mode 100644
index 248c636..0000000
--- a/src/themes/minerva/images/icons/check.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg"; width="44" height="44" viewBox="0, 0,
44, 44">
- <g id="check">
- <path id="mark" d="M41.634,12.619 L15.347,37.121 L15.163,36.923
L9.999,31.386 L2.364,23.201 L8.019,17.924 L15.655,26.119 L36.281,6.879 z"/>
- </g>
-</svg>
diff --git a/src/themes/minerva/layouts.less b/src/themes/minerva/layouts.less
deleted file mode 100644
index 93f5451..0000000
--- a/src/themes/minerva/layouts.less
+++ /dev/null
@@ -1,95 +0,0 @@
-@import 'common';
-
-.theme-oo-ui-layout () {}
-
-.theme-oo-ui-bookletLayout () {
- &-stackLayout {
- .oo-ui-panelLayout {
- padding: 0 0 1em;
- }
- }
-}
-
-.theme-oo-ui-fieldLayout () {
- margin-bottom: 1em;
-
- &:last-child {
- margin-bottom: 0;
- }
-
- &.oo-ui-fieldLayout-align-left,
- &.oo-ui-fieldLayout-align-right {
- > .oo-ui-labelElement-label {
- padding-top: 0.5em;
- margin-right: 5%;
- width: 35%;
- }
-
- > .oo-ui-fieldLayout-field {
- width: 60%;
- }
- }
-
- &.oo-ui-fieldLayout-align-inline {
- > .oo-ui-labelElement-label {
- padding: 0.75em 0.5em 0.5em 0.5em;
- }
-
- > .oo-ui-fieldLayout-field {
- padding: 0.5em 0;
- }
- }
-
- &.oo-ui-fieldLayout-align-top > .oo-ui-labelElement-label {
- padding: 0.5em 0;
- }
-
- > .oo-ui-popupButtonWidget {
- > .oo-ui-buttonElement-button > .oo-ui-iconElement-icon {
- margin-top: 0.25em;
- }
- }
-
- &-disabled .oo-ui-labelElement-label {
- color: #ccc;
- }
-}
-
-.theme-oo-ui-fieldsetLayout () {
- margin: 0;
- padding: 0;
-
- + .oo-ui-fieldsetLayout {
- margin-top: 2em;
- }
-
- > .oo-ui-labelElement-label {
- margin-bottom: 0.5em;
- padding: 0.25em 0;
- }
-
- &.oo-ui-iconElement > .oo-ui-labelElement-label {
- padding-left: 1.75em;
- line-height: 1.33em;
- }
-
- &.oo-ui-iconElement > .oo-ui-iconElement-icon {
- left: 0;
- top: 0.25em;
- width: 2em;
- height: 2em;
- }
-}
-
-.theme-oo-ui-formLayout () {}
-
-.theme-oo-ui-gridLayout () {}
-
-.theme-oo-ui-panelLayout () {
- padding: 1em 3.35em;
-}
-
-.theme-oo-ui-pageLayout () {}
-
-.theme-oo-ui-stackLayout () {}
-
diff --git a/src/themes/minerva/tools.less b/src/themes/minerva/tools.less
deleted file mode 100644
index c41dd1f..0000000
--- a/src/themes/minerva/tools.less
+++ /dev/null
@@ -1,137 +0,0 @@
-@import 'common';
-
-.theme-oo-ui-toolbar () {
- &-bar {
- border-bottom: solid 1px @color-shadow;
- background: white;
-
- .oo-ui-toolbar-bar {
- border: none;
- background: none;
- }
- }
-
-}
-
-.theme-oo-ui-tool () {}
-
-.theme-oo-ui-popupTool () {
- .oo-ui-popupWidget {
- margin-left: 1.25em;
- font-size: 0.8em;
- }
-}
-
-.theme-oo-ui-toolGroup () {
- margin: 0.3em;
-}
-
-.theme-oo-ui-barToolGroup () {
- .oo-ui-tool {
- &-link {
- height: 1.5em;
- padding: 0.25em;
-
- .oo-ui-iconElement-icon {
- height: 1.5em;
- width: 1.5em;
- }
- }
- }
-}
-
-.theme-oo-ui-popupToolGroup () {
- height: 2em;
- min-width: 2.5em;
-
- &.oo-ui-indicatorElement.oo-ui-iconElement {
- min-width: 3.5em;
- }
-
- &-handle {
- .oo-ui-indicatorElement-indicator,
- .oo-ui-iconElement-icon {
- top: 0;
- width: 2em;
- height: 2em;
- }
-
- .oo-ui-indicatorElement-indicator {
- right: 0;
- }
-
- .oo-ui-iconElement-icon {
- left: 0.25em;
- }
-
- .oo-ui-labelElement-label {
- line-height: 2.6em;
- font-size: 0.8em;
- margin: 0 1em;
- }
- }
-
- &-header {
- line-height: 2.6em;
- font-size: 0.8em;
- margin: 0 0.6em;
- font-weight: bold;
- }
-
- &.oo-ui-iconElement .oo-ui-popupToolGroup-handle
.oo-ui-labelElement-label {
- margin-left: 3em;
- }
-
- &.oo-ui-indicatorElement .oo-ui-popupToolGroup-handle
.oo-ui-labelElement-label {
- margin-right: 2.25em;
- }
-
- .oo-ui-toolGroup-tools {
- top: 2.3em;
- margin: 0 -1px;
- border: solid 1px @color-shadow;
- background-color: white;
- }
-
- .oo-ui-tool-link {
- .oo-ui-iconElement-icon {
- height: 2em;
- width: 2em;
- margin-right: 0.25em;
- }
-
- .oo-ui-tool-title {
- line-height: 2em;
- font-size: 0.8em;
- }
- }
-}
-
-.theme-oo-ui-listToolGroup () {
- .oo-ui-toolGroup-tools {
- padding: 0.25em;
- }
-
- .oo-ui-tool {
- &-link {
- padding-right: 0.5em;
- }
- }
-}
-
-.theme-oo-ui-menuToolGroup () {
- .oo-ui-popupToolGroup-handle {
- min-width: 8em;
- }
-
- .oo-ui-toolGroup-tools {
- padding: 0.25em 0 0.25em 0;
- }
-
- .oo-ui-tool {
- &-link {
- padding: 0 1em 0 0.25em;
- }
- }
-}
-
diff --git a/src/themes/minerva/widgets.less b/src/themes/minerva/widgets.less
deleted file mode 100644
index 543be32..0000000
--- a/src/themes/minerva/widgets.less
+++ /dev/null
@@ -1,328 +0,0 @@
-@import 'common';
-
-.theme-oo-ui-widget () {}
-
-.theme-oo-ui-lookupInputWidget () {
- &-menu {
- background-color: #fff;
- }
-}
-
-.theme-oo-ui-outlineControlsWidget () {
- height: 3em;
-
- &-items,
- &-movers {
- height: 2em;
- margin: 0.5em;
- padding: 0;
- }
-
- > .oo-ui-iconElement-icon {
- width: 1.5em;
- height: 2em;
- margin: 0.5em 0 0.5em 0.5em;
- }
-
- &-items {
- margin-left: 0;
- }
-}
-
-.theme-oo-ui-toggleWidget () {}
-
-.theme-oo-ui-buttonGroupWidget () {
- border-radius: 0.3em;
-
- .oo-ui-buttonElement-framed {
- .oo-ui-buttonElement-button {
- border-radius: 0;
- margin-bottom: -1px;
- margin-left: -1px;
- }
-
- &:first-child .oo-ui-buttonElement-button {
- border-bottom-left-radius: 0.3em;
- border-top-left-radius: 0.3em;
- margin-left: 0;
- }
-
- &:last-child .oo-ui-buttonElement-button {
- border-bottom-right-radius: 0.3em;
- border-top-right-radius: 0.3em;
- }
- }
-}
-
-.theme-oo-ui-buttonWidget () {}
-
-.theme-oo-ui-actionWidget () {}
-
-.theme-oo-ui-popupButtonWidget () {}
-
-.theme-oo-ui-toggleButtonWidget () {}
-
-.theme-oo-ui-iconWidget () {
- line-height: 2.5em;
- height: 1.9em;
- width: 1.9em;
- opacity: 0.8;
-
- &.oo-ui-widget-disabled {
- opacity: 0.2;
- }
-}
-
-.theme-oo-ui-indicatorWidget () {
- line-height: 2.5em;
- height: 1.9em;
- width: 1.9em;
- opacity: 0.8;
-
- &.oo-ui-widget-disabled {
- opacity: 0.2;
- }
-}
-
-.theme-oo-ui-inlineMenuWidget () {
- margin: 0.25em 0;
- min-width: 20em;
-
- &-handle {
- height: 2.5em;
-
- .oo-ui-indicatorElement-indicator,
- .oo-ui-iconElement-icon {
- top: 0;
- width: 2.5em;
- height: 2.5em;
- }
-
- .oo-ui-indicatorElement-indicator {
- right: 0;
- }
-
- .oo-ui-iconElement-icon {
- left: 0.25em;
- }
-
- .oo-ui-labelElement-label {
- line-height: 2.5em;
- margin: 0 0.5em;
- }
-
- }
-
- &.oo-ui-iconElement .oo-ui-inlineMenuWidget-handle
.oo-ui-labelElement-label {
- margin-left: 3em;
- }
-
- &.oo-ui-indicatorElement .oo-ui-inlineMenuWidget-handle
.oo-ui-labelElement-label {
- margin-right: 2em;
- }
-}
-
-.theme-oo-ui-inputWidget () {}
-
-.theme-oo-ui-checkboxInputWidget () {}
-
-.theme-oo-ui-textInputWidget () {
- input,
- textarea {
- padding: .8em 1em;
- }
-}
-
-.theme-oo-ui-comboBoxWidget () {
- > .oo-ui-selectWidget {
- min-width: 20em;
- }
-}
-
-.theme-oo-ui-labelWidget () {
- padding: 0.5em 0;
-}
-
-.theme-oo-ui-optionWidget () {
- padding: 0.8em 1em 0.8em @window-header-height;
- border: none;
- font-weight: bold;
-
- .oo-ui-labelElement-label {
- line-height: 1.5em;
- }
-
- &.oo-ui-indicatorElement .oo-ui-labelElement-label {
- padding-right: 1.5em;
- }
-
- &-level-0 {
- padding-left: 3.5em;
-
- .oo-ui-iconElement-icon {
- left: 1em;
- }
- }
- &-level-1 {
- padding-left: 5em;
-
- .oo-ui-iconElement-icon {
- left: 2.5em;
- }
- }
-
- &-level-2 {
- padding-left: 6.5em;
-
- .oo-ui-iconElement-icon {
- left: 4em;
- }
- }
-}
-
-.theme-oo-ui-decoratedOptionWidget () {
- .oo-ui-iconElement-icon,
- .oo-ui-indicatorElement-indicator {
- top: 50%;
- width: 2em;
- height: 2em;
- margin-top: -1em;
- }
-
- .oo-ui-iconElement-icon {
- left: 0.5em;
- }
-
- .oo-ui-indicatorElement-indicator {
- right: 0.5em;
- }
-}
-
-.theme-oo-ui-buttonOptionWidget () {
- padding: 0;
- background-color: transparent;
-
- .oo-ui-buttonElement-button {
- height: 1.9em;
- }
-
- &.oo-ui-iconElement .oo-ui-iconElement-icon,
- &.oo-ui-indicatorElement .oo-ui-indicatorElement-indicator {
- height: 1.9em;
- margin-top: 0;
- }
-}
-
-.theme-oo-ui-menuItemWidget () {
- &.oo-ui-optionWidget-selected {
- background: @color-progressive;
- color: @color-white;
- }
-
- .oo-ui-iconElement-icon {
- background-size: 24px auto;
- }
-}
-
-.theme-oo-ui-menuSectionItemWidget () {
- font-weight: normal;
- color: @color-neutral;
- border: none;
-}
-
-.theme-oo-ui-outlineItemWidget () {
- padding: 0.75em;
-}
-
-.theme-oo-ui-popupWidget () {
- &-anchored {
- .oo-ui-popupWidget-popup {
- margin-top: 7px;
- }
- }
-
- &-head {
- height: 2.5em;
-
- .oo-ui-buttonWidget {
- margin: 0.25em;
- }
-
- .oo-ui-labelElement-label {
- margin: 0.75em 1em;
- }
- }
-
- &-body-padded {
- padding: 0 1em;
- }
-}
-
-.theme-oo-ui-searchWidget () {
- &-query {
- height: 4em;
- padding: 0 1em;
-
- .oo-ui-textInputWidget {
- margin: 0.75em 0;
- }
- }
-
- &-results {
- top: 4em;
- padding: 1em;
- line-height: 0;
- }
-}
-
-.theme-oo-ui-selectWidget () {
- margin: 0;
- padding: 0;
-}
-
-.theme-oo-ui-buttonSelectWidget () {}
-
-.theme-oo-ui-menuWidget () {
- background: white;
- border: solid 1px @color-shadow;
-}
-
-.theme-oo-ui-textInputMenuWidget () {}
-
-.theme-oo-ui-outlineWidget () {}
-
-.theme-oo-ui-toggleSwitchWidget () {
- @travelDistance: 2em;
-
- height: 2em;
- width: @travelDistance + 2em;
-
- &-grip {
- top: 0.25em;
- left: 0.25em;
- width: 1.5em;
- height: 1.5em;
- margin-top: -1px;
-
- .oo-ui-transition(left 200ms ease-in-out, margin-left 200ms
ease-in-out);
- }
-
- .oo-ui-toggleSwitchWidget-glow {
- .oo-ui-transition(opacity 200ms ease-in-out);
- }
-
- .oo-ui-toggleWidget-on & {
- &-grip {
- left: @travelDistance + 0.25em;
- margin-left: -2px;
- }
- }
-
- .oo-ui-toggleWidget-off & {
- &-grip {
- left: 0.25em;
- margin-left: 0;
- }
- }
-}
-
diff --git a/src/themes/minerva/windows.less b/src/themes/minerva/windows.less
deleted file mode 100644
index 33fdc4d..0000000
--- a/src/themes/minerva/windows.less
+++ /dev/null
@@ -1,299 +0,0 @@
-@import 'common';
-
-@window-header-inner-height: @window-header-height - 1.5em;
-
-.theme-oo-ui-window () {}
-
-.theme-oo-ui-dialog () {}
-
-.theme-oo-ui-messageDialog () {
- &-title,
- &-message {
- display: block;
- text-align: center;
- padding-top: 0.5em;
- }
-
- &-title {
- font-size: 1.5em;
- line-height: 1em;
- color: #000;
- }
-
- &-message {
- font-size: 0.9em;
- line-height: 1.25em;
- color: #666;
-
- &-verbose {
- font-size: 1.1em;
- line-height: 1.5em;
- text-align: left;
- }
- }
-
- &-actions {
- &-horizontal {
- .oo-ui-actionWidget {
- border-right: solid 1px #e5e5e5;
-
- &:last-child {
- border-right-width: 0;
- }
- }
- }
-
- &-vertical {
- .oo-ui-actionWidget {
- border-bottom: solid 1px #e5e5e5;
-
- &:last-child {
- border-bottom-width: 0;
- }
- }
- }
-
- .oo-ui-actionWidget {
- .oo-ui-labelElement-label {
- text-align: center;
- line-height: 3.4em;
- padding: 0 2em;
- }
-
- &:hover {
- background-color: rgba(0,0,0,0.05);
- }
-
- &:active {
- background-color: rgba(0,0,0,0.1);
- }
-
- &.oo-ui-flaggedElement {
- &-primary {
- &:hover {
- background-color:
rgba(8,126,204,0.05);
- }
-
- &:active {
- background-color:
rgba(8,126,204,0.1);
- }
-
- .oo-ui-labelElement-label {
- font-weight: bold;
- }
- }
-
- &-constructive {
- &:hover {
- background-color:
rgba(118,171,54,0.05);
- }
-
- &:active {
- background-color:
rgba(118,171,54,0.1);
- }
- }
-
- &-destructive {
- &:hover {
- background-color:
rgba(212,83,83,0.05);
- }
-
- &:active {
- background-color:
rgba(212,83,83,0.1);
- }
- }
- }
- }
- }
-}
-
-.theme-oo-ui-processDialog () {
- &-content {
- .oo-ui-window-head {
- height: @window-header-height;
- border-bottom: 1px solid @color-shadow;
- .oo-ui-box-sizing(border-box);
- }
- .oo-ui-window-body {
- top: @window-header-height;
- padding: 2em 0;
- }
- }
-
- &-navigation {
- position: relative;
- height: @window-header-height;
- padding: 0 1em;
- }
-
- &-location {
- padding: 0.75em 0;
- height: @window-header-inner-height;
- cursor: default;
- text-align: center;
- }
-
- &-title {
- font-weight: bold;
- line-height: @window-header-inner-height;
- }
-
- &-actions {
- &-safe,
- &-primary,
- &-other {
- .oo-ui-actionWidget {
- .oo-ui-buttonElement-button {
- padding: 0.35em 0.75em;
- min-width: @window-header-inner-height;
- min-height: @window-header-inner-height;
- border: 1px solid @color-shadow;
- border-radius: 4px;
- }
-
- .oo-ui-labelElement-label {
- line-height:
@window-header-inner-height;
- padding: 0 1em;
- font-weight: bold;
- color: @color-neutral;
- }
-
- .oo-ui-iconElement-icon {
- position: absolute;
- margin-top: -0.125em;
- }
-
- &.oo-ui-buttonElement-framed {
- .oo-ui-buttonElement-button {
- vertical-align: middle;
- }
- }
-
- &.oo-ui-flaggedElement {
- &-destructive {
- .oo-ui-buttonElement-button {
- border: 1px solid
transparent;
- }
-
- .oo-ui-labelElement-label {
- color:
@color-destructive;
- }
- }
- }
- }
- }
-
- &-safe,
- &-primary {
- .oo-ui-actionWidget {
- .oo-ui-buttonElement-button {
- padding: 0.75em 0.35em;
- border: none;
- border-radius: 0;
- }
-
- &.oo-ui-flaggedElement {
- &-primary {
- .oo-ui-buttonElement-button {
- background-color:
@color-progressive;
- }
-
- .oo-ui-labelElement-label {
- color: @color-white;
- }
- }
- }
- }
- }
-
- &-safe {
- .oo-ui-actionWidget.oo-ui-iconElement {
- .oo-ui-iconElement-icon {
- left: 0.5em;
- }
-
- .oo-ui-labelElement-label {
- padding-left: 2.25em;
- }
- }
- }
-
- &-primary {
- .oo-ui-actionWidget.oo-ui-iconElement {
- .oo-ui-iconElement-icon {
- right: 0.5em;
- }
-
- .oo-ui-labelElement-label {
- padding-right: 2.25em;
- }
- }
- }
-
- &-other {
- position: absolute;
- bottom: 1em;
- }
- }
-
- > .oo-ui-window-frame {
- min-height: 5em;
- }
-
- &-errors {
- background-color: rgba(255,255,255,0.9);
- padding: 3em 3em 1.5em 3em;
- text-align: center;
-
- .oo-ui-buttonWidget {
- margin: 2em 1em 2em 1em;
- }
-
- &-title {
- font-size: 1.5em;
- color: #000;
- margin-bottom: 2em;
- }
- }
-
- &-error {
- text-align: left;
- margin: 1em;
- padding: 1em;
- border: solid 1px #ff9e9e;
- background-color: #fff7f7;
- border-radius: 0.25em;
- }
-}
-
-.theme-oo-ui-windowManager () {
- &-modal > .oo-ui-dialog {
- background-color: rgba(255,255,255,0.5);
- opacity: 0;
-
- .oo-ui-transition(opacity 250ms ease-in-out);
-
- > .oo-ui-window-frame {
- top: 0;
- bottom: 0;
- background-color: #fff;
-
- .oo-ui-transform(translate3d(0,-200%,0));
- .oo-ui-transition(transform 250ms ease-in-out);
- }
-
- &.oo-ui-window-ready {
- opacity: 1;
-
- > .oo-ui-window-frame {
- .oo-ui-transform(translate3d(0,0,0));
- }
- }
- }
-
- &-modal&-floating > .oo-ui-dialog > .oo-ui-window-frame {
- border: solid 1px #ccc;
- border-radius: 0.5em;
- box-shadow: 0 0.2em 1em rgba(0, 0, 0, 0.3);
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/165761
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I21015c5bff6d8170e86286678333be50eebd0ce2
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
