Skip to content

Commit

Permalink
Updates dependencies to jQuery 3.5.1, Bootstrap 4.5.0, popper.js 1.16…
Browse files Browse the repository at this point in the history
….1, Bootstrap Select 1.13.17 and needed changes. (#451)

Also updates Jekyll to 4.1.0.
  • Loading branch information
francescozaia authored Jun 3, 2020
1 parent 56e8a70 commit 68f4703
Show file tree
Hide file tree
Showing 11 changed files with 185 additions and 107 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://rubygems.org'

gem 'jekyll', '~> 4.0.0'
gem 'jekyll', '~> 4.1.0'
gem 'jekyll-redirect-from', '~> 0.16.0'
gem 'jekyll-sitemap', '~> 1.4.0'
gem 'jekyll-toc', '~> 0.13.1'
gem 'jekyll-toc', '~> 0.14.0'
gem 'html-proofer', '~> 3.15.0'
26 changes: 13 additions & 13 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GEM
ethon (0.12.0)
ffi (>= 1.3.0)
eventmachine (1.2.7)
ffi (1.12.2)
ffi (1.13.0)
forwardable-extended (2.6.0)
html-proofer (3.15.3)
addressable (~> 2.3)
Expand All @@ -24,17 +24,17 @@ GEM
http_parser.rb (0.6.0)
i18n (1.8.2)
concurrent-ruby (~> 1.0)
jekyll (4.0.0)
jekyll (4.1.0)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (>= 0.9.5, < 2)
i18n (~> 1.0)
jekyll-sass-converter (~> 2.0)
jekyll-watch (~> 2.0)
kramdown (~> 2.1)
kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0)
mercenary (~> 0.3.3)
mercenary (~> 0.4.0)
pathutil (~> 0.9)
rouge (~> 3.0)
safe_yaml (~> 1.0)
Expand All @@ -45,9 +45,9 @@ GEM
sassc (> 2.0.1, < 3.0)
jekyll-sitemap (1.4.0)
jekyll (>= 3.7, < 5.0)
jekyll-toc (0.13.1)
jekyll (>= 3.7)
nokogiri (~> 1.9)
jekyll-toc (0.14.0)
jekyll (>= 3.8)
nokogiri (~> 1.10)
jekyll-watch (2.2.1)
listen (~> 3.0)
kramdown (2.2.1)
Expand All @@ -58,7 +58,7 @@ GEM
listen (3.2.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.3.6)
mercenary (0.4.0)
mini_portile2 (2.4.0)
nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
Expand All @@ -67,13 +67,13 @@ GEM
parallel (1.19.1)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (4.0.4)
public_suffix (4.0.5)
rainbow (3.0.0)
rb-fsevent (0.10.3)
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.4)
rouge (3.18.0)
rouge (3.19.0)
safe_yaml (1.0.5)
sassc (2.3.0)
ffi (~> 1.9)
Expand All @@ -89,10 +89,10 @@ PLATFORMS

DEPENDENCIES
html-proofer (~> 3.15.0)
jekyll (~> 4.0.0)
jekyll (~> 4.1.0)
jekyll-redirect-from (~> 0.16.0)
jekyll-sitemap (~> 1.4.0)
jekyll-toc (~> 0.13.1)
jekyll-toc (~> 0.14.0)

BUNDLED WITH
2.1.4
10 changes: 5 additions & 5 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,16 @@ twitter: 'https://twitter.com/teamdigitaleIT'
twitter_handle: '@teamdigitaleIT'

# Versions
current_version: 1.3.10
bootstrap_version: 4.3.1
bootstrap_minor: 4.3
current_version: 1.3.10
bootstrap_version: 4.5.0
bootstrap_minor: 4.5

# Analytics
ga_property: 'UA-114758441-1'

# CDN links
cdn:
jquery: '<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js" crossorigin="anonymous"></script>'
popper: '<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" crossorigin="anonymous"></script>'
jquery: '<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js" crossorigin="anonymous"></script>'
popper: '<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.16.1/umd/popper.min.js" crossorigin="anonymous"></script>'
owlcarousel: '<script src="https://cdnjs.cloudflare.com/ajax/libs/OwlCarousel2/2.3.4/owl.carousel.min.js" crossorigin="anonymous"></script>'

24 changes: 11 additions & 13 deletions docs/assets/src/scss/_component-examples.scss
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
.bd-example-row {
.d-flex,
.row {
background-image:
linear-gradient(45deg, $neutral-1-a2 25%, transparent 25%),
linear-gradient(-45deg, $neutral-1-a2 25%, transparent 25%),
linear-gradient(45deg, transparent 75%, $neutral-1-a2 75%),
linear-gradient(-45deg, transparent 75%, $neutral-1-a2 75%);
background-image: linear-gradient(45deg, $neutral-1-a2 25%, transparent 25%),
linear-gradient(-45deg, $neutral-1-a2 25%, transparent 25%),
linear-gradient(45deg, transparent 75%, $neutral-1-a2 75%),
linear-gradient(-45deg, transparent 75%, $neutral-1-a2 75%);
background-size: 20px 20px;
background-position: 0 0, 0 10px, 10px -10px, -10px 0px;
}

.row {
> .col,
> [class^="col-"] {
padding-top: .75rem;
Expand All @@ -16,10 +18,10 @@
border: 1px solid $primary;
color: $white;
}
}

.row + .row {
margin-top: 1rem;
+ .row {
margin-top: 1rem;
}
}

.flex-items-top,
Expand All @@ -28,15 +30,11 @@
min-height: 6rem;
background-color: rgba(255, 0, 0, .1);
}

&.bd-example-row-flex-cols .row {
min-height: 10rem;
}
}


.bd-highlight {
background-color: rgba($primary, .55);
background-color: rgba($primary, .75);
border: 1px solid $primary;
color: white;
}
Expand Down
4 changes: 2 additions & 2 deletions docs/componenti/popover.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ Per aprire il Popover all'hover del mouse sull'elemento, aggiungere l'attributo
</button>
{% endcapture %}{% include example.html content=example %}

### Dismiss al click successivo
### Chiusura al click successivo

Usa l'evento `focus` per ignorare i popover sul clic successivo dell'utente di un elemento diverso rispetto all'elemento di attivazione / disattivazione.

Expand All @@ -153,7 +153,7 @@ Per il giusto comportamento cross-browser e cross-platform, è necessario utiliz
{% endcapture %}{% include callout.html content=callout type="danger" %}

{% capture example %}
<a tabindex="0" class="btn btn-lg btn-danger" role="button" data-toggle="popover" data-trigger="focus" title="Dismissible popover" data-content="Ed ecco alcuni contenuti sorprendenti. È molto coinvolgente. Non trovi?">Dismissible popover</a>
<a tabindex="0" href="#" class="btn btn-lg btn-danger" role="button" data-toggle="popover" data-trigger="focus" title="Popover richiudibile" data-content="Ecco il contenuto del popover richiudibile">Popover richiudibile</a>
{% endcapture %}{% include example.html content=example %}

{% highlight js %}
Expand Down
Loading

0 comments on commit 68f4703

Please sign in to comment.