Skip to content

Commit

Permalink
Merge pull request #17 from nasa-jpl/feature/5-remove-ie-support
Browse files Browse the repository at this point in the history
Removing IE-specific scripts, styles and fonts
  • Loading branch information
stephiescastle committed Sep 23, 2021
2 parents 6ec911c + db411c0 commit d227ea9
Show file tree
Hide file tree
Showing 43 changed files with 68 additions and 178 deletions.
2 changes: 1 addition & 1 deletion dist/css/explorer-1.min.css

Large diffs are not rendered by default.

40 changes: 13 additions & 27 deletions dist/css/font-face.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,105 +3,91 @@
font-weight: 800;
font-style: normal;
font-display: swap;
src: url(../fonts/metropolis/Metropolis-ExtraBold.woff2) format('woff2'),
url(../fonts/metropolis/Metropolis-ExtraBold.woff) format('woff');
src: url(../fonts/metropolis/Metropolis-ExtraBold.woff2) format('woff2');
}
@font-face {
font-family: Metropolis;
font-weight: 700;
font-style: normal;
font-display: swap;
src: url(../fonts/metropolis/Metropolis-Bold.woff2) format('woff2'),
url(../fonts/metropolis/Metropolis-Bold.woff) format('woff');
src: url(../fonts/metropolis/Metropolis-Bold.woff2) format('woff2');
}
@font-face {
font-family: Metropolis;
font-weight: 700;
font-style: italic;
font-display: swap;
src: url(../fonts/metropolis/Metropolis-BoldItalic.woff2) format('woff2'),
url(../fonts/metropolis/Metropolis-BoldItalic.woff) format('woff');
src: url(../fonts/metropolis/Metropolis-BoldItalic.woff2) format('woff2');
}
@font-face {
font-family: Metropolis;
font-weight: 600;
font-style: normal;
font-display: swap;
src: url(../fonts/metropolis/Metropolis-SemiBold.woff2) format('woff2'),
url(../fonts/metropolis/Metropolis-SemiBold.woff) format('woff');
src: url(../fonts/metropolis/Metropolis-SemiBold.woff2) format('woff2');
}
@font-face {
font-family: Metropolis;
font-weight: 600;
font-style: italic;
font-display: swap;
src: url(../fonts/metropolis/Metropolis-SemiBoldItalic.woff2) format('woff2'),
url(../fonts/metropolis/Metropolis-SemiBoldItalic.woff) format('woff');
src: url(../fonts/metropolis/Metropolis-SemiBoldItalic.woff2) format('woff2');
}
@font-face {
font-family: Metropolis;
font-weight: 500;
font-style: normal;
font-display: swap;
src: url(../fonts/metropolis/Metropolis-Medium.woff2) format('woff2'),
url(../fonts/metropolis/Metropolis-Medium.woff) format('woff');
src: url(../fonts/metropolis/Metropolis-Medium.woff2) format('woff2');
}
@font-face {
font-family: Metropolis;
font-weight: 500;
font-style: italic;
font-display: swap;
src: url(../fonts/metropolis/Metropolis-MediumItalic.woff2) format('woff2'),
url(../fonts/metropolis/Metropolis-MediumItalic.woff) format('woff');
src: url(../fonts/metropolis/Metropolis-MediumItalic.woff2) format('woff2');
}
@font-face {
font-family: Metropolis;
font-weight: 400;
font-style: normal;
font-display: swap;
src: url(../fonts/metropolis/Metropolis-Regular.woff2) format('woff2'),
url(../fonts/metropolis/Metropolis-Regular.woff) format('woff');
src: url(../fonts/metropolis/Metropolis-Regular.woff2) format('woff2');
}
@font-face {
font-family: Metropolis;
font-weight: 400;
font-style: italic;
font-display: swap;
src: url(../fonts/metropolis/Metropolis-RegularItalic.woff2) format('woff2'),
url(../fonts/metropolis/Metropolis-RegularItalic.woff) format('woff');
src: url(../fonts/metropolis/Metropolis-RegularItalic.woff2) format('woff2');
}
@font-face {
font-family: 'Archivo Narrow';
font-weight: 700;
font-style: normal;
font-display: swap;
src: url(../fonts/archivo-narrow/ArchivoNarrow-Bold.woff2) format('woff2'),
url(../fonts/archivo-narrow/ArchivoNarrow-Bold.woff) format('woff');
src: url(../fonts/archivo-narrow/ArchivoNarrow-Bold.woff2) format('woff2');
}
@font-face {
font-family: 'Archivo Narrow';
font-weight: 700;
font-style: italic;
font-display: swap;
src: url(../fonts/archivo-narrow/ArchivoNarrow-BoldItalic.woff2)
format('woff2'),
url(../fonts/archivo-narrow/ArchivoNarrow-BoldItalic.woff) format('woff');
format('woff2');
}
@font-face {
font-family: 'Archivo Narrow';
font-weight: 600;
font-style: normal;
font-display: swap;
src: url(../fonts/archivo-narrow/ArchivoNarrow-SemiBold.woff2) format('woff2'),
url(../fonts/archivo-narrow/ArchivoNarrow-SemiBold.woff) format('woff');
src: url(../fonts/archivo-narrow/ArchivoNarrow-SemiBold.woff2) format('woff2');
}
@font-face {
font-family: 'Archivo Narrow';
font-weight: 600;
font-style: italic;
font-display: swap;
src: url(../fonts/archivo-narrow/ArchivoNarrow-SemiBoldItalic.woff2)
format('woff2'),
url(../fonts/archivo-narrow/ArchivoNarrow-SemiBoldItalic.woff)
format('woff');
format('woff2');
}
Binary file removed dist/fonts/archivo-narrow/ArchivoNarrow-Bold.woff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed dist/fonts/metropolis/Metropolis-Bold.woff
Binary file not shown.
Binary file removed dist/fonts/metropolis/Metropolis-BoldItalic.woff
Binary file not shown.
Binary file removed dist/fonts/metropolis/Metropolis-ExtraBold.woff
Binary file not shown.
Binary file removed dist/fonts/metropolis/Metropolis-Medium.woff
Binary file not shown.
Binary file removed dist/fonts/metropolis/Metropolis-MediumItalic.woff
Binary file not shown.
Binary file removed dist/fonts/metropolis/Metropolis-Regular.woff
Binary file not shown.
Binary file removed dist/fonts/metropolis/Metropolis-RegularItalic.woff
Binary file not shown.
Binary file removed dist/fonts/metropolis/Metropolis-SemiBold.woff
Binary file not shown.
Binary file removed dist/fonts/metropolis/Metropolis-SemiBoldItalic.woff
Binary file not shown.
2 changes: 1 addition & 1 deletion dist/js/explorer-1.min.js

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions src/fonts/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Fonts

Place optimized fonts file in this folder. We provide font files as WOFF 2.0 for all modern browsers.

- WOFF 2.0 conversion: [woff2](https://github.com/google/woff2)

Fonts:

- [Metropolis](https://fontsarena.com/metropolis-by-chris-simpson/)
- [Archivo Narrow](https://fonts.google.com/specimen/Archivo+Narrow)

See the styleguide for font usage guidelines.
Binary file removed src/fonts/archivo-narrow/ArchivoNarrow-Bold.woff
Binary file not shown.
Binary file not shown.
Binary file removed src/fonts/archivo-narrow/ArchivoNarrow-SemiBold.woff
Binary file not shown.
Binary file not shown.
Binary file removed src/fonts/metropolis/Metropolis-Bold.woff
Binary file not shown.
Binary file removed src/fonts/metropolis/Metropolis-BoldItalic.woff
Binary file not shown.
Binary file removed src/fonts/metropolis/Metropolis-ExtraBold.woff
Binary file not shown.
Binary file removed src/fonts/metropolis/Metropolis-Medium.woff
Binary file not shown.
Binary file removed src/fonts/metropolis/Metropolis-MediumItalic.woff
Binary file not shown.
Binary file removed src/fonts/metropolis/Metropolis-Regular.woff
Binary file not shown.
Binary file removed src/fonts/metropolis/Metropolis-RegularItalic.woff
Binary file not shown.
Binary file removed src/fonts/metropolis/Metropolis-SemiBold.woff
Binary file not shown.
Binary file removed src/fonts/metropolis/Metropolis-SemiBoldItalic.woff
Binary file not shown.
4 changes: 0 additions & 4 deletions src/js/_detect-ie.js

This file was deleted.

8 changes: 1 addition & 7 deletions src/js/scripts.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
/* base scripts for jpl-design-system */

// node polyfill. see: https://javascript.info/global-object
var global = global || window

require('./_detect-ie.js')
require('./_lazysizes.js')
require('./_swiper.js')
// add scripts here
// add more scripts here
56 changes: 27 additions & 29 deletions src/scss/_components.scss
Original file line number Diff line number Diff line change
@@ -1,59 +1,57 @@
@import 'components/AnimationCaret';
@import 'components/BasePlaceholder';
@import 'components/BaseButton';
@import 'components/BaseCarouselCards';
@import 'components/BlockIframeEmbed';
@import 'components/BaseImageCaption';
@import 'components/BlockInlineImage';
@import 'components/BaseImage';
@import 'components/BlockImageCarouselItem';
@import 'components/BlockQuote';
@import 'components/BaseImageCaption';
@import 'components/BaseImagePlaceholder';
@import 'components/BasePlaceholder';
@import 'components/BlockIframeEmbed';
@import 'components/BlockImageCarousel';
@import 'components/BlockVideoEmbed';
@import 'components/BlockImageCarouselItem';
@import 'components/BlockImageGallery';
@import 'components/BlockInlineImage';
@import 'components/BlockKeyPoints';
@import 'components/BlockQuote';
@import 'components/BlockTable';
@import 'components/BlockTeaser';
@import 'components/BlockText';
@import 'components/BlockVideoEmbed';
@import 'components/HeroFeature';
@import 'components/HeroFocalPoint';
@import 'components/BaseImagePlaceholder';
@import 'components/HeroMedia';
@import 'components/HeroFeature';
@import 'components/IconArrows';
@import 'components/BlockText';
@import 'components/Icon360';
@import 'components/IconArrow';
@import 'components/IconArrows';
@import 'components/IconAudio';
@import 'components/IconCalendar';
@import 'components/IconCaret';
@import 'components/IconCheckbox';
@import 'components/IconCheckboxSelected';
@import 'components/IconCalendar';
@import 'components/IconClose';
@import 'components/IconDownload';
@import 'components/IconCloseLightbox';
@import 'components/IconCaret';
@import 'components/IconDownload';
@import 'components/IconDropdown';
@import 'components/IconExpand';
@import 'components/IconExternal';
@import 'components/IconFilter';
@import 'components/IconGrid';
@import 'components/IconExpand';
@import 'components/IconDropdown';
@import 'components/IconInfo';
@import 'components/IconList';
@import 'components/IconLocation';
@import 'components/IconMenu';
@import 'components/IconNext';
@import 'components/IconMinus';
@import 'components/IconPlay';
@import 'components/IconLocation';
@import 'components/IconMute';
@import 'components/IconNext';
@import 'components/IconPause';
@import 'components/IconPlay';
@import 'components/IconPlus';
@import 'components/IconPrev';
@import 'components/IconSearch';
@import 'components/IconMute';
@import 'components/IconAudio';
@import 'components/IconSocialEmail';
@import 'components/IconSocialFacebook';
@import 'components/IconSocialTwitter';
@import 'components/BaseButton';
@import 'components/IconSocialInstagram';
@import 'components/BlockImageGallery';
@import 'components/IconPrev';
@import 'components/IconSocialTwitter';
@import 'components/IconSocialYoutube';
@import 'components/IconTime';
@import 'components/IconSocialEmail';
@import 'components/IconStop';
@import 'components/IconTime';
@import 'components/IconVolume';
@import 'components/RoboticsDetailFacts';
@import 'components/SearchResultCard';
40 changes: 13 additions & 27 deletions src/scss/_fonts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,105 +3,91 @@
font-weight: 800;
font-style: normal;
font-display: swap;
src: url(../fonts/metropolis/Metropolis-ExtraBold.woff2) format('woff2'),
url(../fonts/metropolis/Metropolis-ExtraBold.woff) format('woff');
src: url(../fonts/metropolis/Metropolis-ExtraBold.woff2) format('woff2');
}
@font-face {
font-family: Metropolis;
font-weight: 700;
font-style: normal;
font-display: swap;
src: url(../fonts/metropolis/Metropolis-Bold.woff2) format('woff2'),
url(../fonts/metropolis/Metropolis-Bold.woff) format('woff');
src: url(../fonts/metropolis/Metropolis-Bold.woff2) format('woff2');
}
@font-face {
font-family: Metropolis;
font-weight: 700;
font-style: italic;
font-display: swap;
src: url(../fonts/metropolis/Metropolis-BoldItalic.woff2) format('woff2'),
url(../fonts/metropolis/Metropolis-BoldItalic.woff) format('woff');
src: url(../fonts/metropolis/Metropolis-BoldItalic.woff2) format('woff2');
}
@font-face {
font-family: Metropolis;
font-weight: 600;
font-style: normal;
font-display: swap;
src: url(../fonts/metropolis/Metropolis-SemiBold.woff2) format('woff2'),
url(../fonts/metropolis/Metropolis-SemiBold.woff) format('woff');
src: url(../fonts/metropolis/Metropolis-SemiBold.woff2) format('woff2');
}
@font-face {
font-family: Metropolis;
font-weight: 600;
font-style: italic;
font-display: swap;
src: url(../fonts/metropolis/Metropolis-SemiBoldItalic.woff2) format('woff2'),
url(../fonts/metropolis/Metropolis-SemiBoldItalic.woff) format('woff');
src: url(../fonts/metropolis/Metropolis-SemiBoldItalic.woff2) format('woff2');
}
@font-face {
font-family: Metropolis;
font-weight: 500;
font-style: normal;
font-display: swap;
src: url(../fonts/metropolis/Metropolis-Medium.woff2) format('woff2'),
url(../fonts/metropolis/Metropolis-Medium.woff) format('woff');
src: url(../fonts/metropolis/Metropolis-Medium.woff2) format('woff2');
}
@font-face {
font-family: Metropolis;
font-weight: 500;
font-style: italic;
font-display: swap;
src: url(../fonts/metropolis/Metropolis-MediumItalic.woff2) format('woff2'),
url(../fonts/metropolis/Metropolis-MediumItalic.woff) format('woff');
src: url(../fonts/metropolis/Metropolis-MediumItalic.woff2) format('woff2');
}
@font-face {
font-family: Metropolis;
font-weight: 400;
font-style: normal;
font-display: swap;
src: url(../fonts/metropolis/Metropolis-Regular.woff2) format('woff2'),
url(../fonts/metropolis/Metropolis-Regular.woff) format('woff');
src: url(../fonts/metropolis/Metropolis-Regular.woff2) format('woff2');
}
@font-face {
font-family: Metropolis;
font-weight: 400;
font-style: italic;
font-display: swap;
src: url(../fonts/metropolis/Metropolis-RegularItalic.woff2) format('woff2'),
url(../fonts/metropolis/Metropolis-RegularItalic.woff) format('woff');
src: url(../fonts/metropolis/Metropolis-RegularItalic.woff2) format('woff2');
}
@font-face {
font-family: 'Archivo Narrow';
font-weight: 700;
font-style: normal;
font-display: swap;
src: url(../fonts/archivo-narrow/ArchivoNarrow-Bold.woff2) format('woff2'),
url(../fonts/archivo-narrow/ArchivoNarrow-Bold.woff) format('woff');
src: url(../fonts/archivo-narrow/ArchivoNarrow-Bold.woff2) format('woff2');
}
@font-face {
font-family: 'Archivo Narrow';
font-weight: 700;
font-style: italic;
font-display: swap;
src: url(../fonts/archivo-narrow/ArchivoNarrow-BoldItalic.woff2)
format('woff2'),
url(../fonts/archivo-narrow/ArchivoNarrow-BoldItalic.woff) format('woff');
format('woff2');
}
@font-face {
font-family: 'Archivo Narrow';
font-weight: 600;
font-style: normal;
font-display: swap;
src: url(../fonts/archivo-narrow/ArchivoNarrow-SemiBold.woff2) format('woff2'),
url(../fonts/archivo-narrow/ArchivoNarrow-SemiBold.woff) format('woff');
src: url(../fonts/archivo-narrow/ArchivoNarrow-SemiBold.woff2) format('woff2');
}
@font-face {
font-family: 'Archivo Narrow';
font-weight: 600;
font-style: italic;
font-display: swap;
src: url(../fonts/archivo-narrow/ArchivoNarrow-SemiBoldItalic.woff2)
format('woff2'),
url(../fonts/archivo-narrow/ArchivoNarrow-SemiBoldItalic.woff)
format('woff');
format('woff2');
}
13 changes: 0 additions & 13 deletions src/scss/components/_AnimationCaret.scss
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,4 @@
transform: translate(0, -50%);
}
}
.ie11 & {
> .arrow-wrapper {
> .arrow,
> .arrow-fixed {
@apply top-0 mt-1;
}
}
&.caret-inline {
.arrow-wrapper {
@apply hidden;
}
}
}
}
2 changes: 0 additions & 2 deletions src/scss/components/_BaseCarouselCards.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


.BaseCarouselCards {
.swiper-container {
@apply overflow-visible #{!important};
Expand Down
8 changes: 0 additions & 8 deletions src/scss/components/_BlockInlineImage.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,4 @@
@apply text-white;
}
}
.ie11 & {
@screen lg {
@apply flex;
> div {
@apply px-5;
}
}
}
}
Loading

0 comments on commit d227ea9

Please sign in to comment.