From 46604ae4923675a1b3cbdb24d5851c353d43c7df Mon Sep 17 00:00:00 2001 From: Martin Mahner Date: Thu, 5 Apr 2018 21:17:42 +0200 Subject: [PATCH] Unreset all styles. --- client/scss/_reset.scss | 39 ++++++++-------------------- client/scss/components/_article.scss | 33 ----------------------- client/scss/components/_code.scss | 38 +++++---------------------- client/scss/components/_header.scss | 17 ++++++++++++ client/scss/components/_history.scss | 3 +++ 5 files changed, 38 insertions(+), 92 deletions(-) delete mode 100644 client/scss/components/_article.scss diff --git a/client/scss/_reset.scss b/client/scss/_reset.scss index 199fb33..47a6bf8 100644 --- a/client/scss/_reset.scss +++ b/client/scss/_reset.scss @@ -3,38 +3,21 @@ License: none (public domain) */ -html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video { +// html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video + +html, body, p { margin: 0; padding: 0; border: 0; font-size: 100%; - font: inherit; - vertical-align: baseline; } - -/* HTML5 display-role reset for older browsers */ - -article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section { - display: block; } + vertical-align: baseline; +} body { - line-height: 1; } + line-height: 1; +} -ol, ul { - list-style: none; } - -blockquote, q { - quotes: none; } - -blockquote { - &:before, &:after { - content: ''; - content: none; } } - -q { - &:before, &:after { - content: ''; - content: none; } } - -table { - border-collapse: collapse; -border-spacing: 0; } +%reset { + margin: 0; + padding: 0; +} diff --git a/client/scss/components/_article.scss b/client/scss/components/_article.scss deleted file mode 100644 index da7615f..0000000 --- a/client/scss/components/_article.scss +++ /dev/null @@ -1,33 +0,0 @@ -/* - - Generic Content pages such as about or 404 error pages. - - */ - -article { - padding: 40px $boxPadding; - - font-size: 16px; - font-weight: $baseFontRegular; - line-height: 24px; - - max-width: 520px; - - color: $textColor; - - h2 { - font-size: 28px; - line-height: 36px; - margin: 0 0 30px 0; - } - - p { - margin: 30px 0; - } - - strong, b { - font-weight: $baseFontDemiBold; - } - - @include colored-links; -} diff --git a/client/scss/components/_code.scss b/client/scss/components/_code.scss index ca9f571..79ad4f9 100644 --- a/client/scss/components/_code.scss +++ b/client/scss/components/_code.scss @@ -3,7 +3,8 @@ background-color: $codeBgColor; h2 { - padding: 20px $boxPadding 10px $boxPadding; + margin: 0; + padding: 20px $boxPadding 20px $boxPadding; color: $codeTextColor; font-weight: $baseFontDemiBold; font-size: 14px; @@ -11,7 +12,7 @@ .snippet-code { background-color: $codeDiffBgColor; - padding: 20px $boxPadding 20px $boxPadding; + padding: 10px $boxPadding 10px $boxPadding; white-space: pre; font-size: 12px; } @@ -35,11 +36,15 @@ } ol { + margin: 0; + padding: 0; position: relative; list-style: none; counter-reset: lineNumberCounter; li { + margin: 0; + padding: 0; white-space: pre; padding-left: 50px; @@ -134,32 +139,3 @@ .il { color: #ae81ff } /* Literal.Number.Integer.Long */ } - -.snippet-text { - background: $bgColor; - padding: 20px $boxPadding; - - color: $textColor; - - font-family: $textFont; - font-weight: $baseFontRegular; - font-size: 16px; - line-height: 22px; - - & > div { - max-width: 540px; - } -} - -.snippet-message { - margin: 20px $boxPadding 0 $boxPadding; - padding: 8px 20px; - - max-width: 660px; - - color: $messageTextColor; - background-color: $messageBgColor; - - font-size: 14px; - font-weight: $baseFontDemiBold; -} diff --git a/client/scss/components/_header.scss b/client/scss/components/_header.scss index 8e52069..ef19893 100644 --- a/client/scss/components/_header.scss +++ b/client/scss/components/_header.scss @@ -61,6 +61,7 @@ header { ul#snippetOptions { + margin: 0; padding: 0 $boxPadding; height: 40px; @@ -84,7 +85,9 @@ ul#snippetOptions { } li { + margin: 0; padding: 0 7px; + list-style: none; &:first-child{ padding-left: 0; } &:last-child{ padding-right: 0; } @@ -113,3 +116,17 @@ ul#snippetOptions { top: -7px; } } + + +.snippet-message { + margin: 20px $boxPadding 0 $boxPadding; + padding: 8px 20px; + + max-width: 660px; + + color: $messageTextColor; + background-color: $messageBgColor; + + font-size: 14px; + font-weight: $baseFontDemiBold; +} diff --git a/client/scss/components/_history.scss b/client/scss/components/_history.scss index 420855c..a851235 100644 --- a/client/scss/components/_history.scss +++ b/client/scss/components/_history.scss @@ -2,9 +2,12 @@ .history-header { + margin: 0; padding: 15px $boxPadding; + color: $textColor; font-size: 14px; + font-weight: $baseFontRegular; background-color: $borderColor; a:link, a:visited {