jenkins-bot has submitted this change and it was merged. Change subject: Story 1030: Clean up typography.less ......................................................................
Story 1030: Clean up typography.less Change-Id: I45ec9b74695db0aa96821eb00c66a5a49744487a --- M less/common/reset.less M less/common/typography.less M stylesheets/common/reset.css M stylesheets/common/typography.css 4 files changed, 37 insertions(+), 81 deletions(-) Approvals: Jdlrobson: Looks good to me, approved jenkins-bot: Verified diff --git a/less/common/reset.less b/less/common/reset.less index a8b1215..aaf72e3 100644 --- a/less/common/reset.less +++ b/less/common/reset.less @@ -1,4 +1,4 @@ -/* Fork of http://meyerweb.com/eric/tools/css/reset/ +/* Fork of http://meyerweb.com/eric/tools/css/reset/ v2.0 | 20110126 License: none (public domain) */ @@ -11,7 +11,7 @@ b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, -input, textarea, button, +input, textarea, button, select, table, caption, tbody, tfoot, thead, tr, th, td, audio, video { margin: 0; @@ -19,7 +19,6 @@ border: 0; font-size: 100%; font: inherit; - font-family: inherit; vertical-align: baseline; } button { diff --git a/less/common/typography.less b/less/common/typography.less index bb5e617..125d826 100644 --- a/less/common/typography.less +++ b/less/common/typography.less @@ -11,7 +11,6 @@ body { font-family: @fontFamily; - font-size: @baseFontSize; line-height: @bodyLineHeight; color: #252525; } @@ -47,7 +46,6 @@ } } -@2xBaseFontSize: ( @baseFontSize * 2 ); h1 { font-size: @baseFontSize * 1.833; line-height: @headingLineHeight; @@ -84,6 +82,24 @@ .content { margin: @headingMargin @contentMarginRight 0 @contentMarginLeft; + + // make sure that the spinner is visible on lazy loading + // (room for spinner + margins) + min-height: 100px; + + .content_block { + h3:first-child { + margin-top: 0; + } + } + + .thumb { + margin: 15px 0 15px 0; + border: 1px solid #ccc; + border-radius: 5px; + background: #f9f9f9; + text-align: center; + } } // FIXME: This is included on all pages but only used by certain special pages. @@ -93,69 +109,29 @@ } } -#content_wrapper { - position: relative; - // make sure that the spinner is visible on lazy loading - // (room for spinner + margins) - min-height: 100px; - - .content_block { - h3:first-child { - margin-top: 0; - } - &:last-child { - border-bottom: none; - } - } - - .thumb { - border: 1px solid #cccccc; - border-radius: 5px; - background: #f9f9f9; - text-align: center; - } -} - -#content { - .thumb { - margin: 15px 0 15px 0; - } -} - -input.search { - font-family: @fontFamily; -} - @media all and (max-width: 280px) { body { - font-size: @baseFontSize * 0.8; + font-size: .8em; } - #content_wrapper { + .content { margin: 0 12px; } } blockquote { - quotes:"\201C" "\201D"; - padding-left: 10px; - padding-bottom: 30px; - padding-right: 0; - margin-top: 20px; - margin-right: 0; + quotes: "\201C" "\201D"; + padding: 1em 0 1em 10px; position: relative; &:before { content: open-quote; - font-size: @baseFontSize * 3; - font-weight: bold; + font-size: 3em; } &:after{ - font-size: @baseFontSize * 3; + font-size: 3em; content: close-quote; - font-weight: bold; - float: right; position: absolute; right: 0; bottom: 0; diff --git a/stylesheets/common/reset.css b/stylesheets/common/reset.css index 6b7c4c6..5c7d47b 100644 --- a/stylesheets/common/reset.css +++ b/stylesheets/common/reset.css @@ -1,4 +1,4 @@ -/* Fork of http://meyerweb.com/eric/tools/css/reset/ +/* Fork of http://meyerweb.com/eric/tools/css/reset/ v2.0 | 20110126 License: none (public domain) */ @@ -49,6 +49,7 @@ input, textarea, button, +select, table, caption, tbody, @@ -64,7 +65,6 @@ border: 0; font-size: 100%; font: inherit; - font-family: inherit; vertical-align: baseline; } button { diff --git a/stylesheets/common/typography.css b/stylesheets/common/typography.css index 43ab2d8..cf167a2 100644 --- a/stylesheets/common/typography.css +++ b/stylesheets/common/typography.css @@ -16,7 +16,6 @@ /* = 16pt */ body { font-family: "Helvetica Neue", "Helvetica", "Nimbus Sans L", "Arial", "Liberation Sans", sans-serif; - font-size: 1em; line-height: 1.3333333333333333em; color: #252525; } @@ -80,59 +79,41 @@ } .content { margin: 9pt 16px 0 16px; -} -body.no-margins #content_wrapper > .content { - margin: 0; -} -#content_wrapper { - position: relative; min-height: 100px; } -#content_wrapper .content_block h3:first-child { +.content .content_block h3:first-child { margin-top: 0; } -#content_wrapper .content_block:last-child { - border-bottom: none; -} -#content_wrapper .thumb { - border: 1px solid #cccccc; +.content .thumb { + margin: 15px 0 15px 0; + border: 1px solid #ccc; border-radius: 5px; background: #f9f9f9; text-align: center; } -#content .thumb { - margin: 15px 0 15px 0; -} -input.search { - font-family: "Helvetica Neue", "Helvetica", "Nimbus Sans L", "Arial", "Liberation Sans", sans-serif; +body.no-margins #content_wrapper > .content { + margin: 0; } @media all and (max-width: 280px) { body { - font-size: 0.8em; + font-size: .8em; } - #content_wrapper { + .content { margin: 0 12px; } } blockquote { quotes: "\201C" "\201D"; - padding-left: 10px; - padding-bottom: 30px; - padding-right: 0; - margin-top: 20px; - margin-right: 0; + padding: 1em 0 1em 10px; position: relative; } blockquote:before { content: open-quote; font-size: 3em; - font-weight: bold; } blockquote:after { font-size: 3em; content: close-quote; - font-weight: bold; - float: right; position: absolute; right: 0; bottom: 0; -- To view, visit https://gerrit.wikimedia.org/r/86795 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I45ec9b74695db0aa96821eb00c66a5a49744487a Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: JGonera <[email protected]> Gerrit-Reviewer: JGonera <[email protected]> Gerrit-Reviewer: Jdlrobson <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
