Skip to content

Commit

Permalink
Merge branch 'master' into feature/#192-Datepicker-Timepicker
Browse files Browse the repository at this point in the history
# Conflicts:
#	_data/nav.yml
#	docs/come-iniziare/strumenti-di-compilazione.md
#	docs/componenti/button-group.md
#	docs/componenti/datepicker.md
  • Loading branch information
francescozaia committed Dec 14, 2018
2 parents 3f3f6b5 + 568a5d6 commit dad8789
Show file tree
Hide file tree
Showing 176 changed files with 11,902 additions and 2,314 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -4,4 +4,4 @@ gem 'jekyll', '~> 3.8.5'
gem 'jekyll-redirect-from', '~> 0.14.0'
gem 'jekyll-sitemap', '~> 1.2.0'
gem 'jekyll-toc', '~> 0.9.0'

gem 'html-proofer'
28 changes: 27 additions & 1 deletion Gemfile.lock
@@ -1,20 +1,37 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (5.2.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
colorator (1.1.0)
colorize (0.8.1)
concurrent-ruby (1.1.3)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
ethon (0.11.0)
ffi (>= 1.3.0)
eventmachine (1.2.7)
eventmachine (1.2.7-x64-mingw32)
eventmachine (1.2.7-x86-mingw32)
ffi (1.9.25)
ffi (1.9.25-x64-mingw32)
ffi (1.9.25-x86-mingw32)
forwardable-extended (2.6.0)
html-proofer (3.9.3)
activesupport (>= 4.2, < 6.0)
addressable (~> 2.3)
colorize (~> 0.8)
mercenary (~> 0.3.2)
nokogiri (~> 1.8.1)
parallel (~> 1.3)
typhoeus (~> 1.3)
yell (~> 2.0)
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
Expand Down Expand Up @@ -49,12 +66,14 @@ GEM
ruby_dep (~> 1.2)
mercenary (0.3.6)
mini_portile2 (2.3.0)
minitest (5.11.3)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
nokogiri (1.8.5-x64-mingw32)
mini_portile2 (~> 2.3.0)
nokogiri (1.8.5-x86-mingw32)
mini_portile2 (~> 2.3.0)
parallel (1.12.1)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (3.0.3)
Expand All @@ -69,17 +88,24 @@ GEM
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
thread_safe (0.3.6)
typhoeus (1.3.1)
ethon (>= 0.9.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
yell (2.0.7)

PLATFORMS
ruby
x64-mingw32
x86-mingw32

DEPENDENCIES
html-proofer
jekyll (~> 3.8.5)
jekyll-redirect-from (~> 0.14.0)
jekyll-sitemap (~> 1.2.0)
jekyll-toc (~> 0.9.0)

BUNDLED WITH
1.16.6
1.17.1
2 changes: 1 addition & 1 deletion _config.yml
Expand Up @@ -53,7 +53,7 @@ twitter: 'https://twitter.com/teamdigitaleIT'
twitter_handle: '@teamdigitaleIT'

# Versions
current_version: 0.24.0
current_version: 0.27.1
bootstrap_version: 4.1.3

# Analytics
Expand Down
11 changes: 8 additions & 3 deletions _data/examples.yml
@@ -1,12 +1,17 @@
- category: Esperimenti
- category: Componenti
description: Di seguito sono riportati alcuni esempi per il corretto utilizzo dei componenti, secondo le linee guida di design.
examples:
- name: Cookiebar
description: Una barra di avviso sui cookie basata su un cookie nominato 'cookies_consent'.
description: Una barra di avviso sui cookie.
- name: Notifications
description: Pagina con vari esempi di Notifications.
- name: Navscroll
description: Pagina con esempio di Navscroll.
- name: Hero
description: Pagina con vari esempi di Hero.

#- category: Template
# description: Questa area conterrà alcuni esempi di pagine complete.

- category: Esempi di Bootstrap
description: La documentazione di Bootstrap 4 contiene <a href="https://getbootstrap.com/docs/4.0/examples/" target="_blank">molti altri esempi</a> che possono risultare utili nell'utilizzo della libreria.
description: La documentazione di Bootstrap 4 contiene <a href="https://getbootstrap.com/docs/4.1/examples/" target="_blank">molti altri esempi</a> che possono risultare utili nell'utilizzo della libreria.
152 changes: 81 additions & 71 deletions _data/nav.yml
Expand Up @@ -7,110 +7,120 @@
- title: Modificare Componenti
- title: Componente base

- title: Contenuti
- title: Organizzare gli spazi
pages:
- title: Reboot
- title: Tipografia
- title: Introduzione
- title: Allineamento verticale
- title: Bordi
- title: Clearfix
- title: Dimensionamento
- title: Display
- title: Flex
- title: Float
- title: Griglie
status: wip
- title: Ombreggiature
- title: Posizionamento
- title: Spaziature

- title: Organizzare i contenuti
pages:
- title: Introduzione
- title: Codice
- title: Embed
- title: Immagini
- title: Liste
- title: Liste di immagini
- title: Liste di link
status: wip
- title: Liste elenco
- title: Oggetto Media
- title: Tabelle
- title: Figure
- title: Testo
- title: Tipografia

- title: Menu di navigazione
pages:
- title: Introduzione
- title: BottomNav
- title: Breadcrumbs
- title: Header
- title: Megamenu
#- title: Navigazione
# status: to do
#- title: Navscroll
# status: to do
- title: Navscroll
- title: Scrollspy
status: wip
- title: Sidebar
- title: Skiplinks
- title: Thumbnav
- title: Toolbar
- title: Torna indietro
- title: Torna su

- title: Componenti
pages:
- title: Introduzione
- title: Affix
- title: Alert
- title: Avatar
- title: Badge
- title: Barre di Avanzamento
- title: Breadcrumbs
- title: Bottoni
status: wip
- title: Card
- title: Callout
- title: Carousel
status: wip # Lacks a11y
- title: Chips
- title: Collapse
- title: Dropdown
- title: Elenchi
- title: Form
status: wip
- title: Form Input
status: wip
- title: Form Select
- title: Form Checkbox
- title: Form Radio Button
- title: Form Datepicker
- title: Form Toggles
- title: Form Upload
- title: Form Input Number
#- title: Form Input Time
- title: Cookiebar
#- title: Datepicker
# status: wip
- title: Grid list
- title: Header
- title: Dimmer
- title: Dropdown
- title: Forward
- title: Hero
- title: Link list
status: wip
- title: List
- title: Megamenu
#- title: Input group
# status: to do
- title: Modale
- title: Navbar
- title: Navscroll
- title: Pager
status: wip
- title: Notifiche
- title: Overlay
- title: Paginazione
- title: Popover
- title: Scrollspy
- title: Sidebar
- title: Skiplinks
status: wip
- title: Progress Indicators
- title: Rating
- title: Sections
- title: Steppers
- title: Tab
- title: Timeline
- title: Tooltip
- title: Transfer

- title: Componenti Aggiuntivi
- title: Form
pages:
- title: Introduzione
- title: Avatar
- title: Affix
status: wip
- title: Back to top
- title: Cookiebar
- title: Form Checkbox
- title: Form Datepicker
status: wip
- title: Callout
- title: Forward
- title: Form Input
status: wip
- title: Notifications
- title: Overlay
- title: Progress Indicators
- title: Sections
- title: Steppers
- title: Thumbnav
- title: BottomNav
- title: ThumbNav
- title: Toolbar
- title: Form Input Number
status: wip
- title: Form Input Time
- title: Form Radio Button
- title: Form Select
- title: Form Toggles
- title: Form Upload

- title: Utilities
pages:
- title: Introduzione
- title: Allineamento verticale
- title: Bordi
- title: Clearfix
- title: Colori
- title: Colori Custom
- title: Dimensionamento
- title: Display
- title: Embed
- title: Flex
- title: Float
- title: Griglie
status: wip
- title: History Back
- title: Immagini sostitutive
- title: Icone
- title: Media object
- title: Ombreggiature
- title: Posizionamento
- title: Screenreaders
- title: Spaziature
- title: Testo
- title: Visibility

#- title: Esempi
- title: Esempi

- title: Informazioni
4 changes: 2 additions & 2 deletions _includes/cookiebar.html
@@ -1,7 +1,7 @@
<div class="cookiebar">
<p>Questo sito utilizza cookie tecnici, analytics e di terze parti. <br>Proseguendo nella navigazione accetti l’utilizzo dei cookie.</p>
<div class="cookiebar-buttons">
<a href="https://designers.italia.it/privacy-policy/" class="cookiebar-btn">Privacy policy</span></a>
<a href="https://designers.italia.it/privacy-policy/" class="cookiebar-btn">Privacy policy</a>
<button data-accept="cookiebar" class="cookiebar-btn cookiebar-confirm">Accetto<span class="sr-only"> i cookies</span></button>
</div>
</div>
</div>
6 changes: 6 additions & 0 deletions _includes/docs-toc.html
@@ -0,0 +1,6 @@
<div class="d-none d-xl-block col-xl-2 bd-toc">
<div class="sidebar-wrapper">
<h3>{{ page.title | smartify }}</h3>
{{ content | toc_only }}
</div>
</div>
17 changes: 16 additions & 1 deletion _includes/scripts.html
Expand Up @@ -2,13 +2,28 @@

<script src="{{ site.baseurl }}/dist/js/bootstrap-italia.bundle.min.js?{{ buildTime }}"></script>


<script src="https://cdnjs.cloudflare.com/ajax/libs/anchor-js/4.1.0/anchor.min.js" integrity="sha256-lZaRhKri35AyJSypXXs4o6OPFTbTmUoltBbDCbdzegg=" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/2.0.1/clipboard.min.js" integrity="sha256-hIvIxeqhGZF+VVeM55k0mJvWpQ6gTkWk3Emc+NmowYA=" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/holder/2.9.4/holder.min.js" integrity="sha256-ifihHN6L/pNU1ZQikrAb7CnyMBvisKG3SUAab0F3kVU=" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/particles.js/2.0.0/particles.min.js" integrity="sha256-+u54FaX9J+k40eAcg5K2YzICSQjrEYBI9gju5nE3HfY=" crossorigin="anonymous"></script>

<script src="{{ site.baseurl }}/docs/assets/dist/js/docs.min.js?{{ buildTime }}"></script>


<script src="https://code.createjs.com/1.0.0/createjs.min.js"></script>
<script>
var manifest = [
{src:"{{ site.baseurl }}/docs/assets/img/cover/cover-animation-1.png", id:"cover-1"},
{src:"{{ site.baseurl }}/docs/assets/img/cover/cover-animation-2.png", id:"cover-2"},
{src:"{{ site.baseurl }}/docs/assets/img/cover/cover-animation-3.png", id:"cover-3"},
{src:"{{ site.baseurl }}/docs/assets/img/cover/cover-animation-4.png", id:"cover-4"},
{src:"{{ site.baseurl }}/docs/assets/img/cover/cover-animation-5.png", id:"cover-5"},
{src:"{{ site.baseurl }}/docs/assets/img/cover/cover-animation-6.png", id:"cover-6"},
{src:"{{ site.baseurl }}/docs/assets/img/cover/cover-animation-7.png", id:"cover-7"}
];
</script>
<script src="{{ site.baseurl }}/docs/assets/dist/js/cover-animation.min.js?{{ buildTime }}"></script>

{%- if page.layout == "docs" -%}
{% comment %}La ricerca è gestita con Algolia DocSearch https://github.com/algolia/docsearch{% endcomment %}
<script src="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js"></script>
Expand Down
9 changes: 9 additions & 0 deletions _layouts/base.html
@@ -0,0 +1,9 @@
<!doctype html>
<html lang="it">
<head>
{% include head.html %}
</head>
<body>
{{ content }}
</body>
</html>
2 changes: 1 addition & 1 deletion _layouts/default.html
Expand Up @@ -3,7 +3,7 @@
<head>
{% include head.html %}
</head>
<body>
<body onload="initCoverAnimation()">
<a id="skippy" class="sr-only sr-only-focusable" href="#content">
<div class="container">
<span class="skiplink-text">Skip to main content</span>
Expand Down
4 changes: 1 addition & 3 deletions _layouts/docs.html
Expand Up @@ -20,9 +20,7 @@
</div>

{% if page.toc %}
<div class="d-none d-xl-block col-xl-2 bd-toc">
{{ content | toc_only }}
</div>
{% include docs-toc.html %}
{% endif %}

<main class="col-12 col-md-9 col-xl-8 py-md-3 px-md-3 bd-content">
Expand Down

0 comments on commit dad8789

Please sign in to comment.