diff --git a/notes b/notes deleted file mode 100644 index 34fc164..0000000 --- a/notes +++ /dev/null @@ -1,29 +0,0 @@ - -logo -site navigation -> wiki tools - -> listen -table of contents - - - -search -firstheading -page actions - edit etc -content -> references -related content - - - -personal tools -notifications - -page tools - protect etc -user tools -> all page tools - related, info etc - -> languages -> sister projects -categories diff --git a/resources/extensions/Echo.less b/resources/extensions/Echo.less index aa8b1dd..0f92e34 100644 --- a/resources/extensions/Echo.less +++ b/resources/extensions/Echo.less @@ -10,6 +10,7 @@ #personal-extra li { display: inline-block; } + #personal-extra { // Position and keep it from randomly overflowing massively for no apparent reason margin: 0.7em 0 -2em 0; @@ -20,6 +21,7 @@ margin: 0 -1em 0 0; padding: 0; } + li { margin: 0 0.75em 0 0; float: left; @@ -31,6 +33,7 @@ float: left; margin-left: -4.5em; } + .extension-icons { #p-search { margin-right: 21em; @@ -48,6 +51,7 @@ .extension-icons #p-search { margin-right: 11em; } + #personal-extra { margin-left: -2.5em; } @@ -58,6 +62,7 @@ #user-tools { width: auto; } + .color-middle { margin-right: @column-left-size + 2 * @content-padding + 4em; } @@ -68,6 +73,7 @@ .mw-echo-ui-notificationBadgeButtonPopupWidget { z-index: 2; } + #personal-extra { position: absolute; top: 0.9em; @@ -88,6 +94,7 @@ .oo-ui-popupWidget-anchored > .oo-ui-popupWidget-anchor { display: none; } + .mw-echo-ui-notificationBadgeButtonPopupWidget-popup { left: 0 !important; width: 100%; diff --git a/resources/extensions/VisualEditor.article.less b/resources/extensions/VisualEditor.article.less index ff36465..e093e9d 100644 --- a/resources/extensions/VisualEditor.article.less +++ b/resources/extensions/VisualEditor.article.less @@ -6,9 +6,11 @@ .background-image-svg( '../images/brackets-grey.svg', '../images/brackets-grey.png' ); margin-right: 1.25em; } + .mw-editsection a.mw-editsection-visualeditor { .background-image-svg( '../images/pencil-grey.svg', '../images/pencil-grey.png' ); } + .mw-editsection-divider { display: none; } @@ -17,6 +19,7 @@ #ca-ve-edit a { .background-image-svg( '../images/pencil-grey.svg', '../images/pencil-grey.png' ); } + #ca-edit a { .background-image-svg( '../images/brackets-grey.svg', '../images/brackets-grey.png' ); } diff --git a/resources/extensions/VisualEditor.core.less b/resources/extensions/VisualEditor.core.less index ba034cf..004c8e6 100644 --- a/resources/extensions/VisualEditor.core.less +++ b/resources/extensions/VisualEditor.core.less @@ -21,6 +21,7 @@ margin-left: -@content-padding; margin-right: -@content-padding; } + .ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface .ve-ce-documentNode, .ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface .ve-ui-surface-placeholder { padding-left: @content-padding; diff --git a/resources/forms.less b/resources/forms.less index 1859962..3218282 100644 --- a/resources/forms.less +++ b/resources/forms.less @@ -19,6 +19,7 @@ } } } + #preferences { margin: 0; clear: both; @@ -30,23 +31,28 @@ margin: 0; box-shadow: none; } + .mainLegend { display: none; } + .preferences-login { clear: both; margin-bottom: 1.5em; } + .mw-email-not-authenticated .mw-input, .mw-email-none .mw-input { display: block; padding: 0.25em 0.5em; } + input[ type='checkbox' ], input[ type='radio' ] { margin-left: 0; } } + .mw-prefs-buttons { margin-top: 1em; } @@ -69,19 +75,24 @@ fieldset { color: @blue-dark; } } + label { padding-left: 0.5em; } + .mw-input label { padding: 0; margin-right: 1em; } + .mw-label { padding-right: 0.5em; } + .mw-submit { padding-top: 2em; } + .htmlform-tip { font-size: 85%; color: @text; @@ -120,21 +131,26 @@ textarea, min-height: 30px; font-family: @fonts; } + select { padding: 0.25em; margin: 0.5em 0; } + input[ type='checkbox' ], input[ type='radio' ] { margin-left: 1em; min-height: 0; } + input[ type='checkbox' ] { border-radius: 2px; } + input[ type='radio' ] { border-radius: 8px; } + .mw-ui-button.mw-ui-progressive, .mw-ui-button.mw-ui-progressive:active, .mw-ui-button.mw-ui-progressive.mw-ui-checked, @@ -154,15 +170,12 @@ button { &:active { background-color: @grey-bright; } + &:hover { background-color: @grey-bright; } } -input[ type='submit' ], -input[ type='button' ], -button { - text-shadow: 0 -1px 0 @grey; -} + textarea { width: 100%; resize: vertical; @@ -170,9 +183,11 @@ textarea { line-height: 1.3em; font-family: @fonts-monospace; } + textarea#wpTextbox1 { border-color: @grey; } + div.editOptions { padding: 1.25em 1.75em; padding: 1em; @@ -183,10 +198,12 @@ div.editOptions { .mw-summary label { padding-left: 0; } + input#wpSummary { box-sizing: border-box; width: 100%; } + label { margin-right: 1.5em; } @@ -206,6 +223,7 @@ div.editOptions { .mw-templatesandbox-page label { padding: 0; } + #wpTemplateSandboxPreview { margin-left: 0.5em; } @@ -215,6 +233,7 @@ div.editOptions { #mw-watchlist-options hr { clear: both; } + .rcoptions #namespace, #mw-watchlist-options .namespaceselector { margin-right: 2em; @@ -225,6 +244,7 @@ div.editOptions { label { padding: 0 1em 0 0; } + input[ type='submit' ] { margin: 0 0 0 4em; } @@ -237,18 +257,22 @@ div.editOptions { float: right; margin: 0 0 0 4em; } + td.mw-label.mw-target-label { vertical-align: top; padding-top: 0.75em; } + input[ name='target' ] { float: left; } } + #showlinkedto { clear: left; float: left; } + label[ for='showlinkedto' ] { padding: 0.4em; float: left; diff --git a/resources/libraries/normalise.css b/resources/libraries/normalise.css index ad9ff8c..a09f7f7 100644 --- a/resources/libraries/normalise.css +++ b/resources/libraries/normalise.css @@ -94,6 +94,7 @@ a { abbr[title] { border-bottom: 1px dotted; } + @supports (text-decoration: underline dotted) { abbr[title] { border-bottom: none; diff --git a/resources/screen-common.less b/resources/screen-common.less index b6d3506..fb30e3e 100644 --- a/resources/screen-common.less +++ b/resources/screen-common.less @@ -7,6 +7,7 @@ body { margin: 0; padding: 0; } + body { font-family: @fonts; color: @text; @@ -24,12 +25,15 @@ body { position: relative; z-index: 0; } + #mw-content-container { background: @background2; } + .mw-body { word-wrap: break-word; } + #mw-footer-container { border-top: solid 1px @background-dark2; box-shadow: inset 0 7px 2px -4px rgba( 0, 0, 0, 0.1 ); @@ -47,6 +51,7 @@ body { text-align: center; margin: auto; } + .mw-wiki-logo { display: block; content: ''; @@ -56,6 +61,7 @@ body { background-position: center center; margin: 0.75em auto 0; } + #p-logo-text { width: @column-left-size; text-align: center; @@ -86,6 +92,7 @@ body { position: relative; border: solid 1px @grey; } + #searchInput { border: 0; margin: 0; @@ -96,6 +103,7 @@ body { width: 100%; min-height: 0; } + #searchButton, #mw-searchButton { position: absolute; @@ -119,20 +127,24 @@ body { border-bottom-width: @border; padding: 0.75em 2em; } + .suggestions-results { background-color: @background; border: 1px solid @grey; border-bottom-width: @border; } + .suggestions-result { color: @text; padding: 0.65em 2em 0.35em; } + .suggestions-result-current { background-color: @blue; color: @background; } } + div.suggestions { position: fixed; top: 2.75em !important; // Override js-provided value to account for fixed header @@ -152,11 +164,13 @@ div.suggestions { width: 0; z-index: 4; } + .pokey { top: 1.85em; right: 1px; display: none; } + .pokey:after { border-bottom-color: #fff; right: -10px; @@ -179,6 +193,7 @@ div.suggestions { list-style: none; padding: 0; } + .footer-icons { float: right; margin: 0 0 0 1em; @@ -187,10 +202,12 @@ div.suggestions { margin: 0 0 1em 0; } } + .footer-places li { display: inline; padding-right: 1em; } + #lastmod, #credits, #copyright { @@ -203,6 +220,7 @@ div.suggestions { #mw-content-container { border-bottom: solid 4px @green; } + #mw-page-header-links { div, ul, @@ -212,6 +230,7 @@ div.suggestions { margin: 0; padding: 0; } + li { margin: 0.25em 0 1em; border-bottom: solid 3px transparent; @@ -219,6 +238,7 @@ div.suggestions { &:hover { border-bottom-color: @grey; } + &.selected { border-bottom-color: @blue; @@ -228,6 +248,7 @@ div.suggestions { } } } + #p-namespaces { float: left; @@ -235,6 +256,7 @@ div.suggestions { margin-right: 1em; } } + #p-views, #p-more { float: right; @@ -248,6 +270,7 @@ div.suggestions { .ca-icon(); .background-image-svg( 'images/star.svg', 'images/star.png' ); } + #ca-unwatch a { .ca-icon(); .background-image-svg( 'images/star-filled.svg', 'images/star-filled.png' ); @@ -264,6 +287,7 @@ a { color: @blue-dark; } } + a.new, .new a { color: @red; @@ -273,6 +297,7 @@ a.new, color: @red-dark; } } + a.mw-selflink { color: inherit; font-weight: bold; @@ -290,19 +315,24 @@ a.mw-selflink { padding: 0.5em 0 0.25em 1.75em; } } + .mw-editsection-bracket { display: none; } + .visual-clear { clear: both; } + .mw-indicators { float: right; margin: 0.25em 0 0 1em; } + .mw-indicator { display: inline-block; } + /* Subtitle area * @see https://phabricator.wikimedia.org/T173951 */ @@ -351,6 +381,7 @@ pre, line-height: 1.25; margin: 1.5em 0 0.5em; } + form dt { margin: 0 0.5em 0 0; } @@ -437,24 +468,29 @@ ul { margin: 0 0 0.5em 0.5em; padding: 0 0 1em 1.5em; } + /* @noflip */ .tleft { margin: 0 0.5em 0.5em 0; padding: 0 1.5em 1em 0; } + .thumbinner { .box; padding: 0.75em; } + .thumbcaption { font-size: 95%; padding: 0.5em 1em; } + .thumbinner .thumbimage, .thumbborder { border: solid 1px @grey-bright; } + .mw-body li.gallerybox div.thumb { .box; padding: 0; @@ -470,14 +506,17 @@ ul#filetoc, margin: 1em 0; min-width: 15em; } + ul#filetoc { display: block; border: 0; } + .toc ul { margin: 1em 0 0; list-style: none; } + .mw-body .toc h2 { font-size: 1em; font-family: @fonts; @@ -485,14 +524,17 @@ ul#filetoc { display: inline; border-bottom-color: @grey; } + .toctoggle { color: @background3; } + // Remove brackets around the show/hide button of the TOC body :not( :checked ) > .toctogglespan:before, body :not( :checked ) > .toctogglespan:after { content: ''; } + .toctogglelabel { padding-left: 0; // Overwrite label { padding-left: 0.5em; } from forms.less margin-left: 0.5em; // Create new distance to the TOC title without increasing the focus ring @@ -501,12 +543,15 @@ body :not( :checked ) > .toctogglespan:after { .toc li:last-child { margin-bottom: 0.5em; } + .toclevel-1 { margin-bottom: 0.25em; } + .tocnumber { color: @grey-dark; } + .mw-changeslist-legend, .mw-body .mw-search-profile-tabs, .mw-body fieldset#mw-searchoptions, @@ -515,6 +560,7 @@ table.wikitable { color: @text; .box; } + .mw-body .mw-search-profile-tabs { padding: 0.5em; } @@ -537,12 +583,14 @@ table.wikitable > * > tr > th { .color-bar { width: 100%; } + .color-left { height: @color-height; background: @red-dark; width: 50%; float: left; } + .color-right { display: inline-block; height: @color-height; @@ -550,11 +598,13 @@ table.wikitable > * > tr > th { width: 50%; float: right; } + .color-middle-container { max-width: @content-width; margin: 0 auto -@color-height; position: relative; } + .color-middle { height: @color-height; background: @blue-dark; @@ -567,6 +617,7 @@ table.wikitable > * > tr > th { #mw-page-header-links .emptyPortlet { display: none; } + #p-lang.emptyPortlet { display: inherit; } diff --git a/resources/screen-desktop-mid.less b/resources/screen-desktop-mid.less index 7b0082a..07ba025 100644 --- a/resources/screen-desktop-mid.less +++ b/resources/screen-desktop-mid.less @@ -21,6 +21,7 @@ margin-left: -@column-left-size; width: 100%; } + #mw-content, #content-bottom-stuff { margin-left: @column-left-size; diff --git a/resources/screen-desktop-small.less b/resources/screen-desktop-small.less index 4b598d3..4a4a4ea 100644 --- a/resources/screen-desktop-small.less +++ b/resources/screen-desktop-small.less @@ -5,6 +5,7 @@ #mw-content-block { padding: 0; } + #mw-content { border-width: 0 0 1px; clear: both; @@ -23,6 +24,7 @@ display: inline-block; } } + .sidebar-inner, #p-logo { display: none !important; @@ -65,6 +67,7 @@ background: @background; width: 100%; } + #mw-header-nav-hack .color-bar { margin-top: 2.5em; // Height of expected menu header contents } @@ -77,10 +80,12 @@ .sidebar-chunk { margin: 0 1em 0 0; } + .sidebar-inner { .dropdown-menu( left ); } } + #mw-related-navigation { position: absolute; top: 3.1em; @@ -89,6 +94,7 @@ .sidebar-chunk { margin: 0 0 0 1em; } + .sidebar-inner { .dropdown-menu(); top: 2.95em !important; // to override mobile positioning @@ -100,6 +106,7 @@ #mw-header { padding: 0 2em; } + #p-logo-text a { padding-left: 0; text-align: left; @@ -117,9 +124,11 @@ h2 span { display: none; } + h2:after { margin-left: -0.65em; } + .dropdown { right: -1em; } @@ -128,6 +137,7 @@ #user-tools { width: 6em; } + #p-search { margin-right: 6em; } diff --git a/resources/screen-desktop.less b/resources/screen-desktop.less index 5d8486a..e2b7f31 100644 --- a/resources/screen-desktop.less +++ b/resources/screen-desktop.less @@ -12,6 +12,7 @@ padding: 0 1em; margin: auto; } + #mw-content-container { .background-image-svg( 'images/cat-grey.svg', 'images/cat-grey.png' ); background-repeat: no-repeat; @@ -37,18 +38,22 @@ min-height: @fixed-header-height; box-sizing: border-box; } + #p-logo-text { width: @column-left-size; float: left; } + #p-search { margin-left: @column-left-size; margin-right: @column-right-size; } + #user-tools { width: @column-right-size; float: right; } + #mw-header-nav-hack, #mw-header-hack { position: fixed; @@ -56,6 +61,7 @@ top: @fixed-header-height; box-shadow: 0 3px 3px 2px rgba( 0, 0, 0, 0.075 ), 0 0 2px rgba( 0, 0, 0, 0.2 ); } + #mw-header-nav-hack { display: none; } @@ -75,9 +81,11 @@ top: 2.95em; right: -2em; } + .pokey { top: 2.05em; } + h2 { margin: 0; padding: 0.7em 0 0 25px; @@ -97,6 +105,7 @@ word-wrap: break-word; } } + &:hover { .pokey, .dropdown { diff --git a/resources/screen-misc.less b/resources/screen-misc.less index b266673..195a4e6 100644 --- a/resources/screen-misc.less +++ b/resources/screen-misc.less @@ -8,6 +8,7 @@ .ts-inner { padding: 0 3em; } + .color-middle { margin-left: @column-left-size; margin-right: @column-right-size; @@ -19,6 +20,7 @@ .ts-inner { padding: 0 3em; } + .color-middle { margin-left: @column-left-size + 3em; margin-right: @column-right-size + 3em; @@ -33,6 +35,7 @@ a { padding-top: 0; } + a.long { padding-bottom: 0.2em; } diff --git a/resources/screen-mobile.less b/resources/screen-mobile.less index 93382fc..15aac87 100644 --- a/resources/screen-mobile.less +++ b/resources/screen-mobile.less @@ -5,12 +5,14 @@ #mw-footer { padding: 0 @content-padding; } + .color-middle { margin: auto; width: 34%; } .categories-bottom(); + #catlinks { padding-bottom: 2em; border-top: solid 3px @grey; @@ -65,9 +67,11 @@ h3 { margin: 0.5em 0 1.5em; } + ul { margin: 1em 0 2em; } + li { margin: 0 0 0.75em; } @@ -105,26 +109,31 @@ display: inline-block; .icon(); } + &:after { position: absolute; top: 0.65em; left: 23px; } } + #user-tools h2 { right: @content-padding + 0.5em; .background-image-svg( 'images/user-large-grey.svg', 'images/user-large-grey.png' ); } + #site-navigation { h2 { left: @content-padding; .background-image-svg( 'images/menu-large-grey.svg', 'images/menu-large-grey.png' ); } + .sidebar-inner { left: 0; right: auto; } } + #site-tools h2 { right: 7em; .background-image-svg( 'images/gear-large-grey.svg', 'images/gear-large-grey.png' ); @@ -148,6 +157,7 @@ #p-namespaces li { margin-right: 1.5em; } + #p-pagetools li { margin-left: 1.5em; @@ -159,21 +169,27 @@ #mw-page-header-links a { .ca-icon(); } + #ca-edit a { .background-image-svg( 'images/pencil-grey.svg', 'images/pencil-grey.png' ); } + #ca-history a { .background-image-svg( 'images/clock-grey.svg', 'images/clock-grey.png' ); } + #ca-talk a { .background-image-svg( 'images/talk-grey.svg', 'images/talk-grey.png' ); } + #t-contributions a { .background-image-svg( 'images/puzzle-grey.svg', 'images/puzzle-grey.png' ); } + #ca-addsection a { .background-image-svg( 'images/plus-grey.svg', 'images/plus-grey.png' ); } + *[ id^='ca-nstab-' ] a { .background-image-svg( 'images/page-grey.svg', 'images/page-grey.png' ); } @@ -188,9 +204,11 @@ .ca-icon(); } } + #ca-more span { .background-image-svg( 'images/gear-grey.svg', 'images/gear-grey.png' ); } + #ca-languages span { .background-image-svg( 'images/languages-grey.svg', 'images/languages-grey.png' ); } @@ -200,22 +218,27 @@ div.thumb { float: none; } + .thumb { margin: 1em auto; } + .tright { margin-left: 0; padding-left: 0; } + .tleft { margin-right: 0; padding-right: 0; } + .thumbinner { padding: 1em 1.5em; width: 100% !important; box-sizing: border-box; } + .thumbimage { display: block; margin: 0 auto 0.5em; diff --git a/resources/variables.less b/resources/variables.less index 014dfbe..df61757 100644 --- a/resources/variables.less +++ b/resources/variables.less @@ -119,6 +119,7 @@ margin: 0; padding: 0; } + h3 { font-weight: normal; font-size: 1em; @@ -126,9 +127,11 @@ padding-bottom: 0.15em; border-bottom: solid 2px @grey; } + ul { margin-bottom: 2em; } + li { margin: 0 0 0.35em; } @@ -142,6 +145,7 @@ .nav-block(); } } + .column-left() { padding-right: 1em; box-sizing: border-box; @@ -167,6 +171,7 @@ background-repeat: no-repeat; } } + .dropdown-menu( @direction: right ) { .nav-block(); background: @background; @@ -195,6 +200,7 @@ li { border-left: 0; } + div { margin: 0 0 0.35em; }