Skip to content

Commit

Permalink
Merge pull request #1064 from paulcpederson/1.x
Browse files Browse the repository at this point in the history
📦 v1.2.5
  • Loading branch information
paulcpederson authored Feb 25, 2019
2 parents 8b8de3c + c47b302 commit 152e2c8
Show file tree
Hide file tree
Showing 30 changed files with 170 additions and 127 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
## [1.2.5]

### Fixes
- update web font CDN link for more permament fix to Arabic type
- remove `nowrap` for buttons to fix responsive designs (#1063)
- open/close accordions with space bar (#1062)
- fix RTL styles for input-search (#1061)

## [1.2.4]

### Fixes
Expand Down Expand Up @@ -1423,6 +1431,7 @@ Begin foundational sass for the framework.
- CSS Reset
- Grunt Workflows

[1.2.5]: https://github.com/esri/calcite-web/compare/v1.2.4...v1.2.5
[1.2.4]: https://github.com/esri/calcite-web/compare/v1.2.3...v1.2.4
[1.2.3]: https://github.com/esri/calcite-web/compare/v1.2.2...v1.2.3
[1.2.2]: https://github.com/esri/calcite-web/compare/v1.2.1...v1.2.2
Expand Down
76 changes: 38 additions & 38 deletions dist/css/calcite-web-dark.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/css/calcite-web-dark.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/calcite-web-e-commerce.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* Calcite Web - Calcite Design Components in CSS, JS and HTML
* @version v1.2.4
* @version v1.2.5
* @license Apache-2.0
* @copyright 2018 Esri
* @link https://github.com/Esri/calcite-web
Expand Down
2 changes: 1 addition & 1 deletion dist/css/calcite-web-e-commerce.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/calcite-web-marketing.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* Calcite Web - Calcite Design Components in CSS, JS and HTML
* @version v1.2.4
* @version v1.2.5
* @license Apache-2.0
* @copyright 2018 Esri
* @link https://github.com/Esri/calcite-web
Expand Down
2 changes: 1 addition & 1 deletion dist/css/calcite-web-marketing.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions dist/css/calcite-web-no-fonts.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* Calcite Web - Calcite Design Components in CSS, JS and HTML
* @version v1.2.4
* @version v1.2.5
* @license Apache-2.0
* @copyright 2018 Esri
* @link https://github.com/Esri/calcite-web
Expand Down Expand Up @@ -3453,7 +3453,6 @@ html[lang="vi"] body, html.vi body {
-webkit-transition: all 0.05s linear;
transition: all 0.05s linear;
cursor: pointer;
white-space: nowrap;
font-size: 0.9375rem;
line-height: 1.5; }
.btn:hover {
Expand Down Expand Up @@ -3582,7 +3581,6 @@ input[type="file"]::-webkit-file-upload-button,
-webkit-transition: all 0.05s linear;
transition: all 0.05s linear;
cursor: pointer;
white-space: nowrap;
font-size: 0.9375rem;
line-height: 1.5; }
input[type="file"]::-webkit-file-upload-button:hover,
Expand Down Expand Up @@ -4122,6 +4120,10 @@ input[type="file"]::-webkit-file-upload-button,
background-position: .25em center;
background-repeat: no-repeat;
padding-left: 1.5em; }
html[dir="rtl"] .input-search, html[dir="rtl"] .search-input {
background-position: right .25em center;
padding-right: 1.5em;
padding-left: 0.3rem; }

form {
margin: 0;
Expand Down Expand Up @@ -4290,7 +4292,6 @@ input[type="file"]::-webkit-file-upload-button {
-webkit-transition: all 0.05s linear;
transition: all 0.05s linear;
cursor: pointer;
white-space: nowrap;
font-size: 0.9375rem;
line-height: 1.5;
color: #0079c1;
Expand Down Expand Up @@ -4331,7 +4332,6 @@ input[type="file"]::-webkit-file-upload-button {
-webkit-transition: all 0.05s linear;
transition: all 0.05s linear;
cursor: pointer;
white-space: nowrap;
font-size: 0.9375rem;
line-height: 1.5;
color: #0079c1;
Expand Down
4 changes: 2 additions & 2 deletions dist/css/calcite-web-no-fonts.min.css

Large diffs are not rendered by default.

76 changes: 38 additions & 38 deletions dist/css/calcite-web.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/css/calcite-web.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/calcite-web-marketing.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* Calcite Web - Calcite Design Components in CSS, JS and HTML
* @version v1.2.4
* @version v1.2.5
* @license Apache-2.0
* @copyright 2018 Esri
* @link https://github.com/Esri/calcite-web
Expand Down
2 changes: 1 addition & 1 deletion dist/js/calcite-web-marketing.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 7 additions & 5 deletions dist/js/calcite-web.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* Calcite Web - Calcite Design Components in CSS, JS and HTML
* @version v1.2.4
* @version v1.2.5
* @license Apache-2.0
* @copyright 2018 Esri
* @link https://github.com/Esri/calcite-web
Expand Down Expand Up @@ -415,7 +415,9 @@ function handleToggle (options) {
}

function checkKeyCode (e) {
if (e.keyCode === 13 && has(target(e), 'accordion-title')) {
if ((e.keyCode === 13 || e.keyCode === 32) && has(target(e), 'accordion-title')) {
preventDefault(e);
stopPropagation(e);
toggleClick(e);
}
}
Expand Down Expand Up @@ -454,9 +456,9 @@ function setUpAccordion (accordion) {
});
if (!eventExists) {
boundEvents.accordions.push({target: sectionTitle, event: click(), fn: toggleClick});
boundEvents.accordions.push({target: section, event: 'keyup', fn: checkKeyCode});
boundEvents.accordions.push({target: section, event: 'keydown', fn: checkKeyCode});
add$1(sectionTitle, click(), toggleClick);
add$1(section, 'keyup', checkKeyCode);
add$1(section, 'keydown', checkKeyCode);
}
});
}
Expand Down Expand Up @@ -1406,7 +1408,7 @@ function extend (plugin) {
// │ Public API │
// └────────────┘
// define all public api methods
var version = '1.2.4';
var version = '1.2.5';
var click$1 = click;
var addEvent = add$1;
var removeEvent = remove$1;
Expand Down
4 changes: 2 additions & 2 deletions dist/js/calcite-web.min.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion dist/sass/calcite-web/components/_button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
@include box-sizing(border-box);
@include transition(all 0.05s linear);
cursor: pointer;
white-space: nowrap;
@include font-size(-1);
&:hover {
text-decoration: none;
Expand Down
7 changes: 6 additions & 1 deletion dist/sass/calcite-web/components/_form.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
background-position: .25em center;
background-repeat: no-repeat;
padding-left: 1.5em;
html[dir="rtl"] & {
background-position: right .25em center;
padding-right: 1.5em;
padding-left: $baseline / 5;
}
}

@mixin input-search {
Expand Down Expand Up @@ -138,7 +143,7 @@
background-position: right center;
background-repeat: no-repeat;
}

.input-error, .input-success {
html[dir="rtl"] & {
padding-left: 24px;
Expand Down
2 changes: 1 addition & 1 deletion dist/sass/calcite-web/type/_config.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ $body-size: 1rem;
$small-size: 0.85rem;
$indent: 1em;

$cdn-fonts-path: 'https://webapps-cdn.esri.com/CDN/fonts/v1.0.1/' !default;
$cdn-fonts-path: 'https://webapps-cdn.esri.com/CDN/fonts/v1.1.2/' !default;

// Header Family
$avenir-tracking: 0;
Expand Down
9 changes: 3 additions & 6 deletions dist/sass/calcite-web/type/_import.scss
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,7 @@
// Arabic, Arabic Presentation Forms A, Arabic Presentation Forms B
@font-face {
font-family: "Avenir Next";
src: local("Segoe UI Light"),
url("#{$cdn-fonts-path}2a1ae9a5-b6b5-405c-b660-bbdf1b356952.woff2") format("woff2"),
src: url("#{$cdn-fonts-path}2a1ae9a5-b6b5-405c-b660-bbdf1b356952.woff2") format("woff2"),
url("#{$cdn-fonts-path}a8aeea1b-1a9d-45b7-8ad9-7c71824599e2.woff") format("woff");
font-weight: 300;
font-style: normal;
Expand All @@ -209,8 +208,7 @@

@font-face {
font-family: "Avenir Next";
src: local("Segoe UI"),
url("#{$cdn-fonts-path}6ea5fa46-5311-450b-8744-288a30c55348.woff2") format("woff2"),
src: url("#{$cdn-fonts-path}6ea5fa46-5311-450b-8744-288a30c55348.woff2") format("woff2"),
url("#{$cdn-fonts-path}d9e4040d-32ff-4a1c-ac04-927a781da1f5.woff") format("woff");
font-weight: 400;
font-style: normal;
Expand All @@ -219,8 +217,7 @@

@font-face {
font-family: "Avenir Next";
src: local("Segoe UI Bold"),
url("#{$cdn-fonts-path}97694c53-4e94-4f9e-969b-a148adfcdcfd.woff2") format("woff2"),
src: url("#{$cdn-fonts-path}97694c53-4e94-4f9e-969b-a148adfcdcfd.woff2") format("woff2"),
url("#{$cdn-fonts-path}8b01637a-f445-4f10-92ea-b84a355f7690.woff") format("woff");
font-weight: 700;
font-style: normal;
Expand Down
26 changes: 26 additions & 0 deletions docs/source/assets/js/animation.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
(function () {
document.querySelector(".js-replay-animations").addEventListener("click", replayAnimations);
var animations = calcite.findElements(".js-animation")
.map(function (el) {
var animationClass = [].slice.apply(el.classList).filter(function (c) {
return c !== "js-animation";
});
return {
el: el,
animationClass: animationClass[0]
};
})
.filter(function (obj) {
return obj.animationClass;
})
function replayAnimations () {
animations.forEach(function (animation) {
animation.el.classList.remove(animation.animationClass);
});
setTimeout(function () {
animations.forEach(function (animation) {
animation.el.classList.add(animation.animationClass);
});
}, 50);
}
})();
2 changes: 1 addition & 1 deletion docs/source/documentation/components/_animation.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Animation helper classes are used to provide character, visual richness, and tactile feedback for the user. Adding an `.animate-` class to any DOM node will animate that node. Using JavaScript to add `.animate-fade-in` to a DOM node when it enters the viewport will cause that node to fade in.

**Note:** The animations probably already happened if you scrolled here from further up the page. Refresh the page to see them in action.
<button class="btn js-replay-animations">Replay Animations</button>
4 changes: 3 additions & 1 deletion docs/source/documentation/components/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@
title: Calcite Web
description: Quickly build beautiful, consistent websites with the Calcite Web Framework
section: 'components'
---
js:
- animation
---
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div class="{{modifier}}">
<div class="{{modifier}} js-animation">
<h3>Wakko packs away the snacks, while Bill Clinton plays the sax.</h3>
</div>
</div>
2 changes: 1 addition & 1 deletion es6.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ function extend (plugin) {
// │ Public API │
// └────────────┘
// define all public api methods
var version = '1.2.4';
var version = '1.2.5';
var click = event.click;
var addEvent = event.add;
var removeEvent = event.remove;
Expand Down
8 changes: 5 additions & 3 deletions lib/js/patterns/accordion.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ function handleToggle (options) {
}

function checkKeyCode (e) {
if (e.keyCode === 13 && classy.has(event.target(e), 'accordion-title')) {
if ((e.keyCode === 13 || e.keyCode === 32) && classy.has(event.target(e), 'accordion-title')) {
event.preventDefault(e);
event.stopPropagation(e);
toggleClick(e);
}
}
Expand Down Expand Up @@ -68,9 +70,9 @@ function setUpAccordion (accordion) {
});
if (!eventExists) {
event.boundEvents.accordions.push({target: sectionTitle, event: event.click(), fn: toggleClick});
event.boundEvents.accordions.push({target: section, event: 'keyup', fn: checkKeyCode});
event.boundEvents.accordions.push({target: section, event: 'keydown', fn: checkKeyCode});
event.add(sectionTitle, event.click(), toggleClick);
event.add(section, 'keyup', checkKeyCode);
event.add(section, 'keydown', checkKeyCode);
}
});
}
Expand Down
1 change: 0 additions & 1 deletion lib/sass/calcite-web/components/_button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
@include box-sizing(border-box);
@include transition(all 0.05s linear);
cursor: pointer;
white-space: nowrap;
@include font-size(-1);
&:hover {
text-decoration: none;
Expand Down
7 changes: 6 additions & 1 deletion lib/sass/calcite-web/components/_form.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
background-position: .25em center;
background-repeat: no-repeat;
padding-left: 1.5em;
html[dir="rtl"] & {
background-position: right .25em center;
padding-right: 1.5em;
padding-left: $baseline / 5;
}
}

@mixin input-search {
Expand Down Expand Up @@ -138,7 +143,7 @@
background-position: right center;
background-repeat: no-repeat;
}

.input-error, .input-success {
html[dir="rtl"] & {
padding-left: 24px;
Expand Down
2 changes: 1 addition & 1 deletion lib/sass/calcite-web/type/_config.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ $body-size: 1rem;
$small-size: 0.85rem;
$indent: 1em;

$cdn-fonts-path: 'https://webapps-cdn.esri.com/CDN/fonts/v1.0.1/' !default;
$cdn-fonts-path: 'https://webapps-cdn.esri.com/CDN/fonts/v1.1.2/' !default;

// Header Family
$avenir-tracking: 0;
Expand Down
9 changes: 3 additions & 6 deletions lib/sass/calcite-web/type/_import.scss
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,7 @@
// Arabic, Arabic Presentation Forms A, Arabic Presentation Forms B
@font-face {
font-family: "Avenir Next";
src: local("Segoe UI Light"),
url("#{$cdn-fonts-path}2a1ae9a5-b6b5-405c-b660-bbdf1b356952.woff2") format("woff2"),
src: url("#{$cdn-fonts-path}2a1ae9a5-b6b5-405c-b660-bbdf1b356952.woff2") format("woff2"),
url("#{$cdn-fonts-path}a8aeea1b-1a9d-45b7-8ad9-7c71824599e2.woff") format("woff");
font-weight: 300;
font-style: normal;
Expand All @@ -209,8 +208,7 @@

@font-face {
font-family: "Avenir Next";
src: local("Segoe UI"),
url("#{$cdn-fonts-path}6ea5fa46-5311-450b-8744-288a30c55348.woff2") format("woff2"),
src: url("#{$cdn-fonts-path}6ea5fa46-5311-450b-8744-288a30c55348.woff2") format("woff2"),
url("#{$cdn-fonts-path}d9e4040d-32ff-4a1c-ac04-927a781da1f5.woff") format("woff");
font-weight: 400;
font-style: normal;
Expand All @@ -219,8 +217,7 @@

@font-face {
font-family: "Avenir Next";
src: local("Segoe UI Bold"),
url("#{$cdn-fonts-path}97694c53-4e94-4f9e-969b-a148adfcdcfd.woff2") format("woff2"),
src: url("#{$cdn-fonts-path}97694c53-4e94-4f9e-969b-a148adfcdcfd.woff2") format("woff2"),
url("#{$cdn-fonts-path}8b01637a-f445-4f10-92ea-b84a355f7690.woff") format("woff");
font-weight: 700;
font-style: normal;
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "calcite-web",
"version": "1.2.4",
"version": "1.2.5",
"description": "SASS & CSS Framework for Esri websites",
"private": true,
"homepage": "https://github.com/esri/calcite-web",
Expand Down

0 comments on commit 152e2c8

Please sign in to comment.