From f723e23b8a36d8e25d05e9bf57ce99a436a68ba5 Mon Sep 17 00:00:00 2001 From: Angelos Chalaris Date: Sat, 15 Oct 2016 09:26:20 +0300 Subject: [PATCH] Updated background properties to use shorthand --- docs/v2/DEVLOG.md | 6 +++++- flavors/v2/mini-default.css | 14 +++++++------- flavors/v2/mini-default.min.css | 2 +- scss/v2/_base.scss | 16 ++++++++-------- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/docs/v2/DEVLOG.md b/docs/v2/DEVLOG.md index 66723c4..39684f4 100644 --- a/docs/v2/DEVLOG.md +++ b/docs/v2/DEVLOG.md @@ -68,4 +68,8 @@ - Added margin for `pre` elements to be in line with paragraphs. - Changed borders for `pre` elements: left-side borders' `border-radius` is now `0`. - Changed index, centered title etc. -- Deployed first live demo version of the framework's demo index. \ No newline at end of file +- Deployed first live demo version of the framework's demo index. + +## 20161015 + +- Updated references to `background-color` and `background-image` to use the `background` shorthand instead. \ No newline at end of file diff --git a/flavors/v2/mini-default.css b/flavors/v2/mini-default.css index f24d063..28eccea 100644 --- a/flavors/v2/mini-default.css +++ b/flavors/v2/mini-default.css @@ -12,7 +12,7 @@ html, * { body { margin: 0; color: #222; - background-color: #f9f9f9; } + background: #f9f9f9; } article, aside, footer, header, nav, section, figcaption, figure, main { display: block; } @@ -58,28 +58,28 @@ hr { line-height: 1.2em; margin: 0.5em 4px; height: 1px; - background-image: linear-gradient(to right, #ccc, #666, #ccc); - background-image: -webkit-linear-gradient(to right, #ccc, #666, #ccc); } + background: linear-gradient(to right, #ccc, #666, #ccc); + background: -webkit-linear-gradient(to right, #ccc, #666, #ccc); } code, kbd, pre, samp { font-family: monospace, monospace; } code { border-radius: 2px; - background-color: #ddd; + background: #ddd; padding: 2px 4px; } pre { overflow: auto; border-radius: 0 2px 2px 0; - background-color: #ddd; + background: #ddd; padding: 12px; margin: 1px 10px; border-left: 3px solid #0039e6; } kbd { border-radius: 2px; - background-color: #222; + background: #222; color: #f9f9f9; padding: 2px 4px; } @@ -137,7 +137,7 @@ dfn { * Add the correct background and color in IE 9-. */ mark { - background-color: #ff0; + background: #ff0; color: #000; } /** diff --git a/flavors/v2/mini-default.min.css b/flavors/v2/mini-default.min.css index a2d6ea9..b726f2a 100644 --- a/flavors/v2/mini-default.min.css +++ b/flavors/v2/mini-default.min.css @@ -1 +1 @@ -*,html{font-family:"Helvetica Neue",Helvetica,sans-serif;font-size:1em;line-height:1.5;-webkit-text-size-adjust:100%}body{margin:0;color:#222;background-color:#f9f9f9}article,aside,figcaption,figure,footer,header,main,nav,section{display:block}h1,h2,h3,h4,h5,h6{line-height:1.2em;margin:.7em 8px;font-weight:500}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#444;display:block;margin-top:-.35em;font-size:45%}h1{font-size:2em}h2{font-size:1.5em}h3{font-size:1.15em}h4{font-size:1em}h5{font-size:.85em}h6{font-size:.75em}p{margin:1px 10px}b,strong{font-weight:700}hr{box-sizing:content-box;border:0;overflow:visible;line-height:1.2em;margin:.5em 4px;height:1px;background-image:linear-gradient(to right,#ccc,#666,#ccc);background-image:-webkit-linear-gradient(to right,#ccc,#666,#ccc)}code,kbd,pre,samp{font-family:monospace,monospace}code{border-radius:2px;background-color:#ddd;padding:2px 4px}pre{overflow:auto;border-radius:0 2px 2px 0;background-color:#ddd;padding:12px;margin:1px 10px;border-left:3px solid #0039e6}kbd{border-radius:2px;background-color:#222;color:#f9f9f9;padding:2px 4px}small,sub,sup{font-size:75%}sup{top:-.5em}sub{bottom:-.25em}sub,sup{line-height:0;position:relative;vertical-align:baseline}a{background-color:transparent;-webkit-text-decoration-skip:objects}a:active,a:hover{outline-width:0}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}dfn{font-style:italic}mark{background-color:#ff0;color:#000}audio,video{display:inline-block}svg:not(:root){overflow:hidden}button,input,optgroup,select,textarea{font-family:sans-serif;font-size:100%;line-height:1.15;margin:0}button,input{overflow:visible}button,select{text-transform:none}[type=reset],[type=submit],button,html [type=button]{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{border-style:none;padding:0}[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring,button:-moz-focusring{outline:1px dotted ButtonText}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}progress{vertical-align:baseline}textarea{overflow:auto}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}details,menu{display:block}summary{display:list-item} \ No newline at end of file +*,html{font-family:"Helvetica Neue",Helvetica,sans-serif;font-size:1em;line-height:1.5;-webkit-text-size-adjust:100%}body{margin:0;color:#222;background:#f9f9f9}article,aside,figcaption,figure,footer,header,main,nav,section{display:block}h1,h2,h3,h4,h5,h6{line-height:1.2em;margin:.7em 8px;font-weight:500}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#444;display:block;margin-top:-.35em;font-size:45%}h1{font-size:2em}h2{font-size:1.5em}h3{font-size:1.15em}h4{font-size:1em}h5{font-size:.85em}h6{font-size:.75em}p{margin:1px 10px}b,strong{font-weight:700}hr{box-sizing:content-box;border:0;overflow:visible;line-height:1.2em;margin:.5em 4px;height:1px;background:linear-gradient(to right,#ccc,#666,#ccc);background:-webkit-linear-gradient(to right,#ccc,#666,#ccc)}code,kbd,pre,samp{font-family:monospace,monospace}code{border-radius:2px;background:#ddd;padding:2px 4px}pre{overflow:auto;border-radius:0 2px 2px 0;background:#ddd;padding:12px;margin:1px 10px;border-left:3px solid #0039e6}kbd{border-radius:2px;background:#222;color:#f9f9f9;padding:2px 4px}small,sub,sup{font-size:75%}sup{top:-.5em}sub{bottom:-.25em}sub,sup{line-height:0;position:relative;vertical-align:baseline}a{background-color:transparent;-webkit-text-decoration-skip:objects}a:active,a:hover{outline-width:0}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}dfn{font-style:italic}mark{background:#ff0;color:#000}audio,video{display:inline-block}svg:not(:root){overflow:hidden}button,input,optgroup,select,textarea{font-family:sans-serif;font-size:100%;line-height:1.15;margin:0}button,input{overflow:visible}button,select{text-transform:none}[type=reset],[type=submit],button,html [type=button]{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{border-style:none;padding:0}[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring,button:-moz-focusring{outline:1px dotted ButtonText}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}progress{vertical-align:baseline}textarea{overflow:auto}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}details,menu{display:block}summary{display:list-item} \ No newline at end of file diff --git a/scss/v2/_base.scss b/scss/v2/_base.scss index c1eccf3..dfa2444 100644 --- a/scss/v2/_base.scss +++ b/scss/v2/_base.scss @@ -21,7 +21,7 @@ html { body { margin: $body-margin; color: $fore-color; - background-color: $back-color; + background: $back-color; } // Correct display for older versions of IE. @@ -86,8 +86,8 @@ hr { $horizontal-rule-fancy-style: false !default; @if $horizontal-rule-fancy-style { height: 1px; - background-image: linear-gradient(#{$horizontal-rule-fancy-gradient}); - background-image: -webkit-linear-gradient(#{$horizontal-rule-fancy-gradient}); + background: linear-gradient(#{$horizontal-rule-fancy-gradient}); + background: -webkit-linear-gradient(#{$horizontal-rule-fancy-gradient}); } @else { height: 0; @@ -115,7 +115,7 @@ code { border-radius: $code-element-border-radius; } @if $code-element-back-color != $back-color { - background-color: $code-element-back-color; + background: $code-element-back-color; } @if $code-element-fore-color != $fore-color { color: $code-element-fore-color; @@ -134,7 +134,7 @@ pre { border-radius: $pre-element-border-radius; } @if $pre-element-back-color != $back-color { - background-color: $pre-element-back-color; + background: $pre-element-back-color; } @if $pre-element-fore-color != $fore-color { color: $pre-element-fore-color; @@ -159,7 +159,7 @@ kbd { border-radius: $kbd-element-border-radius; } @if $kbd-element-back-color != $back-color { - background-color: $kbd-element-back-color; + background: $kbd-element-back-color; } @if $kbd-element-fore-color != $fore-color { color: $kbd-element-fore-color; @@ -179,7 +179,7 @@ samp{ border-radius: $samp-element-border-radius; } @if $samp-element-back-color != $back-color { - background-color: $samp-element-back-color; + background: $samp-element-back-color; } @if $samp-element-fore-color != $fore-color { color: $samp-element-fore-color; @@ -320,7 +320,7 @@ dfn { */ mark { - background-color: #ff0; + background: #ff0; color: #000; }