From 16d11696d5544504cb71de892a7a5af2a21a0fee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Matall=C3=ADn?= Date: Fri, 22 Dec 2017 18:12:39 +0100 Subject: [PATCH] update dependencies --- package.json | 5 +- src/entry.css | 7 +- src/vendor/_normalize.css | 608 -------------------- src/vendor/perfect-scrollbar/_main.css | 3 - src/vendor/perfect-scrollbar/_mixins.css | 144 ----- src/vendor/perfect-scrollbar/_themes.css | 29 - src/vendor/perfect-scrollbar/_variables.css | 30 - src/vendor/{_reset.css => reset.css} | 0 yarn.lock | 4 + 9 files changed, 11 insertions(+), 819 deletions(-) delete mode 100644 src/vendor/_normalize.css delete mode 100644 src/vendor/perfect-scrollbar/_main.css delete mode 100644 src/vendor/perfect-scrollbar/_mixins.css delete mode 100644 src/vendor/perfect-scrollbar/_themes.css delete mode 100644 src/vendor/perfect-scrollbar/_variables.css rename src/vendor/{_reset.css => reset.css} (100%) diff --git a/package.json b/package.json index 4e3de43..1d2d50c 100644 --- a/package.json +++ b/package.json @@ -32,5 +32,8 @@ "assets", "styleguide", "shared components" - ] + ], + "dependencies": { + "normalize.css": "^7.0.0" + } } diff --git a/src/entry.css b/src/entry.css index 8eeec76..4d15d31 100644 --- a/src/entry.css +++ b/src/entry.css @@ -2,13 +2,11 @@ @import 'variables/colors'; @import 'vendor/reset'; -@import 'vendor/normalize'; -@import 'utilities/defaults'; +@import "normalize.css"; +/*@import 'utilities/defaults'; @import 'utilities/fonts'; @import 'utilities/helpers'; -@import 'vendor/perfect-scrollbar/main'; - @import 'components/forms/checkbox'; @import 'components/forms/dropdowns'; @import 'components/forms/inputs'; @@ -48,3 +46,4 @@ @import 'components/tooltips'; @import 'components/typography'; @import 'components/layer-selector'; +*/ \ No newline at end of file diff --git a/src/vendor/_normalize.css b/src/vendor/_normalize.css deleted file mode 100644 index 7bd6216..0000000 --- a/src/vendor/_normalize.css +++ /dev/null @@ -1,608 +0,0 @@ -/* ========================================================================== - Normalize.scss settings - ========================================================================== */ -/** - * Includes legacy browser support IE6/7 - * - * Set to false if you want to drop support for IE6 and IE7 - */ - -$legacy_browser_support: false !default; - -/* Base - ========================================================================== */ - -/** - * 1. Set default font family to sans-serif. - * 2. Prevent iOS and IE text size adjust after device orientation change, - * without disabling user zoom. - * 3. Corrects text resizing oddly in IE 6/7 when body `font-size` is set using - * `em` units. - */ - -html { - font-family: sans-serif; /* 1 */ - -ms-text-size-adjust: 100%; /* 2 */ - -webkit-text-size-adjust: 100%; /* 2 */ - @if $legacy_browser_support { - *font-size: 100%; /* 3 */ - } -} - -/** - * Remove default margin. - */ - -body { - margin: 0; -} - -/* HTML5 display definitions - ========================================================================== */ - -/** - * Correct `block` display not defined for any HTML5 element in IE 8/9. - * Correct `block` display not defined for `details` or `summary` in IE 10/11 - * and Firefox. - * Correct `block` display not defined for `main` in IE 11. - */ - -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -main, -menu, -nav, -section, -summary { - display: block; -} - -/** - * 1. Correct `inline-block` display not defined in IE 6/7/8/9 and Firefox 3. - * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. - */ - -audio, -canvas, -progress, -video { - display: inline-block; /* 1 */ - vertical-align: baseline; /* 2 */ - @if $legacy_browser_support { - *display: inline; - *zoom: 1; - } -} - -/** - * Prevents modern browsers from displaying `audio` without controls. - * Remove excess height in iOS 5 devices. - */ - -audio:not([controls]) { - display: none; - height: 0; -} - -/** - * Address `[hidden]` styling not present in IE 8/9/10. - * Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22. - */ - -[hidden], -template { - display: none; -} - -/* Links - ========================================================================== */ - -/** - * Remove the gray background color from active links in IE 10. - */ - -a { - background-color: transparent; -} - -/** - * Improve readability of focused elements when they are also in an - * active/hover state. - */ - -a { - &:active, &:hover { - outline: 0; - }; -} - -/* Text-level semantics - ========================================================================== */ - -/** - * Address styling not present in IE 8/9/10/11, Safari, and Chrome. - */ - -abbr[title] { - border-bottom: 1px dotted; -} - -/** - * Address style set to `bolder` in Firefox 4+, Safari, and Chrome. - */ - -b, -strong { - font-weight: bold; -} - -@if $legacy_browser_support { - blockquote { - margin: 1em 40px; - } -} - -/** - * Address styling not present in Safari and Chrome. - */ - -dfn { - font-style: italic; -} - -/** - * Address variable `h1` font-size and margin within `section` and `article` - * contexts in Firefox 4+, Safari, and Chrome. - */ - -h1 { - font-size: 2em; - margin: 0.67em 0; -} - -@if $legacy_browser_support { - h2 { - font-size: 1.5em; - margin: 0.83em 0; - } - - h3 { - font-size: 1.17em; - margin: 1em 0; - } - - h4 { - font-size: 1em; - margin: 1.33em 0; - } - - h5 { - font-size: 0.83em; - margin: 1.67em 0; - } - - h6 { - font-size: 0.67em; - margin: 2.33em 0; - } -} - -/** - * Addresses styling not present in IE 8/9. - */ - -mark { - background: #ff0; - color: #000; -} - -@if $legacy_browser_support { - - /** - * Addresses margins set differently in IE 6/7. - */ - - p, - pre { - *margin: 1em 0; - } - - /* - * Addresses CSS quotes not supported in IE 6/7. - */ - - q { - *quotes: none; - } - - /* - * Addresses `quotes` property not supported in Safari 4. - */ - - q:before, - q:after { - content: ''; - content: none; - } -} - -/** - * Address inconsistent and variable font size in all browsers. - */ - -small { - font-size: 80%; -} - -/** - * Prevent `sub` and `sup` affecting `line-height` in all browsers. - */ - -sub, -sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; -} - -sup { - top: -0.5em; -} - -sub { - bottom: -0.25em; -} - -@if $legacy_browser_support { - - /* ========================================================================== - Lists - ========================================================================== */ - - /* - * Addresses margins set differently in IE 6/7. - */ - - dl, - menu, - ol, - ul { - *margin: 1em 0; - } - - dd { - *margin: 0 0 0 40px; - } - - /* - * Addresses paddings set differently in IE 6/7. - */ - - menu, - ol, - ul { - *padding: 0 0 0 40px; - } - - /* - * Corrects list images handled incorrectly in IE 7. - */ - - nav ul, - nav ol { - *list-style: none; - *list-style-image: none; - } - -} - -/* Embedded content - ========================================================================== */ - -/** - * 1. Remove border when inside `a` element in IE 8/9/10. - * 2. Improves image quality when scaled in IE 7. - */ - -img { - border: 0; - @if $legacy_browser_support { - *-ms-interpolation-mode: bicubic; /* 2 */ - } -} - -/** - * Correct overflow not hidden in IE 9/10/11. - */ - -svg:not(:root) { - overflow: hidden; -} - -/* Grouping content - ========================================================================== */ - -/** - * Address margin not present in IE 8/9 and Safari. - */ - -figure { - margin: 1em 40px; -} - -/** - * Address differences between Firefox and other browsers. - */ - -hr { - box-sizing: content-box; - height: 0; -} - -/** - * Contain overflow in all browsers. - */ - -pre { - overflow: auto; -} - -/** - * Address odd `em`-unit font size rendering in all browsers. - * Correct font family set oddly in IE 6, Safari 4/5, and Chrome. - */ - -code, -kbd, -pre, -samp { - font-family: monospace, monospace; - @if $legacy_browser_support { - _font-family: 'courier new', monospace; - } - font-size: 1em; -} - -/* Forms - ========================================================================== */ - -/** - * Known limitation: by default, Chrome and Safari on OS X allow very limited - * styling of `select`, unless a `border` property is set. - */ - -/** - * 1. Correct color not being inherited. - * Known issue: affects color of disabled elements. - * 2. Correct font properties not being inherited. - * 3. Address margins set differently in Firefox 4+, Safari, and Chrome. - * 4. Improves appearance and consistency in all browsers. - */ - -button, -input, -optgroup, -select, -textarea { - color: inherit; /* 1 */ - font: inherit; /* 2 */ - margin: 0; /* 3 */ - @if $legacy_browser_support { - vertical-align: baseline; /* 3 */ - *vertical-align: middle; /* 3 */ - } -} - -/** - * Address `overflow` set to `hidden` in IE 8/9/10/11. - */ - -button { - overflow: visible; -} - -/** - * Address inconsistent `text-transform` inheritance for `button` and `select`. - * All other form control elements do not inherit `text-transform` values. - * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. - * Correct `select` style inheritance in Firefox. - */ - -button, -select { - text-transform: none; -} - -/** - * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` - * and `video` controls. - * 2. Correct inability to style clickable `input` types in iOS. - * 3. Improve usability and consistency of cursor style between image-type - * `input` and others. - * 4. Removes inner spacing in IE 7 without affecting normal text inputs. - * Known issue: inner spacing remains in IE 6. - */ - -button, -html input[type="button"], /* 1 */ -input[type="reset"], -input[type="submit"] { - -webkit-appearance: button; /* 2 */ - cursor: pointer; /* 3 */ - @if $legacy_browser_support { - *overflow: visible; /* 4 */ - } -} - -/** - * Re-set default cursor for disabled elements. - */ - -button[disabled], -html input[disabled] { - cursor: default; -} - -/** - * Remove inner padding and border in Firefox 4+. - */ - -button::-moz-focus-inner, -input::-moz-focus-inner { - border: 0; - padding: 0; -} - -/** - * Address Firefox 4+ setting `line-height` on `input` using `!important` in - * the UA stylesheet. - */ - -input { - line-height: normal; -} - -/** - * 1. Address box sizing set to `content-box` in IE 8/9/10. - * 2. Remove excess padding in IE 8/9/10. - * Known issue: excess padding remains in IE 6. - */ - -input[type="checkbox"], -input[type="radio"] { - -moz-appearance: none; - -webkit-appearance: none; - appearance: none; - box-sizing: border-box; /* 1 */ - padding: 0; /* 2 */ - outline: none; - cursor: pointer; - @if $legacy_browser_support { - *height: 13px; /* 3 */ - *width: 13px; /* 3 */ - } -} -input[type=range]::-webkit-slider-thumb { - -moz-appearance: none; - -webkit-appearance: none; - appearance: none; -} - - -/** - * Fix the cursor style for Chrome's increment/decrement buttons. For certain - * `font-size` values of the `input`, it causes the cursor style of the - * decrement button to change from `default` to `text`. - */ - -input[type="number"]::-webkit-inner-spin-button, -input[type="number"]::-webkit-outer-spin-button { - height: auto; -} - -/** - * 1. Address `appearance` set to `searchfield` in Safari and Chrome. - * 2. Address `box-sizing` set to `border-box` in Safari and Chrome. - */ - -input[type="search"] { - -webkit-appearance: textfield; /* 1 */ - box-sizing: content-box; /* 2 */ -} - -/** - * Remove inner padding and search cancel button in Safari and Chrome on OS X. - * Safari (but not Chrome) clips the cancel button when the search input has - * padding (and `textfield` appearance). - */ - -input[type="search"]::-webkit-search-cancel-button, -input[type="search"]::-webkit-search-decoration { - -webkit-appearance: none; -} - -/** - * Define consistent border, margin, and padding. - */ - -fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; -} - -/** - * 1. Correct `color` not being inherited in IE 8/9/10/11. - * 2. Remove padding so people aren't caught out if they zero out fieldsets. - * 3. Corrects text not wrapping in Firefox 3. - * 4. Corrects alignment displayed oddly in IE 6/7. - */ - -legend { - border: 0; /* 1 */ - padding: 0; /* 2 */ - @if $legacy_browser_support { - white-space: normal; /* 3 */ - *margin-left: -7px; /* 4 */ - } -} - -/** - * Remove default vertical scrollbar in IE 8/9/10/11. - */ - -textarea { - overflow: auto; -} - -/** - * Don't inherit the `font-weight` (applied by a rule above). - * NOTE: the default cannot safely be changed in Chrome and Safari on OS X. - */ - -optgroup { - font-weight: bold; -} - -/* Tables - ========================================================================== */ - -/** - * Remove most spacing between table cells. - */ - -table { - border-collapse: collapse; - border-spacing: 0; -} - -td, -th { - padding: 0; -} - -/* Forms - ========================================================================== */ - -/** - * Remove default styles for forms - */ - -input { - -moz-appearance: none; - -webkit-appearance: none; - appearance: none; - outline: none; - - &[type="checkbox"], - &[type="radio"] { - cursor: pointer; - } -} diff --git a/src/vendor/perfect-scrollbar/_main.css b/src/vendor/perfect-scrollbar/_main.css deleted file mode 100644 index ae1f655..0000000 --- a/src/vendor/perfect-scrollbar/_main.css +++ /dev/null @@ -1,3 +0,0 @@ -@import 'variables'; -@import 'mixins'; -@import 'themes'; diff --git a/src/vendor/perfect-scrollbar/_mixins.css b/src/vendor/perfect-scrollbar/_mixins.css deleted file mode 100644 index b9411bb..0000000 --- a/src/vendor/perfect-scrollbar/_mixins.css +++ /dev/null @@ -1,144 +0,0 @@ -@mixin scrollbar-rail-default($theme) { - display: none; - position: absolute; /* please don't change 'position' */ - opacity: map_get($theme, rail-default-opacity); - transition: height 0.2s linear, width 0.2s ease-in-out, border-radius 0.2s ease-in-out; -} - -@mixin scrollbar-rail-hover($theme) { - opacity: map_get($theme, rail-hover-opacity); -} - -@mixin scrollbar-default($theme) { - position: absolute; /* please don't change 'position' */ - background: map_get($theme, bar-bg); - border-radius: map_get($theme, border-radius); - transition: height 0.2s linear, width 0.2s ease-in-out, border-radius 0.2s ease-in-out; -} - -@mixin scrollbar-hover($theme) { - background: map_get($theme, bar-hover-bg); -} - -@mixin in-scrolling($theme) { - &.ps-in-scrolling { - &.ps-x > .ps-scrollbar-x-rail { - @include scrollbar-rail-hover($theme); - height: map_get($theme, scrollbar-x-rail-hover-height); - background: map_get($theme, bar-x-rail-hover-bg); - - > .ps-scrollbar-x { - @include scrollbar-hover($theme); - height: map_get($theme, scrollbar-x-hover-height); - } - } - &.ps-y > .ps-scrollbar-y-rail { - @include scrollbar-rail-hover($theme); - width: map_get($theme, scrollbar-y-rail-hover-width); - background: map_get($theme, bar-y-rail-hover-bg); - - > .ps-scrollbar-y { - @include scrollbar-hover($theme); - width: map_get($theme, scrollbar-y-hover-width); - } - } - } -} - -// Layout and theme mixin -@mixin ps-container($theme) { - -ms-touch-action: auto; - touch-action: auto; - overflow: hidden !important; - -ms-overflow-style: none; - - // Edge - @supports (-ms-overflow-style: none) { - overflow: auto !important; - } - // IE10+ - @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) { - overflow: auto !important; - } - - &.ps-active-x > .ps-scrollbar-x-rail { - display: block; - background: map_get($theme, bar-x-rail-bg); - cursor: default !important; - } - - &.ps-active-y > .ps-scrollbar-y-rail { - display: block; - background: map_get($theme, bar-y-rail-bg); - cursor: default !important; - } - - @include in-scrolling($theme); - - > .ps-scrollbar-x-rail { - @include scrollbar-rail-default($theme); - bottom: map_get($theme, scrollbar-x-rail-bottom); /* there must be 'bottom' for ps-scrollbar-x-rail */ - height: map_get($theme, scrollbar-x-rail-height); - - > .ps-scrollbar-x { - @include scrollbar-default($theme); - bottom: map_get($theme, scrollbar-x-bottom); /* there must be 'bottom' for ps-scrollbar-x */ - height: map_get($theme, scrollbar-x-height); - } - &:hover, - &:active { - height: map_get($theme, scrollbar-x-rail-hover-height); - - > .ps-scrollbar-x { - height: map_get($theme, scrollbar-x-hover-height); - } - } - } - - > .ps-scrollbar-y-rail { - @include scrollbar-rail-default($theme); - right: map_get($theme, scrollbar-y-rail-right); /* there must be 'right' for ps-scrollbar-y-rail */ - width: map_get($theme, scrollbar-y-rail-width); - - > .ps-scrollbar-y { - @include scrollbar-default($theme); - right: map_get($theme, scrollbar-y-right); /* there must be 'right' for ps-scrollbar-y */ - width: map_get($theme, scrollbar-y-width); - } - &:hover, - &:active { - width: map_get($theme, scrollbar-y-rail-hover-width); - - > .ps-scrollbar-y { - width: map_get($theme, scrollbar-y-hover-width); - } - } - } - - &:hover { - @include in-scrolling($theme); - - > .ps-scrollbar-x-rail, - > .ps-scrollbar-y-rail { - opacity: map_get($theme, rail-container-hover-opacity); - } - - > .ps-scrollbar-x-rail:hover { - @include scrollbar-rail-hover($theme); - background: map_get($theme, bar-x-rail-hover-bg); - - > .ps-scrollbar-x { - @include scrollbar-hover($theme); - } - } - - > .ps-scrollbar-y-rail:hover { - @include scrollbar-rail-hover($theme); - background: map_get($theme, bar-y-rail-hover-bg); - - > .ps-scrollbar-y { - @include scrollbar-hover($theme); - } - } - } -} diff --git a/src/vendor/perfect-scrollbar/_themes.css b/src/vendor/perfect-scrollbar/_themes.css deleted file mode 100644 index e0d972a..0000000 --- a/src/vendor/perfect-scrollbar/_themes.css +++ /dev/null @@ -1,29 +0,0 @@ -$ps-theme-default: ( - border-radius: $ps-border-radius, - rail-default-opacity: $ps-rail-default-opacity, - rail-container-hover-opacity: $ps-rail-container-hover-opacity, - rail-hover-opacity: $ps-rail-hover-opacity, - bar-bg: $ps-bar-bg, - bar-hover-bg: $ps-bar-hover-bg, - bar-x-rail-bg: $ps-bar-x-rail-bg, - bar-x-rail-hover-bg: $ps-bar-x-rail-hover-bg, - bar-y-rail-bg: $ps-bar-y-rail-bg, - bar-y-rail-hover-bg: $ps-bar-y-rail-hover-bg, - scrollbar-x-rail-bottom: $ps-scrollbar-x-rail-bottom, - scrollbar-x-rail-height: $ps-scrollbar-x-rail-height, - scrollbar-x-rail-hover-height: $ps-scrollbar-x-rail-hover-height, - scrollbar-x-bottom: $ps-scrollbar-x-bottom, - scrollbar-x-height: $ps-scrollbar-x-height, - scrollbar-x-hover-height: $ps-scrollbar-x-hover-height, - scrollbar-y-rail-right: $ps-scrollbar-y-rail-right, - scrollbar-y-rail-width: $ps-scrollbar-y-rail-width, - scrollbar-y-rail-hover-width: $ps-scrollbar-y-rail-hover-width, - scrollbar-y-right: $ps-scrollbar-y-right, - scrollbar-y-width: $ps-scrollbar-y-width, - scrollbar-y-hover-width: $ps-scrollbar-y-hover-width, -); - -// Default theme -.ps-container { - @include ps-container($ps-theme-default); -} diff --git a/src/vendor/perfect-scrollbar/_variables.css b/src/vendor/perfect-scrollbar/_variables.css deleted file mode 100644 index 2ad6964..0000000 --- a/src/vendor/perfect-scrollbar/_variables.css +++ /dev/null @@ -1,30 +0,0 @@ -// Colors -$ps-border-radius: 0 !default; - -$ps-rail-default-opacity: 1 !default; -$ps-rail-container-hover-opacity: 1 !default; -$ps-rail-hover-opacity: 1 !default; - -$ps-bar-bg: #AAA !default; -$ps-bar-hover-bg: #AAA !default; - -$ps-bar-x-rail-bg: linear-gradient(180deg, transparent 50%, #EEE 50%) !default; -$ps-bar-x-rail-hover-bg: linear-gradient(180deg, transparent 50%, #EEE 50%) !default; - -$ps-bar-y-rail-bg: linear-gradient(90deg, transparent 50%, #EEE 50%) !default; -$ps-bar-y-rail-hover-bg: linear-gradient(90deg, transparent 50%, #EEE 50%) !default; - -// Sizes -$ps-scrollbar-x-rail-bottom: 0 !default; -$ps-scrollbar-x-rail-height: 8px !default; -$ps-scrollbar-x-rail-hover-height: 16px !default; -$ps-scrollbar-x-bottom: 0 !default; -$ps-scrollbar-x-height: 4px !default; -$ps-scrollbar-x-hover-height: 8px !default; - -$ps-scrollbar-y-rail-right: 0 !default; -$ps-scrollbar-y-rail-width: 8px !default; -$ps-scrollbar-y-rail-hover-width: 16px !default; -$ps-scrollbar-y-right: 0 !default; -$ps-scrollbar-y-width: 4px !default; -$ps-scrollbar-y-hover-width: 8px !default; diff --git a/src/vendor/_reset.css b/src/vendor/reset.css similarity index 100% rename from src/vendor/_reset.css rename to src/vendor/reset.css diff --git a/yarn.lock b/yarn.lock index cf7c785..d6d7120 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1086,6 +1086,10 @@ normalize-url@^1.4.0: query-string "^4.1.0" sort-keys "^1.0.0" +normalize.css@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-7.0.0.tgz#abfb1dd82470674e0322b53ceb1aaf412938e4bf" + npmlog@^4.0.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"