Skip to content

Commit

Permalink
Merge branch 'release/v2.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
VincentLoy committed Dec 5, 2024
2 parents 304911e + 0ae7f1b commit 0873e74
Show file tree
Hide file tree
Showing 12 changed files with 15,709 additions and 6,230 deletions.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,9 @@ You can easly customize the countdown using the css theme starter file or create

### Changelog

#### 2.0.1
Update all 2015 npm dependencies and rebuild the plugin with new deps.

#### 2.0.0
This version may have breaking changes, if your website is working well with 1.7.0, you may want to stay on the previous version.
- fix plurals in a generic way [#52](https://github.com/VincentLoy/simplyCountdown.js/pull/52)
Expand Down
2 changes: 1 addition & 1 deletion css/demo.css

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

21 changes: 14 additions & 7 deletions css/scss/demo.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
* Date : 27/06/2015
* Author : Vincent Loy <vincent.loy1$gmail.com>
*/
@use "sass:color";

$color-main: #3F72AF;
$color-main-darken: #112D4E;
$color-main-lighten: #6995ca;
Expand Down Expand Up @@ -79,7 +81,7 @@ header {

@media #{$tablet} {
font-size: 1.75rem;
margin: ($spacing * 2) 0 ($spacing * 3) 0;
margin: calc($spacing * 2) 0 calc($spacing * 3) 0;
}
}

Expand All @@ -96,7 +98,7 @@ header {
border:2px solid $color-secondary-lighten;
border-radius: 2px;
text-decoration: none;
padding: $spacing / 2;
padding: calc($spacing / 2);
transition: 0.1s ease-in-out all;
display: block;
margin: 0 $spacing $spacing $spacing;
Expand All @@ -115,7 +117,7 @@ header {

> i {
@media #{$tablet} {
margin-right: $spacing / 2;
margin-right: calc($spacing / 2);
}
}

Expand All @@ -136,11 +138,16 @@ header {
}

.note {
background: $color-main-darken;
background: $color-main;
color: $color-white;
font-style: italic;
border-radius: 2px;
padding: ($spacing / 3) $spacing;
padding: calc($spacing / 3) $spacing;
border-radius: 5px;

p {
margin-bottom: $spacing;
}
}

main {
Expand Down Expand Up @@ -169,7 +176,7 @@ main {

@media #{$tablet} {
font-size: 25px;
margin: ($spacing * 2) 0;
margin: calc($spacing * 2) 0;
}

a {
Expand Down Expand Up @@ -245,7 +252,7 @@ footer {
font-weight: 600;

a {
color: lighten($color-main-lighten, 25%);
color: color.adjust($color-main-lighten, $lightness: 25%);
text-decoration: none;
font-weight: bold;

Expand Down
2 changes: 1 addition & 1 deletion css/simplyCountdown.theme.default.css

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

2 changes: 1 addition & 1 deletion css/simplyCountdown.theme.losange.css

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

21 changes: 10 additions & 11 deletions dev/simplyCountdown.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
/* global Symbol */

/*!
* Project : simply-countdown
* Date : 06/12/2024
* License : MIT
* Version : 2.0.1
* Author : Vincent Loy <[email protected]>
* Contributors :
* - Justin Beasley <[email protected]>
* - Nathan Smith <[email protected]>
*/
(function (exports) {
'use strict';

/*!
* Project : simply-countdown
* Date : 27/06/2015
* License : MIT
* Version : 1.6.0
* Author : Vincent Loy <[email protected]>
* Contributors :
* - Justin Beasley <[email protected]>
* - Nathan Smith <[email protected]>
*/

/**
* Function that merge user parameters with defaults one.
* @param output
Expand Down
Loading

0 comments on commit 0873e74

Please sign in to comment.