From 796657d6093158e22f7338248f4a667147cf40a5 Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 21 Jan 2016 12:25:53 +0100 Subject: [PATCH 1/3] Adding necessary reset stylesheet --- .scss-lint.yml | 1 + src/scss/utilities/reset.scss | 60 +++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 src/scss/utilities/reset.scss diff --git a/.scss-lint.yml b/.scss-lint.yml index ee73a66..0f167d0 100644 --- a/.scss-lint.yml +++ b/.scss-lint.yml @@ -1,6 +1,7 @@ scss_files: 'src/scss/**/*.scss' exclude: - 'src/scss/utilities/normalize.scss' + - 'src/scss/utilities/reset.scss' - 'src/scss/utilities/helpers.scss' - 'src/scss/variables/_sizes.scss' linters: diff --git a/src/scss/utilities/reset.scss b/src/scss/utilities/reset.scss new file mode 100644 index 0000000..0c9b86d --- /dev/null +++ b/src/scss/utilities/reset.scss @@ -0,0 +1,60 @@ +/* http://meyerweb.com/eric/tools/css/reset/ + v2.0 | 20110126 + 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 { + 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; +} +body { + line-height: 1; +} +ol, ul { + list-style: none; +} +blockquote, q { + quotes: none; +} +blockquote:before, blockquote:after, +q:before, q:after { + content: ''; + content: none; +} +table { + border-collapse: collapse; + border-spacing: 0; +} +// Resetting buttons too +button { + margin: 0; + padding: 0; + border: none; + background: transparent; + box-sizing: border-box; + outline: none; +} +dd, dt { + display: inline-block; +} From 2f18a4d0751d5cc160bfa6707bc78e945cd0d0a7 Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 21 Jan 2016 12:26:57 +0100 Subject: [PATCH 2/3] New CartoAssets version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 607ec45..75316b3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cartoassets", "description": "Share frontend assets between different CartoDB repositories", - "version": "0.1.15", + "version": "0.1.16", "homepage": "https://github.com/cartodb/CartoAssets", "author": { "name": "xavijam", From e8994b32c787dadbb537e66f5fe6ce66aaed7b67 Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 21 Jan 2016 12:38:12 +0100 Subject: [PATCH 3/3] Changed excluded scss-lint files path --- .scss-lint.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.scss-lint.yml b/.scss-lint.yml index 0f167d0..bc7a7fe 100644 --- a/.scss-lint.yml +++ b/.scss-lint.yml @@ -1,8 +1,8 @@ scss_files: 'src/scss/**/*.scss' exclude: - - 'src/scss/utilities/normalize.scss' - - 'src/scss/utilities/reset.scss' - - 'src/scss/utilities/helpers.scss' + - 'src/scss/cdb-utilities/normalize.scss' + - 'src/scss/cdb-utilities/reset.scss' + - 'src/scss/cdb-utilities/helpers.scss' - 'src/scss/variables/_sizes.scss' linters: BangFormat: