From fa8048b5f496a10a7ed3329cd51ac5e2665c5918 Mon Sep 17 00:00:00 2001 From: Stephan Date: Wed, 9 Nov 2016 15:49:04 +0100 Subject: [PATCH 001/372] Started development branch with some dummy files --- robots.txt | 3 +++ sitemap.xml | 10 ++++++++++ 2 files changed, 13 insertions(+) create mode 100644 robots.txt create mode 100644 sitemap.xml diff --git a/robots.txt b/robots.txt new file mode 100644 index 0000000..4e91b12 --- /dev/null +++ b/robots.txt @@ -0,0 +1,3 @@ +user-agent: * +disallow: /private/ +sitemap: http://interaktionsweise.de/sitemap.xml diff --git a/sitemap.xml b/sitemap.xml new file mode 100644 index 0000000..0c51dbf --- /dev/null +++ b/sitemap.xml @@ -0,0 +1,10 @@ + + + + + http://interaktionsweise.de/ + 2016-11-09 + monthly + 1.0 + + \ No newline at end of file From ad4697dd9eca8563b125f05cd600f2db993a7c25 Mon Sep 17 00:00:00 2001 From: Stephan Date: Wed, 9 Nov 2016 16:02:43 +0100 Subject: [PATCH 002/372] Update LICENSE --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 58ebd36..3f37947 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2016 Stephan +Copyright (c) 2016 Stephan Hagedorn Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From f2dfe32ca2589a632b5de49ab8e2867e704bfe74 Mon Sep 17 00:00:00 2001 From: Stephan Date: Thu, 1 Dec 2016 15:37:49 +0100 Subject: [PATCH 003/372] Added sass and changed basic structure Many things to do. --- README.md | 4 +- TODO.md | 4 + _config.scss | 4 + _default.scss | 315 +++++++++++++ _hippie.scss | 45 ++ basic/_io.scss | 31 ++ basic/_layout.scss | 224 +++++++++ basic/_typo.scss | 297 ++++++++++++ modules/_flexbox.scss | 175 +++++++ modules/_vendor.scss | 23 + modules/card/_card_module.scss | 105 +++++ modules/card/_extends.scss | 0 modules/card/_mixins.scss | 0 modules/editor/_editor_module.scss | 23 + modules/editor/_extends.scss | 0 modules/editor/_mixins.scss | 0 modules/explanation/_explanation_module.scss | 114 +++++ modules/explanation/_extends.scss | 0 modules/explanation/_mixins.scss | 0 other/normalize.css | 461 +++++++++++++++++++ robots.txt | 2 +- sitemap.xml | 4 +- 22 files changed, 1827 insertions(+), 4 deletions(-) create mode 100644 TODO.md create mode 100644 _config.scss create mode 100644 _default.scss create mode 100644 _hippie.scss create mode 100644 basic/_io.scss create mode 100644 basic/_layout.scss create mode 100644 basic/_typo.scss create mode 100644 modules/_flexbox.scss create mode 100644 modules/_vendor.scss create mode 100644 modules/card/_card_module.scss create mode 100644 modules/card/_extends.scss create mode 100644 modules/card/_mixins.scss create mode 100644 modules/editor/_editor_module.scss create mode 100644 modules/editor/_extends.scss create mode 100644 modules/editor/_mixins.scss create mode 100644 modules/explanation/_explanation_module.scss create mode 100644 modules/explanation/_extends.scss create mode 100644 modules/explanation/_mixins.scss create mode 100644 other/normalize.css diff --git a/README.md b/README.md index bfa9760..896c34d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ # HIPPIE -## USE +## USE (work in progress) + +Clone the repo `https://github.com/sthag/hippie.git`. Copy the source folder to your projects style folder. diff --git a/TODO.md b/TODO.md new file mode 100644 index 0000000..e839123 --- /dev/null +++ b/TODO.md @@ -0,0 +1,4 @@ +- add dynamic content to robots.txt during build process +- add dynamic content to sitemap.xml +- add build process for normalize.css from github.com/necolas/normalize.css +- add build process for bourbon from https://github.com/thoughtbot/bourbon \ No newline at end of file diff --git a/_config.scss b/_config.scss new file mode 100644 index 0000000..1d9d663 --- /dev/null +++ b/_config.scss @@ -0,0 +1,4 @@ +// Main configuration +// ------------------------------------------------------------------------------ + +//$basic_size: 17px; \ No newline at end of file diff --git a/_default.scss b/_default.scss new file mode 100644 index 0000000..979fd93 --- /dev/null +++ b/_default.scss @@ -0,0 +1,315 @@ +// Default configuration +// ------------------------------------------------------------------------------ + +// TEXT +// ------------------------------------------------------------------------------ + +$basic_size: 15px; +$size_1: $basic_size * 4; + +$basic_line: 1; + +$head_size_1: 3.1em; +$head_size_2: 2.5em; +$head_size_3: 1.8em; +$head_size_4: 1.35em; + +$text_size_1: 1em; +$text_size_2: 20; + +$text_line_1: 1.5; +$head_line_1: $text_line_1; +$head_line_2: $text_line_1; +$head_line_3: $text_line_1; +$head_line_4: $text_line_1; + +$primary_font_family: #{'Trebuchet MS', Helvetica, Arial, sans-serif, sans}; +$secondary_font_family: #{'Roboto', sans-serif}; +$third_font_family: #{'Courier New', monospace}; + +$basic_indent: 2em; + + +// COLORS +// ------------------------------------------------------------------------------ + +$alpha_color: #fad803; +$bravo_color: #d30a51; +$charlie_color: #273f8b; +$delta_color: #b7e0f0; +$echo_color: #52bed1; +$foxtrot_color: #0c85ff; + +$black: black; +$white: white; +$medium_gray: lighten($black, 50%); + + +$basic_font_color: $black; +$basic_head_color: $black; + +$basic_link_color: $echo_color; +$basic_highlight_color: $white; +$basic_action_color: $foxtrot_color; + +$basic_border_color: $black; + +$basic_background_color: $medium_gray; + +// default shadow colors +// $shadow_color: fade-out($medium_gray, 0.5); + + + +// LAYOUT +// ------------------------------------------------------------------------------ + +$basic_width: 96%; +$width_2: 80%; +$width_3: 60%; +$width_4: 48%; + +$tiny_space: 1px; +$basic_space: 8px; +$half_space: $basic_space / 2; +$space_2: $basic_space * 2; +$space_3: $basic_space * 4; +$space_4: $basic_space * 8; +$space_5: $basic_space * 16; + +$basic_corner: 4px; +$basic_border_width: $tiny_space; +$border_width_4: $tiny_space * 4; +$border_width_8: $tiny_space * 8; +$basic_border: $tiny_space solid $basic_border_color; + + + +// IO +// ------------------------------------------------------------------------------ + +$basic_io_font_color: darken($white, 10%); +$basic_io_background_color: lighten($black, 25%); +$basic_shadow: inset 0 1px 3px rgba($black, 0.06); +$basic_focus_shadow: $basic_shadow, 0 0 5px adjust-color($basic_action_color, $lightness: -5%, $alpha: -0.3); + + + +// ANIMATIONS +// ------------------------------------------------------------------------------ + +$basic_duration: 150ms; +$basic_timing: ease; + + + + +// HARDWARE BREAKPOINTS +// ------------------------------------------------------------------------------ + +$tablet: "screen and (max-width: 64em)"; +$tablet_portrait: "screen and (max-width: 50em) and (orientation: portrait)"; +$tablet_landscape: "screen and (max-width: 50em) and (orientation: landscape)"; + +$mobile: "screen and (max-width: 30em)"; +$mobile_portrait: "screen and (max-width: 30em) and (orientation : portrait)"; +$mobile_landscape: "screen and (max-width: 30em) and (orientation : landscape)"; + +$screen_small: 1024px; +$screen_medium: 1280px; +$screen_large: 1920px; + + + +// VENDOR PREFIX +// ------------------------------------------------------------------------------ + +$prefix_defaults: -moz- -webkit- -o- -ms- ''; +$webkit_support: -webkit- ''; +$moz_support: -moz- ''; +$ms_support: -ms- ''; +$moz_webkit_support: -moz- -webkit- ''; +$moz_ms_support: -moz- -ms- ''; +$webkit_ms_support: -webkit- -ms- ''; + + + +// The config file is intended to allow users to quickly redefine core elements of the design +// that will cascade throughout the css to get your design up and running FAST! + +// For instruction, please see https://github.com/Anotheruiguy/toadstool/blob/master/sass/doc-src/config.md + +/////// Typography configuration/////// +// ----------------------------------------------------------------------------- +// $font_size: 12; +// +// $heading_1: 46; +// $heading_2: 32; +// $heading_3: 28; +// $heading_4: 18; +// $heading_5: 18; +// $heading_6: 18; +// +// $line: $font_size * 1.5; +// +// $small_point_size: 10; +// $large_point_size: 14; +// +// $primary_font_family: #{"Helvetica Neue", Arial, sans-serif}; +// $secondary_font_family: #{"Helvetica Neue", Arial, sans-serif}; +// $heading_font_family: #{"Helvetica Neue", Arial, sans-serif}; + +// $icon_font_alpha: #{'ico-fonts'}; + +/////// Default webfont directory/////// +// ----------------------------------------------------------------------------- +// $webfont_directory: "/fonts/"; + +/////// default image directory /////// +// ----------------------------------------------------------------------------- +// In Sinatra, the images folder resides in the public directory. This directory is not made publically accessible, +// so simply referencing the images directory will be fine. +// $imgDir: "/images/"; + +/////// OOCSS generic base colors/////// +// ----------------------------------------------------------------------------- +// Red, green, yellow, blue, accent and black is not law, but a common theme in most designs. +// Using Toadstool, all you need to do is edit these 6 hex values and everything else is created +// by magic, unicorns and fairy dust! + +// $alpha_primary: #5a2e2e; // red +// $bravo_primary: #3e4147; // green +// $charlie_primary: #fffedf; // yellow +// $delta_primary: #2a2c31; // blue +// $echo_primary: #dfba69; // accent + +// $alpha_gray: #333; //black + +/////// Toadstool color math /////// +// ----------------------------------------------------------------------------- +// Local color functions to create default color palette +//@import "color/color_math"; +//@import "color/grayscale_math"; +//@import "color/color_defaults"; + +/////// Grid configuration /////// +// ----------------------------------------------------------------------------- +// setting default units of measurement for Toadstool grid solution +// $grid_type: 12; // sets default column grid +// $grid_uom: percent; // use either ``em`` or ``percent`` +// $grid_padding_l: 0; // sets default left/right padding inside grid block +// $grid_padding_r: 0; // sets default left/right padding inside grid block +// $grid_padding_tb: 0; // sets default top/bottom padding inside grid block +// $grid_border: 0; // sets default border width on all grid blocks +// $grid_child: none; // sets parent child relationship between grid blocks +// $grid_align: default; // by default grids float left. Optional argument is ``center`` +// $col_base: 10; // equal to 10px in the standard 960.gs +// $col_gutter: $col_base * 2; // sets default grid gutter width +// $grid_960: 960 / 100%; // grid math for percentages + + + +/////// HTML 5 feature colors /////// +// ----------------------------------------------------------------------------- +// used with the `ins` tag +// http://www.w3schools.com/tags/tag_ins.asp +// $ins_color: $charlie_color; + +// used with the `mark` tag +// http://www.w3schools.com/html5/tag_mark.asp +// $mark_color: $charlie_color; + +// webkit tap highlight color +// $webkit_tap_hightlight: $delta_color_bravo; + +// overrides the default content selection color in the browser +// $selection_color: $charlie_color; +// $selection_text_color: $primary_text; + + + +/////// Config defaults for forms /////// +// ----------------------------------------------------------------------------- +// $alert_background_color: $alpha_color; + +// $input_disabled: $bravo_gray; +// $input_disabled_bkg: lighten($input_disabled, 75%); +// $input_disabled_border: lighten($input_disabled, 50%); +// $input_disabled_text: lighten($input_disabled, 50%); +// +// $form_field_background_color: $white; +// $form_field_focus_color: $white; +// $form_field_fail_bkg: $alpha_color_juliet; + +// $form_field_border: $charlie_gray; +// $form_field_border_fail: $alpha_color_echo; +// $form_field_focus_border_color: $charlie_gray; + +// $form_field_text_fail: $alpha_color_echo; +// $form_label_color: $alpha_gray; +// $optional_field_text_color: $delta_gray; +// $instructional_text: $charlie_gray; +// $placeholder_text: $hotel_gray; +// $inline_alert_bkg_color: $alpha_color_delta; +// $inline_alert_text_color: $white; + +// Non-color defaults (currently not represented in the SG view) +// --------------------------------------------------------- +// $form_field_border_radius: $standard_round_corner; +// $form_field_text: $primary_text; +// $form_field_height: 35; +// $form_field_padding: 6; +// $form_label_weight: bold; +// $form_label_lineheight: 20; +// $inline_alert_lineheight: 30; +// $inline_alert_left_padding: 12; +// $inline_alert_weight: bold; +// $inline_alert_top_margin: 12; +// $inline_alert_border_width: 1; + + + +/////// Config defaults for buttons /////// +// ----------------------------------------------------------------------------- +// $button-color: $delta-color; +// $button-text-color: $white; +// $button-line-height: 32; +// $button-border-radius: 3; +// $button-padding: 20; +// $button-font-size: 18; +// $button-weight: bold; +// $button-text-shadow: true; +// $button-box-shadow: true; + +/////// Config defaults for ``standard_rounded_border`` mixin /////// +// ----------------------------------------------------------------------------- +// $standard_round_corner: 3; // sets default border radius +// $standard_corner_width: 1px; // sets default border width +// $standard_border_color: $border_color; // sets default border color + +/////// Config defaults for ``standard_block_spacing`` mixin /////// +// ----------------------------------------------------------------------------- +// $default_block_spacing: 20; // sets margin-bottom + +/////// Config defaults for site border style /////// +// ----------------------------------------------------------------------------- +// $standard_border_style: solid; + +/////// Config defaults for ``standard_hr`` mixin /////// +// ----------------------------------------------------------------------------- +// $standard_hr_spacing: 40; // sets padding and margin bottom +// $standard_hr_color: $delta_gray; +// $standard_hr_width: 1px; + +/////// Config values for all default shadows /////// +// ----------------------------------------------------------------------------- +// $h-shadow: 0; // horizontal shadow settings +// $v-shadow: 2; // vertical shaddow settings +// $blur: 3; // blur settings +// +// $inset_color: $shadow_color; // for use with ``dual_box_shadow`` mixin +// $ih-shadow: 0; // inset horizontal shadow settings +// $iv-shadow: 2; // inset vertical shaddow settings +// $is-shadow: 2; // inset spread shaddow settings +// $iblur: 3; // inset blur settings + diff --git a/_hippie.scss b/_hippie.scss new file mode 100644 index 0000000..1a1102c --- /dev/null +++ b/_hippie.scss @@ -0,0 +1,45 @@ +// Add Bourbon and Bitters +// ------------------------------------------------------------------------------ +// @import "bourbon/bourbon"; + + + +// Reset +// ------------------------------------------------------------------------------ +@import "other/normalize.min.css"; + + + +// Global configuration with default values +// Adjustments can be made by copying values from default to config +// ------------------------------------------------------------------------------ +@import "default"; // NOTE // do not edit +@import "config"; // EDIT THIS // copy default values and adjust + + + +// Modules and variables +// Additional modules can be defined here +// ------------------------------------------------------------------------------ +@import "modules/flexbox"; +@import "modules/vendor"; +//@import modules/all deprecated because of the new vendor mixin +//@import modules/*/* needs sass-glob +// ADD HERE // @import "modules/example"; + +// Basic styles - this is the core of definitions +// Individual styles can be added her +// ------------------------------------------------------------------------------ +@import "basic/typo"; +@import "basic/io"; +@import "basic/layout"; +// ADD HERE // @import "{name}/example"; + +// Individual Modules and variables +// in dependency to other styles +// ------------------------------------------------------------------------------ +@import "modules/card/card_module"; +@import "modules/editor/editor_module"; +@import "modules/explanation/explanation_module"; + +// NOTE // No css rules allowed in here \ No newline at end of file diff --git a/basic/_io.scss b/basic/_io.scss new file mode 100644 index 0000000..f220e27 --- /dev/null +++ b/basic/_io.scss @@ -0,0 +1,31 @@ +// Input/Output styles +// ------------------------------------------------------------------------------ + +// Common +fieldset { + margin: $basic_space 0; + border: $basic_border; +} +legend { + @extend %basic; + padding: 0 $half_space; +} + +label { + @extend %basic; + display: table; + margin: $half_space 0; + input { + display: table-cell; + margin-left: $basic_space; + padding: $half_space ($half_space + 1); + border-style: solid; + border-color: transparent; + background-color: $basic_io_background_color; + color: $basic_io_font_color; + &:hover { + background-color: $black; + color: $white; + } + } +} diff --git a/basic/_layout.scss b/basic/_layout.scss new file mode 100644 index 0000000..d005f7f --- /dev/null +++ b/basic/_layout.scss @@ -0,0 +1,224 @@ +// Basic styles +// ------------------------------------------------------------------------------ + +html { + box-sizing: border-box; +} + +*, +::before, +::after { + box-sizing: inherit; +} + +body { + background-color: $basic_background_color; +} + +img { + vertical-align: top; +} + +.center_50 { + margin-right: 25%; + margin-left: 25%; +} +.center_25 { + margin-right: 37.5%; + margin-left: 37.5%; +} + +.width_full { + width: 100%; + margin-right: 0; + margin-left: 0; +} + +.clear { + clear: both; + &::before, + &::after { + clear: both; + } +} +.float_left { + float: left; + margin-right: $space_3; +} +.overflow { + overflow: auto; +} + + +// Layout structure +// ------------------------------------------------------------------------------ + +// Simulate new body element +.div_body { + width: $basic_width; + @media screen and (orientation: landscape) { + @media (min-width: $screen_small) { + width: $width_2; + } + @media (min-width: $screen_medium) { + width: $width_3; + } + @media (min-width: $screen_large) { + width: $width_4; + } + } + @media screen and (orientation: portrait) { + @media (min-width: $screen_small) { + width: $width_2; + } + } + margin: 0 auto; + border-top-width: $border_width_8; + border-top-style: solid; + border-color: $basic_border_color; + padding-top: $space_3; +} + +// Fixed elements +.relative { + position: relative; +} +.div_fix { + position: fixed; +} +.bottom { + bottom: 0; +} + + +// Layout elements +// ------------------------------------------------------------------------------ + +// Tabellen +table { + margin-top: $space_2; + margin-bottom: $space_2; + border: $basic_border; +} +th, td { + padding: $half_space; +} +th { + border: $basic_border_width dotted $basic_border_color; + border-bottom: $basic_border; +} +.precol { + border-right: $basic_border; +} +td { + border: $basic_border_width dotted $basic_border_color; +} +.table_blank { + border: $basic_border_width solid transparent; + th, td { + border: $basic_border_width solid transparent; + } +} +.table_free { + border: $basic_border_width solid transparent; +} +.table_stripe { + td { + border-top: 0; + border-bottom: 0; + } + tr:nth-child(even) td { + background-color: rgba($white,.1); + } +} +.table_fix { + table-layout: fixed; +} + +// Freiraum +.space_box { + float: left; + display: table; + width: $space_4; + text-align: center; + vertical-align: middle; + span { + display: table-cell; + } +} + +.div_placeholder { + width: 100%; + height: $space_4; + border: $border_width_4 solid rgba($black,.1); + border-radius: $basic_corner; + padding: $basic_space; + background-color: rgba($black,.1); + svg { + vertical-align: top; + } +} +.div_placeholder_bkg { + width: 100%; + height: $space_4; + border: $border_width_4 solid rgba($black,.1); + border-radius: $basic_corner; + padding: $basic_space; + /*data:[][;charset=][;base64],*/ + background: url("data:image/svg+xml;utf8,") no-repeat; + background-color: rgba($black,.1); +} + +.div_info { + padding: $space_2 $basic_indent; + border-right: $basic_space solid rgba($echo_color, .6); + background-color: rgba($echo_color, .1) !important; +} + +// Print +.div_print { + margin: $space_3 auto; + padding: 1.2cm 0.6cm 0.6cm 2.4cm; + background-color: $white; +} + +.dina5 { + width: 14.8cm; + height: 21.0cm; +} + +.test { + li:after { + content: ""; + display: block; + height: 16px; + } +} +.front_color_1 { color: $alpha_color; &:after { background-color: $alpha_color; } } +.front_color_2 { color: $bravo_color; &:after { background-color: $bravo_color; } } +.front_color_3 { color: $charlie_color; &:after { background-color: $charlie_color; } } +.front_color_4 { color: $delta_color; &:after { background-color: $delta_color; } } +.front_color_5 { color: $echo_color; &:after { background-color: $echo_color; } } + +.back_color_1 { background-color: $alpha_color;} +.back_color_2 { background-color: $bravo_color;} +.back_color_3 { background-color: $charlie_color;} +.back_color_4 { background-color: $delta_color;} +.back_color_5 { background-color: $echo_color;} + +%label { + padding: 0 $half_space; +} +.label_1 { + @extend %label; + @extend .back_color_1; +} +.label_2 { + @extend %label; + @extend .back_color_2; +} +.label_3 { + @extend %label; + @extend .back_color_3; +} + diff --git a/basic/_typo.scss b/basic/_typo.scss new file mode 100644 index 0000000..00d942a --- /dev/null +++ b/basic/_typo.scss @@ -0,0 +1,297 @@ +// Basic styles +// ------------------------------------------------------------------------------ + +%basic { + font-family: $secondary_font_family; + font-size: $text_size_1; + line-height: $text_line_1; +} + +%basic_mono { + font-family: $third_font_family; + font-size: $text_size_1; + line-height: $text_line_1; +} + +%head_all { + color: $basic_head_color; +} + +%head_1 { + font-family: $secondary_font_family; + font-size: $head_size_1; + font-weight: 300; + line-height: $head_line_1; +} + +%head_2 { + font-family: $secondary_font_family; + font-size: $head_size_2; + font-weight: 300; + line-height: $head_line_2; +} + +%head_3 { + font-family: $secondary_font_family; + font-size: $head_size_3; + font-weight: 300; + line-height: $head_line_3; +} + +%head_4 { + font-family: $secondary_font_family; + font-size: $head_size_4; + font-weight: 300; + line-height: $head_line_4; +} + + + +// Specific styles +// ------------------------------------------------------------------------------ + +body { + font-size: $basic_size; + line-height: $basic_line; +} + +// Grouping +p { + @extend %basic; + margin: $basic_space 0; + color: $basic_font_color; + code { + padding: $tiny_space $half_space; + font-size: 1em; + line-height: 1; + } +} + +pre { + @extend %basic_mono; +} +.pre_code { + border-color: rgba($white,.1); + border-style: dotted; + border-width: 0 0 0 $border_width_4; + border-radius: $basic_corner; + padding: $basic_space; + background-color: rgba($white,.1); + code { + background-color: transparent; + } +} + +blockquote { + margin: $basic_space $basic_indent; +} + +figure { + margin: $space_2 $basic_indent; +} +figcaption { + @extend %basic; +} + +// Formatting +.p_col_line { + column-rule: $basic_border_width solid $black; +} +.p_col_2, .p_col_3 { + @extend p; +} +.p_col_2 { + column-count: 2; + column-gap: $space_3; +} +.p_col_3 { + column-count: 3; + column-gap: $space_4; +} + +.span_solo { + @extend %basic; + color: $basic_font_color; +} + +b, strong { + font-weight: 500; +} + +i, em { + font-style: italic; +} + +mark { + background-color: $alpha_color; +} +.mark_cursor { + color: $basic_highlight_color; + background-color: $black; +} +::-moz-selection { + color: $basic_highlight_color; + background-color: $black; +} +::selection { + color: $basic_highlight_color; + background-color: $black; +} + +.txt_center { + text-align: center; +} +.txt_right { + text-align: right; +} + +// Special +code { + @extend %basic_mono; + color: lighten($black, 12%); + background-color: rgba($white,.1); +} +.code_solo { + @extend %basic_mono; + padding: $tiny_space $half_space; + color: $basic_font_color; +} + +// Quotation +.quote_mark { + p::before { + content: "\201E \0020"; + } + p::after { + content: "\201C \0020"; + } + .quote_source { + &::before, &::after { + content: ""; + } + } +} +cite { + font-style: italic; +} + +// Line +hr { + margin: $space_3 auto; + border-width: $basic_border_width 0 0; + border-style: solid; + border-color: $black; +} +.hr_hidden { + @extend hr; + border-color: transparent; +} +.hr_dotted { + @extend hr; + border-style: dotted; +} + +// Heading +h1 { + @extend %head_1; + margin: $space_5 0 $space_3; +} + +h2 { + @extend %head_2; + margin: $space_4 0 $space_3; +} + +h3 { + @extend %head_3; + margin: $space_2 0 $space_2; + text-transform: uppercase; +} + +h4 { + @extend %head_3; + margin: $space_2 0 $space_2; + text-transform: none; +} + +h5 { + @extend %head_4; + margin: $space_2 0 $basic_space; + text-transform: none; +} + +h6 { + @extend %basic; + margin: $basic_space 0; + text-transform: none; + font-weight: bold; +} + +// Link +a { + color: $basic_link_color; +// color: lighten($basic_action_color, 20%); + text-decoration: none; + + &:active, + &:focus, + &:hover { + color: $basic_highlight_color; + } +} +.link_line { + border-bottom-width: $tiny_space; + border-bottom-style: dotted; + border-color: $basic_border_color; + background-color: transparent; + color: $basic_font_color; + transition: color $basic_duration $basic_timing; + + &:active, + &:focus, + &:hover { + background-color: $basic_action_color; + color: $basic_highlight_color; + } +} + +// List +dl, ul, ol { + margin: $space_2 0 $basic_space; +} +ul, ol { + padding-left: $basic_indent; +} +li, dt, dd { + @extend %basic; + color: $black; +} +dd { + margin-left: $basic_indent; +} +ul { + li { + list-style: none; + position: relative; + + &:before { + content: "_"; + position: absolute; + left: -1em; + } + } +} + +// Table +th, td { + @extend %basic; +} +th { + text-align: left; +} +caption { + @extend p; + padding: $half_space 0; + border: $basic_border_width dotted $basic_border_color; + text-align: center; +} \ No newline at end of file diff --git a/modules/_flexbox.scss b/modules/_flexbox.scss new file mode 100644 index 0000000..3524b24 --- /dev/null +++ b/modules/_flexbox.scss @@ -0,0 +1,175 @@ +/** + * @description + * Generates flexbox properties for a given element + * + * @author romamatusevich + * + * @link MDN https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Flexible_boxes + * @link css-tricks http://css-tricks.com/snippets/css/a-guide-to-flexbox/ + * @link spec http://www.w3.org/TR/css3-flexbox/ + */ + +/** + * @returns + * display: -webkit-box; + * display: -moz-box; + * display: -ms-flexbox; + * display: -webkit-flex; + * display: flex; + * + * @example + * .selector { + * @include x-display-flex; + * } + */ +@mixin x-display-flex { + display: -webkit-box; // Chrome 20-, iOS 6-, Safari 3.1 -6 + display: -moz-box; // FF 19- + display: -webkit-flex; // Chrome 21 - 28 + display: -ms-flexbox; // IE 10 + display: flex; // FF 20+, Chrome 29+, Opera 12.1, 17+ +} + +/** + * @param values + * @returns + * -webkit-box-flex: ; + * -moz-box-flex: ; + * -webkit-flex: ; + * -ms-flex: ; + * flex: ; + * + * @example + * .selector { + * @include x-flex(1 1 auto); + * } + */ +@mixin x-flex ($values...) { + -webkit-box-flex: $values; // Chrome 20-, iOS 6-, Safari 3.1 - 6 + -moz-box-flex: $values; // FF 19- + -webkit-flex: $values; // Chrome 21 - 28 + -ms-flex: $values; // IE 10 + flex: $values; // FF 20+, Chrome 29+, Opera 12.1, 17+ +} + +/** + * @param value + * @returns + * -webkit-box-ordinal-group: ; + * -moz-box-ordinal-group: ; + * -ms-flex-order: ; + * -webkit-order: ; + * order: ; + * + * @example + * .selector { + * @include x-order(1); + * } + */ +@mixin x-order ($value) { + -webkit-box-ordinal-group: $value; // Chrome 20-, iOS 6-, Safari 3.1 - 6 + -moz-box-ordinal-group: $value; // FF 19- + -ms-flex-order: $value; // IE 10 + -webkit-order: $value; // Chrome 21 - 28 + order: $value; // FF 20+, Chrome 29+, Opera 12.1, 17+ +} + +/** + * @param value + * @returns + * -webkit-flex-wrap: ; + * -ms-flex-wrap: ; + * flex-wrap: ; + * + * @example + * .selector { + * @include x-flex-wrap(wrap); + * } + */ +@mixin x-flex-wrap ($value) { + // IE 10 + @if $value == nowrap { + -ms-flex-wrap: none; + } @else { + -ms-flex-wrap: $value; + } + -webkit-flex-wrap: $value; // Chrome 20-, iOS 6-, Safari 3.1 - 6 + flex-wrap: $value; // FF 28+, Chrome 21+, Opera 12.1, 17+, IE 11 +} + +/** + * @param value + * @returns + * -webkit-align-content: ; + * -moz-align-content: ; + * -ms-flex-line-pack: ; + * align-content: ; + * @example + * .selector { + * @include x-align-content(center); + * } + */ + @mixin x-align-content ($value) { + // IE 10 + @if $value == flex-start { + -ms-flex-line-pack: start; + } @else if $value == flex-end { + -ms-flex-line-pack: end; + } @else if $value == space-between { + -ms-flex-line-pack: justify; + } @else if $value == space-around { + -ms-flex-line-pack: distribute; + } @else { + -ms-flex-line-pack: $value; + } + -webkit-align-content: $value; // Chrome 20-, iOS 6-, Safari 3.1 - 6 + -moz-align-content: $value; // FF 19- + align-content: $value; // FF 20+, Chrome 21+, Opera 12.1, 17+, IE 11 + } + +/** + * @param value + * @returns + * -webkit-box-direction: ; + * -moz-box-direction: ; + * -webkit-box-orient: ; + * -moz-box-orient: ; + * -webkit-flex-direction: ; + * -moz-flex-direction: ; + * -ms-flex-direction: ; + * flex-direction: ; + * @example + * .selector { + * @include x-flex-direction(row-reverse); + * } + */ + @mixin x-flex-direction ($value) { + @if $value == row { + -webkit-box-direction: normal; + -moz-box-direction: normal; + -webkit-box-orient: horizontal; + -moz-box-orient: horizontal; + } @elseif $value == row-reverse { + -webkit-box-direction: reverse; + -moz-box-direction: reverse; + -webkit-box-orient: horizontal; + -moz-box-orient: horizontal; + } @elseif $value == column { + -webkit-box-direction: normal; + -moz-box-direction: normal; + -webkit-box-orient: vertical; + -moz-box-orient: vertical; + } @elseif $value == column-reverse { + -webkit-box-direction: reverse; + -moz-box-direction: reverse; + -webkit-box-orient: vertical; + -moz-box-orient: vertical; + } + + -webkit-flex-direction: $value; + -moz-flex-direction: $value; + -ms-flex-direction: $value; + flex-direction: $value; + } + +/* ToDo: add flex-grow, flex-shrink, flex-basis, flex-flow, align-items, align-self, justify-content mixins */ diff --git a/modules/_vendor.scss b/modules/_vendor.scss new file mode 100644 index 0000000..5d1ef73 --- /dev/null +++ b/modules/_vendor.scss @@ -0,0 +1,23 @@ +/** + * @description + * Generates cross-browser-compatible output for a given element with its value. + * + * @author sthag + * + * @param values + * @returns + * -webkit-: + * ...-: + * + * @example + * .selector + * @include vendor-prefix(hyphens, auto) + */ +@mixin vendor-prefix($name, $argument) { + -webkit-#{$name}: #{$argument}; + -ms-#{$name}: #{$argument}; + -moz-#{$name}: #{$argument}; + -o-#{$name}: #{$argument}; + #{$name}: #{$argument}; +} + diff --git a/modules/card/_card_module.scss b/modules/card/_card_module.scss new file mode 100644 index 0000000..89f3416 --- /dev/null +++ b/modules/card/_card_module.scss @@ -0,0 +1,105 @@ +// Custom extends and mixins +// ------------------------------------------------------------------------------ +@import "mixins"; +@import "extends"; + +// Card module styles +// ------------------------------------------------------------------------------ + +.card_body { + .bkgBox { + transition-duration: 800ms; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + overflow: hidden; + vertical-align: top; + z-index: -1; + } + + .bkgBox > svg { + position: relative; + } + + .wrapperBox { + display: -webkit-box; + display: -webkit-flex; + display: -moz-box; + display: -ms-flexbox; + display: flex; + -webkit-box-align: center; + -webkit-align-items: center; + -moz-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-pack: center; + -webkit-justify-content: center; + -moz-box-pack: center; + -ms-flex-pack: center; + justify-content: center; + height: 100%; + } + + #content { + position: relative; + padding: 64px 64px 24px 64px; + border: 1px solid #FFF; + background-color: #F5F5F5; + z-index: 40; + } + + h1 { + margin: 16px 0; + color: #1E1E1E; + font-family: $primary_font_family; + font-size: 24px; + line-height: 1.4em; + font-weight: normal; + } + + p { + margin-top: 0; + margin-bottom: 16px; + font-family: $primary_font_family; + font-size: 12px; + line-height: 1.4em; + } + + .full { + position: absolute; + width: 128px; + height: 128px; + top: 16px; + left: 16px; + background-color: #fff; + } + + .mark { + float: left; + width: 32px; + height: 32px; + margin-top: 16px; + } + + .marked { + padding-left: 1em; + text-indent: -1em; + text-align: center; + } + + .marked:before { content: "*\0000a0" } + + .decent { color: #666 } + + a { + color: #000; + text-decoration: none; + } + a:hover { + color: #F4F9FA; + background-color: #0C85FF; + text-decoration: none; + } +} diff --git a/modules/card/_extends.scss b/modules/card/_extends.scss new file mode 100644 index 0000000..e69de29 diff --git a/modules/card/_mixins.scss b/modules/card/_mixins.scss new file mode 100644 index 0000000..e69de29 diff --git a/modules/editor/_editor_module.scss b/modules/editor/_editor_module.scss new file mode 100644 index 0000000..9708c63 --- /dev/null +++ b/modules/editor/_editor_module.scss @@ -0,0 +1,23 @@ +// Custom extends and mixins +// ------------------------------------------------------------------------------ +@import "mixins"; +@import "extends"; + +// Editor module styles +// ------------------------------------------------------------------------------ + +%wip { + border-right: $basic_space solid rgba(crimson, .8); + background-color: rgba(crimson, .1) !important; +} +.wip { + @extend %wip; + &:before, &:after { + content: ""; + display: block; + height: 48px; + } +} +.wip_txt { + @extend %wip; +} \ No newline at end of file diff --git a/modules/editor/_extends.scss b/modules/editor/_extends.scss new file mode 100644 index 0000000..e69de29 diff --git a/modules/editor/_mixins.scss b/modules/editor/_mixins.scss new file mode 100644 index 0000000..e69de29 diff --git a/modules/explanation/_explanation_module.scss b/modules/explanation/_explanation_module.scss new file mode 100644 index 0000000..a05af2d --- /dev/null +++ b/modules/explanation/_explanation_module.scss @@ -0,0 +1,114 @@ +// Custom extends and mixins +// ------------------------------------------------------------------------------ +@import "mixins"; +@import "extends"; + +// Explanation module styles +// ------------------------------------------------------------------------------ + +%expose_after { + &:after { + content: ""; + display: block; + height: 48px; + background-color: rgba($delta_color, .1) !important; + } +} +%expose_before { + &:before { + content: ""; + display: block; + height: 48px; + background-color: rgba($delta_color, .1) !important; + } +} +%expose { + &:before, &:after { + content: ""; + display: block; + height: 48px; + background-color: rgba($delta_color, .1) !important; + } +} +%exp { +} +%exp_hidden { + display: none; +} + +.exp_wrap { + position: relative; +} + +.exp_pop { + @extend %exp_hidden !optional; + position: absolute; + z-index: 100; + top: $space_5; + left: $space_5; + padding: $half_space; + border: 4px solid $basic_background_color; + border-radius: 4px; + background-color: $basic_background_color; + pointer-events: none; +} +.exp_marker_pop { + position: absolute; + top: -$basic_size / 4 * 3; + right: -$basic_size / 2; + width: $basic_size; + height: $basic_size; + border: $tiny_space solid $basic_highlight_color; + border-radius: $basic_size; + color: $basic_highlight_color; + background-color: $black; +} + +.exp_expose { + @extend %expose !optional; +} +.exp_expose_pre { + @extend %expose_after +} +.exp_expose_post { + @extend %expose_before +} + +.exp_overlay_btn { + position: fixed; + width: $size_1; + height: $size_1; + cursor: pointer; +} +.exp_help_btn { + display: table; + right: $space_2; + bottom: $space_2; + background-color: rgba($black, .4); + &:hover { + background-color: $white; + > .span_solo { + color: $echo_color; + } + } + .span_solo { + @extend %head_1; + display: table-cell; + color: rgba($echo_color, .6); + font-weight: bold; + text-align: center; + vertical-align: middle; + } +} + + + +.expose_height { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + background-color: rgba($delta_color, .1) !important; + @include vendor-prefix(transition, height .5s ease); +} diff --git a/modules/explanation/_extends.scss b/modules/explanation/_extends.scss new file mode 100644 index 0000000..e69de29 diff --git a/modules/explanation/_mixins.scss b/modules/explanation/_mixins.scss new file mode 100644 index 0000000..e69de29 diff --git a/other/normalize.css b/other/normalize.css new file mode 100644 index 0000000..9b77e0e --- /dev/null +++ b/other/normalize.css @@ -0,0 +1,461 @@ +/*! normalize.css v5.0.0 | MIT License | github.com/necolas/normalize.css */ + +/** + * 1. Change the default font family in all browsers (opinionated). + * 2. Correct the line height in all browsers. + * 3. Prevent adjustments of font size after orientation changes in + * IE on Windows Phone and in iOS. + */ + +/* Document + ========================================================================== */ + +html { + font-family: sans-serif; /* 1 */ + line-height: 1.15; /* 2 */ + -ms-text-size-adjust: 100%; /* 3 */ + -webkit-text-size-adjust: 100%; /* 3 */ +} + +/* Sections + ========================================================================== */ + +/** + * Remove the margin in all browsers (opinionated). + */ + +body { + margin: 0; +} + +/** + * Add the correct display in IE 9-. + */ + +article, +aside, +footer, +header, +nav, +section { + display: block; +} + +/** + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/* Grouping content + ========================================================================== */ + +/** + * Add the correct display in IE 9-. + * 1. Add the correct display in IE. + */ + +figcaption, +figure, +main { /* 1 */ + display: block; +} + +/** + * Add the correct margin in IE 8. + */ + +figure { + margin: 1em 40px; +} + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ + +hr { + box-sizing: content-box; /* 1 */ + height: 0; /* 1 */ + overflow: visible; /* 2 */ +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +pre { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/* Text-level semantics + ========================================================================== */ + +/** + * 1. Remove the gray background on active links in IE 10. + * 2. Remove gaps in links underline in iOS 8+ and Safari 8+. + */ + +a { + background-color: transparent; /* 1 */ + -webkit-text-decoration-skip: objects; /* 2 */ +} + +/** + * Remove the outline on focused links when they are also active or hovered + * in all browsers (opinionated). + */ + +a:active, +a:hover { + outline-width: 0; +} + +/** + * 1. Remove the bottom border in Firefox 39-. + * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. + */ + +abbr[title] { + border-bottom: none; /* 1 */ + text-decoration: underline; /* 2 */ + text-decoration: underline dotted; /* 2 */ +} + +/** + * Prevent the duplicate application of `bolder` by the next rule in Safari 6. + */ + +b, +strong { + font-weight: inherit; +} + +/** + * Add the correct font weight in Chrome, Edge, and Safari. + */ + +b, +strong { + font-weight: bolder; +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +code, +kbd, +samp { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/** + * Add the correct font style in Android 4.3-. + */ + +dfn { + font-style: italic; +} + +/** + * Add the correct background and color in IE 9-. + */ + +mark { + background-color: #ff0; + color: #000; +} + +/** + * Add the correct font size in all browsers. + */ + +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` elements from affecting the line height in + * all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sub { + bottom: -0.25em; +} + +sup { + top: -0.5em; +} + +/* Embedded content + ========================================================================== */ + +/** + * Add the correct display in IE 9-. + */ + +audio, +video { + display: inline-block; +} + +/** + * Add the correct display in iOS 4-7. + */ + +audio:not([controls]) { + display: none; + height: 0; +} + +/** + * Remove the border on images inside links in IE 10-. + */ + +img { + border-style: none; +} + +/** + * Hide the overflow in IE. + */ + +svg:not(:root) { + overflow: hidden; +} + +/* Forms + ========================================================================== */ + +/** + * 1. Change the font styles in all browsers (opinionated). + * 2. Remove the margin in Firefox and Safari. + */ + +button, +input, +optgroup, +select, +textarea { + font-family: sans-serif; /* 1 */ + font-size: 100%; /* 1 */ + line-height: 1.15; /* 1 */ + margin: 0; /* 2 */ +} + +/** + * Show the overflow in IE. + * 1. Show the overflow in Edge. + */ + +button, +input { /* 1 */ + overflow: visible; +} + +/** + * Remove the inheritance of text transform in Edge, Firefox, and IE. + * 1. Remove the inheritance of text transform in Firefox. + */ + +button, +select { /* 1 */ + text-transform: none; +} + +/** + * 1. Prevent a WebKit bug where (2) destroys native `audio` and `video` + * controls in Android 4. + * 2. Correct the inability to style clickable types in iOS and Safari. + */ + +button, +html [type="button"], /* 1 */ +[type="reset"], +[type="submit"] { + -webkit-appearance: button; /* 2 */ +} + +/** + * Remove the inner border and padding in Firefox. + */ + +button::-moz-focus-inner, +[type="button"]::-moz-focus-inner, +[type="reset"]::-moz-focus-inner, +[type="submit"]::-moz-focus-inner { + border-style: none; + padding: 0; +} + +/** + * Restore the focus styles unset by the previous rule. + */ + +button:-moz-focusring, +[type="button"]:-moz-focusring, +[type="reset"]:-moz-focusring, +[type="submit"]:-moz-focusring { + outline: 1px dotted ButtonText; +} + +/** + * Change the border, margin, and padding in all browsers (opinionated). + */ + +fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; +} + +/** + * 1. Correct the text wrapping in Edge and IE. + * 2. Correct the color inheritance from `fieldset` elements in IE. + * 3. Remove the padding so developers are not caught out when they zero out + * `fieldset` elements in all browsers. + */ + +legend { + box-sizing: border-box; /* 1 */ + color: inherit; /* 2 */ + display: table; /* 1 */ + max-width: 100%; /* 1 */ + padding: 0; /* 3 */ + white-space: normal; /* 1 */ +} + +/** + * 1. Add the correct display in IE 9-. + * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ + +progress { + display: inline-block; /* 1 */ + vertical-align: baseline; /* 2 */ +} + +/** + * Remove the default vertical scrollbar in IE. + */ + +textarea { + overflow: auto; +} + +/** + * 1. Add the correct box sizing in IE 10-. + * 2. Remove the padding in IE 10-. + */ + +[type="checkbox"], +[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Correct the cursor style of increment and decrement buttons in Chrome. + */ + +[type="number"]::-webkit-inner-spin-button, +[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Correct the odd appearance in Chrome and Safari. + * 2. Correct the outline style in Safari. + */ + +[type="search"] { + -webkit-appearance: textfield; /* 1 */ + outline-offset: -2px; /* 2 */ +} + +/** + * Remove the inner padding and cancel buttons in Chrome and Safari on macOS. + */ + +[type="search"]::-webkit-search-cancel-button, +[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * 1. Correct the inability to style clickable types in iOS and Safari. + * 2. Change font properties to `inherit` in Safari. + */ + +::-webkit-file-upload-button { + -webkit-appearance: button; /* 1 */ + font: inherit; /* 2 */ +} + +/* Interactive + ========================================================================== */ + +/* + * Add the correct display in IE 9-. + * 1. Add the correct display in Edge, IE, and Firefox. + */ + +details, /* 1 */ +menu { + display: block; +} + +/* + * Add the correct display in all browsers. + */ + +summary { + display: list-item; +} + +/* Scripting + ========================================================================== */ + +/** + * Add the correct display in IE 9-. + */ + +canvas { + display: inline-block; +} + +/** + * Add the correct display in IE. + */ + +template { + display: none; +} + +/* Hidden + ========================================================================== */ + +/** + * Add the correct display in IE 10-. + */ + +[hidden] { + display: none; +} diff --git a/robots.txt b/robots.txt index 4e91b12..991af4e 100644 --- a/robots.txt +++ b/robots.txt @@ -1,3 +1,3 @@ user-agent: * disallow: /private/ -sitemap: http://interaktionsweise.de/sitemap.xml +sitemap: http://domain.tld/sitemap.xml diff --git a/sitemap.xml b/sitemap.xml index 0c51dbf..775085b 100644 --- a/sitemap.xml +++ b/sitemap.xml @@ -2,8 +2,8 @@ - http://interaktionsweise.de/ - 2016-11-09 + http://domain.tld/ + YYYY-MM-DD monthly 1.0 From 3598c3fc8f6f6aa6dc3f276f3e7923103b72090e Mon Sep 17 00:00:00 2001 From: Stephan Date: Thu, 1 Dec 2016 18:00:18 +0100 Subject: [PATCH 004/372] Small fixes --- _default.scss | 4 +++- _hippie.scss | 2 +- basic/_typo.scss | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/_default.scss b/_default.scss index 979fd93..c5a3b9d 100644 --- a/_default.scss +++ b/_default.scss @@ -23,10 +23,12 @@ $head_line_2: $text_line_1; $head_line_3: $text_line_1; $head_line_4: $text_line_1; -$primary_font_family: #{'Trebuchet MS', Helvetica, Arial, sans-serif, sans}; +$primary_font_family: #{'Roboto', sans-serif}; $secondary_font_family: #{'Roboto', sans-serif}; $third_font_family: #{'Courier New', monospace}; +$alternative_font_family: #{'Trebuchet MS', Helvetica, Arial, sans-serif, sans}; + $basic_indent: 2em; diff --git a/_hippie.scss b/_hippie.scss index 1a1102c..477cacd 100644 --- a/_hippie.scss +++ b/_hippie.scss @@ -6,7 +6,7 @@ // Reset // ------------------------------------------------------------------------------ -@import "other/normalize.min.css"; +@import "other/normalize.css"; diff --git a/basic/_typo.scss b/basic/_typo.scss index 00d942a..39a10c2 100644 --- a/basic/_typo.scss +++ b/basic/_typo.scss @@ -2,7 +2,7 @@ // ------------------------------------------------------------------------------ %basic { - font-family: $secondary_font_family; + font-family: $primary_font_family; font-size: $text_size_1; line-height: $text_line_1; } @@ -51,8 +51,10 @@ // ------------------------------------------------------------------------------ body { + font-family: $primary_font_family; font-size: $basic_size; line-height: $basic_line; + color: $basic_font_color; } // Grouping From f87bcf3df1b493d90f261e678968b9fa28f3f48b Mon Sep 17 00:00:00 2001 From: Stephan Date: Wed, 7 Dec 2016 19:06:52 +0100 Subject: [PATCH 005/372] Removed normalize.css --- _hippie.scss | 1 + other/normalize.css | 461 -------------------------------------------- 2 files changed, 1 insertion(+), 461 deletions(-) delete mode 100644 other/normalize.css diff --git a/_hippie.scss b/_hippie.scss index 477cacd..3639a7b 100644 --- a/_hippie.scss +++ b/_hippie.scss @@ -5,6 +5,7 @@ // Reset +// Use a file outside of hippie i.e. other/normalize.css // ------------------------------------------------------------------------------ @import "other/normalize.css"; diff --git a/other/normalize.css b/other/normalize.css deleted file mode 100644 index 9b77e0e..0000000 --- a/other/normalize.css +++ /dev/null @@ -1,461 +0,0 @@ -/*! normalize.css v5.0.0 | MIT License | github.com/necolas/normalize.css */ - -/** - * 1. Change the default font family in all browsers (opinionated). - * 2. Correct the line height in all browsers. - * 3. Prevent adjustments of font size after orientation changes in - * IE on Windows Phone and in iOS. - */ - -/* Document - ========================================================================== */ - -html { - font-family: sans-serif; /* 1 */ - line-height: 1.15; /* 2 */ - -ms-text-size-adjust: 100%; /* 3 */ - -webkit-text-size-adjust: 100%; /* 3 */ -} - -/* Sections - ========================================================================== */ - -/** - * Remove the margin in all browsers (opinionated). - */ - -body { - margin: 0; -} - -/** - * Add the correct display in IE 9-. - */ - -article, -aside, -footer, -header, -nav, -section { - display: block; -} - -/** - * Correct the font size and margin on `h1` elements within `section` and - * `article` contexts in Chrome, Firefox, and Safari. - */ - -h1 { - font-size: 2em; - margin: 0.67em 0; -} - -/* Grouping content - ========================================================================== */ - -/** - * Add the correct display in IE 9-. - * 1. Add the correct display in IE. - */ - -figcaption, -figure, -main { /* 1 */ - display: block; -} - -/** - * Add the correct margin in IE 8. - */ - -figure { - margin: 1em 40px; -} - -/** - * 1. Add the correct box sizing in Firefox. - * 2. Show the overflow in Edge and IE. - */ - -hr { - box-sizing: content-box; /* 1 */ - height: 0; /* 1 */ - overflow: visible; /* 2 */ -} - -/** - * 1. Correct the inheritance and scaling of font size in all browsers. - * 2. Correct the odd `em` font sizing in all browsers. - */ - -pre { - font-family: monospace, monospace; /* 1 */ - font-size: 1em; /* 2 */ -} - -/* Text-level semantics - ========================================================================== */ - -/** - * 1. Remove the gray background on active links in IE 10. - * 2. Remove gaps in links underline in iOS 8+ and Safari 8+. - */ - -a { - background-color: transparent; /* 1 */ - -webkit-text-decoration-skip: objects; /* 2 */ -} - -/** - * Remove the outline on focused links when they are also active or hovered - * in all browsers (opinionated). - */ - -a:active, -a:hover { - outline-width: 0; -} - -/** - * 1. Remove the bottom border in Firefox 39-. - * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. - */ - -abbr[title] { - border-bottom: none; /* 1 */ - text-decoration: underline; /* 2 */ - text-decoration: underline dotted; /* 2 */ -} - -/** - * Prevent the duplicate application of `bolder` by the next rule in Safari 6. - */ - -b, -strong { - font-weight: inherit; -} - -/** - * Add the correct font weight in Chrome, Edge, and Safari. - */ - -b, -strong { - font-weight: bolder; -} - -/** - * 1. Correct the inheritance and scaling of font size in all browsers. - * 2. Correct the odd `em` font sizing in all browsers. - */ - -code, -kbd, -samp { - font-family: monospace, monospace; /* 1 */ - font-size: 1em; /* 2 */ -} - -/** - * Add the correct font style in Android 4.3-. - */ - -dfn { - font-style: italic; -} - -/** - * Add the correct background and color in IE 9-. - */ - -mark { - background-color: #ff0; - color: #000; -} - -/** - * Add the correct font size in all browsers. - */ - -small { - font-size: 80%; -} - -/** - * Prevent `sub` and `sup` elements from affecting the line height in - * all browsers. - */ - -sub, -sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; -} - -sub { - bottom: -0.25em; -} - -sup { - top: -0.5em; -} - -/* Embedded content - ========================================================================== */ - -/** - * Add the correct display in IE 9-. - */ - -audio, -video { - display: inline-block; -} - -/** - * Add the correct display in iOS 4-7. - */ - -audio:not([controls]) { - display: none; - height: 0; -} - -/** - * Remove the border on images inside links in IE 10-. - */ - -img { - border-style: none; -} - -/** - * Hide the overflow in IE. - */ - -svg:not(:root) { - overflow: hidden; -} - -/* Forms - ========================================================================== */ - -/** - * 1. Change the font styles in all browsers (opinionated). - * 2. Remove the margin in Firefox and Safari. - */ - -button, -input, -optgroup, -select, -textarea { - font-family: sans-serif; /* 1 */ - font-size: 100%; /* 1 */ - line-height: 1.15; /* 1 */ - margin: 0; /* 2 */ -} - -/** - * Show the overflow in IE. - * 1. Show the overflow in Edge. - */ - -button, -input { /* 1 */ - overflow: visible; -} - -/** - * Remove the inheritance of text transform in Edge, Firefox, and IE. - * 1. Remove the inheritance of text transform in Firefox. - */ - -button, -select { /* 1 */ - text-transform: none; -} - -/** - * 1. Prevent a WebKit bug where (2) destroys native `audio` and `video` - * controls in Android 4. - * 2. Correct the inability to style clickable types in iOS and Safari. - */ - -button, -html [type="button"], /* 1 */ -[type="reset"], -[type="submit"] { - -webkit-appearance: button; /* 2 */ -} - -/** - * Remove the inner border and padding in Firefox. - */ - -button::-moz-focus-inner, -[type="button"]::-moz-focus-inner, -[type="reset"]::-moz-focus-inner, -[type="submit"]::-moz-focus-inner { - border-style: none; - padding: 0; -} - -/** - * Restore the focus styles unset by the previous rule. - */ - -button:-moz-focusring, -[type="button"]:-moz-focusring, -[type="reset"]:-moz-focusring, -[type="submit"]:-moz-focusring { - outline: 1px dotted ButtonText; -} - -/** - * Change the border, margin, and padding in all browsers (opinionated). - */ - -fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; -} - -/** - * 1. Correct the text wrapping in Edge and IE. - * 2. Correct the color inheritance from `fieldset` elements in IE. - * 3. Remove the padding so developers are not caught out when they zero out - * `fieldset` elements in all browsers. - */ - -legend { - box-sizing: border-box; /* 1 */ - color: inherit; /* 2 */ - display: table; /* 1 */ - max-width: 100%; /* 1 */ - padding: 0; /* 3 */ - white-space: normal; /* 1 */ -} - -/** - * 1. Add the correct display in IE 9-. - * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera. - */ - -progress { - display: inline-block; /* 1 */ - vertical-align: baseline; /* 2 */ -} - -/** - * Remove the default vertical scrollbar in IE. - */ - -textarea { - overflow: auto; -} - -/** - * 1. Add the correct box sizing in IE 10-. - * 2. Remove the padding in IE 10-. - */ - -[type="checkbox"], -[type="radio"] { - box-sizing: border-box; /* 1 */ - padding: 0; /* 2 */ -} - -/** - * Correct the cursor style of increment and decrement buttons in Chrome. - */ - -[type="number"]::-webkit-inner-spin-button, -[type="number"]::-webkit-outer-spin-button { - height: auto; -} - -/** - * 1. Correct the odd appearance in Chrome and Safari. - * 2. Correct the outline style in Safari. - */ - -[type="search"] { - -webkit-appearance: textfield; /* 1 */ - outline-offset: -2px; /* 2 */ -} - -/** - * Remove the inner padding and cancel buttons in Chrome and Safari on macOS. - */ - -[type="search"]::-webkit-search-cancel-button, -[type="search"]::-webkit-search-decoration { - -webkit-appearance: none; -} - -/** - * 1. Correct the inability to style clickable types in iOS and Safari. - * 2. Change font properties to `inherit` in Safari. - */ - -::-webkit-file-upload-button { - -webkit-appearance: button; /* 1 */ - font: inherit; /* 2 */ -} - -/* Interactive - ========================================================================== */ - -/* - * Add the correct display in IE 9-. - * 1. Add the correct display in Edge, IE, and Firefox. - */ - -details, /* 1 */ -menu { - display: block; -} - -/* - * Add the correct display in all browsers. - */ - -summary { - display: list-item; -} - -/* Scripting - ========================================================================== */ - -/** - * Add the correct display in IE 9-. - */ - -canvas { - display: inline-block; -} - -/** - * Add the correct display in IE. - */ - -template { - display: none; -} - -/* Hidden - ========================================================================== */ - -/** - * Add the correct display in IE 10-. - */ - -[hidden] { - display: none; -} From da18a756f38acf30bf001b6559774f11bf28cd77 Mon Sep 17 00:00:00 2001 From: Stephan Date: Thu, 8 Dec 2016 12:00:56 +0100 Subject: [PATCH 006/372] Changes to selector naming and structuring Modules are still on old scheme --- modules/card/_card_module.scss | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/modules/card/_card_module.scss b/modules/card/_card_module.scss index 89f3416..97df5b7 100644 --- a/modules/card/_card_module.scss +++ b/modules/card/_card_module.scss @@ -6,24 +6,28 @@ // Card module styles // ------------------------------------------------------------------------------ +%absolute_full { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; +} + .card_body { - .bkgBox { + .bkg_box { + @extend absolute_full; transition-duration: 800ms; - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; overflow: hidden; vertical-align: top; z-index: -1; } - .bkgBox > svg { + .bkg_box > svg { position: relative; } - .wrapperBox { + .flex_wrap_center { display: -webkit-box; display: -webkit-flex; display: -moz-box; @@ -42,7 +46,7 @@ height: 100%; } - #content { + .flex_content { position: relative; padding: 64px 64px 24px 64px; border: 1px solid #FFF; @@ -53,7 +57,6 @@ h1 { margin: 16px 0; color: #1E1E1E; - font-family: $primary_font_family; font-size: 24px; line-height: 1.4em; font-weight: normal; @@ -62,12 +65,11 @@ p { margin-top: 0; margin-bottom: 16px; - font-family: $primary_font_family; font-size: 12px; line-height: 1.4em; } - .full { +/* .full { position: absolute; width: 128px; height: 128px; @@ -76,13 +78,13 @@ background-color: #fff; } - .mark { + .mark { float: left; width: 32px; height: 32px; margin-top: 16px; } - + */ .marked { padding-left: 1em; text-indent: -1em; From c1c24b0967225862304c2691c1b3853e2d673843 Mon Sep 17 00:00:00 2001 From: Stephan Date: Thu, 8 Dec 2016 12:03:30 +0100 Subject: [PATCH 007/372] Small fix --- modules/card/_card_module.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/card/_card_module.scss b/modules/card/_card_module.scss index 97df5b7..42921b3 100644 --- a/modules/card/_card_module.scss +++ b/modules/card/_card_module.scss @@ -16,7 +16,7 @@ .card_body { .bkg_box { - @extend absolute_full; + @extend %absolute_full; transition-duration: 800ms; overflow: hidden; vertical-align: top; From f700f9be72692750259fb0bc75566f704dd839a0 Mon Sep 17 00:00:00 2001 From: Stephan Date: Thu, 8 Dec 2016 12:09:15 +0100 Subject: [PATCH 008/372] Small fix Missing body height --- modules/card/_card_module.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/card/_card_module.scss b/modules/card/_card_module.scss index 42921b3..3b8e23d 100644 --- a/modules/card/_card_module.scss +++ b/modules/card/_card_module.scss @@ -15,6 +15,7 @@ } .card_body { + height: 100%; .bkg_box { @extend %absolute_full; transition-duration: 800ms; From 81acd33c77b98d81927207d337ccd3ec84541958 Mon Sep 17 00:00:00 2001 From: Stephan Date: Thu, 8 Dec 2016 12:13:14 +0100 Subject: [PATCH 009/372] Add height to html This is important to know and remember --- basic/_layout.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/basic/_layout.scss b/basic/_layout.scss index d005f7f..02514ba 100644 --- a/basic/_layout.scss +++ b/basic/_layout.scss @@ -2,6 +2,7 @@ // ------------------------------------------------------------------------------ html { + height: 100%; box-sizing: border-box; } From d8a0b5e8d03c11bfbddc26f79a2fd8ab9ce53629 Mon Sep 17 00:00:00 2001 From: Stephan Date: Thu, 8 Dec 2016 17:50:51 +0100 Subject: [PATCH 010/372] New structure, indentation and content Adapted w3c structure for html5 elements New files for different sections of elements Indentation now made with tabs Added optional "above the fold" file --- _abovethefold.scss | 23 ++++ _hippie.scss | 58 ++++++-- basic/_common.scss | 119 ++++++++++++++++ basic/_embedded.scss | 50 +++++++ basic/_grouping.scss | 141 +++++++++++++++++++ basic/_interactive.scss | 120 ++++++++++++++++ basic/_io.scss | 31 ----- basic/_layout.scss | 225 ------------------------------ basic/_new.scss | 35 +++++ basic/_print.scss | 18 +++ basic/_sections.scss | 93 +++++++++++++ basic/_tables.scss | 61 ++++++++ basic/_textlevel.scss | 143 +++++++++++++++++++ basic/_typo.scss | 299 ---------------------------------------- basic/_typography.scss | 58 ++++++++ 15 files changed, 906 insertions(+), 568 deletions(-) create mode 100644 _abovethefold.scss create mode 100644 basic/_common.scss create mode 100644 basic/_embedded.scss create mode 100644 basic/_grouping.scss create mode 100644 basic/_interactive.scss delete mode 100644 basic/_io.scss delete mode 100644 basic/_layout.scss create mode 100644 basic/_new.scss create mode 100644 basic/_print.scss create mode 100644 basic/_sections.scss create mode 100644 basic/_tables.scss create mode 100644 basic/_textlevel.scss delete mode 100644 basic/_typo.scss create mode 100644 basic/_typography.scss diff --git a/_abovethefold.scss b/_abovethefold.scss new file mode 100644 index 0000000..ce51a2a --- /dev/null +++ b/_abovethefold.scss @@ -0,0 +1,23 @@ +/* + * # TABLE OF CONTENTS + * + * - Reset + * - Priority CSS Rules + * + */ + + +// Reset +// Use a file outside of hippie i.e. other/normalize.css +// ----------------------------------------------------------------------------- +// @import "other/normalize.css"; + + + +/* + * # NOTE + * + * CSS rules for content which is presented immediately + * to the screen and needs priority loading + * + */ diff --git a/_hippie.scss b/_hippie.scss index 3639a7b..cb7d29f 100644 --- a/_hippie.scss +++ b/_hippie.scss @@ -1,19 +1,44 @@ -// Add Bourbon and Bitters -// ------------------------------------------------------------------------------ -// @import "bourbon/bourbon"; - +/* + * # TABLE OF CONTENTS + * + * - Reset + * - Configuration + * - Special modules + * - Basic styles + * - Sections + * - Typography + * - I/O + * - Modules + * + * - Elements + * - Navigation + * - Links + * - Menus + * - Accessibility + * - Alignments + * - Clearings + * - Widgets + * - Content + * - Posts and pages + * - Comments + * - Infinite scroll + * - Media + * - Captions + * - Galleries + * + */ // Reset // Use a file outside of hippie i.e. other/normalize.css -// ------------------------------------------------------------------------------ +// ----------------------------------------------------------------------------- @import "other/normalize.css"; // Global configuration with default values // Adjustments can be made by copying values from default to config -// ------------------------------------------------------------------------------ +// ----------------------------------------------------------------------------- @import "default"; // NOTE // do not edit @import "config"; // EDIT THIS // copy default values and adjust @@ -21,7 +46,7 @@ // Modules and variables // Additional modules can be defined here -// ------------------------------------------------------------------------------ +// ----------------------------------------------------------------------------- @import "modules/flexbox"; @import "modules/vendor"; //@import modules/all deprecated because of the new vendor mixin @@ -30,15 +55,22 @@ // Basic styles - this is the core of definitions // Individual styles can be added her -// ------------------------------------------------------------------------------ -@import "basic/typo"; -@import "basic/io"; -@import "basic/layout"; +// ----------------------------------------------------------------------------- +@import "basic/common"; +@import "basic/typography"; +// Following the w3c document element structure +// https://w3c.github.io/html/index.html#contents +@import "basic/sections"; +@import "basic/grouping"; +@import "basic/textlevel"; +@import "basic/embedded"; +@import "basic/tables"; +@import "basic/interactive"; // ADD HERE // @import "{name}/example"; -// Individual Modules and variables +// Individual Modules and variables // in dependency to other styles -// ------------------------------------------------------------------------------ +// ----------------------------------------------------------------------------- @import "modules/card/card_module"; @import "modules/editor/editor_module"; @import "modules/explanation/explanation_module"; diff --git a/basic/_common.scss b/basic/_common.scss new file mode 100644 index 0000000..01a6b75 --- /dev/null +++ b/basic/_common.scss @@ -0,0 +1,119 @@ +// Clearing and floating +// ------------------------------------------------------------------------------ + +.clear { + clear: both; + &::before, + &::after { + clear: both; + } +} +.float_left { + float: left; + margin-right: $space_3; +} +.overflow { + overflow: auto; +} + + + +// General positioning attributes +// ------------------------------------------------------------------------------ + +.center_50 { + margin-right: 25%; + margin-left: 25%; +} +.center_25 { + margin-right: 37.5%; + margin-left: 37.5%; +} + +.width_full { + width: 100%; + margin-right: 0; + margin-left: 0; +} + + + +// Structure attributes +// ------------------------------------------------------------------------------ + +// Simulate new body element +.div_body { + width: $basic_width; + @media screen and (orientation: landscape) { + @media (min-width: $screen_small) { + width: $width_2; + } + @media (min-width: $screen_medium) { + width: $width_3; + } + @media (min-width: $screen_large) { + width: $width_4; + } + } + @media screen and (orientation: portrait) { + @media (min-width: $screen_small) { + width: $width_2; + } + } + margin: 0 auto; + border-top-width: $border_width_8; + border-top-style: solid; + border-color: $basic_border_color; + padding-top: $space_3; +} + +// Fixed elements +.relative { + position: relative; +} +.div_fix { + position: fixed; +} +.bottom { + bottom: 0; +} + +// Space and placeholders +.space_box { + float: left; + display: table; + width: $space_4; + text-align: center; + vertical-align: middle; + span { + display: table-cell; + } +} + +.div_placeholder { + width: 100%; + height: $space_4; + border: $border_width_4 solid rgba($black,.1); + border-radius: $basic_corner; + padding: $basic_space; + background-color: rgba($black,.1); + svg { + vertical-align: top; + } +} +.div_placeholder_bkg { + width: 100%; + height: $space_4; + border: $border_width_4 solid rgba($black,.1); + border-radius: $basic_corner; + padding: $basic_space; + /*data:[][;charset=][;base64],*/ + background: url("data:image/svg+xml;utf8,") no-repeat; + background-color: rgba($black,.1); +} + +.div_info { + padding: $space_2 $basic_indent; + border-right: $basic_space solid rgba($echo_color, .6); + background-color: rgba($echo_color, .1) !important; +} diff --git a/basic/_embedded.scss b/basic/_embedded.scss new file mode 100644 index 0000000..62e9b8c --- /dev/null +++ b/basic/_embedded.scss @@ -0,0 +1,50 @@ +// Edits +// ----------------------------------------------------------------------------- + +// Images +// ----------------------------------------------------------------------------- + +img { + vertical-align: top; +} + +picture { + +} + +source { + +} + + + +// Other stuff +// ----------------------------------------------------------------------------- + +iframe { + +} + +embed { + +} + +object { + +} + +video { + +} + +audio { + +} + +map { + +} + +area { + +} diff --git a/basic/_grouping.scss b/basic/_grouping.scss new file mode 100644 index 0000000..6d51205 --- /dev/null +++ b/basic/_grouping.scss @@ -0,0 +1,141 @@ +// Basic content +// ----------------------------------------------------------------------------- + +// Paragraph +p { + @extend %basic; + margin: $basic_space 0; + color: $basic_font_color; + code { + padding: $tiny_space $half_space; + font-size: 1em; + line-height: 1; + } +} + +.p_col_line { + column-rule: $basic_border_width solid $black; +} +.p_col_2, .p_col_3 { + @extend p; +} +.p_col_2 { + column-count: 2; + column-gap: $space_3; +} +.p_col_3 { + column-count: 3; + column-gap: $space_4; +} + +// Address +address { + +} + +// Line +hr { + margin: $space_3 auto; + border-width: $basic_border_width 0 0; + border-style: solid; + border-color: $black; +} + +.hr_hidden { + @extend hr; + border-color: transparent; +} + +.hr_dotted { + @extend hr; + border-style: dotted; +} + +// Preformat +pre { + @extend %basic_mono; +} + +.pre_code { + border-color: rgba($white,.1); + border-style: dotted; + border-width: 0 0 0 $border_width_4; + border-radius: $basic_corner; + padding: $basic_space; + background-color: rgba($white,.1); + code { + background-color: transparent; + } +} + +// Quote +blockquote { + margin: $basic_space $basic_indent; +} + +.quote_mark { + p::before { + content: "\201E \0020"; + } + p::after { + content: "\201C \0020"; + } + .quote_source { + &::before, &::after { + content: ""; + } + } +} + +// List +dl, ul, ol { + margin: $space_2 0 $basic_space; +} + +ul, ol { + padding-left: $basic_indent; +} + +li, dt, dd { + @extend %basic; + color: $black; +} + +dd { + margin-left: $basic_indent; +} + +ul { + li { + list-style: none; + position: relative; + + &:before { + content: "_"; + position: absolute; + left: -1em; + } + } +} + +// Embedded +figure { + margin: $space_2 $basic_indent; +} + +figcaption { + @extend %basic; +} + + + +// Special elements +// ----------------------------------------------------------------------------- + +main { + +} + +div { + +} \ No newline at end of file diff --git a/basic/_interactive.scss b/basic/_interactive.scss new file mode 100644 index 0000000..a5fe628 --- /dev/null +++ b/basic/_interactive.scss @@ -0,0 +1,120 @@ +// Form basics +// ----------------------------------------------------------------------------- + +form { + +} + +fieldset { + margin: $basic_space 0; + border: $basic_border; +} + +legend { + @extend %basic; + padding: 0 $half_space; +} + + + +// Common +// ----------------------------------------------------------------------------- +label { + @extend %basic; + display: table; + margin: $half_space 0; + + input { + display: table-cell; + margin-left: $basic_space; + padding: $half_space ($half_space + 1); + border-style: solid; + border-color: transparent; + background-color: $basic_io_background_color; + color: $basic_io_font_color; + + &:hover { + background-color: $black; + color: $white; + } + } +} + +input { + +} + + + +// More +// ----------------------------------------------------------------------------- + +button { + +} + +select { + +} + +datalist { + +} + +optgroup { + +} + +option { + +} + +textarea { + +} + +output { + +} + +progress { + +} + +meter { + +} + + + +// Interactive elements +// ----------------------------------------------------------------------------- + +details { + +} + +summary { + +} + +menu { + +} + +menuitem { + +} + +dialog { + +} + + + +// Canvas +// ----------------------------------------------------------------------------- + +canvas { + +} \ No newline at end of file diff --git a/basic/_io.scss b/basic/_io.scss deleted file mode 100644 index f220e27..0000000 --- a/basic/_io.scss +++ /dev/null @@ -1,31 +0,0 @@ -// Input/Output styles -// ------------------------------------------------------------------------------ - -// Common -fieldset { - margin: $basic_space 0; - border: $basic_border; -} -legend { - @extend %basic; - padding: 0 $half_space; -} - -label { - @extend %basic; - display: table; - margin: $half_space 0; - input { - display: table-cell; - margin-left: $basic_space; - padding: $half_space ($half_space + 1); - border-style: solid; - border-color: transparent; - background-color: $basic_io_background_color; - color: $basic_io_font_color; - &:hover { - background-color: $black; - color: $white; - } - } -} diff --git a/basic/_layout.scss b/basic/_layout.scss deleted file mode 100644 index 02514ba..0000000 --- a/basic/_layout.scss +++ /dev/null @@ -1,225 +0,0 @@ -// Basic styles -// ------------------------------------------------------------------------------ - -html { - height: 100%; - box-sizing: border-box; -} - -*, -::before, -::after { - box-sizing: inherit; -} - -body { - background-color: $basic_background_color; -} - -img { - vertical-align: top; -} - -.center_50 { - margin-right: 25%; - margin-left: 25%; -} -.center_25 { - margin-right: 37.5%; - margin-left: 37.5%; -} - -.width_full { - width: 100%; - margin-right: 0; - margin-left: 0; -} - -.clear { - clear: both; - &::before, - &::after { - clear: both; - } -} -.float_left { - float: left; - margin-right: $space_3; -} -.overflow { - overflow: auto; -} - - -// Layout structure -// ------------------------------------------------------------------------------ - -// Simulate new body element -.div_body { - width: $basic_width; - @media screen and (orientation: landscape) { - @media (min-width: $screen_small) { - width: $width_2; - } - @media (min-width: $screen_medium) { - width: $width_3; - } - @media (min-width: $screen_large) { - width: $width_4; - } - } - @media screen and (orientation: portrait) { - @media (min-width: $screen_small) { - width: $width_2; - } - } - margin: 0 auto; - border-top-width: $border_width_8; - border-top-style: solid; - border-color: $basic_border_color; - padding-top: $space_3; -} - -// Fixed elements -.relative { - position: relative; -} -.div_fix { - position: fixed; -} -.bottom { - bottom: 0; -} - - -// Layout elements -// ------------------------------------------------------------------------------ - -// Tabellen -table { - margin-top: $space_2; - margin-bottom: $space_2; - border: $basic_border; -} -th, td { - padding: $half_space; -} -th { - border: $basic_border_width dotted $basic_border_color; - border-bottom: $basic_border; -} -.precol { - border-right: $basic_border; -} -td { - border: $basic_border_width dotted $basic_border_color; -} -.table_blank { - border: $basic_border_width solid transparent; - th, td { - border: $basic_border_width solid transparent; - } -} -.table_free { - border: $basic_border_width solid transparent; -} -.table_stripe { - td { - border-top: 0; - border-bottom: 0; - } - tr:nth-child(even) td { - background-color: rgba($white,.1); - } -} -.table_fix { - table-layout: fixed; -} - -// Freiraum -.space_box { - float: left; - display: table; - width: $space_4; - text-align: center; - vertical-align: middle; - span { - display: table-cell; - } -} - -.div_placeholder { - width: 100%; - height: $space_4; - border: $border_width_4 solid rgba($black,.1); - border-radius: $basic_corner; - padding: $basic_space; - background-color: rgba($black,.1); - svg { - vertical-align: top; - } -} -.div_placeholder_bkg { - width: 100%; - height: $space_4; - border: $border_width_4 solid rgba($black,.1); - border-radius: $basic_corner; - padding: $basic_space; - /*data:[][;charset=][;base64],*/ - background: url("data:image/svg+xml;utf8,") no-repeat; - background-color: rgba($black,.1); -} - -.div_info { - padding: $space_2 $basic_indent; - border-right: $basic_space solid rgba($echo_color, .6); - background-color: rgba($echo_color, .1) !important; -} - -// Print -.div_print { - margin: $space_3 auto; - padding: 1.2cm 0.6cm 0.6cm 2.4cm; - background-color: $white; -} - -.dina5 { - width: 14.8cm; - height: 21.0cm; -} - -.test { - li:after { - content: ""; - display: block; - height: 16px; - } -} -.front_color_1 { color: $alpha_color; &:after { background-color: $alpha_color; } } -.front_color_2 { color: $bravo_color; &:after { background-color: $bravo_color; } } -.front_color_3 { color: $charlie_color; &:after { background-color: $charlie_color; } } -.front_color_4 { color: $delta_color; &:after { background-color: $delta_color; } } -.front_color_5 { color: $echo_color; &:after { background-color: $echo_color; } } - -.back_color_1 { background-color: $alpha_color;} -.back_color_2 { background-color: $bravo_color;} -.back_color_3 { background-color: $charlie_color;} -.back_color_4 { background-color: $delta_color;} -.back_color_5 { background-color: $echo_color;} - -%label { - padding: 0 $half_space; -} -.label_1 { - @extend %label; - @extend .back_color_1; -} -.label_2 { - @extend %label; - @extend .back_color_2; -} -.label_3 { - @extend %label; - @extend .back_color_3; -} - diff --git a/basic/_new.scss b/basic/_new.scss new file mode 100644 index 0000000..116a6a5 --- /dev/null +++ b/basic/_new.scss @@ -0,0 +1,35 @@ +.test { + li:after { + content: ""; + display: block; + height: 16px; + } +} +.front_color_1 { color: $alpha_color; &:after { background-color: $alpha_color; } } +.front_color_2 { color: $bravo_color; &:after { background-color: $bravo_color; } } +.front_color_3 { color: $charlie_color; &:after { background-color: $charlie_color; } } +.front_color_4 { color: $delta_color; &:after { background-color: $delta_color; } } +.front_color_5 { color: $echo_color; &:after { background-color: $echo_color; } } + +.back_color_1 { background-color: $alpha_color;} +.back_color_2 { background-color: $bravo_color;} +.back_color_3 { background-color: $charlie_color;} +.back_color_4 { background-color: $delta_color;} +.back_color_5 { background-color: $echo_color;} + +%label { + padding: 0 $half_space; +} +.label_1 { + @extend %label; + @extend .back_color_1; +} +.label_2 { + @extend %label; + @extend .back_color_2; +} +.label_3 { + @extend %label; + @extend .back_color_3; +} + diff --git a/basic/_print.scss b/basic/_print.scss new file mode 100644 index 0000000..b549316 --- /dev/null +++ b/basic/_print.scss @@ -0,0 +1,18 @@ +// Print elements +// ------------------------------------------------------------------------------ + +.div_print { + margin: $space_3 auto; + padding: 1.2cm 0.6cm 0.6cm 2.4cm; + background-color: $white; +} + +.dina4 { + width: 21.0cm; + height: 29.7cm; +} + +.dina5 { + width: 14.8cm; + height: 21.0cm; +} diff --git a/basic/_sections.scss b/basic/_sections.scss new file mode 100644 index 0000000..eb1f9b7 --- /dev/null +++ b/basic/_sections.scss @@ -0,0 +1,93 @@ +// Document +// ----------------------------------------------------------------------------- + +html { + height: 100%; + box-sizing: border-box; +} + +*, +::before, +::after { + box-sizing: inherit; +} + + + +// Basic sections +// ----------------------------------------------------------------------------- + +body { + font-family: $primary_font_family; + font-size: $basic_size; + line-height: $basic_line; + color: $basic_font_color; + background-color: $basic_background_color; +} + +article { + +} + +section { + +} + +nav { + +} + +aside { + +} + +header { + +} + +footer { + +} + +// Headings +// ----------------------------------------------------------------------------- + +h1, h2, h3, h4, h5. h6 { + +} + +h1 { + @extend %head_1; + margin: $space_5 0 $space_3; +} + +h2 { + @extend %head_2; + margin: $space_4 0 $space_3; +} + +h3 { + @extend %head_3; + margin: $space_2 0 $space_2; + text-transform: uppercase; +} + +h4 { + @extend %head_3; + margin: $space_2 0 $space_2; + text-transform: none; +} + +h5 { + @extend %head_4; + margin: $space_2 0 $basic_space; + text-transform: none; +} + +h6 { + @extend %basic; + margin: $basic_space 0; + text-transform: none; + font-weight: bold; +} + diff --git a/basic/_tables.scss b/basic/_tables.scss new file mode 100644 index 0000000..34fc3ce --- /dev/null +++ b/basic/_tables.scss @@ -0,0 +1,61 @@ +// Table +// ----------------------------------------------------------------------------- + +table { + margin-top: $space_2; + margin-bottom: $space_2; + border: $basic_border; +} + +th, td { + @extend %basic; + padding: $half_space; +} + +th { + border: $basic_border_width dotted $basic_border_color; + border-bottom: $basic_border; + text-align: left; +} + +.precol { + border-right: $basic_border; +} + +td { + border: $basic_border_width dotted $basic_border_color; +} + +.table_blank { + border: $basic_border_width solid transparent; + + th, td { + border: $basic_border_width solid transparent; + } +} + +.table_free { + border: $basic_border_width solid transparent; +} + +.table_stripe { + td { + border-top: 0; + border-bottom: 0; + } + + tr:nth-child(even) td { + background-color: rgba($white,.1); + } +} + +.table_fix { + table-layout: fixed; +} + +caption { + @extend p; + padding: $half_space 0; + border: $basic_border_width dotted $basic_border_color; + text-align: center; +} diff --git a/basic/_textlevel.scss b/basic/_textlevel.scss new file mode 100644 index 0000000..06851dc --- /dev/null +++ b/basic/_textlevel.scss @@ -0,0 +1,143 @@ +// Links +// ----------------------------------------------------------------------------- + +a { + color: $basic_link_color; +// color: lighten($basic_action_color, 20%); + text-decoration: none; + + &:active, + &:focus, + &:hover { + color: $basic_highlight_color; + } +} +.link_line { + border-bottom-width: $tiny_space; + border-bottom-style: dotted; + border-color: $basic_border_color; + background-color: transparent; + color: $basic_font_color; + transition: color $basic_duration $basic_timing; + + &:active, + &:focus, + &:hover { + background-color: $basic_action_color; + color: $basic_highlight_color; + } +} + + + +// Other elements +// ----------------------------------------------------------------------------- + +i, em { + font-style: italic; +} + +b, strong { + font-weight: 500; +} + +small { + +} + + +// Cite +cite { + font-style: italic; +} + +q { + +} + +dfn { + +} + +abbr { + +} + +data { + +} + +time { + +} + +// Code +code { + @extend %basic_mono; + color: lighten($black, 12%); + background-color: rgba($white,.1); +} +.code_solo { + @extend %basic_mono; + padding: $tiny_space $half_space; + color: $basic_font_color; +} + +samp { + +} + +kbd { + +} + +sub, sup { + +} + +u { + +} + +// Marks +mark { + background-color: $alpha_color; +} +.mark_cursor { + color: $basic_highlight_color; + background-color: $black; +} +::-moz-selection { + color: $basic_highlight_color; + background-color: $black; +} +::selection { + color: $basic_highlight_color; + background-color: $black; +} + +.span_solo { + @extend %basic; + color: $basic_font_color; +} + +br { + +} + +wbr { + +} + + + +// Edits +// ----------------------------------------------------------------------------- + +ins { + +} + +del { + +} \ No newline at end of file diff --git a/basic/_typo.scss b/basic/_typo.scss deleted file mode 100644 index 39a10c2..0000000 --- a/basic/_typo.scss +++ /dev/null @@ -1,299 +0,0 @@ -// Basic styles -// ------------------------------------------------------------------------------ - -%basic { - font-family: $primary_font_family; - font-size: $text_size_1; - line-height: $text_line_1; -} - -%basic_mono { - font-family: $third_font_family; - font-size: $text_size_1; - line-height: $text_line_1; -} - -%head_all { - color: $basic_head_color; -} - -%head_1 { - font-family: $secondary_font_family; - font-size: $head_size_1; - font-weight: 300; - line-height: $head_line_1; -} - -%head_2 { - font-family: $secondary_font_family; - font-size: $head_size_2; - font-weight: 300; - line-height: $head_line_2; -} - -%head_3 { - font-family: $secondary_font_family; - font-size: $head_size_3; - font-weight: 300; - line-height: $head_line_3; -} - -%head_4 { - font-family: $secondary_font_family; - font-size: $head_size_4; - font-weight: 300; - line-height: $head_line_4; -} - - - -// Specific styles -// ------------------------------------------------------------------------------ - -body { - font-family: $primary_font_family; - font-size: $basic_size; - line-height: $basic_line; - color: $basic_font_color; -} - -// Grouping -p { - @extend %basic; - margin: $basic_space 0; - color: $basic_font_color; - code { - padding: $tiny_space $half_space; - font-size: 1em; - line-height: 1; - } -} - -pre { - @extend %basic_mono; -} -.pre_code { - border-color: rgba($white,.1); - border-style: dotted; - border-width: 0 0 0 $border_width_4; - border-radius: $basic_corner; - padding: $basic_space; - background-color: rgba($white,.1); - code { - background-color: transparent; - } -} - -blockquote { - margin: $basic_space $basic_indent; -} - -figure { - margin: $space_2 $basic_indent; -} -figcaption { - @extend %basic; -} - -// Formatting -.p_col_line { - column-rule: $basic_border_width solid $black; -} -.p_col_2, .p_col_3 { - @extend p; -} -.p_col_2 { - column-count: 2; - column-gap: $space_3; -} -.p_col_3 { - column-count: 3; - column-gap: $space_4; -} - -.span_solo { - @extend %basic; - color: $basic_font_color; -} - -b, strong { - font-weight: 500; -} - -i, em { - font-style: italic; -} - -mark { - background-color: $alpha_color; -} -.mark_cursor { - color: $basic_highlight_color; - background-color: $black; -} -::-moz-selection { - color: $basic_highlight_color; - background-color: $black; -} -::selection { - color: $basic_highlight_color; - background-color: $black; -} - -.txt_center { - text-align: center; -} -.txt_right { - text-align: right; -} - -// Special -code { - @extend %basic_mono; - color: lighten($black, 12%); - background-color: rgba($white,.1); -} -.code_solo { - @extend %basic_mono; - padding: $tiny_space $half_space; - color: $basic_font_color; -} - -// Quotation -.quote_mark { - p::before { - content: "\201E \0020"; - } - p::after { - content: "\201C \0020"; - } - .quote_source { - &::before, &::after { - content: ""; - } - } -} -cite { - font-style: italic; -} - -// Line -hr { - margin: $space_3 auto; - border-width: $basic_border_width 0 0; - border-style: solid; - border-color: $black; -} -.hr_hidden { - @extend hr; - border-color: transparent; -} -.hr_dotted { - @extend hr; - border-style: dotted; -} - -// Heading -h1 { - @extend %head_1; - margin: $space_5 0 $space_3; -} - -h2 { - @extend %head_2; - margin: $space_4 0 $space_3; -} - -h3 { - @extend %head_3; - margin: $space_2 0 $space_2; - text-transform: uppercase; -} - -h4 { - @extend %head_3; - margin: $space_2 0 $space_2; - text-transform: none; -} - -h5 { - @extend %head_4; - margin: $space_2 0 $basic_space; - text-transform: none; -} - -h6 { - @extend %basic; - margin: $basic_space 0; - text-transform: none; - font-weight: bold; -} - -// Link -a { - color: $basic_link_color; -// color: lighten($basic_action_color, 20%); - text-decoration: none; - - &:active, - &:focus, - &:hover { - color: $basic_highlight_color; - } -} -.link_line { - border-bottom-width: $tiny_space; - border-bottom-style: dotted; - border-color: $basic_border_color; - background-color: transparent; - color: $basic_font_color; - transition: color $basic_duration $basic_timing; - - &:active, - &:focus, - &:hover { - background-color: $basic_action_color; - color: $basic_highlight_color; - } -} - -// List -dl, ul, ol { - margin: $space_2 0 $basic_space; -} -ul, ol { - padding-left: $basic_indent; -} -li, dt, dd { - @extend %basic; - color: $black; -} -dd { - margin-left: $basic_indent; -} -ul { - li { - list-style: none; - position: relative; - - &:before { - content: "_"; - position: absolute; - left: -1em; - } - } -} - -// Table -th, td { - @extend %basic; -} -th { - text-align: left; -} -caption { - @extend p; - padding: $half_space 0; - border: $basic_border_width dotted $basic_border_color; - text-align: center; -} \ No newline at end of file diff --git a/basic/_typography.scss b/basic/_typography.scss new file mode 100644 index 0000000..5177e8d --- /dev/null +++ b/basic/_typography.scss @@ -0,0 +1,58 @@ +// Basic styles +// ----------------------------------------------------------------------------- + +%basic { + font-family: $primary_font_family; + font-size: $text_size_1; + line-height: $text_line_1; +} + +%basic_mono { + font-family: $third_font_family; + font-size: $text_size_1; + line-height: $text_line_1; +} + +%head_all { + color: $basic_head_color; +} + +%head_1 { + font-family: $secondary_font_family; + font-size: $head_size_1; + font-weight: 300; + line-height: $head_line_1; +} + +%head_2 { + font-family: $secondary_font_family; + font-size: $head_size_2; + font-weight: 300; + line-height: $head_line_2; +} + +%head_3 { + font-family: $secondary_font_family; + font-size: $head_size_3; + font-weight: 300; + line-height: $head_line_3; +} + +%head_4 { + font-family: $secondary_font_family; + font-size: $head_size_4; + font-weight: 300; + line-height: $head_line_4; +} + + + +// Specific styles +// ----------------------------------------------------------------------------- + +.txt_center { + text-align: center; +} +.txt_right { + text-align: right; +} From eb4b4bfacaae2bd5f9e46ca52e9a1f157694660b Mon Sep 17 00:00:00 2001 From: Stephan Date: Thu, 8 Dec 2016 23:21:28 +0100 Subject: [PATCH 011/372] Add example html file Therefore also added normalize.css This has to be different in the future --- _default.scss | 10 +- _hippie.scss | 26 +-- basic/_common.scss | 2 + basic/_embedded.scss | 3 - basic/_tables.scss | 94 ++++++++- basic/_textlevel.scss | 3 +- basic/_typography.scss | 6 +- example.scss | 5 + other/normalize.css | 461 +++++++++++++++++++++++++++++++++++++++++ 9 files changed, 581 insertions(+), 29 deletions(-) create mode 100644 example.scss create mode 100644 other/normalize.css diff --git a/_default.scss b/_default.scss index c5a3b9d..5cd9099 100644 --- a/_default.scss +++ b/_default.scss @@ -54,9 +54,11 @@ $basic_link_color: $echo_color; $basic_highlight_color: $white; $basic_action_color: $foxtrot_color; -$basic_border_color: $black; - $basic_background_color: $medium_gray; +$light_color: lighten($basic_background_color,5%); +$dark_color: darken($basic_background_color,10%); + +$basic_border_color: $black; // default shadow colors // $shadow_color: fade-out($medium_gray, 0.5); @@ -80,10 +82,14 @@ $space_4: $basic_space * 8; $space_5: $basic_space * 16; $basic_corner: 4px; + $basic_border_width: $tiny_space; $border_width_4: $tiny_space * 4; $border_width_8: $tiny_space * 8; $basic_border: $tiny_space solid $basic_border_color; +$cell_border: $tiny_space solid $dark_color; + +$basic_aside_width: 20%; diff --git a/_hippie.scss b/_hippie.scss index cb7d29f..09ba726 100644 --- a/_hippie.scss +++ b/_hippie.scss @@ -5,26 +5,16 @@ * - Configuration * - Special modules * - Basic styles - * - Sections + * - Common * - Typography - * - I/O - * - Modules * - * - Elements - * - Navigation - * - Links - * - Menus - * - Accessibility - * - Alignments - * - Clearings - * - Widgets - * - Content - * - Posts and pages - * - Comments - * - Infinite scroll - * - Media - * - Captions - * - Galleries + * - Sections + * - Grouping + * - Textlevel + * - Embedded + * - Tables + * - Interactive + * - Modules * */ diff --git a/basic/_common.scss b/basic/_common.scss index 01a6b75..2bb73ad 100644 --- a/basic/_common.scss +++ b/basic/_common.scss @@ -8,10 +8,12 @@ clear: both; } } + .float_left { float: left; margin-right: $space_3; } + .overflow { overflow: auto; } diff --git a/basic/_embedded.scss b/basic/_embedded.scss index 62e9b8c..2cbdc6d 100644 --- a/basic/_embedded.scss +++ b/basic/_embedded.scss @@ -1,6 +1,3 @@ -// Edits -// ----------------------------------------------------------------------------- - // Images // ----------------------------------------------------------------------------- diff --git a/basic/_tables.scss b/basic/_tables.scss index 34fc3ce..06fd06e 100644 --- a/basic/_tables.scss +++ b/basic/_tables.scss @@ -5,6 +5,7 @@ table { margin-top: $space_2; margin-bottom: $space_2; border: $basic_border; + border-collapse: collapse; } th, td { @@ -13,8 +14,7 @@ th, td { } th { - border: $basic_border_width dotted $basic_border_color; - border-bottom: $basic_border; + border: $basic_border; text-align: left; } @@ -23,7 +23,22 @@ th { } td { - border: $basic_border_width dotted $basic_border_color; + border-right: $cell_border; + border-bottom: $cell_border; +} + +td:last-child { + border-right: 0; +} + +tr:last-child td { + border-bottom: 0; +} + +tfoot { + tr:first-child td { + border-top: $basic_border; + } } .table_blank { @@ -45,7 +60,7 @@ td { } tr:nth-child(even) td { - background-color: rgba($white,.1); + background-color: $light_color; } } @@ -59,3 +74,74 @@ caption { border: $basic_border_width dotted $basic_border_color; text-align: center; } + +.table_link { + width: 100%; + border: 0; + table-layout: auto; + + tbody { + border-bottom: $cell_border; + + &:hover { + background-color: $light_color; + } + } + + th, td { + border: 0; + } + + .cell_icon { + width: 48px; + text-align: center; + img { + vertical-align: text-top; + } + } + + .cell_link { + padding-right: $basic_space; + padding-left: $basic_space; + + &:hover { + background-color: $foxtrot_color; + } + + a { + display: block; + } + + .link_url { + display: none; + } + + &:hover .link_url { + display: block; + color: $white; + } + + &:hover .link_text { + display: none; + } + } + + .cell_date { + width: 12%; + text-align: center; + } + + .cell_text { + padding-right: $basic_space; + padding-left: $basic_space; + + div { + width: 100%; + } + + .shorten { + @extend %short; + max-height: 44px; + } + } +} diff --git a/basic/_textlevel.scss b/basic/_textlevel.scss index 06851dc..a3befcc 100644 --- a/basic/_textlevel.scss +++ b/basic/_textlevel.scss @@ -12,6 +12,7 @@ a { color: $basic_highlight_color; } } + .link_line { border-bottom-width: $tiny_space; border-bottom-style: dotted; @@ -139,5 +140,5 @@ ins { } del { - + } \ No newline at end of file diff --git a/basic/_typography.scss b/basic/_typography.scss index 5177e8d..53b5d0c 100644 --- a/basic/_typography.scss +++ b/basic/_typography.scss @@ -45,7 +45,11 @@ line-height: $head_line_4; } - +%short { + overflow: hidden; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; // vendor +} // Specific styles // ----------------------------------------------------------------------------- diff --git a/example.scss b/example.scss new file mode 100644 index 0000000..eabc71e --- /dev/null +++ b/example.scss @@ -0,0 +1,5 @@ +// Add hippie +// ------------------------------------------------------------------------------ +@import "hippie"; + +// NOTE // No css rules allowed in here \ No newline at end of file diff --git a/other/normalize.css b/other/normalize.css new file mode 100644 index 0000000..9b77e0e --- /dev/null +++ b/other/normalize.css @@ -0,0 +1,461 @@ +/*! normalize.css v5.0.0 | MIT License | github.com/necolas/normalize.css */ + +/** + * 1. Change the default font family in all browsers (opinionated). + * 2. Correct the line height in all browsers. + * 3. Prevent adjustments of font size after orientation changes in + * IE on Windows Phone and in iOS. + */ + +/* Document + ========================================================================== */ + +html { + font-family: sans-serif; /* 1 */ + line-height: 1.15; /* 2 */ + -ms-text-size-adjust: 100%; /* 3 */ + -webkit-text-size-adjust: 100%; /* 3 */ +} + +/* Sections + ========================================================================== */ + +/** + * Remove the margin in all browsers (opinionated). + */ + +body { + margin: 0; +} + +/** + * Add the correct display in IE 9-. + */ + +article, +aside, +footer, +header, +nav, +section { + display: block; +} + +/** + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/* Grouping content + ========================================================================== */ + +/** + * Add the correct display in IE 9-. + * 1. Add the correct display in IE. + */ + +figcaption, +figure, +main { /* 1 */ + display: block; +} + +/** + * Add the correct margin in IE 8. + */ + +figure { + margin: 1em 40px; +} + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ + +hr { + box-sizing: content-box; /* 1 */ + height: 0; /* 1 */ + overflow: visible; /* 2 */ +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +pre { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/* Text-level semantics + ========================================================================== */ + +/** + * 1. Remove the gray background on active links in IE 10. + * 2. Remove gaps in links underline in iOS 8+ and Safari 8+. + */ + +a { + background-color: transparent; /* 1 */ + -webkit-text-decoration-skip: objects; /* 2 */ +} + +/** + * Remove the outline on focused links when they are also active or hovered + * in all browsers (opinionated). + */ + +a:active, +a:hover { + outline-width: 0; +} + +/** + * 1. Remove the bottom border in Firefox 39-. + * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. + */ + +abbr[title] { + border-bottom: none; /* 1 */ + text-decoration: underline; /* 2 */ + text-decoration: underline dotted; /* 2 */ +} + +/** + * Prevent the duplicate application of `bolder` by the next rule in Safari 6. + */ + +b, +strong { + font-weight: inherit; +} + +/** + * Add the correct font weight in Chrome, Edge, and Safari. + */ + +b, +strong { + font-weight: bolder; +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +code, +kbd, +samp { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/** + * Add the correct font style in Android 4.3-. + */ + +dfn { + font-style: italic; +} + +/** + * Add the correct background and color in IE 9-. + */ + +mark { + background-color: #ff0; + color: #000; +} + +/** + * Add the correct font size in all browsers. + */ + +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` elements from affecting the line height in + * all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sub { + bottom: -0.25em; +} + +sup { + top: -0.5em; +} + +/* Embedded content + ========================================================================== */ + +/** + * Add the correct display in IE 9-. + */ + +audio, +video { + display: inline-block; +} + +/** + * Add the correct display in iOS 4-7. + */ + +audio:not([controls]) { + display: none; + height: 0; +} + +/** + * Remove the border on images inside links in IE 10-. + */ + +img { + border-style: none; +} + +/** + * Hide the overflow in IE. + */ + +svg:not(:root) { + overflow: hidden; +} + +/* Forms + ========================================================================== */ + +/** + * 1. Change the font styles in all browsers (opinionated). + * 2. Remove the margin in Firefox and Safari. + */ + +button, +input, +optgroup, +select, +textarea { + font-family: sans-serif; /* 1 */ + font-size: 100%; /* 1 */ + line-height: 1.15; /* 1 */ + margin: 0; /* 2 */ +} + +/** + * Show the overflow in IE. + * 1. Show the overflow in Edge. + */ + +button, +input { /* 1 */ + overflow: visible; +} + +/** + * Remove the inheritance of text transform in Edge, Firefox, and IE. + * 1. Remove the inheritance of text transform in Firefox. + */ + +button, +select { /* 1 */ + text-transform: none; +} + +/** + * 1. Prevent a WebKit bug where (2) destroys native `audio` and `video` + * controls in Android 4. + * 2. Correct the inability to style clickable types in iOS and Safari. + */ + +button, +html [type="button"], /* 1 */ +[type="reset"], +[type="submit"] { + -webkit-appearance: button; /* 2 */ +} + +/** + * Remove the inner border and padding in Firefox. + */ + +button::-moz-focus-inner, +[type="button"]::-moz-focus-inner, +[type="reset"]::-moz-focus-inner, +[type="submit"]::-moz-focus-inner { + border-style: none; + padding: 0; +} + +/** + * Restore the focus styles unset by the previous rule. + */ + +button:-moz-focusring, +[type="button"]:-moz-focusring, +[type="reset"]:-moz-focusring, +[type="submit"]:-moz-focusring { + outline: 1px dotted ButtonText; +} + +/** + * Change the border, margin, and padding in all browsers (opinionated). + */ + +fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; +} + +/** + * 1. Correct the text wrapping in Edge and IE. + * 2. Correct the color inheritance from `fieldset` elements in IE. + * 3. Remove the padding so developers are not caught out when they zero out + * `fieldset` elements in all browsers. + */ + +legend { + box-sizing: border-box; /* 1 */ + color: inherit; /* 2 */ + display: table; /* 1 */ + max-width: 100%; /* 1 */ + padding: 0; /* 3 */ + white-space: normal; /* 1 */ +} + +/** + * 1. Add the correct display in IE 9-. + * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ + +progress { + display: inline-block; /* 1 */ + vertical-align: baseline; /* 2 */ +} + +/** + * Remove the default vertical scrollbar in IE. + */ + +textarea { + overflow: auto; +} + +/** + * 1. Add the correct box sizing in IE 10-. + * 2. Remove the padding in IE 10-. + */ + +[type="checkbox"], +[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Correct the cursor style of increment and decrement buttons in Chrome. + */ + +[type="number"]::-webkit-inner-spin-button, +[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Correct the odd appearance in Chrome and Safari. + * 2. Correct the outline style in Safari. + */ + +[type="search"] { + -webkit-appearance: textfield; /* 1 */ + outline-offset: -2px; /* 2 */ +} + +/** + * Remove the inner padding and cancel buttons in Chrome and Safari on macOS. + */ + +[type="search"]::-webkit-search-cancel-button, +[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * 1. Correct the inability to style clickable types in iOS and Safari. + * 2. Change font properties to `inherit` in Safari. + */ + +::-webkit-file-upload-button { + -webkit-appearance: button; /* 1 */ + font: inherit; /* 2 */ +} + +/* Interactive + ========================================================================== */ + +/* + * Add the correct display in IE 9-. + * 1. Add the correct display in Edge, IE, and Firefox. + */ + +details, /* 1 */ +menu { + display: block; +} + +/* + * Add the correct display in all browsers. + */ + +summary { + display: list-item; +} + +/* Scripting + ========================================================================== */ + +/** + * Add the correct display in IE 9-. + */ + +canvas { + display: inline-block; +} + +/** + * Add the correct display in IE. + */ + +template { + display: none; +} + +/* Hidden + ========================================================================== */ + +/** + * Add the correct display in IE 10-. + */ + +[hidden] { + display: none; +} From 224f68e17c86a74f6e2877d982b80080b478d4e2 Mon Sep 17 00:00:00 2001 From: Stephan Date: Thu, 8 Dec 2016 23:22:56 +0100 Subject: [PATCH 012/372] Last commit missed some files --- basic/_sections.scss | 17 +- example.css | 728 +++++++++++++++++++++++++++++++++++++++++++ example.html | 478 ++++++++++++++++++++++++++++ 3 files changed, 1221 insertions(+), 2 deletions(-) create mode 100644 example.css create mode 100644 example.html diff --git a/basic/_sections.scss b/basic/_sections.scss index eb1f9b7..0075b21 100644 --- a/basic/_sections.scss +++ b/basic/_sections.scss @@ -33,12 +33,25 @@ section { } +aside.left + section { + margin-left: calc(#{$basic_aside_width} + #{$basic_space}); +} + nav { } aside { - + width: $basic_aside_width; + &.left { + float: left; + } + &.right { + float: right; + } + *:first-child { + margin-top: 0; + } } header { @@ -52,7 +65,7 @@ footer { // Headings // ----------------------------------------------------------------------------- -h1, h2, h3, h4, h5. h6 { +h1, h2, h3, h4, h5, h6 { } diff --git a/example.css b/example.css new file mode 100644 index 0000000..28ecb92 --- /dev/null +++ b/example.css @@ -0,0 +1,728 @@ +@charset "UTF-8"; +/* + * # TABLE OF CONTENTS + * + * - Reset + * - Configuration + * - Special modules + * - Basic styles + * - Common + * - Typography + * + * - Sections + * - Grouping + * - Textlevel + * - Embedded + * - Tables + * - Interactive + * - Modules + * + */ +@import url(other/normalize.css); +/** + * @description + * Generates flexbox properties for a given element + * + * @author romamatusevich + * + * @link MDN https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Flexible_boxes + * @link css-tricks http://css-tricks.com/snippets/css/a-guide-to-flexbox/ + * @link spec http://www.w3.org/TR/css3-flexbox/ + */ +/** + * @returns + * display: -webkit-box; + * display: -moz-box; + * display: -ms-flexbox; + * display: -webkit-flex; + * display: flex; + * + * @example + * .selector { + * @include x-display-flex; + * } + */ +/** + * @param values + * @returns + * -webkit-box-flex: ; + * -moz-box-flex: ; + * -webkit-flex: ; + * -ms-flex: ; + * flex: ; + * + * @example + * .selector { + * @include x-flex(1 1 auto); + * } + */ +/** + * @param value + * @returns + * -webkit-box-ordinal-group: ; + * -moz-box-ordinal-group: ; + * -ms-flex-order: ; + * -webkit-order: ; + * order: ; + * + * @example + * .selector { + * @include x-order(1); + * } + */ +/** + * @param value + * @returns + * -webkit-flex-wrap: ; + * -ms-flex-wrap: ; + * flex-wrap: ; + * + * @example + * .selector { + * @include x-flex-wrap(wrap); + * } + */ +/** + * @param value + * @returns + * -webkit-align-content: ; + * -moz-align-content: ; + * -ms-flex-line-pack: ; + * align-content: ; + * @example + * .selector { + * @include x-align-content(center); + * } + */ +/** + * @param value + * @returns + * -webkit-box-direction: ; + * -moz-box-direction: ; + * -webkit-box-orient: ; + * -moz-box-orient: ; + * -webkit-flex-direction: ; + * -moz-flex-direction: ; + * -ms-flex-direction: ; + * flex-direction: ; + * @example + * .selector { + * @include x-flex-direction(row-reverse); + * } + */ +/* ToDo: add flex-grow, flex-shrink, flex-basis, flex-flow, align-items, align-self, justify-content mixins */ +/** + * @description + * Generates cross-browser-compatible output for a given element with its value. + * + * @author sthag + * + * @param values + * @returns + * -webkit-: + * ...-: + * + * @example + * .selector + * @include vendor-prefix(hyphens, auto) + */ +.clear { + clear: both; } + .clear::before, .clear::after { + clear: both; } + +.float_left { + float: left; + margin-right: 32px; } + +.overflow { + overflow: auto; } + +.center_50 { + margin-right: 25%; + margin-left: 25%; } + +.center_25 { + margin-right: 37.5%; + margin-left: 37.5%; } + +.width_full { + width: 100%; + margin-right: 0; + margin-left: 0; } + +.div_body { + width: 96%; + margin: 0 auto; + border-top-width: 8px; + border-top-style: solid; + border-color: black; + padding-top: 32px; } +@media screen and (orientation: landscape) and (min-width: 1024px) { + .div_body { + width: 80%; } } +@media screen and (orientation: landscape) and (min-width: 1280px) { + .div_body { + width: 60%; } } +@media screen and (orientation: landscape) and (min-width: 1920px) { + .div_body { + width: 48%; } } + +@media screen and (orientation: portrait) and (min-width: 1024px) { + .div_body { + width: 80%; } } + +.relative { + position: relative; } + +.div_fix { + position: fixed; } + +.bottom { + bottom: 0; } + +.space_box { + float: left; + display: table; + width: 64px; + text-align: center; + vertical-align: middle; } + .space_box span { + display: table-cell; } + +.div_placeholder { + width: 100%; + height: 64px; + border: 4px solid rgba(0, 0, 0, 0.1); + border-radius: 4px; + padding: 8px; + background-color: rgba(0, 0, 0, 0.1); } + .div_placeholder svg { + vertical-align: top; } + +.div_placeholder_bkg { + width: 100%; + height: 64px; + border: 4px solid rgba(0, 0, 0, 0.1); + border-radius: 4px; + padding: 8px; + /*data:[][;charset=][;base64],*/ + background: url("data:image/svg+xml;utf8,") no-repeat; + background-color: rgba(0, 0, 0, 0.1); } + +.div_info { + padding: 16px 2em; + border-right: 8px solid rgba(82, 190, 209, 0.6); + background-color: rgba(82, 190, 209, 0.1) !important; } + +h6, p, .p_col_2, .p_col_3, caption, li, dt, dd, figcaption, .span_solo, th, td, legend, label { + font-family: Roboto, sans-serif; + font-size: 1em; + line-height: 1.5; } + +pre, code, .code_solo { + font-family: Courier New, monospace; + font-size: 1em; + line-height: 1.5; } + +h1, .exp_help_btn .span_solo { + font-family: Roboto, sans-serif; + font-size: 3.1em; + font-weight: 300; + line-height: 1.5; } + +h2 { + font-family: Roboto, sans-serif; + font-size: 2.5em; + font-weight: 300; + line-height: 1.5; } + +h3, h4 { + font-family: Roboto, sans-serif; + font-size: 1.8em; + font-weight: 300; + line-height: 1.5; } + +h5 { + font-family: Roboto, sans-serif; + font-size: 1.35em; + font-weight: 300; + line-height: 1.5; } + +.table_link .cell_text .shorten { + overflow: hidden; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; } + +.txt_center { + text-align: center; } + +.txt_right { + text-align: right; } + +html { + height: 100%; + box-sizing: border-box; } + +*, +::before, +::after { + box-sizing: inherit; } + +body { + font-family: Roboto, sans-serif; + font-size: 15px; + line-height: 1; + color: black; + background-color: gray; } + +aside.left + section { + margin-left: calc(20% + 8px); } + +aside { + width: 20%; } + aside.left { + float: left; } + aside.right { + float: right; } + aside *:first-child { + margin-top: 0; } + +h1 { + margin: 128px 0 32px; } + +h2 { + margin: 64px 0 32px; } + +h3 { + margin: 16px 0 16px; + text-transform: uppercase; } + +h4 { + margin: 16px 0 16px; + text-transform: none; } + +h5 { + margin: 16px 0 8px; + text-transform: none; } + +h6 { + margin: 8px 0; + text-transform: none; + font-weight: bold; } + +p, .p_col_2, .p_col_3, caption { + margin: 8px 0; + color: black; } + p code, .p_col_2 code, .p_col_3 code, caption code { + padding: 1px 4px; + font-size: 1em; + line-height: 1; } + +.p_col_line { + column-rule: 1px solid black; } + +.p_col_2 { + column-count: 2; + column-gap: 32px; } + +.p_col_3 { + column-count: 3; + column-gap: 64px; } + +hr, .hr_hidden, .hr_dotted { + margin: 32px auto; + border-width: 1px 0 0; + border-style: solid; + border-color: black; } + +.hr_hidden { + border-color: transparent; } + +.hr_dotted { + border-style: dotted; } + +.pre_code { + border-color: rgba(255, 255, 255, 0.1); + border-style: dotted; + border-width: 0 0 0 4px; + border-radius: 4px; + padding: 8px; + background-color: rgba(255, 255, 255, 0.1); } + .pre_code code { + background-color: transparent; } + +blockquote { + margin: 8px 2em; } + +.quote_mark p::before, .quote_mark .p_col_2::before, .quote_mark .p_col_3::before, .quote_mark caption::before { + content: "\201E \0020"; } +.quote_mark p::after, .quote_mark .p_col_2::after, .quote_mark .p_col_3::after, .quote_mark caption::after { + content: "\201C \0020"; } +.quote_mark .quote_source::before, .quote_mark .quote_source::after { + content: ""; } + +dl, ul, ol { + margin: 16px 0 8px; } + +ul, ol { + padding-left: 2em; } + +li, dt, dd { + color: black; } + +dd { + margin-left: 2em; } + +ul li { + list-style: none; + position: relative; } + ul li:before { + content: "_"; + position: absolute; + left: -1em; } + +figure { + margin: 16px 2em; } + +a { + color: #52bed1; + text-decoration: none; } + a:active, a:focus, a:hover { + color: white; } + +.link_line { + border-bottom-width: 1px; + border-bottom-style: dotted; + border-color: black; + background-color: transparent; + color: black; + transition: color 150ms ease; } + .link_line:active, .link_line:focus, .link_line:hover { + background-color: #0c85ff; + color: white; } + +i, em { + font-style: italic; } + +b, strong { + font-weight: 500; } + +cite { + font-style: italic; } + +code { + color: #1f1f1f; + background-color: rgba(255, 255, 255, 0.1); } + +.code_solo { + padding: 1px 4px; + color: black; } + +mark { + background-color: #fad803; } + +.mark_cursor { + color: white; + background-color: black; } + +::-moz-selection { + color: white; + background-color: black; } + +::selection { + color: white; + background-color: black; } + +.span_solo { + color: black; } + +img { + vertical-align: top; } + +table { + margin-top: 16px; + margin-bottom: 16px; + border: 1px solid black; + border-collapse: collapse; } + +th, td { + padding: 4px; } + +th { + border: 1px solid black; + text-align: left; } + +.precol { + border-right: 1px solid black; } + +td { + border-right: 1px solid #666666; + border-bottom: 1px solid #666666; } + +td:last-child { + border-right: 0; } + +tr:last-child td { + border-bottom: 0; } + +tfoot tr:first-child td { + border-top: 1px solid black; } + +.table_blank { + border: 1px solid transparent; } + .table_blank th, .table_blank td { + border: 1px solid transparent; } + +.table_free { + border: 1px solid transparent; } + +.table_stripe td { + border-top: 0; + border-bottom: 0; } +.table_stripe tr:nth-child(even) td { + background-color: #8c8c8c; } + +.table_fix { + table-layout: fixed; } + +caption { + padding: 4px 0; + border: 1px dotted black; + text-align: center; } + +.table_link { + width: 100%; + border: 0; + table-layout: auto; } + .table_link tbody { + border-bottom: 1px solid #666666; } + .table_link tbody:hover { + background-color: #8c8c8c; } + .table_link th, .table_link td { + border: 0; } + .table_link .cell_icon { + width: 48px; + text-align: center; } + .table_link .cell_icon img { + vertical-align: text-top; } + .table_link .cell_link { + padding-right: 8px; + padding-left: 8px; } + .table_link .cell_link:hover { + background-color: #0c85ff; } + .table_link .cell_link a { + display: block; } + .table_link .cell_link .link_url { + display: none; } + .table_link .cell_link:hover .link_url { + display: block; + color: white; } + .table_link .cell_link:hover .link_text { + display: none; } + .table_link .cell_date { + width: 12%; + text-align: center; } + .table_link .cell_text { + padding-right: 8px; + padding-left: 8px; } + .table_link .cell_text div { + width: 100%; } + .table_link .cell_text .shorten { + max-height: 44px; } + +fieldset { + margin: 8px 0; + border: 1px solid black; } + +legend { + padding: 0 4px; } + +label { + display: table; + margin: 4px 0; } + label input { + display: table-cell; + margin-left: 8px; + padding: 4px 5px; + border-style: solid; + border-color: transparent; + background-color: #404040; + color: #e6e6e6; } + label input:hover { + background-color: black; + color: white; } + +.card_body .bkg_box { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; } + +.card_body { + height: 100%; + /* .full { + position: absolute; + width: 128px; + height: 128px; + top: 16px; + left: 16px; + background-color: #fff; + } + + .mark { + float: left; + width: 32px; + height: 32px; + margin-top: 16px; + } + */ } + .card_body .bkg_box { + transition-duration: 800ms; + overflow: hidden; + vertical-align: top; + z-index: -1; } + .card_body .bkg_box > svg { + position: relative; } + .card_body .flex_wrap_center { + display: -webkit-box; + display: -webkit-flex; + display: -moz-box; + display: -ms-flexbox; + display: flex; + -webkit-box-align: center; + -webkit-align-items: center; + -moz-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-pack: center; + -webkit-justify-content: center; + -moz-box-pack: center; + -ms-flex-pack: center; + justify-content: center; + height: 100%; } + .card_body .flex_content { + position: relative; + padding: 64px 64px 24px 64px; + border: 1px solid #FFF; + background-color: #F5F5F5; + z-index: 40; } + .card_body h1 { + margin: 16px 0; + color: #1E1E1E; + font-size: 24px; + line-height: 1.4em; + font-weight: normal; } + .card_body p, .card_body .p_col_2, .card_body .p_col_3, .card_body caption { + margin-top: 0; + margin-bottom: 16px; + font-size: 12px; + line-height: 1.4em; } + .card_body .marked { + padding-left: 1em; + text-indent: -1em; + text-align: center; } + .card_body .marked:before { + content: "* "; } + .card_body .decent { + color: #666; } + .card_body a { + color: #000; + text-decoration: none; } + .card_body a:hover { + color: #F4F9FA; + background-color: #0C85FF; + text-decoration: none; } + +.wip, .wip_txt { + border-right: 8px solid rgba(220, 20, 60, 0.8); + background-color: rgba(220, 20, 60, 0.1) !important; } + +.wip:before, .wip:after { + content: ""; + display: block; + height: 48px; } + +.exp_expose_pre:after { + content: ""; + display: block; + height: 48px; + background-color: rgba(183, 224, 240, 0.1) !important; } + +.exp_expose_post:before { + content: ""; + display: block; + height: 48px; + background-color: rgba(183, 224, 240, 0.1) !important; } + +.exp_expose:before, .exp_expose:after { + content: ""; + display: block; + height: 48px; + background-color: rgba(183, 224, 240, 0.1) !important; } + +.exp_pop { + display: none; } + +.exp_wrap { + position: relative; } + +.exp_pop { + position: absolute; + z-index: 100; + top: 128px; + left: 128px; + padding: 4px; + border: 4px solid gray; + border-radius: 4px; + background-color: gray; + pointer-events: none; } + +.exp_marker_pop { + position: absolute; + top: -11.25px; + right: -7.5px; + width: 15px; + height: 15px; + border: 1px solid white; + border-radius: 15px; + color: white; + background-color: black; } + +.exp_overlay_btn { + position: fixed; + width: 60px; + height: 60px; + cursor: pointer; } + +.exp_help_btn { + display: table; + right: 16px; + bottom: 16px; + background-color: rgba(0, 0, 0, 0.4); } + .exp_help_btn:hover { + background-color: white; } + .exp_help_btn:hover > .span_solo { + color: #52bed1; } + .exp_help_btn .span_solo { + display: table-cell; + color: rgba(82, 190, 209, 0.6); + font-weight: bold; + text-align: center; + vertical-align: middle; } + +.expose_height { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + background-color: rgba(183, 224, 240, 0.1) !important; + -webkit-transition: height 0.5s ease; + -ms-transition: height 0.5s ease; + -moz-transition: height 0.5s ease; + -o-transition: height 0.5s ease; + transition: height 0.5s ease; } + +/*# sourceMappingURL=example.css.map */ diff --git a/example.html b/example.html new file mode 100644 index 0000000..cb23b89 --- /dev/null +++ b/example.html @@ -0,0 +1,478 @@ + + + + + + Dummy + + + + + + + + + + + + +
+
?
+
+ +
+ Dies ist einfach nur Text.
Weniger wäre Nichts, denn dieser Text ist nicht durch ein spezifisches Element umschlossen. +

Es wirken nur die Eigenschaften des <body> Elements. Dieses Element umschließt den gesamten Inhalt des Dokumentes und kommt daher nur einmal vor. Inhalte sind normalerweise durch Elemente definiert. Grundlegende Elemente teilen das Dokument zunächst in Abschnitte.

+

Bereiche

+
+
+

Einen Abschnitt, welcher für sich alleine stehen kann, definiert sich durch <article>. Solch ein Element wird oft detailliert gestaltet kommt aber auch ohne jegliche Gestaltung aus.

+

Noch allgemeiner ist das <section> Element. Es schafft Bereiche um Inhalte zu strukturieren.

+

Bestimmte Bereiche haben einen vorgegebene Zweck.
Folgende Bereiche sind vorgegeben:

+
+ + +
+
+

Um einleitenden Inhalt festzuhalten, wird das <header> Element eingesetzt. Es beinhaltet häufig auch Navigationselemente. Dabei bezieht es sich auf den nächsten, umgebenden Abschnitt.

+ +
+
+

Auch abschließender Inhalt kann für einen Abschnitt definiert werden. Dazu wird <footer> eingesetzt.

+
+
+ +
+

Zur feineren Strukturierung und Gliederung von Texten sind einige weitere Elemente verfügbar. Diese werden nun der Reihe nach aufgeführt. Zu Beginn die Überschriften, da sie noch zu den Abschnitten gehören. Das kommt vermutlich daher, da Abschnitte häufig eine kennzeichnende Überschrift beinhalten.

+

Überschrift 1

+

Eine Überschrift erster Ordnung <h1> ist sehr groß und steht daher oft außerhalb eines Textflusses. Sie schafft eine deutliche Trennung sowohl inhaltlich wie auch optisch. Sie erzeugt einen Abstand gleich der horizontalen Linie über sich.

+

Überschrift 2

+

Die weiteren Überschriften <h2> bis <h6> gliedern Text und werden auch als Titel für andere Elemente eingesetzt.

+

Überschrift 3 ist in Großbuchstaben gesetzt

+

Überschrift 4 verwendet normale Buchstaben und gleicht ansonsten Überschrift 3

+
Überschrift 5 ist Überschrift 5
+
Überschrift 6
+

Schließlich eine Überschrift in der Größe des Fließtextes. Allerdings in fett.

+

Gruppierung

+

Ein Absatz <p>. Zugegeben ein kurzer.

+

Aus mehreren Absätzen wird ein ganzer Text. Solche Texte haben gelegentlich großen informativen oder unterhaltsamen Charakter.
Einfache Zeilenumbrüche werden darin mit <br> erreicht.

+

Die Unterteilung in Absätze ist eine von vielen Möglichkeiten Texte zu gruppieren und ihnen Struktur zu verleihen. In diesem Dokument flattert Text normalerweise von Links daher. Er ist schwarz und in einer serifenlosen Schrift gesetzt. Zu weiteren Formatierungen, die eher auf einer Ebene der Zeichen einzuordnen ist, wird im Verlauf näher eingegangen. Zunächst die Struktur:

+

Text sitzt gerne auch mal zentriert.

p.txt_center
+

Rechtsbündig ist schon eher eine Ausnahme bzw. Besonderheit.

p.txt_right
+

Texte können auf verschiedene Arten unterteilt werden. Dafür werden unterschiedlich formatierte <hr> Elemente verwendet. Die horizontale Linie ist die Ausgangsformatierung, daher auch der abgekürzte Name des Elements. Eine Linie ist schwarz und durchgezogen.

+
+

Es ist auch eine unsichtbare Unterteilung möglich:

+
hr.hr_hidden
+

Die Linie darf auch gepunkted sein. Zudem sind verschiedene Längen möglich. Diese sind immer ein Prozentwert der verfügbaren Breite. Hier in gleicher Reihenfolge 100%, 50% und 25%:

+
hr.hr_dotted
+
hr.center_50
+
hr.hr_dotted.center_25
+

Zur horizontalen Unterteilung kommt natürlich auch eine vertikale Trennung hinzu. Text kann so zum Beispiel in mehrere Spalten unterteilt werden. Dies ist hilfreich, wenn ein Text durch eine breite Fläche sehr lange Zeilen bekommen würde. Es ist dann schwer den neuen Zeilanfang zu finden. Die vertikale Trennung dient in erster Linie dazu, diesem Umstand zu begegnen. Auch hier kann die Unterteilung viele Formen annehmen.

p.p_col_2
+

Drei Spalten gilt es jetzt also zu Füllen. Dann erst wird die Trennung der Spalten durch eine Linie sichtbar.

p.p_col_3.p_col_line
+

Ist der Text nicht lang genug bleibt eventuell eine Spalte leer. Diesmal wird dies aber nicht passieren, denn das Anschauungsbeispiel ist ja nun durch den vorherigen Absatz schon gegeben.
Oft ist es sinnvoll, Absätze mit mehreren Spalten deutlich von nachfolgenden Absätzen zu trennen. Da der Textfluss spaltenweise verläuft, liest man eventuell an der falschen Stelle weiter. Ach das ziegen diese beiden Absätze ganz gut.

+

Es gibt die Möglichkeit vorformatierten Text darzustellen <pre>.

+ 
Dadurch
	bleiben
		Einrückungen
			durch
				Tabulatoren
					erhalten.
+

Text bekommt durch Listen besondere optische wie auch inhaltliche Struktur. Es gibt ungeordnete <ul> und geordnete Listen <ol> sowie Beschreibungslisten <dl>. Die beiden ersten Varianten beinhalten das Listenelement <li>. Beschreibungslisten beinhalten jeweils das Paar von Ausdruck <dt> und Beschreibung <dd>. Im Folgenden eine Liste der Listen in ihrer Ausgangskonfiguration:

+
    +
  • Ungeordnete
    • +
  • Liste
    • +
+
    +
  1. Geordnete
    2. +
  2. Liste
    3. +
+
+
Beschreibungsliste
+
Auch Definitionslisten genannt
+
Ausdruck
+
Beschreibung
+
+

Wird Bezug auf fremde Inhalte genommen, kommt ein Zitat <blockquote> zur Anwendung. Es besteht aus der Aussage und der Quelle.

+
+

Ein Zitat (das, lateinisch citatum „Angeführtes, Aufgerufenes“ zu lat. citāre „in Bewegung setzen, vorladen“, vgl. „jemanden vor Gericht zitieren“) ist eine wörtlich übernommene Stelle aus einem Text oder ein Hinweis auf eine bestimmte Textstelle.

+

Wikipedia

+
+
blockquote>p+p.quote_source
+

Auch Inhalte, die nicht in Textform sind, können durch einen Bezug integriert werden. Wie diese Fahne werden sie mit <figure> umschlossen und tragen eine Bezeichnung.

+
+
Fahne
+ + + + + + + + + + + +
+
figure>figcaption+{element}
+

Eine von sich aus undefinierte Möglichkeit zur Gruppierung von Text besteht durch <div>. Dieses Element hat, ohne weitere Klassifizierung keine Auswirkungen auf die Erscheinung oder die inhaltliche Aussage. Daher der allgemeine Einsatz.

+

Es wird allerdings häufig eingesetzt und bekommt vielfältige Funktionen zugeordnet wie diese hervorgehobene Information zeigt.

+

Eine sehr klar definierte Gruppierung stellt das Element <main> dar. Es umschließt den hauptsächlichen Inhalt des Dokumentes.

+

Textebene

+

Verweise

+

Ein wesentlicher Bestandteil von Hypertext sind Verweise <a>. Sie dienen als Sprungmarken innerhalb des Netzwerks. Es kann grob zwischen internen und externen Verweisen unterschieden werden. Interne Verweisetable>tbody>tr>td*2^tr>td[colspan=2] können Verknüpfungen innerhalb des aktuellen Dokumentes sein oder auch Funktionen aktivieren. Externe Verweise verknüpfen Inhalte über das gesamte Netzwerk hinweg. Sie können auch auf E-Mail Adressen oder Dateien zeigen.

+

Nicht nur Text kann als Verweis verwendet werden. Auch andere Elemente wie Bilder können verknüpft werden. Abhängig von ihrer Funktion und ihrem Zweck, werden Verweise unterschiedlich formatiert. Farbige oder unterstrichene Varianten sind möglich.

+

Wird der Verweis innerhalb eines <nav> Elementes notiert, bekommt er die spezielle Bedeutung eines Navigationsverweises innerhalb des Dokumentes oder der Anwendung. Auf diese Verwendung wird im Folgenden genauer eingegangen ...

+

Formatierungen

+

Texte, Wörter oder Zeichen können vielfältig formatiert werden. Sie können fett <b> oder kursiv <i> geschrieben sein. Auch beides ist möglich!?! Sollen sie nicht nur anders aussehen, sondern auch eine besondere inhaltliche Bedeutung bekommen, werden sie mit <strong> und <em> ausgezeichnet.

+

Gerade bei wörtlichen Zitierungen kommt häufig das Anführungszeichen zum Einsatz. Es kann durch die Formatierung automatisch ergänzt werden.

+
+

Das kannst du schon so machen aber dann isses halt Kacke.

+

o. V.

+
+
blockquote.quote_mark>p+p.quote_source
+

Ein besonderer inhaltlicher Bezug ist der Titel eines Werkes. Sowas kann mit <cite> ausgezeichnet werden. Pulp Fiction, super Film - zum Beispiel.

+

Auch die Auszeichnung <code> wurde bis hier hin schon verwendet. Sie markiert Maschinensprache. Für zusammenhängende Blöcke wird die Auszeichnung oft in Kombination mit dem Element <pre> verwendet:

+ 
<html>
  <head>
    <title>Hyper Text Markup Language</title>
  </head>
  <body id="root">
    <!-- Content goes here -->
    <p class="example">Just like this.</p>
  </body>
</html>
+

Dabei bleiben vorhandene Textformatierungen wie Zeilenumbrüche und Einrückung erhalten.

+

Die Zeichen in Absätzen bis hin zu ganzen Texten können, mit einem geeigneten Eingabegerät, markiert werden. Dies stellt sich wie folgt dar:

+

Beispiel zum markieren ^^.

+

Eine Markierung kann, mittels <mark>, auch durch den Autor geschehen. Diese stellt sich ein wenig anders dar: Diese Worte sind markiert.

+ +

Änderungen

+ +

Eingebundene Inhalte

+ + + +

Tabellen

+

Tabellen bieten besonders geordnete Struktur. Häufig werden in ihnen Text und Daten kombiniert dargestellt. Dies erfordert individuelle Formatierungen. Einige grundlegende Eigenschaften werden im folgenden aufgezeigt. Tabellen sind in ihrer Größe entweder vordefiniert oder richten sich nach ihrem Inhalt. Das gilt auch für die einzelnen Zellen....

+ + + + + + + + + + +
Eineeinfache
Tabelle
+
table.width_full>tbody>tr>td*2^tr>td[colspan=2]
+
+ + + + + + + + + + +
Einefließende
Tabelle
+
table>tbody>tr>td*2^tr>td[colspan=2]
+ + + + + + + + + + +
Mitohne
Linien
+
table.table_blank>tbody>tr>td*2^tr>td[colspan=2]
+
+

Die nächste Tabelle verwendet alle zur Auszeichnung verfügbaren Elemente und hat eine starre Zellverteilung:

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Beschreibung bzw. Zusammenhang der Tabelle
KopfzeileAB
FußzeileAB
Tabelle
mitTitel
Kopf-und
Fußzeile
+
table.width_full.table_fix>caption+thead>tr>th*3^^tfoot>tr>td*3^^tbody>(tr>td*3)*3
+
+

Viele weitere Formate sind möglich ...

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
KopfzeileAB
VorspalteEine
1erweiterte
2Tabelle
+
table.width_full>thead>tr>th.precol+th[colspan=2]^^tbody>tr>td.precol+td*2^tr>td.precol+td[colspan=2]
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
KopfzeileAB
Tabelle
ohneRahmen
jedochmit
Streifen
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 Ab / Zy Neu / Alt
NameURLYYYY-MM-DD
+
Beschreibung
+
NameURLYYYY-MM-DD
+
Beschreibung
+
+ +
table.table_link>thead>tr>th*3^^(tbody>tr>td.cell_icon[rowspan=2]>img[width=16 height=16]^+td.cell_link>a.link_text[target=_blank]+a.link_url[target=_blank]^+td.cell_date[rowspan=2]{YYYY-MM-DD}^tr>td.cell_text>div.shorten)*2
+ +

Formulare

+

Spätestens hier werden Betrachter zu Benutzern. Texteingabefelder und verschiedene Bedienelemente geben Möglichkeiten zur Interaktion. Diese Elemente sind in vielerlei Hinsicht besonders. Sie sind in ihrer unveränderten Gestalt, System- bzw. Browser-Abhängig. (Vielleicht ist das auch scheiße, hier darauf einzugehen) ...

+ +
+ Einfache Eingabefelder + + +
+
+ Weitere Zeicheneingabefelder +

Diese Eingabefelder sind zusätzlich aneinander ausgerichtet und gruppiert.

+ + +
+ + + + + + + + + + + + +

Interaktive Elemente

+ + + +

Struktur

+
+ + + + +
+
+
+

Medien

+
+ + + + \ No newline at end of file From 9f7cb5d71fffc0c905b09894abda2e2c7792f23a Mon Sep 17 00:00:00 2001 From: Stephan Date: Fri, 9 Dec 2016 10:39:49 +0100 Subject: [PATCH 013/372] Added aside styles --- basic/_sections.scss | 4 ++++ example.css | 3 +++ 2 files changed, 7 insertions(+) diff --git a/basic/_sections.scss b/basic/_sections.scss index 0075b21..48c8a45 100644 --- a/basic/_sections.scss +++ b/basic/_sections.scss @@ -33,6 +33,10 @@ section { } +aside.right + section { + margin-right: calc(#{$basic_aside_width} + #{$basic_space}); +} + aside.left + section { margin-left: calc(#{$basic_aside_width} + #{$basic_space}); } diff --git a/example.css b/example.css index 28ecb92..d025af6 100644 --- a/example.css +++ b/example.css @@ -276,6 +276,9 @@ body { color: black; background-color: gray; } +aside.right + section { + margin-right: calc(20% + 8px); } + aside.left + section { margin-left: calc(20% + 8px); } From 73bba3e1617eef29eb8ca80c51b477c54135c44b Mon Sep 17 00:00:00 2001 From: Stephan Date: Fri, 9 Dec 2016 16:43:55 +0100 Subject: [PATCH 014/372] Noticed problem with config overrides No solution yet --- _hippie.scss | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/_hippie.scss b/_hippie.scss index 09ba726..ce233a3 100644 --- a/_hippie.scss +++ b/_hippie.scss @@ -27,10 +27,11 @@ // Global configuration with default values -// Adjustments can be made by copying values from default to config +// Adjustments can be made by copying values from _default.scss to _config.scss +// Be careful though changes will get lost if hippie gets updated // ----------------------------------------------------------------------------- -@import "default"; // NOTE // do not edit -@import "config"; // EDIT THIS // copy default values and adjust +@import "default"; // DO NOT EDIT +@import "config"; // EDIT THIS From fc96f0202306f8e5e5b7f30364605c88b69bd20e Mon Sep 17 00:00:00 2001 From: Stephan Date: Fri, 9 Dec 2016 22:23:31 +0100 Subject: [PATCH 015/372] New variables Concept of config and default file does not work. Needs to be changed --- _config.scss | 3 ++- _default.scss | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/_config.scss b/_config.scss index 1d9d663..d413a34 100644 --- a/_config.scss +++ b/_config.scss @@ -1,4 +1,5 @@ // Main configuration // ------------------------------------------------------------------------------ -//$basic_size: 17px; \ No newline at end of file +$default_space: 8px; +$default_font_size: 15px; \ No newline at end of file diff --git a/_default.scss b/_default.scss index 5cd9099..ada18a4 100644 --- a/_default.scss +++ b/_default.scss @@ -4,7 +4,7 @@ // TEXT // ------------------------------------------------------------------------------ -$basic_size: 15px; +$basic_size: $default_font_size; $size_1: $basic_size * 4; $basic_line: 1; @@ -74,7 +74,7 @@ $width_3: 60%; $width_4: 48%; $tiny_space: 1px; -$basic_space: 8px; +$basic_space: $default_space; $half_space: $basic_space / 2; $space_2: $basic_space * 2; $space_3: $basic_space * 4; From e3105a8698577d09b7ab0e1f21c372f9f5bd663b Mon Sep 17 00:00:00 2001 From: Stephan Date: Fri, 9 Dec 2016 22:38:12 +0100 Subject: [PATCH 016/372] Now using the concept of variable defaults from sass First defaults added --- _config.scss | 328 +++++++++++++++++++++++++++++++++++++++++++++++++- _default.scss | 324 +------------------------------------------------ _hippie.scss | 4 +- 3 files changed, 331 insertions(+), 325 deletions(-) diff --git a/_config.scss b/_config.scss index d413a34..41af47c 100644 --- a/_config.scss +++ b/_config.scss @@ -1,5 +1,327 @@ -// Main configuration +// Default configuration // ------------------------------------------------------------------------------ -$default_space: 8px; -$default_font_size: 15px; \ No newline at end of file +// TEXT +// ------------------------------------------------------------------------------ + +$default_font_size: 15px !default; +$basic_size: $default_font_size; +$size_1: $basic_size * 4; + +$basic_line: 1; + +$head_size_1: 3.1em; +$head_size_2: 2.5em; +$head_size_3: 1.8em; +$head_size_4: 1.35em; + +$text_size_1: 1em; +$text_size_2: 20; + + +$default_line_height: 1.5 !default; +$text_line_1: $default_line_height; +$head_line_1: $text_line_1; +$head_line_2: $text_line_1; +$head_line_3: $text_line_1; +$head_line_4: $text_line_1; + +$primary_font_family: #{'Roboto', sans-serif}; +$secondary_font_family: #{'Roboto', sans-serif}; +$third_font_family: #{'Courier New', monospace}; + +$alternative_font_family: #{'Trebuchet MS', Helvetica, Arial, sans-serif, sans}; + +$basic_indent: 2em; + + +// COLORS +// ------------------------------------------------------------------------------ + +$alpha_color: #fad803; +$bravo_color: #d30a51; +$charlie_color: #273f8b; +$delta_color: #b7e0f0; +$echo_color: #52bed1; +$foxtrot_color: #0c85ff; + +$black: black; +$white: white; +$medium_gray: lighten($black, 50%); + + +$basic_font_color: $black; +$basic_head_color: $black; + +$basic_link_color: $echo_color; +$basic_highlight_color: $white; +$basic_action_color: $foxtrot_color; + +$basic_background_color: $medium_gray; +$light_color: lighten($basic_background_color,5%); +$dark_color: darken($basic_background_color,10%); + +$basic_border_color: $black; + +// default shadow colors +// $shadow_color: fade-out($medium_gray, 0.5); + + + +// LAYOUT +// ------------------------------------------------------------------------------ + +$basic_width: 96%; +$width_2: 80%; +$width_3: 60%; +$width_4: 48%; + +$default_space: 8px !default; +$basic_space: $default_space; +$half_space: $basic_space / 2; +$space_2: $basic_space * 2; +$space_3: $basic_space * 4; +$space_4: $basic_space * 8; +$space_5: $basic_space * 16; +$tiny_space: 1px; + +$basic_corner: 4px; + +$basic_border_width: $tiny_space; +$border_width_4: $tiny_space * 4; +$border_width_8: $tiny_space * 8; +$basic_border: $tiny_space solid $basic_border_color; +$cell_border: $tiny_space solid $dark_color; + +$basic_aside_width: 20%; + + + +// IO +// ------------------------------------------------------------------------------ + +$basic_io_font_color: darken($white, 10%); +$basic_io_background_color: lighten($black, 25%); +$basic_shadow: inset 0 1px 3px rgba($black, 0.06); +$basic_focus_shadow: $basic_shadow, 0 0 5px adjust-color($basic_action_color, $lightness: -5%, $alpha: -0.3); + + + +// ANIMATIONS +// ------------------------------------------------------------------------------ + +$basic_duration: 150ms; +$basic_timing: ease; + + + + +// HARDWARE BREAKPOINTS +// ------------------------------------------------------------------------------ + +$tablet: "screen and (max-width: 64em)"; +$tablet_portrait: "screen and (max-width: 50em) and (orientation: portrait)"; +$tablet_landscape: "screen and (max-width: 50em) and (orientation: landscape)"; + +$mobile: "screen and (max-width: 30em)"; +$mobile_portrait: "screen and (max-width: 30em) and (orientation : portrait)"; +$mobile_landscape: "screen and (max-width: 30em) and (orientation : landscape)"; + +$screen_small: 1024px; +$screen_medium: 1280px; +$screen_large: 1920px; + + + +// VENDOR PREFIX +// ------------------------------------------------------------------------------ + +$prefix_defaults: -moz- -webkit- -o- -ms- ''; +$webkit_support: -webkit- ''; +$moz_support: -moz- ''; +$ms_support: -ms- ''; +$moz_webkit_support: -moz- -webkit- ''; +$moz_ms_support: -moz- -ms- ''; +$webkit_ms_support: -webkit- -ms- ''; + + + +// The config file is intended to allow users to quickly redefine core elements of the design +// that will cascade throughout the css to get your design up and running FAST! + +// For instruction, please see https://github.com/Anotheruiguy/toadstool/blob/master/sass/doc-src/config.md + +/////// Typography configuration/////// +// ----------------------------------------------------------------------------- +// $font_size: 12; +// +// $heading_1: 46; +// $heading_2: 32; +// $heading_3: 28; +// $heading_4: 18; +// $heading_5: 18; +// $heading_6: 18; +// +// $line: $font_size * 1.5; +// +// $small_point_size: 10; +// $large_point_size: 14; +// +// $primary_font_family: #{"Helvetica Neue", Arial, sans-serif}; +// $secondary_font_family: #{"Helvetica Neue", Arial, sans-serif}; +// $heading_font_family: #{"Helvetica Neue", Arial, sans-serif}; + +// $icon_font_alpha: #{'ico-fonts'}; + +/////// Default webfont directory/////// +// ----------------------------------------------------------------------------- +// $webfont_directory: "/fonts/"; + +/////// default image directory /////// +// ----------------------------------------------------------------------------- +// In Sinatra, the images folder resides in the public directory. This directory is not made publically accessible, +// so simply referencing the images directory will be fine. +// $imgDir: "/images/"; + +/////// OOCSS generic base colors/////// +// ----------------------------------------------------------------------------- +// Red, green, yellow, blue, accent and black is not law, but a common theme in most designs. +// Using Toadstool, all you need to do is edit these 6 hex values and everything else is created +// by magic, unicorns and fairy dust! + +// $alpha_primary: #5a2e2e; // red +// $bravo_primary: #3e4147; // green +// $charlie_primary: #fffedf; // yellow +// $delta_primary: #2a2c31; // blue +// $echo_primary: #dfba69; // accent + +// $alpha_gray: #333; //black + +/////// Toadstool color math /////// +// ----------------------------------------------------------------------------- +// Local color functions to create default color palette +//@import "color/color_math"; +//@import "color/grayscale_math"; +//@import "color/color_defaults"; + +/////// Grid configuration /////// +// ----------------------------------------------------------------------------- +// setting default units of measurement for Toadstool grid solution +// $grid_type: 12; // sets default column grid +// $grid_uom: percent; // use either ``em`` or ``percent`` +// $grid_padding_l: 0; // sets default left/right padding inside grid block +// $grid_padding_r: 0; // sets default left/right padding inside grid block +// $grid_padding_tb: 0; // sets default top/bottom padding inside grid block +// $grid_border: 0; // sets default border width on all grid blocks +// $grid_child: none; // sets parent child relationship between grid blocks +// $grid_align: default; // by default grids float left. Optional argument is ``center`` +// $col_base: 10; // equal to 10px in the standard 960.gs +// $col_gutter: $col_base * 2; // sets default grid gutter width +// $grid_960: 960 / 100%; // grid math for percentages + + + +/////// HTML 5 feature colors /////// +// ----------------------------------------------------------------------------- +// used with the `ins` tag +// http://www.w3schools.com/tags/tag_ins.asp +// $ins_color: $charlie_color; + +// used with the `mark` tag +// http://www.w3schools.com/html5/tag_mark.asp +// $mark_color: $charlie_color; + +// webkit tap highlight color +// $webkit_tap_hightlight: $delta_color_bravo; + +// overrides the default content selection color in the browser +// $selection_color: $charlie_color; +// $selection_text_color: $primary_text; + + + +/////// Config defaults for forms /////// +// ----------------------------------------------------------------------------- +// $alert_background_color: $alpha_color; + +// $input_disabled: $bravo_gray; +// $input_disabled_bkg: lighten($input_disabled, 75%); +// $input_disabled_border: lighten($input_disabled, 50%); +// $input_disabled_text: lighten($input_disabled, 50%); +// +// $form_field_background_color: $white; +// $form_field_focus_color: $white; +// $form_field_fail_bkg: $alpha_color_juliet; + +// $form_field_border: $charlie_gray; +// $form_field_border_fail: $alpha_color_echo; +// $form_field_focus_border_color: $charlie_gray; + +// $form_field_text_fail: $alpha_color_echo; +// $form_label_color: $alpha_gray; +// $optional_field_text_color: $delta_gray; +// $instructional_text: $charlie_gray; +// $placeholder_text: $hotel_gray; +// $inline_alert_bkg_color: $alpha_color_delta; +// $inline_alert_text_color: $white; + +// Non-color defaults (currently not represented in the SG view) +// --------------------------------------------------------- +// $form_field_border_radius: $standard_round_corner; +// $form_field_text: $primary_text; +// $form_field_height: 35; +// $form_field_padding: 6; +// $form_label_weight: bold; +// $form_label_lineheight: 20; +// $inline_alert_lineheight: 30; +// $inline_alert_left_padding: 12; +// $inline_alert_weight: bold; +// $inline_alert_top_margin: 12; +// $inline_alert_border_width: 1; + + + +/////// Config defaults for buttons /////// +// ----------------------------------------------------------------------------- +// $button-color: $delta-color; +// $button-text-color: $white; +// $button-line-height: 32; +// $button-border-radius: 3; +// $button-padding: 20; +// $button-font-size: 18; +// $button-weight: bold; +// $button-text-shadow: true; +// $button-box-shadow: true; + +/////// Config defaults for ``standard_rounded_border`` mixin /////// +// ----------------------------------------------------------------------------- +// $standard_round_corner: 3; // sets default border radius +// $standard_corner_width: 1px; // sets default border width +// $standard_border_color: $border_color; // sets default border color + +/////// Config defaults for ``standard_block_spacing`` mixin /////// +// ----------------------------------------------------------------------------- +// $default_block_spacing: 20; // sets margin-bottom + +/////// Config defaults for site border style /////// +// ----------------------------------------------------------------------------- +// $standard_border_style: solid; + +/////// Config defaults for ``standard_hr`` mixin /////// +// ----------------------------------------------------------------------------- +// $standard_hr_spacing: 40; // sets padding and margin bottom +// $standard_hr_color: $delta_gray; +// $standard_hr_width: 1px; + +/////// Config values for all default shadows /////// +// ----------------------------------------------------------------------------- +// $h-shadow: 0; // horizontal shadow settings +// $v-shadow: 2; // vertical shaddow settings +// $blur: 3; // blur settings +// +// $inset_color: $shadow_color; // for use with ``dual_box_shadow`` mixin +// $ih-shadow: 0; // inset horizontal shadow settings +// $iv-shadow: 2; // inset vertical shaddow settings +// $is-shadow: 2; // inset spread shaddow settings +// $iblur: 3; // inset blur settings + diff --git a/_default.scss b/_default.scss index ada18a4..923d584 100644 --- a/_default.scss +++ b/_default.scss @@ -1,323 +1,7 @@ -// Default configuration +// Main configuration // ------------------------------------------------------------------------------ -// TEXT -// ------------------------------------------------------------------------------ - -$basic_size: $default_font_size; -$size_1: $basic_size * 4; - -$basic_line: 1; - -$head_size_1: 3.1em; -$head_size_2: 2.5em; -$head_size_3: 1.8em; -$head_size_4: 1.35em; - -$text_size_1: 1em; -$text_size_2: 20; - -$text_line_1: 1.5; -$head_line_1: $text_line_1; -$head_line_2: $text_line_1; -$head_line_3: $text_line_1; -$head_line_4: $text_line_1; - -$primary_font_family: #{'Roboto', sans-serif}; -$secondary_font_family: #{'Roboto', sans-serif}; -$third_font_family: #{'Courier New', monospace}; - -$alternative_font_family: #{'Trebuchet MS', Helvetica, Arial, sans-serif, sans}; - -$basic_indent: 2em; - - -// COLORS -// ------------------------------------------------------------------------------ - -$alpha_color: #fad803; -$bravo_color: #d30a51; -$charlie_color: #273f8b; -$delta_color: #b7e0f0; -$echo_color: #52bed1; -$foxtrot_color: #0c85ff; - -$black: black; -$white: white; -$medium_gray: lighten($black, 50%); - - -$basic_font_color: $black; -$basic_head_color: $black; - -$basic_link_color: $echo_color; -$basic_highlight_color: $white; -$basic_action_color: $foxtrot_color; - -$basic_background_color: $medium_gray; -$light_color: lighten($basic_background_color,5%); -$dark_color: darken($basic_background_color,10%); - -$basic_border_color: $black; - -// default shadow colors -// $shadow_color: fade-out($medium_gray, 0.5); - - - -// LAYOUT -// ------------------------------------------------------------------------------ - -$basic_width: 96%; -$width_2: 80%; -$width_3: 60%; -$width_4: 48%; - -$tiny_space: 1px; -$basic_space: $default_space; -$half_space: $basic_space / 2; -$space_2: $basic_space * 2; -$space_3: $basic_space * 4; -$space_4: $basic_space * 8; -$space_5: $basic_space * 16; - -$basic_corner: 4px; - -$basic_border_width: $tiny_space; -$border_width_4: $tiny_space * 4; -$border_width_8: $tiny_space * 8; -$basic_border: $tiny_space solid $basic_border_color; -$cell_border: $tiny_space solid $dark_color; - -$basic_aside_width: 20%; - - - -// IO -// ------------------------------------------------------------------------------ - -$basic_io_font_color: darken($white, 10%); -$basic_io_background_color: lighten($black, 25%); -$basic_shadow: inset 0 1px 3px rgba($black, 0.06); -$basic_focus_shadow: $basic_shadow, 0 0 5px adjust-color($basic_action_color, $lightness: -5%, $alpha: -0.3); - - - -// ANIMATIONS -// ------------------------------------------------------------------------------ - -$basic_duration: 150ms; -$basic_timing: ease; - - - - -// HARDWARE BREAKPOINTS -// ------------------------------------------------------------------------------ - -$tablet: "screen and (max-width: 64em)"; -$tablet_portrait: "screen and (max-width: 50em) and (orientation: portrait)"; -$tablet_landscape: "screen and (max-width: 50em) and (orientation: landscape)"; - -$mobile: "screen and (max-width: 30em)"; -$mobile_portrait: "screen and (max-width: 30em) and (orientation : portrait)"; -$mobile_landscape: "screen and (max-width: 30em) and (orientation : landscape)"; - -$screen_small: 1024px; -$screen_medium: 1280px; -$screen_large: 1920px; - - - -// VENDOR PREFIX -// ------------------------------------------------------------------------------ - -$prefix_defaults: -moz- -webkit- -o- -ms- ''; -$webkit_support: -webkit- ''; -$moz_support: -moz- ''; -$ms_support: -ms- ''; -$moz_webkit_support: -moz- -webkit- ''; -$moz_ms_support: -moz- -ms- ''; -$webkit_ms_support: -webkit- -ms- ''; - - - -// The config file is intended to allow users to quickly redefine core elements of the design -// that will cascade throughout the css to get your design up and running FAST! - -// For instruction, please see https://github.com/Anotheruiguy/toadstool/blob/master/sass/doc-src/config.md - -/////// Typography configuration/////// -// ----------------------------------------------------------------------------- -// $font_size: 12; -// -// $heading_1: 46; -// $heading_2: 32; -// $heading_3: 28; -// $heading_4: 18; -// $heading_5: 18; -// $heading_6: 18; -// -// $line: $font_size * 1.5; -// -// $small_point_size: 10; -// $large_point_size: 14; -// -// $primary_font_family: #{"Helvetica Neue", Arial, sans-serif}; -// $secondary_font_family: #{"Helvetica Neue", Arial, sans-serif}; -// $heading_font_family: #{"Helvetica Neue", Arial, sans-serif}; - -// $icon_font_alpha: #{'ico-fonts'}; - -/////// Default webfont directory/////// -// ----------------------------------------------------------------------------- -// $webfont_directory: "/fonts/"; - -/////// default image directory /////// -// ----------------------------------------------------------------------------- -// In Sinatra, the images folder resides in the public directory. This directory is not made publically accessible, -// so simply referencing the images directory will be fine. -// $imgDir: "/images/"; - -/////// OOCSS generic base colors/////// -// ----------------------------------------------------------------------------- -// Red, green, yellow, blue, accent and black is not law, but a common theme in most designs. -// Using Toadstool, all you need to do is edit these 6 hex values and everything else is created -// by magic, unicorns and fairy dust! - -// $alpha_primary: #5a2e2e; // red -// $bravo_primary: #3e4147; // green -// $charlie_primary: #fffedf; // yellow -// $delta_primary: #2a2c31; // blue -// $echo_primary: #dfba69; // accent - -// $alpha_gray: #333; //black - -/////// Toadstool color math /////// -// ----------------------------------------------------------------------------- -// Local color functions to create default color palette -//@import "color/color_math"; -//@import "color/grayscale_math"; -//@import "color/color_defaults"; - -/////// Grid configuration /////// -// ----------------------------------------------------------------------------- -// setting default units of measurement for Toadstool grid solution -// $grid_type: 12; // sets default column grid -// $grid_uom: percent; // use either ``em`` or ``percent`` -// $grid_padding_l: 0; // sets default left/right padding inside grid block -// $grid_padding_r: 0; // sets default left/right padding inside grid block -// $grid_padding_tb: 0; // sets default top/bottom padding inside grid block -// $grid_border: 0; // sets default border width on all grid blocks -// $grid_child: none; // sets parent child relationship between grid blocks -// $grid_align: default; // by default grids float left. Optional argument is ``center`` -// $col_base: 10; // equal to 10px in the standard 960.gs -// $col_gutter: $col_base * 2; // sets default grid gutter width -// $grid_960: 960 / 100%; // grid math for percentages - - - -/////// HTML 5 feature colors /////// -// ----------------------------------------------------------------------------- -// used with the `ins` tag -// http://www.w3schools.com/tags/tag_ins.asp -// $ins_color: $charlie_color; - -// used with the `mark` tag -// http://www.w3schools.com/html5/tag_mark.asp -// $mark_color: $charlie_color; - -// webkit tap highlight color -// $webkit_tap_hightlight: $delta_color_bravo; - -// overrides the default content selection color in the browser -// $selection_color: $charlie_color; -// $selection_text_color: $primary_text; - - - -/////// Config defaults for forms /////// -// ----------------------------------------------------------------------------- -// $alert_background_color: $alpha_color; - -// $input_disabled: $bravo_gray; -// $input_disabled_bkg: lighten($input_disabled, 75%); -// $input_disabled_border: lighten($input_disabled, 50%); -// $input_disabled_text: lighten($input_disabled, 50%); -// -// $form_field_background_color: $white; -// $form_field_focus_color: $white; -// $form_field_fail_bkg: $alpha_color_juliet; - -// $form_field_border: $charlie_gray; -// $form_field_border_fail: $alpha_color_echo; -// $form_field_focus_border_color: $charlie_gray; - -// $form_field_text_fail: $alpha_color_echo; -// $form_label_color: $alpha_gray; -// $optional_field_text_color: $delta_gray; -// $instructional_text: $charlie_gray; -// $placeholder_text: $hotel_gray; -// $inline_alert_bkg_color: $alpha_color_delta; -// $inline_alert_text_color: $white; - -// Non-color defaults (currently not represented in the SG view) -// --------------------------------------------------------- -// $form_field_border_radius: $standard_round_corner; -// $form_field_text: $primary_text; -// $form_field_height: 35; -// $form_field_padding: 6; -// $form_label_weight: bold; -// $form_label_lineheight: 20; -// $inline_alert_lineheight: 30; -// $inline_alert_left_padding: 12; -// $inline_alert_weight: bold; -// $inline_alert_top_margin: 12; -// $inline_alert_border_width: 1; - - - -/////// Config defaults for buttons /////// -// ----------------------------------------------------------------------------- -// $button-color: $delta-color; -// $button-text-color: $white; -// $button-line-height: 32; -// $button-border-radius: 3; -// $button-padding: 20; -// $button-font-size: 18; -// $button-weight: bold; -// $button-text-shadow: true; -// $button-box-shadow: true; - -/////// Config defaults for ``standard_rounded_border`` mixin /////// -// ----------------------------------------------------------------------------- -// $standard_round_corner: 3; // sets default border radius -// $standard_corner_width: 1px; // sets default border width -// $standard_border_color: $border_color; // sets default border color - -/////// Config defaults for ``standard_block_spacing`` mixin /////// -// ----------------------------------------------------------------------------- -// $default_block_spacing: 20; // sets margin-bottom - -/////// Config defaults for site border style /////// -// ----------------------------------------------------------------------------- -// $standard_border_style: solid; - -/////// Config defaults for ``standard_hr`` mixin /////// -// ----------------------------------------------------------------------------- -// $standard_hr_spacing: 40; // sets padding and margin bottom -// $standard_hr_color: $delta_gray; -// $standard_hr_width: 1px; - -/////// Config values for all default shadows /////// -// ----------------------------------------------------------------------------- -// $h-shadow: 0; // horizontal shadow settings -// $v-shadow: 2; // vertical shaddow settings -// $blur: 3; // blur settings -// -// $inset_color: $shadow_color; // for use with ``dual_box_shadow`` mixin -// $ih-shadow: 0; // inset horizontal shadow settings -// $iv-shadow: 2; // inset vertical shaddow settings -// $is-shadow: 2; // inset spread shaddow settings -// $iblur: 3; // inset blur settings +$default_font_size: 15px; +$default_line_height: 1.5; +$default_space: 8px; diff --git a/_hippie.scss b/_hippie.scss index ce233a3..cc6315c 100644 --- a/_hippie.scss +++ b/_hippie.scss @@ -30,8 +30,8 @@ // Adjustments can be made by copying values from _default.scss to _config.scss // Be careful though changes will get lost if hippie gets updated // ----------------------------------------------------------------------------- -@import "default"; // DO NOT EDIT -@import "config"; // EDIT THIS +@import "default"; // EDIT +@import "config"; // DO NOT EDIT From ed66b9f6ee85f4c9f481c481e582b144aefad945 Mon Sep 17 00:00:00 2001 From: Stephan Date: Wed, 14 Dec 2016 12:54:39 +0100 Subject: [PATCH 017/372] First print styles and cdn switch --- _config.scss | 6 ++--- _default.scss | 2 ++ _hippie.scss | 5 ++++ basic/_new.scss | 4 +++ basic/_print.scss | 5 ++-- example.css | 66 +++++++++++++++++++++++++++++++++++++++++++++-- example.html | 6 ++++- 7 files changed, 86 insertions(+), 8 deletions(-) diff --git a/_config.scss b/_config.scss index 41af47c..f73855c 100644 --- a/_config.scss +++ b/_config.scss @@ -26,12 +26,12 @@ $head_line_2: $text_line_1; $head_line_3: $text_line_1; $head_line_4: $text_line_1; -$primary_font_family: #{'Roboto', sans-serif}; +$default_font_family: #{'Trebuchet MS', Helvetica, Arial, sans-serif, sans} !default; + +$primary_font_family: $default_font_family; $secondary_font_family: #{'Roboto', sans-serif}; $third_font_family: #{'Courier New', monospace}; -$alternative_font_family: #{'Trebuchet MS', Helvetica, Arial, sans-serif, sans}; - $basic_indent: 2em; diff --git a/_default.scss b/_default.scss index 923d584..50e2346 100644 --- a/_default.scss +++ b/_default.scss @@ -4,4 +4,6 @@ $default_font_size: 15px; $default_line_height: 1.5; +$default_font_family: #{'Trebuchet MS', Helvetica, Arial, sans-serif, sans}; + $default_space: 8px; diff --git a/_hippie.scss b/_hippie.scss index cc6315c..c53b8e9 100644 --- a/_hippie.scss +++ b/_hippie.scss @@ -66,4 +66,9 @@ @import "modules/editor/editor_module"; @import "modules/explanation/explanation_module"; + + +@import "basic/print"; +@import "basic/new"; + // NOTE // No css rules allowed in here \ No newline at end of file diff --git a/basic/_new.scss b/basic/_new.scss index 116a6a5..2add945 100644 --- a/basic/_new.scss +++ b/basic/_new.scss @@ -5,6 +5,7 @@ height: 16px; } } + .front_color_1 { color: $alpha_color; &:after { background-color: $alpha_color; } } .front_color_2 { color: $bravo_color; &:after { background-color: $bravo_color; } } .front_color_3 { color: $charlie_color; &:after { background-color: $charlie_color; } } @@ -20,14 +21,17 @@ %label { padding: 0 $half_space; } + .label_1 { @extend %label; @extend .back_color_1; } + .label_2 { @extend %label; @extend .back_color_2; } + .label_3 { @extend %label; @extend .back_color_3; diff --git a/basic/_print.scss b/basic/_print.scss index b549316..4470a27 100644 --- a/basic/_print.scss +++ b/basic/_print.scss @@ -1,18 +1,19 @@ // Print elements -// ------------------------------------------------------------------------------ +// ----------------------------------------------------------------------------- .div_print { margin: $space_3 auto; - padding: 1.2cm 0.6cm 0.6cm 2.4cm; background-color: $white; } .dina4 { width: 21.0cm; height: 29.7cm; + padding: 1.2cm 1.2cm 1.2cm 2.4cm; } .dina5 { width: 14.8cm; height: 21.0cm; + padding: 1.2cm 0.6cm 0.6cm 2.4cm; } diff --git a/example.css b/example.css index d025af6..766f7d9 100644 --- a/example.css +++ b/example.css @@ -216,7 +216,7 @@ background-color: rgba(82, 190, 209, 0.1) !important; } h6, p, .p_col_2, .p_col_3, caption, li, dt, dd, figcaption, .span_solo, th, td, legend, label { - font-family: Roboto, sans-serif; + font-family: Trebuchet MS, Helvetica, Arial, sans-serif, sans; font-size: 1em; line-height: 1.5; } @@ -270,7 +270,7 @@ html { box-sizing: inherit; } body { - font-family: Roboto, sans-serif; + font-family: Trebuchet MS, Helvetica, Arial, sans-serif, sans; font-size: 15px; line-height: 1; color: black; @@ -728,4 +728,66 @@ label { -o-transition: height 0.5s ease; transition: height 0.5s ease; } +.div_print { + margin: 32px auto; + background-color: white; } + +.dina4 { + width: 21.0cm; + height: 29.7cm; + padding: 1.2cm 1.2cm 1.2cm 2.4cm; } + +.dina5 { + width: 14.8cm; + height: 21.0cm; + padding: 1.2cm 0.6cm 0.6cm 2.4cm; } + +.test li:after { + content: ""; + display: block; + height: 16px; } + +.front_color_1 { + color: #fad803; } + .front_color_1:after { + background-color: #fad803; } + +.front_color_2 { + color: #d30a51; } + .front_color_2:after { + background-color: #d30a51; } + +.front_color_3 { + color: #273f8b; } + .front_color_3:after { + background-color: #273f8b; } + +.front_color_4 { + color: #b7e0f0; } + .front_color_4:after { + background-color: #b7e0f0; } + +.front_color_5 { + color: #52bed1; } + .front_color_5:after { + background-color: #52bed1; } + +.back_color_1, .label_1 { + background-color: #fad803; } + +.back_color_2, .label_2 { + background-color: #d30a51; } + +.back_color_3, .label_3 { + background-color: #273f8b; } + +.back_color_4 { + background-color: #b7e0f0; } + +.back_color_5 { + background-color: #52bed1; } + +.label_1, .label_2, .label_3 { + padding: 0 4px; } + /*# sourceMappingURL=example.css.map */ diff --git a/example.html b/example.html index cb23b89..6a507df 100644 --- a/example.html +++ b/example.html @@ -364,8 +364,12 @@

Medien

+

Druck

- + + src="https://code.jquery.com/jquery-3.1.1.min.js" + integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" + crossorigin="anonymous"> - \ No newline at end of file + diff --git a/gulpfile.js b/gulpfile.js new file mode 100644 index 0000000..6e07165 --- /dev/null +++ b/gulpfile.js @@ -0,0 +1,46 @@ +const gulp = require('gulp'); +const sass = require('gulp-ruby-sass'); +const sourcemaps = require('gulp-sourcemaps'); +const plumber = require('gulp-plumber'); +const notify = require('gulp-notify'); +const livereload = require('gulp-livereload'); + +gulp.task('default', function(){ + console.log('default gulp task...') +}); + +gulp.task('sass', () => +sass('./*.scss', {sourcemap: true}) +// .on('error', sass.logError) +.pipe(plumber(errorReport("sass error"))) +.pipe(sourcemaps.write('./', { + includeContent: false, + sourceRoot: 'source' +})) +.pipe(gulp.dest('./')) +.pipe(livereload()) +); + +gulp.task('watch', function() { + livereload.listen(); + gulp.watch('./**/*.scss', ['sass']); + gulp.watch(['*.html']).on('change', livereload.changed); + // gulp.watch('js/src/*.js', ['js']); + // gulp.watch('img/src/*.{png,jpg,gif}', ['img']); + +}); + +gulp.task('default', ['sass', 'watch']); + + + +function errorReport(errTitle) { + return plumber({ + errorHandler: notify.onError({ + // Customizing error title + title: errTitle || "Error running Gulp", + message: "Error: <%= error.message %>", + sound: true + }) + }); +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..d309568 --- /dev/null +++ b/package.json @@ -0,0 +1,22 @@ +{ + "name": "hippie", + "version": "0.3.3", + "description": "Hippie interweaves preeminent personal interface elements", + "main": "gulpfile.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/sthag/hippie.git" + }, + "author": "Interaktionsweise", + "license": "ISC", + "bugs": { + "url": "https://github.com/sthag/hippie/issues" + }, + "homepage": "https://github.com/sthag/hippie#readme", + "devDependencies": { + "gulp": "^3.9.1" + } +} From e7ca01dd401036c2853a766a3e07c38ebc5b7a9b Mon Sep 17 00:00:00 2001 From: Stephan Hagedorn Date: Thu, 17 Aug 2017 19:47:06 +0200 Subject: [PATCH 034/372] Beispiel-Datei strukturiert --- .gitignore | 18 +- README.md | 6 + _config.scss | 6 +- _hippie.scss | 12 +- basic/_common.scss | 5 +- basic/_sections.scss | 5 +- basic/_tables.scss | 73 +- example.css | 108 +- example.html | 102 +- modules/tables/_tables_module.scss | 70 + package-lock.json | 4778 ++++++++++++++++++++++++++++ package.json | 10 +- 12 files changed, 5023 insertions(+), 170 deletions(-) create mode 100644 modules/tables/_tables_module.scss create mode 100644 package-lock.json diff --git a/.gitignore b/.gitignore index 6c7d6d4..0b9d427 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ # https://gist.github.com/octocat/9257657 +################### +################### # Compiled source # ################### @@ -41,6 +43,8 @@ Thumbs.db # https://github.com/github/gitignore +################### +################### # https://github.com/github/gitignore/blob/master/Global/Windows.gitignore ################### @@ -173,13 +177,13 @@ typings/ # dotenv environment variables file .env +# https://github.com/github/gitignore/blob/master/Sass.gitignore +################### +.sass-cache/ +*.css.map + # https://interaktionsweise.de/ - -# ========================= -# Other files -# ========================= - -.sass-cache/ -*.css.map +################### +################### diff --git a/README.md b/README.md index 896c34d..735778a 100644 --- a/README.md +++ b/README.md @@ -9,3 +9,9 @@ Copy the source folder to your projects style folder. Compile the SCSS files, for example like a so `sass --watch source/:./`. Load the screen.css file within the head section of your HTML document. `` + +## LOGIC + +Klassennamen enthalten Objektnamen und Funktionen +Sie sind mit `-` und `_` unterteilt. +Der Bindestrich `-` trennt Objektnamen von Funktionen. Der Unterstrich `_` wiederum unterteilt Funktionsbezeichnungen. diff --git a/_config.scss b/_config.scss index 6fd0fa1..66d399b 100644 --- a/_config.scss +++ b/_config.scss @@ -4,7 +4,7 @@ // TEXT // ------------------------------------------------------------------------------ -$default_font_size: 15px !default; +$default_font_size: 16px !default; $basic_size: $default_font_size; $default_print_font_size: 10pt !default; @@ -79,6 +79,9 @@ $basic_border_color: $black; // LAYOUT // ------------------------------------------------------------------------------ +$default_box_sizing: box-sizing !default; +$box_sizing: $default_box_sizing; + $basic_width: 96%; $width_2: 80%; $width_3: 60%; @@ -333,4 +336,3 @@ $webkit_ms_support: -webkit- -ms- ''; // $iv-shadow: 2; // inset vertical shaddow settings // $is-shadow: 2; // inset spread shaddow settings // $iblur: 3; // inset blur settings - diff --git a/_hippie.scss b/_hippie.scss index 8aab431..fc1ff2a 100644 --- a/_hippie.scss +++ b/_hippie.scss @@ -23,6 +23,7 @@ // Use a file outside of hippie i.e. other/normalize.css // ----------------------------------------------------------------------------- @import "other/normalize.css"; +// @import "other/YOUR-FILES.css"; @@ -48,8 +49,7 @@ // ----------------------------------------------------------------------------- @import "modules/vendor"; //@import modules/all deprecated because of the new vendor mixin -//@import modules/*/* needs sass-glob -// ADD HERE // @import "modules/example"; +// @import "modules/YOUR-MODULE/YOUR-FILES"; // Basic styles - this is the core of definitions // Individual styles can be added her @@ -64,18 +64,22 @@ @import "basic/embedded"; @import "basic/tables"; @import "basic/interactive"; -// ADD HERE // @import "{name}/example"; +// @import "YOU-NAME-IT"; // Individual Modules and variables // in dependency to other styles +// Additional modules can be defined here // ----------------------------------------------------------------------------- +@import "modules/tables/tables_module"; @import "modules/card/card_module"; @import "modules/editor/editor_module"; @import "modules/explanation/explanation_module"; @import "modules/print/print_module"; +// @import "modules/YOUR-MODULE/YOUR-FILES"; +// Not yet sorted @import "basic/new"; -// NOTE // No css rules allowed in here \ No newline at end of file +// NOTE // No css rules allowed in here diff --git a/basic/_common.scss b/basic/_common.scss index f8a2168..92901ad 100644 --- a/basic/_common.scss +++ b/basic/_common.scss @@ -48,7 +48,7 @@ *, ::before, ::after { - box-sizing: border-box; + box-sizing: $box_sizing; } } @@ -82,8 +82,7 @@ background-color: transparentize($alpha_color, .5); } -.viewport-hover-body { - @extend %full_viewport; +.hover_background_change { background-color: darken($basic_background_color, 20%); transition: background-color .2s ease-in-out; &:hover { diff --git a/basic/_sections.scss b/basic/_sections.scss index 2143634..6cbf3b2 100644 --- a/basic/_sections.scss +++ b/basic/_sections.scss @@ -12,13 +12,13 @@ html { // ----------------------------------------------------------------------------- body { - box-sizing: border-box; + box-sizing: $box_sizing; font-family: $primary_font_family; font-size: $basic_size; line-height: $basic_line; color: $basic_font_color; background-color: $basic_background_color; - + *, ::before, ::after { @@ -108,4 +108,3 @@ h6 { text-transform: none; font-weight: bold; } - diff --git a/basic/_tables.scss b/basic/_tables.scss index 9574138..602c938 100644 --- a/basic/_tables.scss +++ b/basic/_tables.scss @@ -43,7 +43,7 @@ tfoot { .table_blank { border: $basic_border_width solid transparent; - + th, td { border: $basic_border_width solid transparent; } @@ -74,74 +74,3 @@ caption { border: $basic_border_width dotted $basic_border_color; text-align: center; } - -.table_link { - width: 100%; - border: 0; - table-layout: auto; - - tbody { - border-bottom: $cell_border; - - &:hover { - background-color: $light_color; - } - } - - th, td { - border: 0; - } - - .cell_icon { - width: 48px; - text-align: center; - img { - vertical-align: text-top; - } - } - - .cell_link { - padding-right: $basic_space; - padding-left: $basic_space; - - &:hover { - background-color: $foxtrot_color; - } - - a { - display: block; - } - - .link_url { - display: none; - } - - &:hover .link_url { - display: block; - color: $basic_highlight_color; - } - - &:hover .link_text { - display: none; - } - } - - .cell_date { - width: 12%; - text-align: center; - } - - .cell_text { - padding-right: $basic_space; - padding-left: $basic_space; - - div { - width: 100%; - } - - .shorten { - @extend %short; - max-height: 44px; - } - } -} diff --git a/example.css b/example.css index 79b0d64..5a15c95 100644 --- a/example.css +++ b/example.css @@ -59,7 +59,7 @@ margin-right: 0; margin-left: 0; } -.viewport-full-body, .viewport-hover-body { +.viewport-full-body { position: absolute; top: 0; left: 0; @@ -78,10 +78,10 @@ .viewport-full-body { background-color: rgba(250, 216, 3, 0.5); } -.viewport-hover-body { +.hover_background_change { background-color: #4d4d4d; transition: background-color .2s ease-in-out; } - .viewport-hover-body:hover { + .hover_background_change:hover { background-color: gray; } .space_box { @@ -160,7 +160,7 @@ h5 { .span_solo { color: black; } -.table_link .cell_text .shorten { +.table-link_list .cell_text .shorten { overflow: hidden; text-overflow: ellipsis; -o-text-overflow: ellipsis; } @@ -178,9 +178,9 @@ html { height: 100%; } body { - box-sizing: border-box; + box-sizing: box-sizing; font-family: Roboto, Trebuchet MS, Helvetica, Source Sans, Arial, sans-serif, sans; - font-size: 15px; + font-size: 16px; line-height: 1; color: black; background-color: gray; } @@ -428,46 +428,6 @@ caption { border: 1px dotted black; text-align: center; } -.table_link { - width: 100%; - border: 0; - table-layout: auto; } - .table_link tbody { - border-bottom: 1px solid #666666; } - .table_link tbody:hover { - background-color: #8c8c8c; } - .table_link th, .table_link td { - border: 0; } - .table_link .cell_icon { - width: 48px; - text-align: center; } - .table_link .cell_icon img { - vertical-align: text-top; } - .table_link .cell_link { - padding-right: 8px; - padding-left: 8px; } - .table_link .cell_link:hover { - background-color: #0c85ff; } - .table_link .cell_link a { - display: block; } - .table_link .cell_link .link_url { - display: none; } - .table_link .cell_link:hover .link_url { - display: block; - color: white; } - .table_link .cell_link:hover .link_text { - display: none; } - .table_link .cell_date { - width: 12%; - text-align: center; } - .table_link .cell_text { - padding-right: 8px; - padding-left: 8px; } - .table_link .cell_text div { - width: 100%; } - .table_link .cell_text .shorten { - max-height: 44px; } - fieldset { margin: 8px 0; border: 1px solid black; } @@ -490,6 +450,46 @@ legend { background-color: black; color: white; } +.table-link_list { + width: 100%; + border: 0; + table-layout: auto; } + .table-link_list tbody { + border-bottom: 1px solid #666666; } + .table-link_list tbody:hover { + background-color: #8c8c8c; } + .table-link_list th, .table-link_list td { + border: 0; } + .table-link_list .cell_icon { + width: 48px; + text-align: center; } + .table-link_list .cell_icon img { + vertical-align: text-top; } + .table-link_list .cell_link { + padding-right: 8px; + padding-left: 8px; } + .table-link_list .cell_link:hover { + background-color: #0c85ff; } + .table-link_list .cell_link a { + display: block; } + .table-link_list .cell_link .link_url { + display: none; } + .table-link_list .cell_link:hover .link_url { + display: block; + color: white; } + .table-link_list .cell_link:hover .link_text { + display: none; } + .table-link_list .cell_date { + width: 12%; + text-align: center; } + .table-link_list .cell_text { + padding-right: 8px; + padding-left: 8px; } + .table-link_list .cell_text div { + width: 100%; } + .table-link_list .cell_text .shorten { + max-height: 44px; } + .card_body .bkg_box { position: absolute; top: 0; @@ -617,19 +617,19 @@ legend { .exp_marker_pop { position: absolute; - top: -11.25px; - right: -7.5px; - width: 15px; - height: 15px; + top: -12px; + right: -8px; + width: 16px; + height: 16px; border: 1px solid white; - border-radius: 15px; + border-radius: 16px; color: white; background-color: black; } .exp_overlay_btn { position: fixed; - width: 60px; - height: 60px; + width: 64px; + height: 64px; cursor: pointer; } .exp_help_btn { @@ -804,4 +804,6 @@ legend { .label_1, .label_2, .label_3 { padding: 0 4px; } + + /*# sourceMappingURL=example.css.map */ diff --git a/example.html b/example.html index a561e56..3f0be4e 100644 --- a/example.html +++ b/example.html @@ -14,7 +14,7 @@ - +
?
@@ -122,7 +122,7 @@

Eine sehr klar definierte Gruppierung stellt das Element <main> dar. Es umschließt den hauptsächlichen Inhalt des Dokumentes.

Textebene

Verweise

-

Ein wesentlicher Bestandteil von Hypertext sind Verweise <a>. Sie dienen als Sprungmarken innerhalb des Netzwerks. Es kann grob zwischen internen und externen Verweisen unterschieden werden. Interne Verweisetable>tbody>tr>td*2^tr>td[colspan=2] können Verknüpfungen innerhalb des aktuellen Dokumentes sein oder auch Funktionen aktivieren. Externe Verweise verknüpfen Inhalte über das gesamte Netzwerk hinweg. Sie können auch auf E-Mail Adressen oder Dateien zeigen.

+

Ein wesentlicher Bestandteil von Hypertext sind Verweise <a>. Sie dienen als Sprungmarken innerhalb des Netzwerks. Es kann grob zwischen internen und externen Verweisen unterschieden werden. Interne Verweisea.link_line können Verknüpfungen innerhalb des aktuellen Dokumentes sein oder auch Funktionen aktivieren. Externe Verweise verknüpfen Inhalte über das gesamte Netzwerk hinweg. Sie können auch auf E-Mail Adressen oder Dateien zeigen.

Nicht nur Text kann als Verweis verwendet werden. Auch andere Elemente wie Bilder können verknüpft werden. Abhängig von ihrer Funktion und ihrem Zweck, werden Verweise unterschiedlich formatiert. Farbige oder unterstrichene Varianten sind möglich.

Wird der Verweis innerhalb eines <nav> Elementes notiert, bekommt er die spezielle Bedeutung eines Navigationsverweises innerhalb des Dokumentes oder der Anwendung. Auf diese Verwendung wird im Folgenden genauer eingegangen ...

Formatierungen

@@ -292,42 +292,41 @@ - +
+ - - - + + + + + + + + + + - - - + + + - - - - - - - - + + + - + + +
Beschreibung bzw. Zusammenhang der Tabelle
 Ab / Zy Neu / AltKopfzeile1>9000
Fußzeile--
NameURLYYYY-MM-DDAlpha09000
-
Beschreibung
-
NameURLYYYY-MM-DDBravo19001
-
Beschreibung
- 		Charlie09000
-
table.table_link>thead>tr>th*3^^(tbody>tr>td.cell_icon[rowspan=2]>img[width=16 height=16]^+td.cell_link>a.link_text[target=_blank]+a.link_url[target=_blank]^+td.cell_date[rowspan=2]{YYYY-MM-DD}^tr>td.cell_text>div.shorten)*2
-

Formulare

Spätestens hier werden Betrachter zu Benutzern. Texteingabefelder und verschiedene Bedienelemente geben Möglichkeiten zur Interaktion. Diese Elemente sind in vielerlei Hinsicht besonders. Sie sind in ihrer unveränderten Gestalt, System- bzw. Browser-Abhängig. (Vielleicht ist das auch scheiße, hier darauf einzugehen) ...

@@ -369,6 +368,61 @@

Medien

Druck

+ +
+
+

Ende der Einführung

+
+
+

Dies war eine Übersicht der grundlegenden Elemente. Nun folgen weitere Elemente mit besonderen Formatierungen.

+
+
+ +
+
+

Einzelene Elemente

+
+
+

Tabellen

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 Ab / Zy Neu / Alt
NameURLYYYY-MM-DD
+
Beschreibung
+
NameURLYYYY-MM-DD
+
Beschreibung
+
+
table.table-link_list>thead>tr>th*3^^(tbody>tr>td.cell_icon[rowspan=2]>img[width=16 height=16]^+td.cell_link>a.link_text[target=_blank]+a.link_url[target=_blank]^+td.cell_date[rowspan=2]{YYYY-MM-DD}^tr>td.cell_text>div.shorten)*2
+ + +
+
+
- + + + + diff --git a/modules/explanation/_explanation_module.scss b/modules/explanation/_explanation_module.scss index 96e151a..eea463c 100644 --- a/modules/explanation/_explanation_module.scss +++ b/modules/explanation/_explanation_module.scss @@ -61,7 +61,7 @@ border: $tiny_space solid $basic_highlight_color; border-radius: $basic_size; color: $basic_highlight_color; - background-color: $black; + background-color: $dark_color; } .exp_expose { @@ -85,16 +85,16 @@ display: table; right: $space_2; bottom: $space_2; - background-color: rgba($black, .4); + background-color: rgba($dark_color, .4); &:hover { - background-color: $white; + background-color: $bright_color; > .span__solo { - color: $black; + color: $dark_color; } } .span__solo { display: table-cell; - color: rgba($white, .8); + color: rgba($bright_color, .8); font-family: $monospace_font_family; font-size: 1.4em; text-align: center; diff --git a/modules/navigation/_nav_module.scss b/modules/navigation/_nav_module.scss new file mode 100644 index 0000000..f07c1af --- /dev/null +++ b/modules/navigation/_nav_module.scss @@ -0,0 +1,121 @@ +nav { + + ul { + padding-left: 0; + } + + li { + margin-bottom: $basic_space; + list-style: none; + } +} + +.nav__horizontal { + ul { + @extend .overflow; + + li { + @extend .float_left; + margin-right: $basic_space; + margin-bottom: 0; + } + } +} + +.nav__center_old { + @extend .nav__horizontal; + float: right; + position: relative; + left: -50%; + + ul { + position: relative; + left: 50%; + text-align: center; + } +} + +.nav__page_meta { + position: fixed; + // display: table; + // width: 3em; + right: 0; + bottom: $space_2; + + ul { + margin: $basic_space 0; + } + + li { + margin-bottom: 0; + } + .a_button_meta { + // display: table-cell; + display: inline-block; + + &:active, + &:focus { + background-color: transparent; + } + + &:hover { + background-color: $basic_action_color; + } + } +} + +.header__page { + + nav { + @extend .nav__horizontal; + + ul { + margin: $basic_space 0; + } + + li:last-child { + margin-right: 0; + } + + a { + + &:active, + &:focus, + &:hover { + background-color: rgba($basic_font_color, .2); + color: $basic_font_color; + } + } + } + + .nav__right { + float: right; + margin-left: $basic_space; + + .align_parent { + margin-right: $basic_space * -1; + } + } + + .nav__separate_right { + float: right; + li { + position: relative; + + &:first-child { + padding-left: $basic_space * 2 + $tiny_space; + + &::before { + content: ""; + position: absolute; + width: $tiny_space; + height: 100%; + left: 0; + top: 0; + background-color: $bright_color; + margin: 0 $basic_space; + } + } + } + } +} diff --git a/modules/print/_print_module.scss b/modules/print/_print_module.scss index f69c421..adbe14b 100644 --- a/modules/print/_print_module.scss +++ b/modules/print/_print_module.scss @@ -7,7 +7,7 @@ // ------------------------------------------------------------------------------ %paper { - background-color: $white; + background-color: $bright_color; } $a4: ".dina4" 1.2cm 1.2cm 1.2cm 2.4cm; diff --git a/modules/tables/_tables_module.scss b/modules/tables/_tables_module.scss index c4c7af7..8dffa72 100644 --- a/modules/tables/_tables_module.scss +++ b/modules/tables/_tables_module.scss @@ -1,4 +1,4 @@ -.table-link_list { +.table__link { width: 100%; border: 0; table-layout: auto; @@ -15,7 +15,7 @@ border: 0; } - .cell_icon { + .cell__icon { width: 48px; text-align: center; img { @@ -23,38 +23,36 @@ } } - .cell_link { + .cell__link { padding-right: $basic_space; padding-left: $basic_space; &:hover { background-color: $foxtrot_color; + a:first-child { + display: none; + } + a:last-child { + display: block; + color: $basic_highlight_color; + } } a { display: block; } - .link_url { - display: none; - } - - &:hover .link_url { - display: block; - color: $basic_highlight_color; - } - - &:hover .link_text { + a:last-child { display: none; } } - .cell_date { - width: 12%; + th:last-child, .cell__date { + width: 16%; text-align: center; } - .cell_text { + .cell__text { padding-right: $basic_space; padding-left: $basic_space; From 9ae96ba41968a59f785c96333cdecd0f4778131a Mon Sep 17 00:00:00 2001 From: Stephan Hagedorn Date: Mon, 21 Aug 2017 14:57:34 +0200 Subject: [PATCH 037/372] Fix for latest changes Some variables were missing --- _config.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/_config.scss b/_config.scss index a6b0a22..6b515b8 100644 --- a/_config.scss +++ b/_config.scss @@ -46,10 +46,10 @@ $basic_line: 1; // ), // ); -// $head_size_1: 3.1em; -// $head_size_2: 2.5em; -// $head_size_3: 1.8em; -// $head_size_4: 1.35em; +$head_size_1: 3.1em; +$head_size_2: 2.5em; +$head_size_3: 1.8em; +$head_size_4: 1.35em; $text_size_1: 1em; $text_size_2: 20; From db96a298fb8bba79bf80d93a815a58680d1aab1e Mon Sep 17 00:00:00 2001 From: Stephan Hagedorn Date: Tue, 22 Aug 2017 00:09:50 +0200 Subject: [PATCH 038/372] Tweaks --- basic/_common.scss | 12 + basic/_demo.scss | 10 +- basic/_grouping.scss | 1 - basic/_textlevel.scss | 7 +- basic/_typography.scss | 15 - code/variables.js | 2 +- example.css | 1096 ++++++++++++++++++++++++--- example.html | 18 +- modules/navigation/_nav_module.scss | 99 ++- 9 files changed, 1111 insertions(+), 149 deletions(-) diff --git a/basic/_common.scss b/basic/_common.scss index 370cd54..387cc72 100644 --- a/basic/_common.scss +++ b/basic/_common.scss @@ -43,6 +43,18 @@ +.txt_center { + text-align: center !important; +} +.txt_right { + text-align: right !important; +} +.txt_left { + text-align: left !important; +} + + + // Clearing and floating // ------------------------------------------------------------------------------ .clear { diff --git a/basic/_demo.scss b/basic/_demo.scss index a3bb077..41cdd19 100644 --- a/basic/_demo.scss +++ b/basic/_demo.scss @@ -58,9 +58,17 @@ .demo__footer { width: 100%; - height: 128px; + // height: 128px; + padding: $space_2 0; background-color: $dark_color; color: $bright_color; + + nav { + + a { + color: $bright_color; + } + } } .demo__avatar { diff --git a/basic/_grouping.scss b/basic/_grouping.scss index 17d6a04..a24e083 100644 --- a/basic/_grouping.scss +++ b/basic/_grouping.scss @@ -5,7 +5,6 @@ p { @extend %basic; margin: $basic_space 0; - color: $basic_font_color; code { padding: $tiny_space $half_space; font-size: 1em; diff --git a/basic/_textlevel.scss b/basic/_textlevel.scss index 22b891d..66b1679 100644 --- a/basic/_textlevel.scss +++ b/basic/_textlevel.scss @@ -33,14 +33,17 @@ a { @extend %default_button; } -.a__button_border { +.a__button_text { @extend %default_button; padding: $wide_padding; background-color: transparent; color: $basic_font_color; - border: $cell_border; } +.a__button_border { + @extend .a__button_text; + border: $cell_border; +} // Other elements diff --git a/basic/_typography.scss b/basic/_typography.scss index 21ce118..68718b0 100644 --- a/basic/_typography.scss +++ b/basic/_typography.scss @@ -61,18 +61,3 @@ text-overflow: ellipsis; -o-text-overflow: ellipsis; // vendor } - - - -// Specific styles -// ----------------------------------------------------------------------------- - -.txt_center { - text-align: center !important; -} -.txt_right { - text-align: right !important; -} -.txt_left { - text-align: left !important; -} diff --git a/code/variables.js b/code/variables.js index f954521..67e72cd 100644 --- a/code/variables.js +++ b/code/variables.js @@ -1,7 +1,7 @@ var w = Math.max(document.documentElement.clientWidth, window.innerWidth || 0) var h = Math.max(document.documentElement.clientHeight, window.innerHeight || 0) -var full_view_hover = true; +var full_view_hover = false; var doc_pos_y = 0; var basic_ease = 600; diff --git a/example.css b/example.css index a9667fb..6cbb245 100644 --- a/example.css +++ b/example.css @@ -1,90 +1,1014 @@ +@charset "UTF-8"; /* -Error: Undefined variable: "$head_size_1". - on line 28 of basic/_typography.scss - from line 58 of _hippie.scss - from line 3 of ./example.scss + * # TABLE OF CONTENTS + * + * - Reset + * - Configuration + * - Special modules + * - Basic styles + * - Common + * - Typography + * + * - Sections + * - Grouping + * - Textlevel + * - Embedded + * - Tables + * - Interactive + * - Modules + * + */ +@import url(other/normalize.css); +/** + * @description + * Generates cross-browser-compatible output for a given element with its value. + * + * @author sthag + * + * @param values + * @returns + * -webkit-: + * ...-: + * + * @example + * .selector + * @include vendor-prefix(hyphens, auto) + */ +.magic { + display: none; } + +.center_50 { + margin-right: 25%; + margin-left: 25%; } + +.center_25 { + margin-right: 37.5%; + margin-left: 37.5%; } + +.width_full { + width: 100%; + margin-right: 0; + margin-left: 0; } + +.height_basic { + height: 1024px; } + +.txt_center { + text-align: center !important; } + +.txt_right { + text-align: right !important; } + +.txt_left { + text-align: left !important; } + +.clear { + clear: both; } + .clear::before, .clear::after { + clear: both; } + +.float_left, .list__horizontal li, .box__inline_left, .nav__horizontal ul li, .nav__center_old ul li, .header__page nav ul li { + float: left; + margin-right: 32px; } + +.overflow, .nav__horizontal ul, .nav__center_old ul, .header__page nav ul { + overflow: auto; } + +.x_long { + overflow-x: scroll; } + +.pos_full_view, .hover_full_view_change { + position: fixed; + top: 0; + left: 0; + width: 100vw; + height: 100vh; } + +.pos_full_page { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; } + +.pos_abs { + position: absolute; } + +.pos_rel { + position: relative; } + +.pos_fix { + position: fixed; } + +.pos_bottom { + bottom: 0; } + +.pos_full_view { + background-color: rgba(250, 216, 3, 0.5); } + +.pos_full_page { + background-color: rgba(39, 63, 139, 0.25); } + +.hover_back_change { + background-color: #666666; + transition: background-color .2s ease-in-out; } + .hover_back_change:hover { + background-color: gray; } + +.hover_full_view_change { + z-index: 1000; + background-color: rgba(0, 0, 0, 0.5); + transition: background-color .2s ease-in-out; + pointer-events: none; } + +.flex, .nav__column ul { + display: flex; } + +.flex_child, .nav__column ul li { + flex: 0 1 auto; } + +.txt_light_color { + color: #666666; } + +.a__button, .a__button_text, .a__button_border { + display: inline-block; + padding: calc(8px - 3px) 8px; + background-color: rgba(82, 190, 209, 0.2); + border-radius: 1px; } + .a__button:active, .a__button_text:active, .a__button_border:active, .a__button:focus, .a__button_text:focus, .a__button_border:focus, .a__button:hover, .a__button_text:hover, .a__button_border:hover { + background-color: rgba(255, 255, 255, 0.1); + color: white; + border-color: transparent; } + +.span__solo, h6, p, .p__col_2, .p__col_3, caption, li, dt, dd, figcaption, th, td, legend, label { + font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; + font-size: 1em; + line-height: 1.5; } + +pre, code, .code__solo { + font-family: Courier New, monospace; + font-size: 1em; + line-height: 1.5; } + +.print_body *[class^="din"] p, .print_body *[class^="din"] .p__col_2, .print_body *[class^="din"] .p__col_3, .print_body *[class^="din"] caption { + font-family: Courier New, monospace; + font-size: 1em; + line-height: 1.5; } + +h1, .print_body .page_date, .print_body .page_no { + font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; + font-size: 3.1em; + font-weight: 300; + line-height: 1.5; } + +h2 { + font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; + font-size: 2.5em; + font-weight: 300; + line-height: 1.5; } + +h3, h4 { + font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; + font-size: 1.8em; + font-weight: 300; + line-height: 1.5; } + +h5 { + font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; + font-size: 1.35em; + font-weight: 300; + line-height: 1.5; } + +.span__solo { + color: black; } + +.table__link .cell__text .shorten { + overflow: hidden; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; } + +html { + height: 100%; } + +body { + position: relative; + box-sizing: border-box; + font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; + font-size: 17px; + line-height: 1; + color: black; + background-color: gray; } + body *, + body ::before, + body ::after { + box-sizing: inherit; } + body:hover .trigger__hover { + background-color: transparent; } + +.sec__main_center, .demo__intro { + width: 96%; + margin: 0 auto; + padding-top: 32px; } +@media screen and (orientation: landscape) and (min-width: 1024px) { + .sec__main_center, .demo__intro { + width: 80%; } } +@media screen and (orientation: landscape) and (min-width: 1280px) { + .sec__main_center, .demo__intro { + width: 60%; } } +@media screen and (orientation: landscape) and (min-width: 1920px) { + .sec__main_center, .demo__intro { + width: 48%; } } + +@media screen and (orientation: portrait) and (min-width: 1024px) { + .sec__main_center, .demo__intro { + width: 80%; } } + +aside.right + section { + margin-right: calc(20% + 8px); } +aside.left + section { + margin-left: calc(20% + 8px); } + +aside { + width: 20%; } + aside.left { + float: left; } + aside.right { + float: right; } + aside *:first-child { + margin-top: 0; } + +.header__page { + overflow: auto; } + +h1 { + margin: 128px 0 32px; } + +h2 { + margin: 64px 0 32px; } + +h3 { + margin: 16px 0 16px; + text-transform: uppercase; } + +h4 { + margin: 16px 0 16px; + text-transform: none; } + +h5 { + margin: 16px 0 8px; + text-transform: none; } + +h6 { + margin: 8px 0; + text-transform: none; + font-weight: bold; } + +p, .p__col_2, .p__col_3, caption { + margin: 8px 0; } + p code, .p__col_2 code, .p__col_3 code, caption code { + padding: 1px 4px; + font-size: 1em; + line-height: 1; } + +.p__col_line { + column-rule: 1px solid black; } + +.p__col_2 { + column-count: 2; + column-gap: 32px; } + +.p__col_3 { + column-count: 3; + column-gap: 64px; } + +hr, .hr__hidden, .hr__dotted { + margin: 32px auto; + border-width: 1px 0 0; + border-style: solid; + border-color: black; } + +.hr__hidden { + border-color: transparent; } + +.hr__dotted { + border-style: dotted; } + +.pre__code { + border-color: rgba(255, 255, 255, 0.1); + border-style: dotted; + border-width: 0 0 0 4px; + border-radius: 1px; + padding: 8px; + background-color: rgba(255, 255, 255, 0.1); } + .pre__code code { + background-color: transparent; } + +blockquote { + margin: 8px 2em; } + +.quote__mark p::before, .quote__mark .p__col_2::before, .quote__mark .p__col_3::before, .quote__mark caption::before { + content: "\201E \0020"; } +.quote__mark p::after, .quote__mark .p__col_2::after, .quote__mark .p__col_3::after, .quote__mark caption::after { + content: "\201C \0020"; } +.quote__mark .quote__source::before, .quote__mark .quote__source::after { + content: ""; } + +dl, ul, ol { + margin: 16px 0 8px; } + +ul, ol { + padding-left: 2em; } + +li, dt, dd { + color: black; } + +dd { + margin-left: 2em; } + +ul li { + list-style: square; } + +.list__dash li { + list-style: none; + position: relative; } + .list__dash li:before { + content: "_"; + position: absolute; + left: -1em; } + +.list__link li { + margin-bottom: 2px; + text-transform: uppercase; } + .list__link li a { + display: block; + padding: calc(8px - 3px) 8px; + color: black; } + .list__link li a img { + margin-right: 8px; + padding-bottom: .2em; + vertical-align: text-bottom; } + .list__link li a:active, .list__link li a:focus, .list__link li a:hover { + background-color: #0c85ff; + color: white; } + +.list__horizontal { + overflow: auto; } + +figure { + margin: 16px 2em; } + +.box__info { + padding: 16px 2em; + border-right: 8px solid rgba(82, 190, 209, 0.6); + background-color: rgba(82, 190, 209, 0.1) !important; } + +.box__main_indent { + margin-left: 25%; } + +.box__space { + position: relative; + width: 100%; } + +.box__cube { + float: left; + display: table; + width: 64px; + text-align: center; + vertical-align: middle; } + .box__cube span { + display: table-cell; } + +.box__placeholder { + width: 100%; + height: 64px; + border: 4px solid rgba(0, 0, 0, 0.1); + border-radius: 1px; + padding: 8px; + background-color: rgba(0, 0, 0, 0.1); } + .box__placeholder svg { + vertical-align: top; } + +.box__placeholder_bkg { + width: 100%; + height: 64px; + border: 4px solid rgba(0, 0, 0, 0.1); + border-radius: 1px; + padding: 8px; + /*data:[][;charset=][;base64],*/ + background: url("data:image/svg+xml;utf8,") no-repeat; + background-color: rgba(0, 0, 0, 0.1); } + +a { + color: #52bed1; + text-decoration: none; } + a:active, a:focus, a:hover { + color: white; } + +.a__line { + border-bottom-width: 1px; + border-bottom-style: dotted; + border-color: black; + background-color: transparent; + color: black; + transition: color 150ms ease; } + .a__line:active, .a__line:focus, .a__line:hover { + background-color: #0c85ff; + color: white; } + +.a__button_text, .a__button_border { + padding: calc(8px - 1px) calc(8px * 2); + background-color: transparent; + color: black; } + +.a__button_border { + border: 1px solid #666666; } + +i, em { + font-style: italic; } + +b, strong { + font-weight: 500; } + +cite { + font-style: italic; } + +code { + color: #1f1f1f; + background-color: rgba(255, 255, 255, 0.1); } + +.code__solo { + padding: 1px 4px; + color: black; } + +mark { + background-color: #fad803; } + +.mark__cursor { + color: white; + background-color: black; } + +::-moz-selection { + color: white; + background-color: black; } + +::selection { + color: white; + background-color: black; } + +img { + vertical-align: top; } + +table { + margin-top: 16px; + margin-bottom: 16px; + border: 1px solid black; + border-collapse: collapse; } + +th, td { + padding: 4px; } + +th { + border: 1px solid black; + text-align: left; } + +.precol { + border-right: 1px solid black; } + +td { + border-right: 1px solid #666666; + border-bottom: 1px solid #666666; } + +td:last-child { + border-right: 0; } + +tr:last-child td { + border-bottom: 0; } + +tfoot tr:first-child td { + border-top: 1px solid black; } + +.table_blank { + border: 1px solid transparent; } + .table_blank th, .table_blank td { + border: 1px solid transparent; } + +.table_free { + border: 1px solid transparent; } + +.table_stripe td { + border-top: 0; + border-bottom: 0; } +.table_stripe tr:nth-child(even) td { + background-color: #8c8c8c; } + +.table_fix { + table-layout: fixed; } + +caption { + padding: 4px 0; + border: 1px dotted black; + text-align: center; } + +fieldset { + margin: 8px 0; + border: 1px solid black; } + +legend { + padding: 0 4px; } + +.input_default label { + display: table; + margin: 4px 0; } + .input_default label input { + display: table-cell; + margin-left: 8px; + padding: 4px 5px; + border-style: solid; + border-color: transparent; + background-color: #404040; + color: #e6e6e6; } + .input_default label input:hover { + background-color: black; + color: white; } + +nav ul { + padding-left: 0; } +nav li { + margin-bottom: 8px; + list-style: none; } + +.nav__horizontal ul ul, .nav__center_old ul ul, .header__page nav ul ul { + margin: 8px 0; } +.nav__horizontal ul li, .nav__center_old ul li, .header__page nav ul li { + margin-right: 8px; + margin-bottom: 0; } + .nav__horizontal ul li:last-child, .nav__center_old ul li:last-child, .header__page nav ul li:last-child { + margin-right: 0; } + +.nav__right { + float: right; + margin-left: 8px; } + .nav__right .align_parent { + margin-right: -8px; } + +.nav__separate_right { + float: right; } + .nav__separate_right li { + position: relative; } + .nav__separate_right li:first-child { + padding-left: 17px; } + .nav__separate_right li:first-child::before { + content: ""; + position: absolute; + width: 1px; + height: 100%; + left: 0; + top: 0; + background-color: white; + margin: 0 8px; } + +.nav__center_old { + float: right; + position: relative; + left: -50%; } + .nav__center_old ul { + position: relative; + left: 50%; + text-align: center; } + +.nav__column { + position: relative; + margin: 8px 0; } + .nav__column ul { + margin: 0 128px; } + .nav__column ul li { + flex-grow: 1; + margin: 0; + text-align: center; } + .nav__column ul li a { + display: block; } + +.nav__page_meta { + position: fixed; + right: 0; + bottom: 16px; } + .nav__page_meta ul { + margin: 8px 0; } + .nav__page_meta li { + margin-bottom: 0; } + .nav__page_meta .a_button_meta { + display: inline-block; } + .nav__page_meta .a_button_meta:active, .nav__page_meta .a_button_meta:focus { + background-color: transparent; } + .nav__page_meta .a_button_meta:hover { + background-color: #0c85ff; } + +.header__page nav a:active, .header__page nav a:focus, .header__page nav a:hover { + background-color: rgba(0, 0, 0, 0.2); + color: black; } + +.table__link { + width: 100%; + border: 0; + table-layout: auto; } + .table__link tbody { + border-bottom: 1px solid #666666; } + .table__link tbody:hover { + background-color: #8c8c8c; } + .table__link th, .table__link td { + border: 0; } + .table__link .cell__icon { + width: 48px; + text-align: center; } + .table__link .cell__icon img { + vertical-align: text-top; } + .table__link .cell__link { + padding-right: 8px; + padding-left: 8px; } + .table__link .cell__link:hover { + background-color: #0c85ff; } + .table__link .cell__link:hover a:first-child { + display: none; } + .table__link .cell__link:hover a:last-child { + display: block; + color: white; } + .table__link .cell__link a { + display: block; } + .table__link .cell__link a:last-child { + display: none; } + .table__link th:last-child, .table__link .cell__date { + width: 16%; + text-align: center; } + .table__link .cell__text { + padding-right: 8px; + padding-left: 8px; } + .table__link .cell__text div { + width: 100%; } + .table__link .cell__text .shorten { + max-height: 44px; } + +.card_body .bkg_box { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; } + +.card_body { + height: 100%; + /* .full { + position: absolute; + width: 128px; + height: 128px; + top: 16px; + left: 16px; + background-color: #fff; + } + .mark { + float: left; + width: 32px; + height: 32px; + margin-top: 16px; + } + */ } + .card_body .bkg_box { + transition-duration: 800ms; + overflow: hidden; + vertical-align: top; + z-index: -1; } + .card_body .bkg_box > svg { + position: relative; } + .card_body .flex_wrap_center { + display: -webkit-box; + display: -webkit-flex; + display: -moz-box; + display: -ms-flexbox; + display: flex; + -webkit-box-align: center; + -webkit-align-items: center; + -moz-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-pack: center; + -webkit-justify-content: center; + -moz-box-pack: center; + -ms-flex-pack: center; + justify-content: center; + height: 100%; } + .card_body .flex_content { + position: relative; + padding: 64px 64px 24px 64px; + border: 1px solid #FFF; + background-color: #F5F5F5; + z-index: 40; } + .card_body h1 { + margin: 16px 0; + color: #1E1E1E; + font-size: 24px; + line-height: 1.4em; + font-weight: normal; } + .card_body p, .card_body .p__col_2, .card_body .p__col_3, .card_body caption { + margin-top: 0; + margin-bottom: 16px; + font-size: 12px; + line-height: 1.4em; } + .card_body .marked { + padding-left: 1em; + text-indent: -1em; + text-align: center; } + .card_body .marked:before { + content: "* "; } + .card_body .decent { + color: #666; } + .card_body a { + color: #000; + text-decoration: none; } + .card_body a:hover { + color: #F4F9FA; + background-color: #0C85FF; + text-decoration: none; } + +.wip, .wip_txt { + border-right: 8px solid rgba(220, 20, 60, 0.8); + background-color: rgba(220, 20, 60, 0.1) !important; } + +.wip:before, .wip:after { + content: ""; + display: block; + height: 48px; } + +.exp_expose_pre:after { + content: ""; + display: block; + height: 48px; + background-color: rgba(183, 224, 240, 0.1) !important; } + +.exp_expose_post:before { + content: ""; + display: block; + height: 48px; + background-color: rgba(183, 224, 240, 0.1) !important; } + +.exp_expose:before, .exp_expose:after { + content: ""; + display: block; + height: 48px; + background-color: rgba(183, 224, 240, 0.1) !important; } + +.exp_pop { + display: none; } + +.exp_wrap { + position: relative; } + +.exp_pop { + position: absolute; + z-index: 100; + top: 128px; + left: 128px; + padding: 4px; + border: 4px solid gray; + border-radius: 4px; + background-color: gray; + pointer-events: none; } + +.exp_marker_pop { + position: absolute; + top: -12.75px; + right: -8.5px; + width: 17px; + height: 17px; + border: 1px solid white; + border-radius: 17px; + color: white; + background-color: black; } + +.exp_overlay_btn { + position: fixed; + width: 3em; + height: 2em; + cursor: pointer; } + +.exp_help_btn { + display: table; + right: 16px; + bottom: 16px; + background-color: rgba(0, 0, 0, 0.4); } + .exp_help_btn:hover { + background-color: white; } + .exp_help_btn:hover > .span__solo { + color: black; } + .exp_help_btn .span__solo { + display: table-cell; + color: rgba(255, 255, 255, 0.8); + font-family: Courier New, monospace; + font-size: 1.4em; + text-align: center; + vertical-align: middle; } + +.expose_height { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + background-color: rgba(183, 224, 240, 0.1) !important; + -webkit-transition: height 0.5s ease; + -ms-transition: height 0.5s ease; + -moz-transition: height 0.5s ease; + -o-transition: height 0.5s ease; + transition: height 0.5s ease; } + +.print_body *[class^="din"] { + background-color: white; } + +.print_body { + font-size: 10pt; + margin: 10vh 20vw; } +@page { + .print_body { + size: A4; + margin: 1.2cm; } } +@page :first { + .print_body { + size: A4; + margin: 0; } } + .print_body .dina4 { + padding-top: 1.2cm; + padding-right: 1.2cm; + padding-bottom: 1.2cm; + padding-left: 2.4cm; } + .print_body .dina4 .page_head, .print_body .dina4 .page_foot { + right: 1.2cm; + left: 2.4cm; } + .print_body .dina4 .page_head { + top: 1.2cm; } + .print_body .dina4 .page_foot { + bottom: 1.2cm; } + .print_body .dina5 { + padding-top: 0; + padding-right: 0; + padding-bottom: 0; + padding-left: 1.2cm; } + .print_body .dina5 .page_head, .print_body .dina5 .page_foot { + right: 0; + left: 1.2cm; } + .print_body .dina5 .page_head { + top: 0; } + .print_body .dina5 .page_foot { + bottom: 0; } + .print_body .dina6 { + padding-top: 0; + padding-right: 0; + padding-bottom: 0; + padding-left: 1.2cm; } + .print_body .dina6 .page_head, .print_body .dina6 .page_foot { + right: 0; + left: 1.2cm; } + .print_body .dina6 .page_head { + top: 0; } + .print_body .dina6 .page_foot { + bottom: 0; } + .print_body *[class^="din"] { + position: relative; + overflow: auto; + margin: 32px auto; } + .print_body *[class^="din"] .page_head, .print_body *[class^="din"] .page_foot { + position: absolute; } + .print_body *[class^="din"] .page_head { + page: cover; } + .print_body *[class^="din"] .page_foot { + display: flex; + flex-direction: row; } + .print_body *[class^="din"] .page_foot *:last-child { + margin-bottom: 0; } + .print_body *[class^="din"] .page_foot p, .print_body *[class^="din"] .page_foot .p__col_2, .print_body *[class^="din"] .page_foot .p__col_3, .print_body *[class^="din"] .page_foot caption { + flex: 1 0 auto; + margin: 0; + font-size: 8pt; + line-height: 10pt; + text-align: center; } + .print_body *[class^="din"] .page_foot .page_no { + flex: 1 0 auto; + font-size: 20pt; + line-height: 1; + text-align: right; } + .print_body *[class^="din"] .page_foot p:first-child, .print_body *[class^="din"] .page_foot .p__col_2:first-child, .print_body *[class^="din"] .page_foot .p__col_3:first-child, .print_body *[class^="din"] .page_foot caption:first-child { + text-align: left; } + .print_body *[class^="din"] .page_content { + margin-top: 10cm; + margin-bottom: 2cm; } + .print_body .page_title, .print_body .page_date { + font-size: 14pt; } + .print_body .page_title { + margin: 0; } + .print_body .page_date, .print_body .page_no { + float: right; } + .print_body .page_author { + position: absolute; + top: 5cm; + right: 0; + text-align: right; } + .print_body .page_recipient { + position: absolute; + top: 5cm; + left: 0; } + +.demo__intro { + border-top-width: 8px; + border-top-style: solid; + border-color: black; + padding-top: 32px; } + +.demo__header { + padding: 16px; } + .demo__header nav ul { + margin: 0; } + +.header__fancy { + background-color: rgba(211, 10, 81, 0.6); } + .header__fancy nav a { + background-color: rgba(250, 216, 3, 0.6); + color: #fad803; } + .header__fancy nav a:active, .header__fancy nav a:focus, .header__fancy nav a:hover { + background-color: rgba(255, 255, 255, 0.2); + color: white; } + +.header__fix { + position: relative; + top: 0; + width: 100%; + background-color: rgba(39, 63, 139, 0.6); } + .header__fix nav a:active, .header__fix nav a:focus, .header__fix nav a:hover { + background-color: rgba(255, 255, 255, 0.2); + color: white; } + +.demo__footer { + width: 100%; + padding: 16px 0; + background-color: black; + color: white; } + .demo__footer nav a { + color: white; } + +.demo__avatar img { + opacity: 1; + width: 128px; + height: auto; + border-radius: 50%; + background-color: #b7e0f0; } + +.demo__flag { + height: 40vh; } + +.test li:after { + content: ""; + display: block; + height: 16px; } + +.front_color_1 { + color: #fad803; } + .front_color_1:after { + background-color: #fad803; } + +.front_color_2 { + color: #d30a51; } + .front_color_2:after { + background-color: #d30a51; } + +.front_color_3 { + color: #273f8b; } + .front_color_3:after { + background-color: #273f8b; } + +.front_color_4 { + color: #b7e0f0; } + .front_color_4:after { + background-color: #b7e0f0; } + +.front_color_5 { + color: #52bed1; } + .front_color_5:after { + background-color: #52bed1; } + +.back_color_1, .label_1 { + background-color: #fad803; } + +.back_color_2, .label_2 { + background-color: #d30a51; } + +.back_color_3, .label_3 { + background-color: #273f8b; } + +.back_color_4 { + background-color: #b7e0f0; } + +.back_color_5 { + background-color: #52bed1; } + +.label_1, .label_2, .label_3 { + padding: 0 4px; } + -Backtrace: -basic/_typography.scss:28 -_hippie.scss:58 -./example.scss:3 -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/script/tree/variable.rb:49:in `_perform' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/script/tree/node.rb:58:in `perform' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/perform.rb:397:in `visit_prop' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/base.rb:36:in `visit' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/perform.rb:160:in `block in visit' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/stack.rb:79:in `block in with_base' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/stack.rb:115:in `with_frame' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/stack.rb:79:in `with_base' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/perform.rb:160:in `visit' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/perform.rb:433:in `block (2 levels) in visit_rule' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/perform.rb:433:in `map' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/perform.rb:433:in `block in visit_rule' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/perform.rb:181:in `with_environment' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/perform.rb:431:in `visit_rule' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/base.rb:36:in `visit' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/perform.rb:160:in `block in visit' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/stack.rb:79:in `block in with_base' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/stack.rb:115:in `with_frame' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/stack.rb:79:in `with_base' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/perform.rb:160:in `visit' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/perform.rb:328:in `block (2 levels) in visit_import' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/perform.rb:328:in `map' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/perform.rb:328:in `block in visit_import' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/stack.rb:88:in `block in with_import' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/stack.rb:115:in `with_frame' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/stack.rb:88:in `with_import' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/perform.rb:325:in `visit_import' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/base.rb:36:in `visit' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/perform.rb:160:in `block in visit' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/stack.rb:79:in `block in with_base' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/stack.rb:115:in `with_frame' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/stack.rb:79:in `with_base' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/perform.rb:160:in `visit' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/perform.rb:328:in `block (2 levels) in visit_import' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/perform.rb:328:in `map' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/perform.rb:328:in `block in visit_import' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/stack.rb:88:in `block in with_import' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/stack.rb:115:in `with_frame' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/stack.rb:88:in `with_import' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/perform.rb:325:in `visit_import' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/base.rb:36:in `visit' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/perform.rb:160:in `block in visit' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/stack.rb:79:in `block in with_base' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/stack.rb:115:in `with_frame' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/stack.rb:79:in `with_base' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/perform.rb:160:in `visit' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/base.rb:52:in `block in visit_children' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/base.rb:52:in `map' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/base.rb:52:in `visit_children' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/perform.rb:169:in `block in visit_children' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/perform.rb:181:in `with_environment' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/perform.rb:168:in `visit_children' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/base.rb:36:in `block in visit' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/perform.rb:188:in `visit_root' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/base.rb:36:in `visit' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/perform.rb:159:in `visit' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/visitors/perform.rb:8:in `visit' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/root_node.rb:36:in `css_tree' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/tree/root_node.rb:29:in `render_with_sourcemap' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/engine.rb:381:in `_render_with_sourcemap' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/engine.rb:298:in `render_with_sourcemap' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:492:in `update_stylesheet' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:215:in `block in update_stylesheets' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:209:in `each' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin/compiler.rb:209:in `update_stylesheets' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/plugin.rb:82:in `update_stylesheets' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/exec/sass_scss.rb:340:in `watch_or_update' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/exec/sass_scss.rb:51:in `process_result' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/exec/base.rb:52:in `parse' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/lib/sass/exec/base.rb:19:in `parse!' -C:/Sachen/Ruby23-x64/lib/ruby/gems/2.3.0/gems/sass-3.4.23/bin/sass:13:in `' -C:/Sachen/Ruby23-x64/bin/sass:22:in `load' -C:/Sachen/Ruby23-x64/bin/sass:22:in `
' -*/ -body:before { - white-space: pre; - font-family: monospace; - content: "Error: Undefined variable: \"$head_size_1\".\A on line 28 of basic/_typography.scss\A from line 58 of _hippie.scss\A from line 3 of ./example.scss"; } /*# sourceMappingURL=example.css.map */ diff --git a/example.html b/example.html index 1bc64f9..0b3d140 100644 --- a/example.html +++ b/example.html @@ -396,7 +396,7 @@

Aufbau, Standardwerte

-

&ellip;

+

…

@@ -486,12 +486,22 @@ nav.nav__center_old>ul>(li>a.a__button{Typ $})*4
-
+
diff --git a/modules/navigation/_nav_module.scss b/modules/navigation/_nav_module.scss index f07c1af..525d616 100644 --- a/modules/navigation/_nav_module.scss +++ b/modules/navigation/_nav_module.scss @@ -14,10 +14,49 @@ nav { ul { @extend .overflow; + ul { + margin: $basic_space 0; + } + li { @extend .float_left; margin-right: $basic_space; margin-bottom: 0; + + &:last-child { + margin-right: 0; + } + } + } +} + +.nav__right { + float: right; + margin-left: $basic_space; + + .align_parent { + margin-right: $basic_space * -1; + } +} + +.nav__separate_right { + float: right; + li { + position: relative; + + &:first-child { + padding-left: $basic_space * 2 + $tiny_space; + + &::before { + content: ""; + position: absolute; + width: $tiny_space; + height: 100%; + left: 0; + top: 0; + background-color: $bright_color; + margin: 0 $basic_space; + } } } } @@ -35,6 +74,27 @@ nav { } } +.nav__column { + position: relative; + margin: $basic_space 0; + + ul { + @extend .flex; + margin: 0 $space_5; + + li { + @extend .flex_child; + flex-grow: 1; + margin: 0; + text-align: center; + + a { + display: block; + } + } + } +} + .nav__page_meta { position: fixed; // display: table; @@ -69,14 +129,6 @@ nav { nav { @extend .nav__horizontal; - ul { - margin: $basic_space 0; - } - - li:last-child { - margin-right: 0; - } - a { &:active, @@ -87,35 +139,4 @@ nav { } } } - - .nav__right { - float: right; - margin-left: $basic_space; - - .align_parent { - margin-right: $basic_space * -1; - } - } - - .nav__separate_right { - float: right; - li { - position: relative; - - &:first-child { - padding-left: $basic_space * 2 + $tiny_space; - - &::before { - content: ""; - position: absolute; - width: $tiny_space; - height: 100%; - left: 0; - top: 0; - background-color: $bright_color; - margin: 0 $basic_space; - } - } - } - } } From f97f76ee3dbcefdf3e4d623db2e156af6ba3fdab Mon Sep 17 00:00:00 2001 From: Stephan Hagedorn Date: Tue, 22 Aug 2017 16:50:09 +0200 Subject: [PATCH 039/372] New stuff --- _default.scss | 21 - _hippie.scss | 33 +- {basic => elements}/_embedded.scss | 0 {basic => elements}/_grouping.scss | 28 +- {basic => elements}/_interactive.scss | 16 +- {basic => elements}/_new.scss | 13 +- {basic => elements}/_sections.scss | 0 {basic => elements}/_tables.scss | 2 +- {basic => elements}/_textlevel.scss | 13 +- {basic => elements}/_typography.scss | 0 example.css | 2098 +++++++++-------- example.html | 55 +- functions/_all.scss | 3 + functions/_color.scss | 13 + functions/_shade.scss | 24 + functions/_tint.scss | 24 + {basic => global}/_common.scss | 8 +- _config.scss => global/_config.scss | 114 +- global/_default.scss | 23 + mixins/_all.scss | 3 + mixins/_clearflow.scss | 25 + mixins/_color.scss | 20 + mixins/_user_agent.scss | 9 + modules/card/_card_module.scss | 2 +- .../demo/_demo_module.scss | 16 +- modules/editor/_editor_module.scss | 4 +- modules/explanation/_explanation_module.scss | 16 +- modules/navigation/_nav_module.scss | 22 +- modules/print/_print_module.scss | 2 +- modules/tables/_tables_module.scss | 2 +- 30 files changed, 1463 insertions(+), 1146 deletions(-) delete mode 100644 _default.scss rename {basic => elements}/_embedded.scss (100%) rename {basic => elements}/_grouping.scss (87%) rename {basic => elements}/_interactive.scss (86%) rename {basic => elements}/_new.scss (53%) rename {basic => elements}/_sections.scss (100%) rename {basic => elements}/_tables.scss (96%) rename {basic => elements}/_textlevel.scss (89%) rename {basic => elements}/_typography.scss (100%) create mode 100644 functions/_all.scss create mode 100644 functions/_color.scss create mode 100644 functions/_shade.scss create mode 100644 functions/_tint.scss rename {basic => global}/_common.scss (96%) rename _config.scss => global/_config.scss (82%) create mode 100644 global/_default.scss create mode 100644 mixins/_all.scss create mode 100644 mixins/_clearflow.scss create mode 100644 mixins/_color.scss create mode 100644 mixins/_user_agent.scss rename basic/_demo.scss => modules/demo/_demo_module.scss (77%) diff --git a/_default.scss b/_default.scss deleted file mode 100644 index a70d492..0000000 --- a/_default.scss +++ /dev/null @@ -1,21 +0,0 @@ -// Main configuration -// ------------------------------------------------------------------------------ - -//$default_font_size: 15px; -//$default_print_font_size: 10pt; - -//$default_line_height: 1.5; - -//$default_font_family: #{'Roboto', 'Trebuchet MS', Helvetica, 'Source Sans', Arial, sans-serif, sans}; - -//$dark_color: black !default; -//$bright_color: white !default; -//$medium_color: lighten($dark_color, 50%) !default; - -//$default_back_color: lighten(black, 50%); - -//$default_space: 8px; - -//$tiny_space: 1px; - -//$default_border_width: $tiny_space; \ No newline at end of file diff --git a/_hippie.scss b/_hippie.scss index 76fb183..5fe1018 100644 --- a/_hippie.scss +++ b/_hippie.scss @@ -2,6 +2,7 @@ * # TABLE OF CONTENTS * * - Reset + * - Global functions and mixins * - Configuration * - Special modules * - Basic styles @@ -27,6 +28,14 @@ +// Functions and Mixins +// Important code constructions +// ----------------------------------------------------------------------------- +@import "functions/all"; +@import "mixins/all"; + + + // Fonts // Use a central file outside of hippie for font definitions with @font-face // ----------------------------------------------------------------------------- @@ -38,8 +47,8 @@ // Adjustments can be made by copying values from _config.scss to _override.scss // Be careful though changes will get lost if hippie gets updated // ----------------------------------------------------------------------------- -@import "default"; // EDIT -@import "config"; // DO NOT EDIT +@import "global/default"; // DO NOT EDIT +@import "global/config"; // DO NOT EDIT @import "override"; // EDIT @@ -54,16 +63,16 @@ // Basic styles - this is the core of definitions // Individual styles can be added her // ----------------------------------------------------------------------------- -@import "basic/common"; -@import "basic/typography"; +@import "global/common"; +@import "elements/typography"; // Following the w3c document element structure // https://w3c.github.io/html/index.html#contents -@import "basic/sections"; -@import "basic/grouping"; -@import "basic/textlevel"; -@import "basic/embedded"; -@import "basic/tables"; -@import "basic/interactive"; +@import "elements/sections"; +@import "elements/grouping"; +@import "elements/textlevel"; +@import "elements/embedded"; +@import "elements/tables"; +@import "elements/interactive"; // @import "YOU-NAME-IT"; // Individual Modules and variables @@ -81,11 +90,11 @@ // Demonstration -@import "basic/demo"; +@import "modules/demo/demo_module"; // Not yet sorted -@import "basic/new"; +@import "elements/new"; // NOTE // No css rules allowed in here diff --git a/basic/_embedded.scss b/elements/_embedded.scss similarity index 100% rename from basic/_embedded.scss rename to elements/_embedded.scss diff --git a/basic/_grouping.scss b/elements/_grouping.scss similarity index 87% rename from basic/_grouping.scss rename to elements/_grouping.scss index a24e083..cbe9550 100644 --- a/basic/_grouping.scss +++ b/elements/_grouping.scss @@ -13,7 +13,7 @@ p { } .p__col_line { - column-rule: $basic_border_width solid $dark_color; + column-rule: $basic_border_width solid $darkest_color; } .p__col_2, .p__col_3 { @extend p; @@ -37,7 +37,7 @@ hr { margin: $space_3 auto; border-width: $basic_border_width 0 0; border-style: solid; - border-color: $dark_color; + border-color: $darkest_color; } .hr__hidden { @@ -57,12 +57,12 @@ pre { .pre__code { // overflow-x: scroll; - border-color: rgba($bright_color,.1); + border-color: rgba($brightest_color,.1); border-style: dotted; border-width: 0 0 0 $border_width_4; border-radius: $basic_corner; padding: $basic_space; - background-color: rgba($bright_color,.1); + background-color: rgba($brightest_color,.1); code { background-color: transparent; } @@ -116,7 +116,7 @@ ul { list-style: none; position: relative; - &:before { + &::before { content: "_"; position: absolute; left: -1em; @@ -218,10 +218,10 @@ div { .box__placeholder { width: 100%; height: $space_4; - border: $border_width_4 solid rgba($dark_color,.1); + border: $border_width_4 solid rgba($darkest_color,.1); border-radius: $basic_corner; padding: $basic_space; - background-color: rgba($dark_color,.1); + background-color: rgba($darkest_color,.1); svg { vertical-align: top; } @@ -230,10 +230,20 @@ div { .box__placeholder_bkg { width: 100%; height: $space_4; - border: $border_width_4 solid rgba($dark_color,.1); + border: $border_width_4 solid rgba($darkest_color,.1); border-radius: $basic_corner; padding: $basic_space; /*data:[][;charset=][;base64],*/ background: url("data:image/svg+xml;utf8,") no-repeat; - background-color: rgba($dark_color,.1); + background-color: rgba($darkest_color,.1); +} + +// Flex +.box__column { + @extend .flex; + + .column { + @extend .flex_child; + flex-grow: 1; + } } diff --git a/basic/_interactive.scss b/elements/_interactive.scss similarity index 86% rename from basic/_interactive.scss rename to elements/_interactive.scss index f3a48df..d956505 100644 --- a/basic/_interactive.scss +++ b/elements/_interactive.scss @@ -7,6 +7,7 @@ form { fieldset { margin: $basic_space 0; + padding: $basic_space; border: $basic_border; } @@ -21,6 +22,13 @@ legend { // ----------------------------------------------------------------------------- label { @extend %basic; + + & + input { + margin-left: $basic_space; + } + input + & { + margin-left: $basic_space; + } } .input_default label { @@ -37,8 +45,8 @@ label { color: $basic_io_font_color; &:hover { - background-color: $dark_color; - color: $bright_color; + background-color: $darkest_color; + color: $brightest_color; } } } @@ -119,5 +127,5 @@ dialog { // ----------------------------------------------------------------------------- canvas { - -} \ No newline at end of file + +} diff --git a/basic/_new.scss b/elements/_new.scss similarity index 53% rename from basic/_new.scss rename to elements/_new.scss index 2add945..3a6c03d 100644 --- a/basic/_new.scss +++ b/elements/_new.scss @@ -1,16 +1,16 @@ .test { - li:after { + li::after { content: ""; display: block; height: 16px; } } -.front_color_1 { color: $alpha_color; &:after { background-color: $alpha_color; } } -.front_color_2 { color: $bravo_color; &:after { background-color: $bravo_color; } } -.front_color_3 { color: $charlie_color; &:after { background-color: $charlie_color; } } -.front_color_4 { color: $delta_color; &:after { background-color: $delta_color; } } -.front_color_5 { color: $echo_color; &:after { background-color: $echo_color; } } +.front_color_1 { color: $alpha_color; &::after { background-color: $alpha_color; } } +.front_color_2 { color: $bravo_color; &::after { background-color: $bravo_color; } } +.front_color_3 { color: $charlie_color; &::after { background-color: $charlie_color; } } +.front_color_4 { color: $delta_color; &::after { background-color: $delta_color; } } +.front_color_5 { color: $echo_color; &::after { background-color: $echo_color; } } .back_color_1 { background-color: $alpha_color;} .back_color_2 { background-color: $bravo_color;} @@ -36,4 +36,3 @@ @extend %label; @extend .back_color_3; } - diff --git a/basic/_sections.scss b/elements/_sections.scss similarity index 100% rename from basic/_sections.scss rename to elements/_sections.scss diff --git a/basic/_tables.scss b/elements/_tables.scss similarity index 96% rename from basic/_tables.scss rename to elements/_tables.scss index 602c938..4283db3 100644 --- a/basic/_tables.scss +++ b/elements/_tables.scss @@ -60,7 +60,7 @@ tfoot { } tr:nth-child(even) td { - background-color: $light_color; + background-color: $bright_color; } } diff --git a/basic/_textlevel.scss b/elements/_textlevel.scss similarity index 89% rename from basic/_textlevel.scss rename to elements/_textlevel.scss index 66b1679..1713243 100644 --- a/basic/_textlevel.scss +++ b/elements/_textlevel.scss @@ -53,6 +53,11 @@ i, em { font-style: italic; } +.i__bright { + font-style: normal; + color: $brightest_color; +} + b, strong { font-weight: 500; // TODO maybe bolder } @@ -91,7 +96,7 @@ time { code { @extend %basic_mono; color: lighten($basic_font_color, 12%); - background-color: rgba($bright_color,.1); + background-color: rgba($brightest_color,.1); } .code__solo { @extend %basic_mono; @@ -121,15 +126,15 @@ mark { } .mark__cursor { color: $basic_highlight_color; - background-color: $dark_color; + background-color: $darkest_color; } ::-moz-selection { color: $basic_highlight_color; - background-color: $dark_color; + background-color: $darkest_color; } ::selection { color: $basic_highlight_color; - background-color: $dark_color; + background-color: $darkest_color; } span { diff --git a/basic/_typography.scss b/elements/_typography.scss similarity index 100% rename from basic/_typography.scss rename to elements/_typography.scss diff --git a/example.css b/example.css index 6cbb245..2cd2d1a 100644 --- a/example.css +++ b/example.css @@ -1,1014 +1,1084 @@ -@charset "UTF-8"; -/* - * # TABLE OF CONTENTS - * - * - Reset - * - Configuration - * - Special modules - * - Basic styles - * - Common - * - Typography - * - * - Sections - * - Grouping - * - Textlevel - * - Embedded - * - Tables - * - Interactive - * - Modules - * - */ -@import url(other/normalize.css); -/** - * @description - * Generates cross-browser-compatible output for a given element with its value. - * - * @author sthag - * - * @param values - * @returns - * -webkit-: - * ...-: - * - * @example - * .selector - * @include vendor-prefix(hyphens, auto) - */ -.magic { - display: none; } - -.center_50 { - margin-right: 25%; - margin-left: 25%; } - -.center_25 { - margin-right: 37.5%; - margin-left: 37.5%; } - -.width_full { - width: 100%; - margin-right: 0; - margin-left: 0; } - -.height_basic { - height: 1024px; } - -.txt_center { - text-align: center !important; } - -.txt_right { - text-align: right !important; } - -.txt_left { - text-align: left !important; } - -.clear { - clear: both; } - .clear::before, .clear::after { - clear: both; } - -.float_left, .list__horizontal li, .box__inline_left, .nav__horizontal ul li, .nav__center_old ul li, .header__page nav ul li { - float: left; - margin-right: 32px; } - -.overflow, .nav__horizontal ul, .nav__center_old ul, .header__page nav ul { - overflow: auto; } - -.x_long { - overflow-x: scroll; } - -.pos_full_view, .hover_full_view_change { - position: fixed; - top: 0; - left: 0; - width: 100vw; - height: 100vh; } - -.pos_full_page { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; } - -.pos_abs { - position: absolute; } - -.pos_rel { - position: relative; } - -.pos_fix { - position: fixed; } - -.pos_bottom { - bottom: 0; } - -.pos_full_view { - background-color: rgba(250, 216, 3, 0.5); } - -.pos_full_page { - background-color: rgba(39, 63, 139, 0.25); } - -.hover_back_change { - background-color: #666666; - transition: background-color .2s ease-in-out; } - .hover_back_change:hover { - background-color: gray; } - -.hover_full_view_change { - z-index: 1000; - background-color: rgba(0, 0, 0, 0.5); - transition: background-color .2s ease-in-out; - pointer-events: none; } - -.flex, .nav__column ul { - display: flex; } - -.flex_child, .nav__column ul li { - flex: 0 1 auto; } - -.txt_light_color { - color: #666666; } - -.a__button, .a__button_text, .a__button_border { - display: inline-block; - padding: calc(8px - 3px) 8px; - background-color: rgba(82, 190, 209, 0.2); - border-radius: 1px; } - .a__button:active, .a__button_text:active, .a__button_border:active, .a__button:focus, .a__button_text:focus, .a__button_border:focus, .a__button:hover, .a__button_text:hover, .a__button_border:hover { - background-color: rgba(255, 255, 255, 0.1); - color: white; - border-color: transparent; } - -.span__solo, h6, p, .p__col_2, .p__col_3, caption, li, dt, dd, figcaption, th, td, legend, label { - font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; - font-size: 1em; - line-height: 1.5; } - -pre, code, .code__solo { - font-family: Courier New, monospace; - font-size: 1em; - line-height: 1.5; } - -.print_body *[class^="din"] p, .print_body *[class^="din"] .p__col_2, .print_body *[class^="din"] .p__col_3, .print_body *[class^="din"] caption { - font-family: Courier New, monospace; - font-size: 1em; - line-height: 1.5; } - -h1, .print_body .page_date, .print_body .page_no { - font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; - font-size: 3.1em; - font-weight: 300; - line-height: 1.5; } - -h2 { - font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; - font-size: 2.5em; - font-weight: 300; - line-height: 1.5; } - -h3, h4 { - font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; - font-size: 1.8em; - font-weight: 300; - line-height: 1.5; } - -h5 { - font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; - font-size: 1.35em; - font-weight: 300; - line-height: 1.5; } - -.span__solo { - color: black; } - -.table__link .cell__text .shorten { - overflow: hidden; - text-overflow: ellipsis; - -o-text-overflow: ellipsis; } - -html { - height: 100%; } - -body { - position: relative; - box-sizing: border-box; - font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; - font-size: 17px; - line-height: 1; - color: black; - background-color: gray; } - body *, - body ::before, - body ::after { - box-sizing: inherit; } - body:hover .trigger__hover { - background-color: transparent; } - -.sec__main_center, .demo__intro { - width: 96%; - margin: 0 auto; - padding-top: 32px; } -@media screen and (orientation: landscape) and (min-width: 1024px) { - .sec__main_center, .demo__intro { - width: 80%; } } -@media screen and (orientation: landscape) and (min-width: 1280px) { - .sec__main_center, .demo__intro { - width: 60%; } } -@media screen and (orientation: landscape) and (min-width: 1920px) { - .sec__main_center, .demo__intro { - width: 48%; } } - -@media screen and (orientation: portrait) and (min-width: 1024px) { - .sec__main_center, .demo__intro { - width: 80%; } } - -aside.right + section { - margin-right: calc(20% + 8px); } -aside.left + section { - margin-left: calc(20% + 8px); } - -aside { - width: 20%; } - aside.left { - float: left; } - aside.right { - float: right; } - aside *:first-child { - margin-top: 0; } - -.header__page { - overflow: auto; } - -h1 { - margin: 128px 0 32px; } - -h2 { - margin: 64px 0 32px; } - -h3 { - margin: 16px 0 16px; - text-transform: uppercase; } - -h4 { - margin: 16px 0 16px; - text-transform: none; } - -h5 { - margin: 16px 0 8px; - text-transform: none; } - -h6 { - margin: 8px 0; - text-transform: none; - font-weight: bold; } - -p, .p__col_2, .p__col_3, caption { - margin: 8px 0; } - p code, .p__col_2 code, .p__col_3 code, caption code { - padding: 1px 4px; - font-size: 1em; - line-height: 1; } - -.p__col_line { - column-rule: 1px solid black; } - -.p__col_2 { - column-count: 2; - column-gap: 32px; } - -.p__col_3 { - column-count: 3; - column-gap: 64px; } - -hr, .hr__hidden, .hr__dotted { - margin: 32px auto; - border-width: 1px 0 0; - border-style: solid; - border-color: black; } - -.hr__hidden { - border-color: transparent; } - -.hr__dotted { - border-style: dotted; } - -.pre__code { - border-color: rgba(255, 255, 255, 0.1); - border-style: dotted; - border-width: 0 0 0 4px; - border-radius: 1px; - padding: 8px; - background-color: rgba(255, 255, 255, 0.1); } - .pre__code code { - background-color: transparent; } - -blockquote { - margin: 8px 2em; } - -.quote__mark p::before, .quote__mark .p__col_2::before, .quote__mark .p__col_3::before, .quote__mark caption::before { - content: "\201E \0020"; } -.quote__mark p::after, .quote__mark .p__col_2::after, .quote__mark .p__col_3::after, .quote__mark caption::after { - content: "\201C \0020"; } -.quote__mark .quote__source::before, .quote__mark .quote__source::after { - content: ""; } - -dl, ul, ol { - margin: 16px 0 8px; } - -ul, ol { - padding-left: 2em; } - -li, dt, dd { - color: black; } - -dd { - margin-left: 2em; } - -ul li { - list-style: square; } - -.list__dash li { - list-style: none; - position: relative; } - .list__dash li:before { - content: "_"; - position: absolute; - left: -1em; } - -.list__link li { - margin-bottom: 2px; - text-transform: uppercase; } - .list__link li a { - display: block; - padding: calc(8px - 3px) 8px; - color: black; } - .list__link li a img { - margin-right: 8px; - padding-bottom: .2em; - vertical-align: text-bottom; } - .list__link li a:active, .list__link li a:focus, .list__link li a:hover { - background-color: #0c85ff; - color: white; } - -.list__horizontal { - overflow: auto; } - -figure { - margin: 16px 2em; } - -.box__info { - padding: 16px 2em; - border-right: 8px solid rgba(82, 190, 209, 0.6); - background-color: rgba(82, 190, 209, 0.1) !important; } - -.box__main_indent { - margin-left: 25%; } - -.box__space { - position: relative; - width: 100%; } - -.box__cube { - float: left; - display: table; - width: 64px; - text-align: center; - vertical-align: middle; } - .box__cube span { - display: table-cell; } - -.box__placeholder { - width: 100%; - height: 64px; - border: 4px solid rgba(0, 0, 0, 0.1); - border-radius: 1px; - padding: 8px; - background-color: rgba(0, 0, 0, 0.1); } - .box__placeholder svg { - vertical-align: top; } - -.box__placeholder_bkg { - width: 100%; - height: 64px; - border: 4px solid rgba(0, 0, 0, 0.1); - border-radius: 1px; - padding: 8px; - /*data:[][;charset=][;base64],*/ - background: url("data:image/svg+xml;utf8,") no-repeat; - background-color: rgba(0, 0, 0, 0.1); } - -a { - color: #52bed1; - text-decoration: none; } - a:active, a:focus, a:hover { - color: white; } - -.a__line { - border-bottom-width: 1px; - border-bottom-style: dotted; - border-color: black; - background-color: transparent; - color: black; - transition: color 150ms ease; } - .a__line:active, .a__line:focus, .a__line:hover { - background-color: #0c85ff; - color: white; } - -.a__button_text, .a__button_border { - padding: calc(8px - 1px) calc(8px * 2); - background-color: transparent; - color: black; } - -.a__button_border { - border: 1px solid #666666; } - -i, em { - font-style: italic; } - -b, strong { - font-weight: 500; } - -cite { - font-style: italic; } - -code { - color: #1f1f1f; - background-color: rgba(255, 255, 255, 0.1); } - -.code__solo { - padding: 1px 4px; - color: black; } - -mark { - background-color: #fad803; } - -.mark__cursor { - color: white; - background-color: black; } - -::-moz-selection { - color: white; - background-color: black; } - -::selection { - color: white; - background-color: black; } - -img { - vertical-align: top; } - -table { - margin-top: 16px; - margin-bottom: 16px; - border: 1px solid black; - border-collapse: collapse; } - -th, td { - padding: 4px; } - -th { - border: 1px solid black; - text-align: left; } - -.precol { - border-right: 1px solid black; } - -td { - border-right: 1px solid #666666; - border-bottom: 1px solid #666666; } - -td:last-child { - border-right: 0; } - -tr:last-child td { - border-bottom: 0; } - -tfoot tr:first-child td { - border-top: 1px solid black; } - -.table_blank { - border: 1px solid transparent; } - .table_blank th, .table_blank td { - border: 1px solid transparent; } - -.table_free { - border: 1px solid transparent; } - -.table_stripe td { - border-top: 0; - border-bottom: 0; } -.table_stripe tr:nth-child(even) td { - background-color: #8c8c8c; } - -.table_fix { - table-layout: fixed; } - -caption { - padding: 4px 0; - border: 1px dotted black; - text-align: center; } - -fieldset { - margin: 8px 0; - border: 1px solid black; } - -legend { - padding: 0 4px; } - -.input_default label { - display: table; - margin: 4px 0; } - .input_default label input { - display: table-cell; - margin-left: 8px; - padding: 4px 5px; - border-style: solid; - border-color: transparent; - background-color: #404040; - color: #e6e6e6; } - .input_default label input:hover { - background-color: black; - color: white; } - -nav ul { - padding-left: 0; } -nav li { - margin-bottom: 8px; - list-style: none; } - -.nav__horizontal ul ul, .nav__center_old ul ul, .header__page nav ul ul { - margin: 8px 0; } -.nav__horizontal ul li, .nav__center_old ul li, .header__page nav ul li { - margin-right: 8px; - margin-bottom: 0; } - .nav__horizontal ul li:last-child, .nav__center_old ul li:last-child, .header__page nav ul li:last-child { - margin-right: 0; } - -.nav__right { - float: right; - margin-left: 8px; } - .nav__right .align_parent { - margin-right: -8px; } - -.nav__separate_right { - float: right; } - .nav__separate_right li { - position: relative; } - .nav__separate_right li:first-child { - padding-left: 17px; } - .nav__separate_right li:first-child::before { - content: ""; - position: absolute; - width: 1px; - height: 100%; - left: 0; - top: 0; - background-color: white; - margin: 0 8px; } - -.nav__center_old { - float: right; - position: relative; - left: -50%; } - .nav__center_old ul { - position: relative; - left: 50%; - text-align: center; } - -.nav__column { - position: relative; - margin: 8px 0; } - .nav__column ul { - margin: 0 128px; } - .nav__column ul li { - flex-grow: 1; - margin: 0; - text-align: center; } - .nav__column ul li a { - display: block; } - -.nav__page_meta { - position: fixed; - right: 0; - bottom: 16px; } - .nav__page_meta ul { - margin: 8px 0; } - .nav__page_meta li { - margin-bottom: 0; } - .nav__page_meta .a_button_meta { - display: inline-block; } - .nav__page_meta .a_button_meta:active, .nav__page_meta .a_button_meta:focus { - background-color: transparent; } - .nav__page_meta .a_button_meta:hover { - background-color: #0c85ff; } - -.header__page nav a:active, .header__page nav a:focus, .header__page nav a:hover { - background-color: rgba(0, 0, 0, 0.2); - color: black; } - -.table__link { - width: 100%; - border: 0; - table-layout: auto; } - .table__link tbody { - border-bottom: 1px solid #666666; } - .table__link tbody:hover { - background-color: #8c8c8c; } - .table__link th, .table__link td { - border: 0; } - .table__link .cell__icon { - width: 48px; - text-align: center; } - .table__link .cell__icon img { - vertical-align: text-top; } - .table__link .cell__link { - padding-right: 8px; - padding-left: 8px; } - .table__link .cell__link:hover { - background-color: #0c85ff; } - .table__link .cell__link:hover a:first-child { - display: none; } - .table__link .cell__link:hover a:last-child { - display: block; - color: white; } - .table__link .cell__link a { - display: block; } - .table__link .cell__link a:last-child { - display: none; } - .table__link th:last-child, .table__link .cell__date { - width: 16%; - text-align: center; } - .table__link .cell__text { - padding-right: 8px; - padding-left: 8px; } - .table__link .cell__text div { - width: 100%; } - .table__link .cell__text .shorten { - max-height: 44px; } - -.card_body .bkg_box { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; } - -.card_body { - height: 100%; - /* .full { - position: absolute; - width: 128px; - height: 128px; - top: 16px; - left: 16px; - background-color: #fff; - } - .mark { - float: left; - width: 32px; - height: 32px; - margin-top: 16px; - } - */ } - .card_body .bkg_box { - transition-duration: 800ms; - overflow: hidden; - vertical-align: top; - z-index: -1; } - .card_body .bkg_box > svg { - position: relative; } - .card_body .flex_wrap_center { - display: -webkit-box; - display: -webkit-flex; - display: -moz-box; - display: -ms-flexbox; - display: flex; - -webkit-box-align: center; - -webkit-align-items: center; - -moz-box-align: center; - -ms-flex-align: center; - align-items: center; - -webkit-box-pack: center; - -webkit-justify-content: center; - -moz-box-pack: center; - -ms-flex-pack: center; - justify-content: center; - height: 100%; } - .card_body .flex_content { - position: relative; - padding: 64px 64px 24px 64px; - border: 1px solid #FFF; - background-color: #F5F5F5; - z-index: 40; } - .card_body h1 { - margin: 16px 0; - color: #1E1E1E; - font-size: 24px; - line-height: 1.4em; - font-weight: normal; } - .card_body p, .card_body .p__col_2, .card_body .p__col_3, .card_body caption { - margin-top: 0; - margin-bottom: 16px; - font-size: 12px; - line-height: 1.4em; } - .card_body .marked { - padding-left: 1em; - text-indent: -1em; - text-align: center; } - .card_body .marked:before { - content: "* "; } - .card_body .decent { - color: #666; } - .card_body a { - color: #000; - text-decoration: none; } - .card_body a:hover { - color: #F4F9FA; - background-color: #0C85FF; - text-decoration: none; } - -.wip, .wip_txt { - border-right: 8px solid rgba(220, 20, 60, 0.8); - background-color: rgba(220, 20, 60, 0.1) !important; } - -.wip:before, .wip:after { - content: ""; - display: block; - height: 48px; } - -.exp_expose_pre:after { - content: ""; - display: block; - height: 48px; - background-color: rgba(183, 224, 240, 0.1) !important; } - -.exp_expose_post:before { - content: ""; - display: block; - height: 48px; - background-color: rgba(183, 224, 240, 0.1) !important; } - -.exp_expose:before, .exp_expose:after { - content: ""; - display: block; - height: 48px; - background-color: rgba(183, 224, 240, 0.1) !important; } - -.exp_pop { - display: none; } - -.exp_wrap { - position: relative; } - -.exp_pop { - position: absolute; - z-index: 100; - top: 128px; - left: 128px; - padding: 4px; - border: 4px solid gray; - border-radius: 4px; - background-color: gray; - pointer-events: none; } - -.exp_marker_pop { - position: absolute; - top: -12.75px; - right: -8.5px; - width: 17px; - height: 17px; - border: 1px solid white; - border-radius: 17px; - color: white; - background-color: black; } - -.exp_overlay_btn { - position: fixed; - width: 3em; - height: 2em; - cursor: pointer; } - -.exp_help_btn { - display: table; - right: 16px; - bottom: 16px; - background-color: rgba(0, 0, 0, 0.4); } - .exp_help_btn:hover { - background-color: white; } - .exp_help_btn:hover > .span__solo { - color: black; } - .exp_help_btn .span__solo { - display: table-cell; - color: rgba(255, 255, 255, 0.8); - font-family: Courier New, monospace; - font-size: 1.4em; - text-align: center; - vertical-align: middle; } - -.expose_height { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - background-color: rgba(183, 224, 240, 0.1) !important; - -webkit-transition: height 0.5s ease; - -ms-transition: height 0.5s ease; - -moz-transition: height 0.5s ease; - -o-transition: height 0.5s ease; - transition: height 0.5s ease; } - -.print_body *[class^="din"] { - background-color: white; } - -.print_body { - font-size: 10pt; - margin: 10vh 20vw; } -@page { - .print_body { - size: A4; - margin: 1.2cm; } } -@page :first { - .print_body { - size: A4; - margin: 0; } } - .print_body .dina4 { - padding-top: 1.2cm; - padding-right: 1.2cm; - padding-bottom: 1.2cm; - padding-left: 2.4cm; } - .print_body .dina4 .page_head, .print_body .dina4 .page_foot { - right: 1.2cm; - left: 2.4cm; } - .print_body .dina4 .page_head { - top: 1.2cm; } - .print_body .dina4 .page_foot { - bottom: 1.2cm; } - .print_body .dina5 { - padding-top: 0; - padding-right: 0; - padding-bottom: 0; - padding-left: 1.2cm; } - .print_body .dina5 .page_head, .print_body .dina5 .page_foot { - right: 0; - left: 1.2cm; } - .print_body .dina5 .page_head { - top: 0; } - .print_body .dina5 .page_foot { - bottom: 0; } - .print_body .dina6 { - padding-top: 0; - padding-right: 0; - padding-bottom: 0; - padding-left: 1.2cm; } - .print_body .dina6 .page_head, .print_body .dina6 .page_foot { - right: 0; - left: 1.2cm; } - .print_body .dina6 .page_head { - top: 0; } - .print_body .dina6 .page_foot { - bottom: 0; } - .print_body *[class^="din"] { - position: relative; - overflow: auto; - margin: 32px auto; } - .print_body *[class^="din"] .page_head, .print_body *[class^="din"] .page_foot { - position: absolute; } - .print_body *[class^="din"] .page_head { - page: cover; } - .print_body *[class^="din"] .page_foot { - display: flex; - flex-direction: row; } - .print_body *[class^="din"] .page_foot *:last-child { - margin-bottom: 0; } - .print_body *[class^="din"] .page_foot p, .print_body *[class^="din"] .page_foot .p__col_2, .print_body *[class^="din"] .page_foot .p__col_3, .print_body *[class^="din"] .page_foot caption { - flex: 1 0 auto; - margin: 0; - font-size: 8pt; - line-height: 10pt; - text-align: center; } - .print_body *[class^="din"] .page_foot .page_no { - flex: 1 0 auto; - font-size: 20pt; - line-height: 1; - text-align: right; } - .print_body *[class^="din"] .page_foot p:first-child, .print_body *[class^="din"] .page_foot .p__col_2:first-child, .print_body *[class^="din"] .page_foot .p__col_3:first-child, .print_body *[class^="din"] .page_foot caption:first-child { - text-align: left; } - .print_body *[class^="din"] .page_content { - margin-top: 10cm; - margin-bottom: 2cm; } - .print_body .page_title, .print_body .page_date { - font-size: 14pt; } - .print_body .page_title { - margin: 0; } - .print_body .page_date, .print_body .page_no { - float: right; } - .print_body .page_author { - position: absolute; - top: 5cm; - right: 0; - text-align: right; } - .print_body .page_recipient { - position: absolute; - top: 5cm; - left: 0; } - -.demo__intro { - border-top-width: 8px; - border-top-style: solid; - border-color: black; - padding-top: 32px; } - -.demo__header { - padding: 16px; } - .demo__header nav ul { - margin: 0; } - -.header__fancy { - background-color: rgba(211, 10, 81, 0.6); } - .header__fancy nav a { - background-color: rgba(250, 216, 3, 0.6); - color: #fad803; } - .header__fancy nav a:active, .header__fancy nav a:focus, .header__fancy nav a:hover { - background-color: rgba(255, 255, 255, 0.2); - color: white; } - -.header__fix { - position: relative; - top: 0; - width: 100%; - background-color: rgba(39, 63, 139, 0.6); } - .header__fix nav a:active, .header__fix nav a:focus, .header__fix nav a:hover { - background-color: rgba(255, 255, 255, 0.2); - color: white; } - -.demo__footer { - width: 100%; - padding: 16px 0; - background-color: black; - color: white; } - .demo__footer nav a { - color: white; } - -.demo__avatar img { - opacity: 1; - width: 128px; - height: auto; - border-radius: 50%; - background-color: #b7e0f0; } - -.demo__flag { - height: 40vh; } - -.test li:after { - content: ""; - display: block; - height: 16px; } - -.front_color_1 { - color: #fad803; } - .front_color_1:after { - background-color: #fad803; } - -.front_color_2 { - color: #d30a51; } - .front_color_2:after { - background-color: #d30a51; } - -.front_color_3 { - color: #273f8b; } - .front_color_3:after { - background-color: #273f8b; } - -.front_color_4 { - color: #b7e0f0; } - .front_color_4:after { - background-color: #b7e0f0; } - -.front_color_5 { - color: #52bed1; } - .front_color_5:after { - background-color: #52bed1; } - -.back_color_1, .label_1 { - background-color: #fad803; } - -.back_color_2, .label_2 { - background-color: #d30a51; } - -.back_color_3, .label_3 { - background-color: #273f8b; } - -.back_color_4 { - background-color: #b7e0f0; } - -.back_color_5 { - background-color: #52bed1; } - -.label_1, .label_2, .label_3 { - padding: 0 4px; } - - - -/*# sourceMappingURL=example.css.map */ +@charset "UTF-8"; +/* + * # TABLE OF CONTENTS + * + * - Reset + * - Global functions and mixins + * - Configuration + * - Special modules + * - Basic styles + * - Common + * - Typography + * + * - Sections + * - Grouping + * - Textlevel + * - Embedded + * - Tables + * - Interactive + * - Modules + * + */ +@import url(other/normalize.css); +.sym_glass::before { + content: ""; } + +.sym_music::before { + content: ""; } + +.sym_search::before { + content: ""; } + +.sym_envelope-o::before { + content: ""; } + +.sym_heart::before { + content: ""; } + +a[href]:focus { + outline: 0; } + +area[href]:focus { + outline: 0; } + +button:not([disabled]):focus { + outline: 0; } + +input:not([disabled]):focus { + outline: 0; } + +select:not([disabled]):focus { + outline: 0; } + +textarea:not([disabled]):focus { + outline: 0; } + +*[tabindex]:focus { + outline: 0; } + +/** + * @description + * Generates cross-browser-compatible output for a given element with its value. + * + * @author sthag + * + * @param values + * @returns + * -webkit-: + * ...-: + * + * @example + * .selector + * @include vendor-prefix(hyphens, auto) + */ +.magic { + display: none; } + +.center_50 { + margin-right: 25%; + margin-left: 25%; } + +.center_25 { + margin-right: 37.5%; + margin-left: 37.5%; } + +.width_full { + width: 100%; + margin-right: 0; + margin-left: 0; } + +.height_basic { + height: 1024px; } + +.txt_center { + text-align: center !important; } + +.txt_right { + text-align: right !important; } + +.txt_left { + text-align: left !important; } + +.space_right { + margin-right: 32px; } + +.clear { + clear: both; } + .clear::before, .clear::after { + clear: both; } + +.float_left, .list__horizontal li, .box__inline_left, .nav__horizontal ul li, .nav__center_old ul li, .header__page nav ul li { + float: left; + margin-right: 32px; } + +.overflow, .nav__horizontal ul, .nav__center_old ul, .header__page nav ul { + overflow: auto; } + +.x_long { + overflow-x: scroll; } + +.pos_full_view, .hover_full_view_change { + position: fixed; + top: 0; + left: 0; + width: 100vw; + height: 100vh; } + +.pos_full_page { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; } + +.pos_abs { + position: absolute; } + +.pos_rel { + position: relative; } + +.pos_fix { + position: fixed; } + +.pos_bottom { + bottom: 0; } + +.pos_full_view { + background-color: rgba(250, 216, 3, 0.5); } + +.pos_full_page { + background-color: rgba(39, 63, 139, 0.25); } + +.hover_back_change { + background-color: #666666; + transition: background-color .2s ease-in-out; } + .hover_back_change:hover { + background-color: gray; } + +.hover_full_view_change { + z-index: 1000; + background-color: rgba(0, 0, 0, 0.5); + transition: background-color .2s ease-in-out; + pointer-events: none; } + +.flex, .box__column, .nav__column ul { + display: flex; } + +.flex_child, .box__column .column, .nav__column ul li { + flex: 0 1 auto; } + +.txt_light_color { + color: #666666; } + +.a__button, .a__button_text, .a__button_border { + display: inline-block; + padding: calc(8px - 3px) 8px; + background-color: rgba(82, 190, 209, 0.2); + border-radius: 1px; } + .a__button:active, .a__button_text:active, .a__button_border:active, .a__button:focus, .a__button_text:focus, .a__button_border:focus, .a__button:hover, .a__button_text:hover, .a__button_border:hover { + background-color: rgba(255, 255, 255, 0.1); + color: white; + border-color: transparent; } + +.span__solo, h6, p, .p__col_2, .p__col_3, caption, li, dt, dd, figcaption, th, td, legend, label { + font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; + font-size: 1em; + line-height: 1.5; } + +pre, code, .code__solo { + font-family: Courier New, monospace; + font-size: 1em; + line-height: 1.5; } + +.print_body *[class^="din"] p, .print_body *[class^="din"] .p__col_2, .print_body *[class^="din"] .p__col_3, .print_body *[class^="din"] caption { + font-family: Courier New, monospace; + font-size: 1em; + line-height: 1.5; } + +h1, .print_body .page_date, .print_body .page_no { + font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; + font-size: 3.1em; + font-weight: 300; + line-height: 1.5; } + +h2 { + font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; + font-size: 2.5em; + font-weight: 300; + line-height: 1.5; } + +h3, h4 { + font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; + font-size: 1.8em; + font-weight: 300; + line-height: 1.5; } + +h5 { + font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; + font-size: 1.35em; + font-weight: 300; + line-height: 1.5; } + +.span__solo { + color: black; } + +.table__link .cell__text .shorten { + overflow: hidden; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; } + +html { + height: 100%; } + +body { + position: relative; + box-sizing: border-box; + font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; + font-size: 17px; + line-height: 1; + color: black; + background-color: gray; } + body *, + body ::before, + body ::after { + box-sizing: inherit; } + body:hover .trigger__hover { + background-color: transparent; } + +.sec__main_center, .demo__intro { + width: 96%; + margin: 0 auto; + padding-top: 32px; } +@media screen and (orientation: landscape) and (min-width: 1024px) { + .sec__main_center, .demo__intro { + width: 80%; } } +@media screen and (orientation: landscape) and (min-width: 1280px) { + .sec__main_center, .demo__intro { + width: 60%; } } +@media screen and (orientation: landscape) and (min-width: 1920px) { + .sec__main_center, .demo__intro { + width: 48%; } } + +@media screen and (orientation: portrait) and (min-width: 1024px) { + .sec__main_center, .demo__intro { + width: 80%; } } + +aside.right + section { + margin-right: calc(20% + 8px); } +aside.left + section { + margin-left: calc(20% + 8px); } + +aside { + width: 20%; } + aside.left { + float: left; } + aside.right { + float: right; } + aside *:first-child { + margin-top: 0; } + +.header__page { + overflow: auto; } + +h1 { + margin: 128px 0 32px; } + +h2 { + margin: 64px 0 32px; } + +h3 { + margin: 16px 0 16px; + text-transform: uppercase; } + +h4 { + margin: 16px 0 16px; + text-transform: none; } + +h5 { + margin: 16px 0 8px; + text-transform: none; } + +h6 { + margin: 8px 0; + text-transform: none; + font-weight: bold; } + +p, .p__col_2, .p__col_3, caption { + margin: 8px 0; } + p code, .p__col_2 code, .p__col_3 code, caption code { + padding: 1px 4px; + font-size: 1em; + line-height: 1; } + +.p__col_line { + column-rule: 1px solid black; } + +.p__col_2 { + column-count: 2; + column-gap: 32px; } + +.p__col_3 { + column-count: 3; + column-gap: 64px; } + +hr, .hr__hidden, .hr__dotted { + margin: 32px auto; + border-width: 1px 0 0; + border-style: solid; + border-color: black; } + +.hr__hidden { + border-color: transparent; } + +.hr__dotted { + border-style: dotted; } + +.pre__code { + border-color: rgba(255, 255, 255, 0.1); + border-style: dotted; + border-width: 0 0 0 4px; + border-radius: 1px; + padding: 8px; + background-color: rgba(255, 255, 255, 0.1); } + .pre__code code { + background-color: transparent; } + +blockquote { + margin: 8px 2em; } + +.quote__mark p::before, .quote__mark .p__col_2::before, .quote__mark .p__col_3::before, .quote__mark caption::before { + content: "\201E \0020"; } +.quote__mark p::after, .quote__mark .p__col_2::after, .quote__mark .p__col_3::after, .quote__mark caption::after { + content: "\201C \0020"; } +.quote__mark .quote__source::before, .quote__mark .quote__source::after { + content: ""; } + +dl, ul, ol { + margin: 16px 0 8px; } + +ul, ol { + padding-left: 2em; } + +li, dt, dd { + color: black; } + +dd { + margin-left: 2em; } + +ul li { + list-style: square; } + +.list__dash li { + list-style: none; + position: relative; } + .list__dash li::before { + content: "_"; + position: absolute; + left: -1em; } + +.list__link li { + margin-bottom: 2px; + text-transform: uppercase; } + .list__link li a { + display: block; + padding: calc(8px - 3px) 8px; + color: black; } + .list__link li a img { + margin-right: 8px; + padding-bottom: .2em; + vertical-align: text-bottom; } + .list__link li a:active, .list__link li a:focus, .list__link li a:hover { + background-color: #0c85ff; + color: white; } + +.list__horizontal { + overflow: auto; } + +figure { + margin: 16px 2em; } + +.box__info { + padding: 16px 2em; + border-right: 8px solid rgba(82, 190, 209, 0.6); + background-color: rgba(82, 190, 209, 0.1) !important; } + +.box__main_indent { + margin-left: 25%; } + +.box__space { + position: relative; + width: 100%; } + +.box__cube { + float: left; + display: table; + width: 64px; + text-align: center; + vertical-align: middle; } + .box__cube span { + display: table-cell; } + +.box__placeholder { + width: 100%; + height: 64px; + border: 4px solid rgba(0, 0, 0, 0.1); + border-radius: 1px; + padding: 8px; + background-color: rgba(0, 0, 0, 0.1); } + .box__placeholder svg { + vertical-align: top; } + +.box__placeholder_bkg { + width: 100%; + height: 64px; + border: 4px solid rgba(0, 0, 0, 0.1); + border-radius: 1px; + padding: 8px; + /*data:[][;charset=][;base64],*/ + background: url("data:image/svg+xml;utf8,") no-repeat; + background-color: rgba(0, 0, 0, 0.1); } + +.box__column .column { + flex-grow: 1; } + +a { + color: #52bed1; + text-decoration: none; } + a:active, a:focus, a:hover { + color: white; } + +.a__line { + border-bottom-width: 1px; + border-bottom-style: dotted; + border-color: black; + background-color: transparent; + color: black; + transition: color 150ms ease; } + .a__line:active, .a__line:focus, .a__line:hover { + background-color: #0c85ff; + color: white; } + +.a__button_text, .a__button_border { + padding: calc(8px - 1px) calc(8px * 2); + background-color: transparent; + color: black; } + +.a__button_border { + border: 1px solid black; } + +i, em { + font-style: italic; } + +.i__bright { + font-style: normal; + color: white; } + +b, strong { + font-weight: 500; } + +cite { + font-style: italic; } + +code { + color: #1f1f1f; + background-color: rgba(255, 255, 255, 0.1); } + +.code__solo { + padding: 1px 4px; + color: black; } + +mark { + background-color: #fad803; } + +.mark__cursor { + color: white; + background-color: black; } + +::-moz-selection { + color: white; + background-color: black; } + +::selection { + color: white; + background-color: black; } + +img { + vertical-align: top; } + +table { + margin-top: 16px; + margin-bottom: 16px; + border: 1px solid black; + border-collapse: collapse; } + +th, td { + padding: 4px; } + +th { + border: 1px solid black; + text-align: left; } + +.precol { + border-right: 1px solid black; } + +td { + border-right: 1px solid black; + border-bottom: 1px solid black; } + +td:last-child { + border-right: 0; } + +tr:last-child td { + border-bottom: 0; } + +tfoot tr:first-child td { + border-top: 1px solid black; } + +.table_blank { + border: 1px solid transparent; } + .table_blank th, .table_blank td { + border: 1px solid transparent; } + +.table_free { + border: 1px solid transparent; } + +.table_stripe td { + border-top: 0; + border-bottom: 0; } +.table_stripe tr:nth-child(even) td { + background-color: #cccccc; } + +.table_fix { + table-layout: fixed; } + +caption { + padding: 4px 0; + border: 1px dotted black; + text-align: center; } + +fieldset { + margin: 8px 0; + padding: 8px; + border: 1px solid black; } + +legend { + padding: 0 4px; } + +label + input { + margin-left: 8px; } +input + label { + margin-left: 8px; } + +.input_default label { + display: table; + margin: 4px 0; } + .input_default label input { + display: table-cell; + margin-left: 8px; + padding: 4px 5px; + border-style: solid; + border-color: transparent; + background-color: #404040; + color: #e6e6e6; } + .input_default label input:hover { + background-color: black; + color: white; } + +nav ul { + padding-left: 0; } +nav li { + margin-bottom: 8px; + list-style: none; } + +.nav__horizontal ul ul, .nav__center_old ul ul, .header__page nav ul ul { + margin: 8px 0; } +.nav__horizontal ul li, .nav__center_old ul li, .header__page nav ul li { + margin-right: 8px; + margin-bottom: 0; } + .nav__horizontal ul li:last-child, .nav__center_old ul li:last-child, .header__page nav ul li:last-child { + margin-right: 0; } + +.nav__right { + float: right; + margin-left: 8px; } + .nav__right .align_parent { + margin-right: -8px; } + +.nav__separate li { + position: relative; + padding-left: 1px; } + .nav__separate li:not(:first-child)::before { + content: ""; + position: absolute; + width: 1px; + height: 100%; + left: 0; + top: 0; + background-color: black; } + +.nav__separate_right { + float: right; } + .nav__separate_right li { + position: relative; } + .nav__separate_right li:first-child { + padding-left: 17px; } + .nav__separate_right li:first-child::before { + content: ""; + position: absolute; + width: 1px; + height: 100%; + left: 0; + top: 0; + background-color: white; + margin: 0 8px; } + +.nav__center_old { + float: right; + position: relative; + left: -50%; } + .nav__center_old ul { + position: relative; + left: 50%; + text-align: center; } + +.nav__column { + position: relative; + margin: 8px 0; } + .nav__column ul { + margin: 0 128px; } + .nav__column ul li { + flex-grow: 1; + margin: 0; + text-align: center; } + .nav__column ul li a { + display: block; } + +.nav__page_meta { + position: fixed; + right: 0; + bottom: 16px; } + .nav__page_meta ul { + margin: 8px 0; } + .nav__page_meta li { + margin-bottom: 0; } + .nav__page_meta .a_button_meta { + display: inline-block; } + .nav__page_meta .a_button_meta:active, .nav__page_meta .a_button_meta:focus { + background-color: transparent; } + .nav__page_meta .a_button_meta:hover { + background-color: #0c85ff; } + +.header__page nav a:active, .header__page nav a:focus, .header__page nav a:hover { + background-color: rgba(0, 0, 0, 0.2); + color: black; } + +.table__link { + width: 100%; + border: 0; + table-layout: auto; } + .table__link tbody { + border-bottom: 1px solid black; } + .table__link tbody:hover { + background-color: #cccccc; } + .table__link th, .table__link td { + border: 0; } + .table__link .cell__icon { + width: 48px; + text-align: center; } + .table__link .cell__icon img { + vertical-align: text-top; } + .table__link .cell__link { + padding-right: 8px; + padding-left: 8px; } + .table__link .cell__link:hover { + background-color: #0c85ff; } + .table__link .cell__link:hover a:first-child { + display: none; } + .table__link .cell__link:hover a:last-child { + display: block; + color: white; } + .table__link .cell__link a { + display: block; } + .table__link .cell__link a:last-child { + display: none; } + .table__link th:last-child, .table__link .cell__date { + width: 16%; + text-align: center; } + .table__link .cell__text { + padding-right: 8px; + padding-left: 8px; } + .table__link .cell__text div { + width: 100%; } + .table__link .cell__text .shorten { + max-height: 44px; } + +.card_body .bkg_box { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; } + +.card_body { + height: 100%; + /* .full { + position: absolute; + width: 128px; + height: 128px; + top: 16px; + left: 16px; + background-color: #fff; + } + .mark { + float: left; + width: 32px; + height: 32px; + margin-top: 16px; + } + */ } + .card_body .bkg_box { + transition-duration: 800ms; + overflow: hidden; + vertical-align: top; + z-index: -1; } + .card_body .bkg_box > svg { + position: relative; } + .card_body .flex_wrap_center { + display: -webkit-box; + display: -webkit-flex; + display: -moz-box; + display: -ms-flexbox; + display: flex; + -webkit-box-align: center; + -webkit-align-items: center; + -moz-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-pack: center; + -webkit-justify-content: center; + -moz-box-pack: center; + -ms-flex-pack: center; + justify-content: center; + height: 100%; } + .card_body .flex_content { + position: relative; + padding: 64px 64px 24px 64px; + border: 1px solid #FFF; + background-color: #F5F5F5; + z-index: 40; } + .card_body h1 { + margin: 16px 0; + color: #1E1E1E; + font-size: 24px; + line-height: 1.4em; + font-weight: normal; } + .card_body p, .card_body .p__col_2, .card_body .p__col_3, .card_body caption { + margin-top: 0; + margin-bottom: 16px; + font-size: 12px; + line-height: 1.4em; } + .card_body .marked { + padding-left: 1em; + text-indent: -1em; + text-align: center; } + .card_body .marked::before { + content: "* "; } + .card_body .decent { + color: #666; } + .card_body a { + color: #000; + text-decoration: none; } + .card_body a:hover { + color: #F4F9FA; + background-color: #0C85FF; + text-decoration: none; } + +.wip, .wip_txt { + border-right: 8px solid rgba(220, 20, 60, 0.8); + background-color: rgba(220, 20, 60, 0.1) !important; } + +.wip::before, .wip::after { + content: ""; + display: block; + height: 48px; } + +.exp_expose_pre::after { + content: ""; + display: block; + height: 48px; + background-color: rgba(183, 224, 240, 0.1) !important; } + +.exp_expose_post::before { + content: ""; + display: block; + height: 48px; + background-color: rgba(183, 224, 240, 0.1) !important; } + +.exp_expose::before, .exp_expose::after { + content: ""; + display: block; + height: 48px; + background-color: rgba(183, 224, 240, 0.1) !important; } + +.exp_pop { + display: none; } + +.exp_wrap { + position: relative; } + +.exp_pop { + position: absolute; + z-index: 100; + top: 128px; + left: 128px; + padding: 4px; + border: 4px solid gray; + border-radius: 4px; + background-color: gray; + pointer-events: none; } + +.exp_marker_pop { + position: absolute; + top: -12.75px; + right: -8.5px; + width: 17px; + height: 17px; + border: 1px solid white; + border-radius: 17px; + color: white; + background-color: black; } + +.exp_overlay_btn { + position: fixed; + width: 3em; + height: 2em; + cursor: pointer; } + +.exp_help_btn { + display: table; + right: 16px; + bottom: 16px; + background-color: rgba(0, 0, 0, 0.4); } + .exp_help_btn:hover { + background-color: white; } + .exp_help_btn:hover > .span__solo { + color: black; } + .exp_help_btn .span__solo { + display: table-cell; + color: rgba(255, 255, 255, 0.8); + font-family: Courier New, monospace; + font-size: 1.4em; + text-align: center; + vertical-align: middle; } + +.expose_height { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + background-color: rgba(183, 224, 240, 0.1) !important; + -webkit-transition: height 0.5s ease; + -ms-transition: height 0.5s ease; + -moz-transition: height 0.5s ease; + -o-transition: height 0.5s ease; + transition: height 0.5s ease; } + +.print_body [class^="din"] { + background-color: white; } + +.print_body { + font-size: 10pt; + margin: 10vh 20vw; } +@page { + .print_body { + size: A4; + margin: 1.2cm; } } +@page :first { + .print_body { + size: A4; + margin: 0; } } + .print_body .dina4 { + padding-top: 1.2cm; + padding-right: 1.2cm; + padding-bottom: 1.2cm; + padding-left: 2.4cm; } + .print_body .dina4 .page_head, .print_body .dina4 .page_foot { + right: 1.2cm; + left: 2.4cm; } + .print_body .dina4 .page_head { + top: 1.2cm; } + .print_body .dina4 .page_foot { + bottom: 1.2cm; } + .print_body .dina5 { + padding-top: 0; + padding-right: 0; + padding-bottom: 0; + padding-left: 1.2cm; } + .print_body .dina5 .page_head, .print_body .dina5 .page_foot { + right: 0; + left: 1.2cm; } + .print_body .dina5 .page_head { + top: 0; } + .print_body .dina5 .page_foot { + bottom: 0; } + .print_body .dina6 { + padding-top: 0; + padding-right: 0; + padding-bottom: 0; + padding-left: 1.2cm; } + .print_body .dina6 .page_head, .print_body .dina6 .page_foot { + right: 0; + left: 1.2cm; } + .print_body .dina6 .page_head { + top: 0; } + .print_body .dina6 .page_foot { + bottom: 0; } + .print_body *[class^="din"] { + position: relative; + overflow: auto; + margin: 32px auto; } + .print_body *[class^="din"] .page_head, .print_body *[class^="din"] .page_foot { + position: absolute; } + .print_body *[class^="din"] .page_head { + page: cover; } + .print_body *[class^="din"] .page_foot { + display: flex; + flex-direction: row; } + .print_body *[class^="din"] .page_foot *:last-child { + margin-bottom: 0; } + .print_body *[class^="din"] .page_foot p, .print_body *[class^="din"] .page_foot .p__col_2, .print_body *[class^="din"] .page_foot .p__col_3, .print_body *[class^="din"] .page_foot caption { + flex: 1 0 auto; + margin: 0; + font-size: 8pt; + line-height: 10pt; + text-align: center; } + .print_body *[class^="din"] .page_foot .page_no { + flex: 1 0 auto; + font-size: 20pt; + line-height: 1; + text-align: right; } + .print_body *[class^="din"] .page_foot p:first-child, .print_body *[class^="din"] .page_foot .p__col_2:first-child, .print_body *[class^="din"] .page_foot .p__col_3:first-child, .print_body *[class^="din"] .page_foot caption:first-child { + text-align: left; } + .print_body *[class^="din"] .page_content { + margin-top: 10cm; + margin-bottom: 2cm; } + .print_body .page_title, .print_body .page_date { + font-size: 14pt; } + .print_body .page_title { + margin: 0; } + .print_body .page_date, .print_body .page_no { + float: right; } + .print_body .page_author { + position: absolute; + top: 5cm; + right: 0; + text-align: right; } + .print_body .page_recipient { + position: absolute; + top: 5cm; + left: 0; } + +.demo__intro { + border-top-width: 8px; + border-top-style: solid; + border-color: black; + padding-top: 32px; } + +.demo__header { + padding: 16px; } + .demo__header nav ul { + margin: 0; } + +.header__fancy { + background-color: rgba(211, 10, 81, 0.6); } + .header__fancy nav a { + background-color: rgba(250, 216, 3, 0.6); + color: #fad803; } + .header__fancy nav a:active, .header__fancy nav a:focus, .header__fancy nav a:hover { + background-color: rgba(255, 255, 255, 0.2); + color: white; } + +.header__fix { + position: relative; + top: 0; + width: 100%; + background-color: rgba(39, 63, 139, 0.6); } + .header__fix nav a:active, .header__fix nav a:focus, .header__fix nav a:hover { + background-color: rgba(255, 255, 255, 0.2); + color: white; } + +.demo__footer { + width: 100%; + padding: 16px 0; + background-color: #333333; + color: #cccccc; } + .demo__footer nav a { + color: white; } + +.demo__avatar img { + opacity: 1; + width: 128px; + height: auto; + min-width: 128px; + min-height: 128px; + border-radius: 50%; + background-color: #b7e0f0; } + +.demo__flag { + height: 40vh; } + +.demo__credits { + margin: 32px 0 8px 0; } + +.test li::after { + content: ""; + display: block; + height: 16px; } + +.front_color_1 { + color: #fad803; } + .front_color_1::after { + background-color: #fad803; } + +.front_color_2 { + color: #d30a51; } + .front_color_2::after { + background-color: #d30a51; } + +.front_color_3 { + color: #273f8b; } + .front_color_3::after { + background-color: #273f8b; } + +.front_color_4 { + color: #b7e0f0; } + .front_color_4::after { + background-color: #b7e0f0; } + +.front_color_5 { + color: #52bed1; } + .front_color_5::after { + background-color: #52bed1; } + +.back_color_1, .label_1 { + background-color: #fad803; } + +.back_color_2, .label_2 { + background-color: #d30a51; } + +.back_color_3, .label_3 { + background-color: #273f8b; } + +.back_color_4 { + background-color: #b7e0f0; } + +.back_color_5 { + background-color: #52bed1; } + +.label_1, .label_2, .label_3 { + padding: 0 4px; } + + + +/*# sourceMappingURL=example.css.map */ diff --git a/example.html b/example.html index 0b3d140..2bf0ba1 100644 --- a/example.html +++ b/example.html @@ -10,6 +10,8 @@ + + @@ -338,8 +340,19 @@

Formulare

-

Spätestens hier werden Betrachter zu Benutzern. Texteingabefelder und verschiedene Bedienelemente geben Möglichkeiten zur Interaktion. Diese Elemente sind in vielerlei Hinsicht besonders. Sie sind in ihrer unveränderten Gestalt, System- bzw. Browser-Abhängig. (Vielleicht ist das auch scheiße, hier darauf einzugehen) ...

- +

Spätestens hier werden Betrachter zu Benutzern. Texteingabefelder und verschiedene Bedienelemente geben Möglichkeiten zur Interaktion. Diese Elemente sind in vielerlei Hinsicht besonders. Werden sie nicht explizit gestaltet, ist ihre Erscheinung system- bzw. browserabhängig. (Vielleicht ist das auch scheiße, hier darauf einzugehen) ... Üblicherweise stehen alle Formularelemente innerhalb eines <form> Elementes. Dieses ist notwendig um Angaben zur Kommunikation mit dem Server zu setzen. Es hat normalerweise keine gestalterische Funktion.

+

Grundlegend ist das Element <input>. Es hat viele Attribute um den Typ der Eingabe anzupassen. Ist es undefiniert nimmt es jegliche textbasierte Information auf und erhält eine Standardgröße.

+

+

Ein spezieller Typ des Eingabefeldes verändert seine Funktion zu einer Schaltfläche <input[type="button"]>. Es gibt allerdings auch ein eigenes Element <button> dafür. +

+

Interaktive Elemente können durch das Attribut <readonly> nur lesbar gemacht werden oder mittels <disabled> gänzlich deaktiviert werden.

+

+

Das Element <label> ergänzt interaktive Elemente um eine Beschriftung.

+ +

Zusätzlich zur Beschriftung einzelner Elemente gibt es auch die Möglichkeit Gruppierungen zu schaffen. Diese werden mit <fieldset> realisiert.

+
+ +
Einfache Eingabefelder @@ -491,17 +504,20 @@ nav.nav__center_old>ul>(li>a.a__button{Typ $})*4 - +
+ 
footer.pos_abs.pos_bottom>nav.nav__column>ul>(li>a.a__button_text)*4
+ +
@@ -510,6 +526,13 @@ nav.nav__center_old>ul>(li>a.a__button{Typ $})*4
+
+
+
+
+
+
+

Gruppierung

ul.list__link>(li>a>img)*2+li>a
@@ -620,7 +643,7 @@ nav.nav__center_old>ul>(li>a.a__button{Typ $})*4 ); // WIP Activates layer with explanation elements - // Besser :after oder :before benutzen + // Besser ::after oder ::before benutzen $(".exp_help_btn").click(function(e){ var $wrap, $pop; @@ -703,7 +726,7 @@ nav.nav__center_old>ul>(li>a.a__button{Typ $})*4 // jq-sticky-anything $('#js_demo_fix').stickThis({ - pushup: '#js_demo_fix + .demo__footer' + pushup: '#js_demo_stop' }); @@ -718,7 +741,7 @@ nav.nav__center_old>ul>(li>a.a__button{Typ $})*4 doc_pos_y = $( document ).scrollTop(); // console.log(doc_pos_y); var h = scroll_y_margin; - var demo_margin = $('.header__fix'); + // var demo_margin = $('.header__fix'); if (doc_pos_y > h) { $('#js_scrolltop').parent().removeClass('magic'); } else { diff --git a/functions/_all.scss b/functions/_all.scss new file mode 100644 index 0000000..0e63090 --- /dev/null +++ b/functions/_all.scss @@ -0,0 +1,3 @@ +@import "color"; +@import "shade"; +@import "tint"; diff --git a/functions/_color.scss b/functions/_color.scss new file mode 100644 index 0000000..0e32ddb --- /dev/null +++ b/functions/_color.scss @@ -0,0 +1,13 @@ +@function createColorMap($color, $percentage, $opacity) { + $map: ( + base: $color, + light: lighten($color, $percentage), + dark: darken($color, $percentage), + trans: transparentize($color, $opacity) + ); + @return $map; +} + +@function basic_color($key: 'alpha') { + @return map-get($color_palette, $key); +} diff --git a/functions/_shade.scss b/functions/_shade.scss new file mode 100644 index 0000000..34a652b --- /dev/null +++ b/functions/_shade.scss @@ -0,0 +1,24 @@ +@charset "UTF-8"; + +// Mixes a color with black. +// +// @param {Color} $color +// +// @param {Number (Percentage)} $percent +// The amount of black to be mixed in. +// +// @example scss - Usage +// .element { +// background-color: shade(#0c85ff, 60%); +// } +// +// @example css - CSS Output +// .element { +// background-color: #074f99; +// } +// +// @return {Color} + +@function shade($color, $percent) { + @return mix(#000, $color, $percent); +} diff --git a/functions/_tint.scss b/functions/_tint.scss new file mode 100644 index 0000000..fa16997 --- /dev/null +++ b/functions/_tint.scss @@ -0,0 +1,24 @@ +@charset "UTF-8"; + +// Mixes a color with white. +// +// @param {Color} $color +// +// @param {Number (Percentage)} $percent +// The amount of white to be mixed in. +// +// @example scss - Usage +// .element { +// background-color: tint(#0c85ff, 40%); +// } +// +// @example css - CSS Output +// .element { +// background-color: #9dceff; +// } +// +// @return {Color} + +@function tint($color, $percent) { + @return mix(#fff, $color, $percent); +} diff --git a/basic/_common.scss b/global/_common.scss similarity index 96% rename from basic/_common.scss rename to global/_common.scss index 387cc72..1733f1b 100644 --- a/basic/_common.scss +++ b/global/_common.scss @@ -41,8 +41,6 @@ height: 1024px; } - - .txt_center { text-align: center !important; } @@ -53,6 +51,10 @@ text-align: left !important; } +.space_right { + margin-right: $space_3; +} + // Clearing and floating @@ -138,7 +140,7 @@ .hover_full_view_change { @extend %full_viewport; z-index: $z_top; - background-color: transparentize($dark_color, .5); + background-color: transparentize($darkest_color, .5); transition: background-color .2s ease-in-out; pointer-events: none; } diff --git a/_config.scss b/global/_config.scss similarity index 82% rename from _config.scss rename to global/_config.scss index 6b515b8..8c7071e 100644 --- a/_config.scss +++ b/global/_config.scss @@ -1,13 +1,11 @@ // Default configuration // ------------------------------------------------------------------------------ + // TEXT // ------------------------------------------------------------------------------ -$default_font_size: 17px !default; $basic_size: $default_font_size; - -$default_print_font_size: 10pt !default; $basic_print_size: $default_print_font_size; $size_1: $basic_size * 4; @@ -54,15 +52,12 @@ $head_size_4: 1.35em; $text_size_1: 1em; $text_size_2: 20; - -$default_line_height: 1.5 !default; $text_line_1: $default_line_height; $head_line_1: $text_line_1; $head_line_2: $text_line_1; $head_line_3: $text_line_1; $head_line_4: $text_line_1; -$default_font_family: #{'Roboto', 'Segoe UI', 'Liberation Sans', 'Source Sans', 'Trebuchet MS', Helvetica, Arial, sans-serif, sans} !default; $print_font_family: #{'Times New Roman', times}; $monospace_font_family: #{'Courier New', monospace}; @@ -86,43 +81,42 @@ $color_palette: ( foxtrot: #0c85ff ); -$alpha_color: #fad803; -$bravo_color: #d30a51; -$charlie_color: #273f8b; -$delta_color: #b7e0f0; -$echo_color: #52bed1; -$foxtrot_color: #0c85ff; +@include addDefaultColors; -$dark_color: black !default; -$bright_color: white !default; -$medium_color: lighten($dark_color, 50%) !default; - -$default_front_color: $dark_color !default; -$default_back_color: $medium_color !default; +$darkest_color: $default_darkest_color; +$brightest_color: $default_brightest_color; $basic_font_color: $default_front_color; $basic_head_color: $default_front_color; $basic_link_color: $echo_color; -$basic_highlight_color: $bright_color; +$basic_highlight_color: $brightest_color; $basic_action_color: $foxtrot_color; +$basic_front_color: $default_front_color; $basic_back_color: $default_back_color; -$light_color: lighten($basic_back_color, 5%); -$dark_color_color: darken($basic_back_color, 10%); +$dark_color: lighten($darkest_color, 20%); +$medium_color: lighten($darkest_color, 50%); +$bright_color: darken($brightest_color, 20%); $basic_border_color: $default_front_color; // default shadow colors // $shadow_color: fade-out($medium_color, .5); +$basic_color_map: (); + +@each $key, $value in $color_palette { + $map: (); + $map: map-merge($map, ($key: createColorMap($value, 15%, .5)) ); + $basic_color_map: map-merge($basic_color_map, $map); +} // LAYOUT // ------------------------------------------------------------------------------ -$default_box_sizing: border-box !default; $box_sizing: $default_box_sizing; $z_top: 1000; @@ -132,7 +126,6 @@ $width_small: 80%; $width_medium: 60%; $width_large: 48%; -$default_space: 8px !default; $basic_space: $default_space; $half_space: $basic_space / 2; $space_2: $basic_space * 2; @@ -146,25 +139,52 @@ $wide_padding: calc(#{$basic_space} - 1px) calc(#{$basic_space} * 2); $basic_corner: $tiny_space; -$default_border_width: $tiny_space !default; $basic_border_width: $default_border_width; $border_width_4: $tiny_space * 4; $border_width_8: $tiny_space * 8; $basic_border: $tiny_space solid $basic_border_color; -$cell_border: $tiny_space solid $dark_color_color; +$cell_border: $tiny_space solid $darkest_color; $basic_aside_width: 20%; - // IO // ------------------------------------------------------------------------------ -$basic_io_font_color: darken($bright_color, 10%); -$basic_io_back_color: lighten($dark_color, 25%); -$basic_shadow: inset 0 1px 3px rgba($dark_color, 0.06); -$basic_focus_shadow: $basic_shadow, 0 0 5px adjust-color($basic_action_color, $lightness: -5%, $alpha: -0.3); +$basic_text_input_map: 'input[type="color"]', + 'input[type="date"]', + 'input[type="datetime"]', + 'input[type="datetime-local"]', + 'input[type="email"]', + 'input[type="month"]', + 'input[type="number"]', + 'input[type="password"]', + 'input[type="search"]', + 'input[type="tel"]', + 'input[type="text"]', + 'input[type="time"]', + 'input[type="url"]', + 'input[type="week"]', + 'input:not([type])', + 'textarea'; +$basic_button_map: 'button', + 'input[type="button"]', + 'input[type="reset"]', + 'input[type="submit"]'; + +$basic_focus_map: 'a[href]', + 'area[href]', + 'button:not([disabled])', + 'input:not([disabled])', + 'select:not([disabled])', + 'textarea:not([disabled])', + '*[tabindex]'; + +$basic_io_font_color: darken($brightest_color, 10%); +$basic_io_back_color: lighten($darkest_color, 25%); +$basic_shadow: inset 0 1px 3px rgba($darkest_color, 0.06); +$basic_focus_shadow: $basic_shadow, 0 0 5px adjust-color($basic_action_color, $lightness: -5%, $alpha: -0.3); // ANIMATIONS @@ -174,7 +194,6 @@ $basic_duration: 150ms; $basic_timing: ease; - // HARDWARE BREAKPOINTS // ------------------------------------------------------------------------------ @@ -191,7 +210,6 @@ $screen_medium: 1280px; $screen_large: 1920px; - // VENDOR PREFIX // ------------------------------------------------------------------------------ @@ -204,6 +222,30 @@ $moz_ms_support: -moz- -ms- ''; $webkit_ms_support: -webkit- -ms- ''; +// SYMBOLS +// ------------------------------------------------------------------------------ + +$icons: ( + glass: "\f000", + music: "\f001", + search: "\f002", + envelope-o: "\f003", + heart: "\f004" +); + +@each $name, $icon in $icons { + .sym_#{$name}::before { + content: $icon; + } +} + +// USER AGENT +// ------------------------------------------------------------------------------ + +$no_agent_focus: true; + +@include overrideUserAgent; + // The config file is intended to allow users to quickly redefine core elements of the design // that will cascade throughout the css to get your design up and running FAST! @@ -308,8 +350,8 @@ $webkit_ms_support: -webkit- -ms- ''; // $input_disabled_border: lighten($input_disabled, 50%); // $input_disabled_text: lighten($input_disabled, 50%); // -// $form_field_back_color: $bright_color; -// $form_field_focus_color: $bright_color; +// $form_field_back_color: $brightest_color; +// $form_field_focus_color: $brightest_color; // $form_field_fail_bkg: $alpha_color_juliet; // $form_field_border: $charlie_gray; @@ -322,7 +364,7 @@ $webkit_ms_support: -webkit- -ms- ''; // $instructional_text: $charlie_gray; // $placeholder_text: $hotel_gray; // $inline_alert_bkg_color: $alpha_color_delta; -// $inline_alert_text_color: $bright_color; +// $inline_alert_text_color: $brightest_color; // Non-color defaults (currently not represented in the SG view) // --------------------------------------------------------- @@ -343,7 +385,7 @@ $webkit_ms_support: -webkit- -ms- ''; /////// Config defaults for buttons /////// // ----------------------------------------------------------------------------- // $button-color: $delta-color; -// $button-text-color: $bright_color; +// $button-text-color: $brightest_color; // $button-line-height: 32; // $button-border-radius: 3; // $button-padding: 20; diff --git a/global/_default.scss b/global/_default.scss new file mode 100644 index 0000000..113dcd3 --- /dev/null +++ b/global/_default.scss @@ -0,0 +1,23 @@ +// Main configuration +// ------------------------------------------------------------------------------ + +$default_font_size: 17px !default; +$default_print_font_size: 10pt !default; + +$default_line_height: 1.5 !default; + +$default_font_family: #{'Roboto', 'Segoe UI', 'Liberation Sans', 'Source Sans', 'Trebuchet MS', Helvetica, Arial, sans-serif, sans} !default; + +$default_darkest_color: black !default; +$default_medium_color: lighten($default_darkest_color, 50%); +$default_brightest_color: white !default; + +$default_front_color: $default_darkest_color !default; +$default_back_color: $default_medium_color !default; + +$default_box_sizing: border-box !default; + +$default_space: 8px !default; +$default_tiny_space: 1px !default; + +$default_border_width: $default_tiny_space !default; diff --git a/mixins/_all.scss b/mixins/_all.scss new file mode 100644 index 0000000..cab5eb0 --- /dev/null +++ b/mixins/_all.scss @@ -0,0 +1,3 @@ +@import "clearflow"; +@import "color"; +@import "user_agent"; diff --git a/mixins/_clearflow.scss b/mixins/_clearflow.scss new file mode 100644 index 0000000..404a21c --- /dev/null +++ b/mixins/_clearflow.scss @@ -0,0 +1,25 @@ +@charset "UTF-8"; + +// Provides an easy way to include a clearflow for containing floats. +// +// @link http://cssmojo.com/latest_new_clearfix_so_far/ +// +// @example scss - Usage +// .element { +// @include clearflow; +// } +// +// @example css - CSS Output +// .element::after { +// content: ""; +// clear: both; +// display: table; +// } + +@mixin clearflow { + &::after { + content: ""; + clear: both; + display: table; + } +} diff --git a/mixins/_color.scss b/mixins/_color.scss new file mode 100644 index 0000000..3822647 --- /dev/null +++ b/mixins/_color.scss @@ -0,0 +1,20 @@ +@mixin addDefaultColors() { + @if map-has-key($color_palette, alpha) { + $alpha_color: map-get($color_palette, alpha) !global; + } + @if map-has-key($color_palette, bravo) { + $bravo_color: map-get($color_palette, bravo) !global; + } + @if map-has-key($color_palette, charlie) { + $charlie_color: map-get($color_palette, charlie) !global; + } + @if map-has-key($color_palette, delta) { + $delta_color: map-get($color_palette, delta) !global; + } + @if map-has-key($color_palette, echo) { + $echo_color: map-get($color_palette, echo) !global; + } + @if map-has-key($color_palette, foxtrot) { + $foxtrot_color: map-get($color_palette, foxtrot) !global; + } +} diff --git a/mixins/_user_agent.scss b/mixins/_user_agent.scss new file mode 100644 index 0000000..ff7a0ce --- /dev/null +++ b/mixins/_user_agent.scss @@ -0,0 +1,9 @@ +@mixin overrideUserAgent() { + @if $no_agent_focus == true { + @each $el in $basic_focus_map { + #{$el}:focus { + outline: 0; + } + } + } +} diff --git a/modules/card/_card_module.scss b/modules/card/_card_module.scss index 92643ea..4c7b7ab 100644 --- a/modules/card/_card_module.scss +++ b/modules/card/_card_module.scss @@ -85,7 +85,7 @@ margin-top: 16px; text-indent: -1em; text-align: center; } -.marked:before { content: "*\0000a0" } +.marked::before { content: "*\0000a0" } .decent { color: #666 } a { color: #000; diff --git a/basic/_demo.scss b/modules/demo/_demo_module.scss similarity index 77% rename from basic/_demo.scss rename to modules/demo/_demo_module.scss index 41cdd19..036054b 100644 --- a/basic/_demo.scss +++ b/modules/demo/_demo_module.scss @@ -29,8 +29,8 @@ &:active, &:focus, &:hover { - background-color: rgba($bright_color, .2); - color: $bright_color; + background-color: rgba($brightest_color, .2); + color: $brightest_color; } } } @@ -49,8 +49,8 @@ &:active, &:focus, &:hover { - background-color: rgba($bright_color, .2); - color: $bright_color; + background-color: rgba($brightest_color, .2); + color: $brightest_color; } } } @@ -66,7 +66,7 @@ nav { a { - color: $bright_color; + color: $brightest_color; } } } @@ -77,6 +77,8 @@ opacity: 1; width: 128px; height: auto; + min-width: 128px; + min-height: 128px; border-radius: 50%; background-color: $delta_color; } @@ -85,3 +87,7 @@ .demo__flag { height: 40vh; } + +.demo__credits { + margin: $space_3 0 $basic_space 0; +} diff --git a/modules/editor/_editor_module.scss b/modules/editor/_editor_module.scss index 9708c63..82d7da9 100644 --- a/modules/editor/_editor_module.scss +++ b/modules/editor/_editor_module.scss @@ -12,7 +12,7 @@ } .wip { @extend %wip; - &:before, &:after { + &::before, &::after { content: ""; display: block; height: 48px; @@ -20,4 +20,4 @@ } .wip_txt { @extend %wip; -} \ No newline at end of file +} diff --git a/modules/explanation/_explanation_module.scss b/modules/explanation/_explanation_module.scss index eea463c..e6412dd 100644 --- a/modules/explanation/_explanation_module.scss +++ b/modules/explanation/_explanation_module.scss @@ -7,7 +7,7 @@ // ------------------------------------------------------------------------------ %expose_after { - &:after { + &::after { content: ""; display: block; height: 48px; @@ -15,7 +15,7 @@ } } %expose_before { - &:before { + &::before { content: ""; display: block; height: 48px; @@ -23,7 +23,7 @@ } } %expose { - &:before, &:after { + &::before, &::after { content: ""; display: block; height: 48px; @@ -61,7 +61,7 @@ border: $tiny_space solid $basic_highlight_color; border-radius: $basic_size; color: $basic_highlight_color; - background-color: $dark_color; + background-color: $darkest_color; } .exp_expose { @@ -85,16 +85,16 @@ display: table; right: $space_2; bottom: $space_2; - background-color: rgba($dark_color, .4); + background-color: rgba($darkest_color, .4); &:hover { - background-color: $bright_color; + background-color: $brightest_color; > .span__solo { - color: $dark_color; + color: $darkest_color; } } .span__solo { display: table-cell; - color: rgba($bright_color, .8); + color: rgba($brightest_color, .8); font-family: $monospace_font_family; font-size: 1.4em; text-align: center; diff --git a/modules/navigation/_nav_module.scss b/modules/navigation/_nav_module.scss index 525d616..0ee17ad 100644 --- a/modules/navigation/_nav_module.scss +++ b/modules/navigation/_nav_module.scss @@ -39,6 +39,26 @@ nav { } } +.nav__separate { + li { + position: relative; + padding-left: $tiny_space; + + &:not(:first-child) { + + &::before { + content: ""; + position: absolute; + width: $tiny_space; + height: 100%; + left: 0; + top: 0; + background-color: $darkest_color; + } + } + } +} + .nav__separate_right { float: right; li { @@ -54,7 +74,7 @@ nav { height: 100%; left: 0; top: 0; - background-color: $bright_color; + background-color: $brightest_color; margin: 0 $basic_space; } } diff --git a/modules/print/_print_module.scss b/modules/print/_print_module.scss index adbe14b..e1d52ff 100644 --- a/modules/print/_print_module.scss +++ b/modules/print/_print_module.scss @@ -7,7 +7,7 @@ // ------------------------------------------------------------------------------ %paper { - background-color: $bright_color; + background-color: $brightest_color; } $a4: ".dina4" 1.2cm 1.2cm 1.2cm 2.4cm; diff --git a/modules/tables/_tables_module.scss b/modules/tables/_tables_module.scss index 8dffa72..f6e625c 100644 --- a/modules/tables/_tables_module.scss +++ b/modules/tables/_tables_module.scss @@ -7,7 +7,7 @@ border-bottom: $cell_border; &:hover { - background-color: $light_color; + background-color: $bright_color; } } From 615e5df2d981aba1bf893dbb25816e6c5f1dab53 Mon Sep 17 00:00:00 2001 From: Stephan Hagedorn Date: Wed, 23 Aug 2017 09:43:56 +0200 Subject: [PATCH 040/372] Changed interactive elements also tried to define global margin variable --- elements/_interactive.scss | 48 ++++++++++++++++++++++++-------------- elements/_tables.scss | 3 +-- example.css | 15 +++++++----- example.html | 18 +++++++------- global/_config.scss | 3 +++ 5 files changed, 54 insertions(+), 33 deletions(-) diff --git a/elements/_interactive.scss b/elements/_interactive.scss index d956505..abe8124 100644 --- a/elements/_interactive.scss +++ b/elements/_interactive.scss @@ -6,7 +6,7 @@ form { } fieldset { - margin: $basic_space 0; + margin: $high_margin; padding: $basic_space; border: $basic_border; } @@ -26,28 +26,13 @@ label { & + input { margin-left: $basic_space; } + input + & { margin-left: $basic_space; } -} - -.input_default label { - display: table; - margin: $half_space 0; input { - display: table-cell; margin-left: $basic_space; - padding: $half_space ($half_space + 1); - border-style: solid; - border-color: transparent; - background-color: $basic_io_back_color; - color: $basic_io_font_color; - - &:hover { - background-color: $darkest_color; - color: $brightest_color; - } } } @@ -55,6 +40,35 @@ input { } +.label__table { + display: table; + + input { + display: table-cell; + } +} + +.input_default { + + label { + @extend .label__table; + margin: $half_space 0; + + input { + padding: $half_space ($half_space + 1); + border-style: solid; + border-color: transparent; + background-color: $basic_io_back_color; + color: $basic_io_font_color; + + &:hover { + background-color: $darkest_color; + color: $brightest_color; + } + } + } +} + // More diff --git a/elements/_tables.scss b/elements/_tables.scss index 4283db3..475651b 100644 --- a/elements/_tables.scss +++ b/elements/_tables.scss @@ -2,8 +2,7 @@ // ----------------------------------------------------------------------------- table { - margin-top: $space_2; - margin-bottom: $space_2; + margin: $high_margin; border: $basic_border; border-collapse: collapse; } diff --git a/example.css b/example.css index 2cd2d1a..9c293da 100644 --- a/example.css +++ b/example.css @@ -506,8 +506,7 @@ img { vertical-align: top; } table { - margin-top: 16px; - margin-bottom: 16px; + margin: calc(8px * 2) 0; border: 1px solid black; border-collapse: collapse; } @@ -557,7 +556,7 @@ caption { text-align: center; } fieldset { - margin: 8px 0; + margin: calc(8px * 2) 0; padding: 8px; border: 1px solid black; } @@ -568,13 +567,17 @@ label + input { margin-left: 8px; } input + label { margin-left: 8px; } +label input { + margin-left: 8px; } + +.label__table, .input_default label { + display: table; } + .label__table input, .input_default label input { + display: table-cell; } .input_default label { - display: table; margin: 4px 0; } .input_default label input { - display: table-cell; - margin-left: 8px; padding: 4px 5px; border-style: solid; border-color: transparent; diff --git a/example.html b/example.html index 2bf0ba1..ff7ecc6 100644 --- a/example.html +++ b/example.html @@ -353,17 +353,19 @@
-
+

Sie können mittels <legend> auch eine eigene Beschriftung erhalten.

+
Einfache Eingabefelder - - + +
-
+
Weitere Zeicheneingabefelder -

Diese Eingabefelder sind zusätzlich aneinander ausgerichtet und gruppiert.

- - +

Innerhalb einer Gruppe können nicht nur Ein- und Ausgabefelder platziert werden. Andere Elemente ergänzen Information oder lockern das Erscheinungsbild auf. Hier nun eine Liste aller möglichen Arten von Eingabefeldern.

+ 
ul>(li>label>input[type="text"])
+ + @@ -415,7 +417,7 @@
-

Einzelene Elemente

+

Einzelne Elemente

Bereiche

diff --git a/global/_config.scss b/global/_config.scss index 8c7071e..09ca3d8 100644 --- a/global/_config.scss +++ b/global/_config.scss @@ -134,6 +134,9 @@ $space_4: $basic_space * 8; $space_5: $basic_space * 16; $tiny_space: 1px !default; +$basic_margin: $basic_space 0; +$high_margin: calc(#{$basic_space} * 2) 0; + $basic_padding: calc(#{$basic_space} - 3px) $basic_space; $wide_padding: calc(#{$basic_space} - 1px) calc(#{$basic_space} * 2); From 8ec7ce370f017c5ab3dfd8280c6ac5e687816ee2 Mon Sep 17 00:00:00 2001 From: Stephan Hagedorn Date: Wed, 23 Aug 2017 11:25:00 +0200 Subject: [PATCH 041/372] Renaming --- elements/_grouping.scss | 14 ++++++------ elements/_sections.scss | 6 ++--- example.css | 24 ++++++++++---------- example.html | 6 ++--- global/_config.scss | 2 +- modules/demo/_demo_module.scss | 4 ++-- modules/explanation/_explanation_module.scss | 4 ++-- modules/navigation/_nav_module.scss | 2 +- 8 files changed, 31 insertions(+), 31 deletions(-) diff --git a/elements/_grouping.scss b/elements/_grouping.scss index cbe9550..ae1f035 100644 --- a/elements/_grouping.scss +++ b/elements/_grouping.scss @@ -12,17 +12,17 @@ p { } } -.p__col_line { +.p__column_line { column-rule: $basic_border_width solid $darkest_color; } -.p__col_2, .p__col_3 { +.p__column_2, .p__column_3 { @extend p; } -.p__col_2 { +.p__column_2 { column-count: 2; column-gap: $space_3; } -.p__col_3 { +.p__column_3 { column-count: 3; column-gap: $space_4; } @@ -89,7 +89,7 @@ blockquote { // List dl, ul, ol { - margin: $space_2 0 $basic_space; + margin: $double_space 0 $basic_space; } ul, ol { @@ -156,7 +156,7 @@ ul { // Embedded figure { - margin: $space_2 $basic_indent; + margin: $double_space $basic_indent; } figcaption { @@ -177,7 +177,7 @@ div { } .box__info { - padding: $space_2 $basic_indent; + padding: $double_space $basic_indent; border-right: $basic_space solid rgba($echo_color, .6); background-color: rgba($echo_color, .1) !important; } diff --git a/elements/_sections.scss b/elements/_sections.scss index 4ea1354..ab04a89 100644 --- a/elements/_sections.scss +++ b/elements/_sections.scss @@ -121,19 +121,19 @@ h2 { h3 { @extend %head_3; - margin: $space_2 0 $space_2; + margin: $double_space 0 $double_space; text-transform: uppercase; } h4 { @extend %head_3; - margin: $space_2 0 $space_2; + margin: $double_space 0 $double_space; text-transform: none; } h5 { @extend %head_4; - margin: $space_2 0 $basic_space; + margin: $double_space 0 $basic_space; text-transform: none; } diff --git a/example.css b/example.css index 9c293da..e542a19 100644 --- a/example.css +++ b/example.css @@ -180,7 +180,7 @@ textarea:not([disabled]):focus { color: white; border-color: transparent; } -.span__solo, h6, p, .p__col_2, .p__col_3, caption, li, dt, dd, figcaption, th, td, legend, label { +.span__solo, h6, p, .p__column_2, .p__column_3, caption, li, dt, dd, figcaption, th, td, legend, label { font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; font-size: 1em; line-height: 1.5; } @@ -190,7 +190,7 @@ pre, code, .code__solo { font-size: 1em; line-height: 1.5; } -.print_body *[class^="din"] p, .print_body *[class^="din"] .p__col_2, .print_body *[class^="din"] .p__col_3, .print_body *[class^="din"] caption { +.print_body *[class^="din"] p, .print_body *[class^="din"] .p__column_2, .print_body *[class^="din"] .p__column_3, .print_body *[class^="din"] caption { font-family: Courier New, monospace; font-size: 1em; line-height: 1.5; } @@ -303,21 +303,21 @@ h6 { text-transform: none; font-weight: bold; } -p, .p__col_2, .p__col_3, caption { +p, .p__column_2, .p__column_3, caption { margin: 8px 0; } - p code, .p__col_2 code, .p__col_3 code, caption code { + p code, .p__column_2 code, .p__column_3 code, caption code { padding: 1px 4px; font-size: 1em; line-height: 1; } -.p__col_line { +.p__column_line { column-rule: 1px solid black; } -.p__col_2 { +.p__column_2 { column-count: 2; column-gap: 32px; } -.p__col_3 { +.p__column_3 { column-count: 3; column-gap: 64px; } @@ -346,9 +346,9 @@ hr, .hr__hidden, .hr__dotted { blockquote { margin: 8px 2em; } -.quote__mark p::before, .quote__mark .p__col_2::before, .quote__mark .p__col_3::before, .quote__mark caption::before { +.quote__mark p::before, .quote__mark .p__column_2::before, .quote__mark .p__column_3::before, .quote__mark caption::before { content: "\201E \0020"; } -.quote__mark p::after, .quote__mark .p__col_2::after, .quote__mark .p__col_3::after, .quote__mark caption::after { +.quote__mark p::after, .quote__mark .p__column_2::after, .quote__mark .p__column_3::after, .quote__mark caption::after { content: "\201C \0020"; } .quote__mark .quote__source::before, .quote__mark .quote__source::after { content: ""; } @@ -775,7 +775,7 @@ nav li { font-size: 24px; line-height: 1.4em; font-weight: normal; } - .card_body p, .card_body .p__col_2, .card_body .p__col_3, .card_body caption { + .card_body p, .card_body .p__column_2, .card_body .p__column_3, .card_body caption { margin-top: 0; margin-bottom: 16px; font-size: 12px; @@ -950,7 +950,7 @@ nav li { flex-direction: row; } .print_body *[class^="din"] .page_foot *:last-child { margin-bottom: 0; } - .print_body *[class^="din"] .page_foot p, .print_body *[class^="din"] .page_foot .p__col_2, .print_body *[class^="din"] .page_foot .p__col_3, .print_body *[class^="din"] .page_foot caption { + .print_body *[class^="din"] .page_foot p, .print_body *[class^="din"] .page_foot .p__column_2, .print_body *[class^="din"] .page_foot .p__column_3, .print_body *[class^="din"] .page_foot caption { flex: 1 0 auto; margin: 0; font-size: 8pt; @@ -961,7 +961,7 @@ nav li { font-size: 20pt; line-height: 1; text-align: right; } - .print_body *[class^="din"] .page_foot p:first-child, .print_body *[class^="din"] .page_foot .p__col_2:first-child, .print_body *[class^="din"] .page_foot .p__col_3:first-child, .print_body *[class^="din"] .page_foot caption:first-child { + .print_body *[class^="din"] .page_foot p:first-child, .print_body *[class^="din"] .page_foot .p__column_2:first-child, .print_body *[class^="din"] .page_foot .p__column_3:first-child, .print_body *[class^="din"] .page_foot caption:first-child { text-align: left; } .print_body *[class^="din"] .page_content { margin-top: 10cm; diff --git a/example.html b/example.html index ff7ecc6..774cc7a 100644 --- a/example.html +++ b/example.html @@ -83,9 +83,9 @@
hr.hr__dotted
hr.center_50
hr.hr__dotted.center_25
-

Zur horizontalen Unterteilung kommt natürlich auch eine vertikale Trennung hinzu. Text kann so zum Beispiel in mehrere Spalten unterteilt werden. Dies ist hilfreich, wenn ein Text durch eine breite Fläche sehr lange Zeilen bekommen würde. Es ist dann schwer den neuen Zeilanfang zu finden. Die vertikale Trennung dient in erster Linie dazu, diesem Umstand zu begegnen. Auch hier kann die Unterteilung viele Formen annehmen.

p.p__col_2
-

Drei Spalten gilt es jetzt also zu Füllen. Dann erst wird die Trennung der Spalten durch eine Linie sichtbar.

p.p__col_3.p__col_line
-

Ist der Text nicht lang genug bleibt eventuell eine Spalte leer. Diesmal wird dies aber nicht passieren, denn das Anschauungsbeispiel ist ja nun durch den vorherigen Absatz schon gegeben.
Oft ist es sinnvoll, Absätze mit mehreren Spalten deutlich von nachfolgenden Absätzen zu trennen. Da der Textfluss spaltenweise verläuft, liest man eventuell an der falschen Stelle weiter. Ach das ziegen diese beiden Absätze ganz gut.

+

Zur horizontalen Unterteilung kommt natürlich auch eine vertikale Trennung hinzu. Text kann so zum Beispiel in mehrere Spalten unterteilt werden. Dies ist hilfreich, wenn ein Text durch eine breite Fläche sehr lange Zeilen bekommen würde. Es ist dann schwer den neuen Zeilanfang zu finden. Die vertikale Trennung dient in erster Linie dazu, diesem Umstand zu begegnen. Auch hier kann die Unterteilung viele Formen annehmen.

p.p__column_2
+

Drei Spalten gilt es jetzt also zu Füllen. Dann erst wird die Trennung der Spalten durch eine Linie sichtbar.

p.p__column_3.p__column_line
+

Ist der Text nicht lang genug bleibt eventuell eine Spalte leer. Diesmal wird dies aber nicht passieren, denn das Anschauungsbeispiel ist ja nun durch den vorherigen Absatz schon gegeben.
Oft ist es sinnvoll, Absätze mit mehreren Spalten deutlich von nachfolgenden Absätzen zu trennen. Da der Textfluss spaltenweise verläuft, liest man eventuell an der falschen Stelle weiter. Ach das ziegen diese beiden Absätze ganz gut.

Es gibt die Möglichkeit vorformatierten Text darzustellen <pre>.

Dadurch
	bleiben
		Einrückungen
			durch
				Tabulatoren
					erhalten.

Text bekommt durch Listen besondere optische wie auch inhaltliche Struktur. Es gibt ungeordnete <ul> und geordnete Listen <ol> sowie Beschreibungslisten <dl>. Die beiden ersten Varianten beinhalten das Listenelement <li>. Beschreibungslisten beinhalten jeweils das Paar von Ausdruck <dt> und Beschreibung <dd>. Im Folgenden eine Liste der Listen in ihrer Ausgangskonfiguration:

diff --git a/global/_config.scss b/global/_config.scss index 09ca3d8..f22266c 100644 --- a/global/_config.scss +++ b/global/_config.scss @@ -128,7 +128,7 @@ $width_large: 48%; $basic_space: $default_space; $half_space: $basic_space / 2; -$space_2: $basic_space * 2; +$double_space: $basic_space * 2; $space_3: $basic_space * 4; $space_4: $basic_space * 8; $space_5: $basic_space * 16; diff --git a/modules/demo/_demo_module.scss b/modules/demo/_demo_module.scss index 036054b..7ef6617 100644 --- a/modules/demo/_demo_module.scss +++ b/modules/demo/_demo_module.scss @@ -7,7 +7,7 @@ } .demo__header { - padding: $space_2; + padding: $double_space; nav { @@ -59,7 +59,7 @@ .demo__footer { width: 100%; // height: 128px; - padding: $space_2 0; + padding: $double_space 0; background-color: $dark_color; color: $bright_color; diff --git a/modules/explanation/_explanation_module.scss b/modules/explanation/_explanation_module.scss index e6412dd..a2a016f 100644 --- a/modules/explanation/_explanation_module.scss +++ b/modules/explanation/_explanation_module.scss @@ -83,8 +83,8 @@ } .exp_help_btn { display: table; - right: $space_2; - bottom: $space_2; + right: $double_space; + bottom: $double_space; background-color: rgba($darkest_color, .4); &:hover { background-color: $brightest_color; diff --git a/modules/navigation/_nav_module.scss b/modules/navigation/_nav_module.scss index 0ee17ad..5d8267d 100644 --- a/modules/navigation/_nav_module.scss +++ b/modules/navigation/_nav_module.scss @@ -120,7 +120,7 @@ nav { // display: table; // width: 3em; right: 0; - bottom: $space_2; + bottom: $double_space; ul { margin: $basic_space 0; From fa6f9cf1d8e9058f8647f64ddd475afa6df24ade Mon Sep 17 00:00:00 2001 From: Stephan Hagedorn Date: Wed, 23 Aug 2017 17:09:37 +0200 Subject: [PATCH 042/372] New margins needed --- elements/_grouping.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/elements/_grouping.scss b/elements/_grouping.scss index ae1f035..8cce366 100644 --- a/elements/_grouping.scss +++ b/elements/_grouping.scss @@ -101,6 +101,10 @@ li, dt, dd { color: $basic_font_color; } +li, dd { + // margin-bottom: $basic_space; +} + dd { margin-left: $basic_indent; } From bf00d396922332fe812014341dff4c635076340c Mon Sep 17 00:00:00 2001 From: Stephan Hagedorn Date: Thu, 24 Aug 2017 09:22:15 +0200 Subject: [PATCH 043/372] Override working again --- _hippie.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_hippie.scss b/_hippie.scss index 5fe1018..ad01369 100644 --- a/_hippie.scss +++ b/_hippie.scss @@ -48,8 +48,8 @@ // Be careful though changes will get lost if hippie gets updated // ----------------------------------------------------------------------------- @import "global/default"; // DO NOT EDIT -@import "global/config"; // DO NOT EDIT @import "override"; // EDIT +@import "global/config"; // DO NOT EDIT From f668d3a6b1d843a461ffac655c61fd13bb7ffca9 Mon Sep 17 00:00:00 2001 From: Stephan Hagedorn Date: Thu, 24 Aug 2017 10:21:46 +0200 Subject: [PATCH 044/372] Defaults for color palette --- global/_config.scss | 9 +-------- global/_default.scss | 9 +++++++++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/global/_config.scss b/global/_config.scss index f22266c..e6fe272 100644 --- a/global/_config.scss +++ b/global/_config.scss @@ -72,14 +72,7 @@ $basic_indent: 2em; // COLORS // ------------------------------------------------------------------------------ -$color_palette: ( - alpha: #fad803, - bravo: #d30a51, - charlie: #273f8b, - delta: #b7e0f0, - echo: #52bed1, - foxtrot: #0c85ff -); +$color_palette: $default_color_palette; @include addDefaultColors; diff --git a/global/_default.scss b/global/_default.scss index 113dcd3..23644dd 100644 --- a/global/_default.scss +++ b/global/_default.scss @@ -8,6 +8,15 @@ $default_line_height: 1.5 !default; $default_font_family: #{'Roboto', 'Segoe UI', 'Liberation Sans', 'Source Sans', 'Trebuchet MS', Helvetica, Arial, sans-serif, sans} !default; +$default_color_palette: ( + alpha: #fad803, + bravo: #d30a51, + charlie: #273f8b, + delta: #b7e0f0, + echo: #52bed1, + foxtrot: #0c85ff +) !default; + $default_darkest_color: black !default; $default_medium_color: lighten($default_darkest_color, 50%); $default_brightest_color: white !default; From cf72f18cbf9086e7712e6432a93a3a68743fcbb0 Mon Sep 17 00:00:00 2001 From: Stephan Hagedorn Date: Thu, 24 Aug 2017 15:56:31 +0200 Subject: [PATCH 045/372] Remove explicit font color --- elements/_grouping.scss | 1 - example.css | 3 --- 2 files changed, 4 deletions(-) diff --git a/elements/_grouping.scss b/elements/_grouping.scss index 8cce366..ffe4600 100644 --- a/elements/_grouping.scss +++ b/elements/_grouping.scss @@ -98,7 +98,6 @@ ul, ol { li, dt, dd { @extend %basic; - color: $basic_font_color; } li, dd { diff --git a/example.css b/example.css index e542a19..5b1108d 100644 --- a/example.css +++ b/example.css @@ -359,9 +359,6 @@ dl, ul, ol { ul, ol { padding-left: 2em; } -li, dt, dd { - color: black; } - dd { margin-left: 2em; } From d5c5da67ea35aafe5ca153f1b6b373ff74d69a84 Mon Sep 17 00:00:00 2001 From: Stephan Hagedorn Date: Fri, 25 Aug 2017 13:32:35 +0200 Subject: [PATCH 046/372] New z-index variables --- example.css | 2 +- global/_config.scss | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/example.css b/example.css index 5b1108d..bcc292e 100644 --- a/example.css +++ b/example.css @@ -156,7 +156,7 @@ textarea:not([disabled]):focus { background-color: gray; } .hover_full_view_change { - z-index: 1000; + z-index: 100; background-color: rgba(0, 0, 0, 0.5); transition: background-color .2s ease-in-out; pointer-events: none; } diff --git a/global/_config.scss b/global/_config.scss index e6fe272..49f09bd 100644 --- a/global/_config.scss +++ b/global/_config.scss @@ -112,7 +112,10 @@ $basic_color_map: (); $box_sizing: $default_box_sizing; -$z_top: 1000; +$z_heaven: 100; +$z_top: 10; +$z_basic: 1; +$z_earth: -100; $basic_width: 96%; $width_small: 80%; From a8fabf373e4ba76047731facdb2c4d934ccf1c51 Mon Sep 17 00:00:00 2001 From: Stephan Hagedorn Date: Fri, 25 Aug 2017 15:20:46 +0200 Subject: [PATCH 047/372] Missed change for z-index --- global/_common.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global/_common.scss b/global/_common.scss index 1733f1b..439585c 100644 --- a/global/_common.scss +++ b/global/_common.scss @@ -139,7 +139,7 @@ .hover_full_view_change { @extend %full_viewport; - z-index: $z_top; + z-index: $z_heaven; background-color: transparentize($darkest_color, .5); transition: background-color .2s ease-in-out; pointer-events: none; From 0c4e8016900e424081f395a6e993a2e2aac72220 Mon Sep 17 00:00:00 2001 From: Stephan Hagedorn Date: Tue, 29 Aug 2017 10:50:34 +0200 Subject: [PATCH 048/372] New examples and new default variable structure --- _hippie.scss | 4 +- _override.scss => _settings.scss | 2 +- code/global.js | 150 ++++++++++++++++++++++++ demo-explorer.html | 156 +++++++++++++++++++++++++ example.html => demo-index.html | 172 +++------------------------- elements/_grouping.scss | 11 +- elements/_tables.scss | 13 ++- example.css | 46 +++++--- global/_common.scss | 22 +++- global/_config.scss | 99 ++++++++-------- global/_default.scss | 32 ------ modules/demo/_demo_module.scss | 5 + modules/navigation/_nav_module.scss | 2 +- 13 files changed, 455 insertions(+), 259 deletions(-) rename _override.scss => _settings.scss (79%) create mode 100644 code/global.js create mode 100644 demo-explorer.html rename example.html => demo-index.html (87%) delete mode 100644 global/_default.scss diff --git a/_hippie.scss b/_hippie.scss index ad01369..d265a47 100644 --- a/_hippie.scss +++ b/_hippie.scss @@ -47,8 +47,8 @@ // Adjustments can be made by copying values from _config.scss to _override.scss // Be careful though changes will get lost if hippie gets updated // ----------------------------------------------------------------------------- -@import "global/default"; // DO NOT EDIT -@import "override"; // EDIT +// @import "global/default"; // DO NOT EDIT +@import "settings"; // EDIT @import "global/config"; // DO NOT EDIT diff --git a/_override.scss b/_settings.scss similarity index 79% rename from _override.scss rename to _settings.scss index e4b3c48..6239a8e 100644 --- a/_override.scss +++ b/_settings.scss @@ -1,4 +1,4 @@ // Override for configuration file // ------------------------------------------------------------------------------ -// $default_font_size: 10px; +// $basic_link_color: magenta; diff --git a/code/global.js b/code/global.js new file mode 100644 index 0000000..4275707 --- /dev/null +++ b/code/global.js @@ -0,0 +1,150 @@ +// DOM ready +// ------------------------------------------------------------------------------ +$( document ).ready(function() { + + // Setup + // ------------------------------------------------------------------------------ + + setup(); + + + + // Modules + // ------------------------------------------------------------------------------ + + // Explanation module scripts + var exp_mode = false; + + // Displays explanation popup + $(".js_pop").hover( + function() { + var $this = $(this); + + if($(this).attr("emmet")){ + + } + + $(this).next(".exp_pop").show(); + }, function() { + $(this).next(".exp_pop").hide(); + } + ).mousemove( + function(ev) { + $(this).next(".exp_pop").css({ + "top": ev.pageY - $(this).next(".exp_pop").outerHeight() - 4, + "left": ev.pageX + 8 + }); + } + ); + + // WIP Activates layer with explanation elements + // Besser ::after oder ::before benutzen + $(".exp_help_btn").click(function(e){ + var $wrap, $pop; + + if(exp_mode != true){ + exp_mode = true; + + $(".js_pop").each(function(i, e){ + if($(this).css("position") == "static") { + $(this).addClass("js_changed_pos"); + $(this).css("position", "relative"); + } + + $pop = $(this).next(".exp_pop").detach(); + $wrap = $(this).wrap("").parent().prepend(""); + $wrap.after($pop); + }); + + } else { + $(".js_pop").each(function(i, e){ + $wrap = $(this).parent(".exp_wrap"); + $pop = $wrap.next(".exp_pop").detach(); + $wrap.find(".exp_marker_pop").remove(); + $(this).unwrap(".exp_wrap"); + $(this).after($pop); + if($(this).hasClass("js_changed_pos")){ + $(this).css("position", ""); + if($(this).attr("style") == "") { + $(this).removeAttr("style"); + } + $(this).removeClass("js_changed_pos"); + } + }); + + exp_mode = false; + + } + console.log("Explanation mode: "+ exp_mode); + }); + + // WIP Scroll to top + $('#js_scrolltop').click(function(event) { + console.log('scroll to the top'); + event.preventDefault(); + // $('body').scrollTop(); + $('body').animate({scrollTop: 0}, basic_ease, function() { + console.log('arrived at top'); + }); + }); + $('#js_scrolldown').click(function(event) { + console.log('scroll down'); + event.preventDefault(); + $('body').animate({scrollTop: $(document).height()}, basic_ease * 2, function() { + console.log('arrived at bottom'); + }); + }); + + + + $( "#gameIcon" ).click(function(event) { + event.preventDefault(); + $( this ).clone().appendTo( "#gameDetail" ); + $( this ).siblings().clone().appendTo( "#gameDetail" ); + $( "#gameDetail" ).removeClass( "magic" ); + }); + + var i = 0; + $( ".pass-def dd" ).each(function() { + $( this ).find( "li" ).each(function( index ) { + if ( 0 == $( this ).children( "ul" ).length ) { + //console.log( index + ": " + $( this ).text() ); + var tempContent = $( this ).html(); + //$( this ).html( "" ); + $( this ).html( tempContent +""+ i +"" ); + i++; + } + }) + }); + + + + // jq-sticky-anything + $('#js_demo_fix').stickThis({ + pushup: '#js_demo_stop' + }); + + + +}); + + + +// Scroll +// ------------------------------------------------------------------------------ +$( document ).scroll(function() { + + // Toggle navigation elements + doc_pos_y = $( document ).scrollTop(); + // console.log(doc_pos_y); + var h = scroll_y_margin; + // var demo_margin = $('.header__fix'); + if (doc_pos_y > h) { + $('#js_scrolltop').parent().removeClass('magic'); + } else { + $('#js_scrolltop').parent().addClass('magic'); + } + + + +}); diff --git a/demo-explorer.html b/demo-explorer.html new file mode 100644 index 0000000..5b1f6bd --- /dev/null +++ b/demo-explorer.html @@ -0,0 +1,156 @@ + + + + + + HIPPIE Explorer Demo + + + + + + + + + + + + + +
+
+ + + + + + +
+
+
+ + + +
+
+ +
+
+
+
+

Dateiname 1

+

Auszeichnung 1

+
+
+
+
+
+

Dateiname 2

+

Auszeichnung 2

+
+
+
+
+
+

Dateiname 3

+

Auszeichnung 3

+
+
+
+
+
+

Dateiname 4

+

Auszeichnung 4

+
+
+
+
+ + + + + + + + + + + +
Objektname 1Objektpfad 1
Objektname 2Objektpfad 2
+
+
+

Status

+
+
+
+
+ + + + + + + + + diff --git a/example.html b/demo-index.html similarity index 87% rename from example.html rename to demo-index.html index 774cc7a..54b8767 100644 --- a/example.html +++ b/demo-index.html @@ -3,7 +3,7 @@ - Dummy + HIPPIE Dummy @@ -186,7 +186,7 @@
table>tbody>tr>td*2^tr>td[colspan=2]
- +
@@ -197,10 +197,10 @@
Mit
-
table.table_blank>tbody>tr>td*2^tr>td[colspan=2]
+
table.table__blank>tbody>tr>td*2^tr>td[colspan=2]

Die nächste Tabelle verwendet alle zur Auszeichnung verfügbaren Elemente und hat eine starre Zellverteilung:

- +
@@ -239,7 +239,7 @@
Beschreibung bzw. Zusammenhang der Tabelle
-
table.width_full.table_fix>caption+thead>tr>th*3^^tfoot>tr>td*3^^tbody>(tr>td*3)*3
+
table.width_full.table__fix>caption+thead>tr>th*3^^tfoot>tr>td*3^^tbody>(tr>td*3)*3

Viele weitere Formate sind möglich ...

@@ -273,7 +273,7 @@
table.width_full>thead>tr>th.precol+th[colspan=2]^^tbody>tr>td.precol+td*2^tr>td.precol+td[colspan=2]
- +
@@ -304,7 +304,7 @@
Kopfzeile
- +
@@ -522,11 +522,11 @@ nav.nav__center_old>ul>(li>a.a__button{Typ $})*4
-
-
-
-
-
+
+
+
+
+
@@ -606,153 +606,11 @@ nav.nav__center_old>ul>(li>a.a__button{Typ $})*4 + diff --git a/elements/_grouping.scss b/elements/_grouping.scss index ffe4600..a8804ca 100644 --- a/elements/_grouping.scss +++ b/elements/_grouping.scss @@ -179,6 +179,10 @@ div { } +.box__page { + +} + .box__info { padding: $double_space $basic_indent; border-right: $basic_space solid rgba($echo_color, .6); @@ -241,12 +245,17 @@ div { background-color: rgba($darkest_color,.1); } +// Data +.box__file_tile { + @extend .float_left; +} + // Flex .box__column { @extend .flex; .column { - @extend .flex_child; + @extend .flex__child; flex-grow: 1; } } diff --git a/elements/_tables.scss b/elements/_tables.scss index 475651b..0560976 100644 --- a/elements/_tables.scss +++ b/elements/_tables.scss @@ -40,7 +40,7 @@ tfoot { } } -.table_blank { +.table__blank { border: $basic_border_width solid transparent; th, td { @@ -48,11 +48,11 @@ tfoot { } } -.table_free { +.table__free { border: $basic_border_width solid transparent; } -.table_stripe { +.table__stripe { td { border-top: 0; border-bottom: 0; @@ -63,7 +63,7 @@ tfoot { } } -.table_fix { +.table__fix { table-layout: fixed; } @@ -73,3 +73,8 @@ caption { border: $basic_border_width dotted $basic_border_color; text-align: center; } + +// Data +.table__file_simple { + @extend .width_full; +} diff --git a/example.css b/example.css index bcc292e..7526255 100644 --- a/example.css +++ b/example.css @@ -82,7 +82,7 @@ textarea:not([disabled]):focus { margin-right: 37.5%; margin-left: 37.5%; } -.width_full { +.width_full, .table__file_simple { width: 100%; margin-right: 0; margin-left: 0; } @@ -107,7 +107,7 @@ textarea:not([disabled]):focus { .clear::before, .clear::after { clear: both; } -.float_left, .list__horizontal li, .box__inline_left, .nav__horizontal ul li, .nav__center_old ul li, .header__page nav ul li { +.float_left, .list__horizontal li, .box__inline_left, .box__file_tile, .nav__horizontal ul li, .nav__center_old ul li, .header__page nav ul li { float: left; margin-right: 32px; } @@ -161,12 +161,26 @@ textarea:not([disabled]):focus { transition: background-color .2s ease-in-out; pointer-events: none; } -.flex, .box__column, .nav__column ul { - display: flex; } +.flex, .flex__wrap, .flex__row, .box__column, .nav__column ul { + display: flex; + background-color: rgba(250, 216, 3, 0.1); } -.flex_child, .box__column .column, .nav__column ul li { +.flex__wrap { + flex-wrap: wrap; } + +.flex__row { + flex-direction: column; + justify-content: flex-start; } + +.flex__child, .box__column .column, .nav__column ul li { flex: 0 1 auto; } +.flex__child_one { + flex: 1; } + +.flex__child_end { + align-self: flex-end; } + .txt_light_color { color: #666666; } @@ -503,7 +517,7 @@ img { vertical-align: top; } table { - margin: calc(8px * 2) 0; + margin: 16px 0; border: 1px solid black; border-collapse: collapse; } @@ -530,21 +544,21 @@ tr:last-child td { tfoot tr:first-child td { border-top: 1px solid black; } -.table_blank { +.table__blank { border: 1px solid transparent; } - .table_blank th, .table_blank td { + .table__blank th, .table__blank td { border: 1px solid transparent; } -.table_free { +.table__free { border: 1px solid transparent; } -.table_stripe td { +.table__stripe td { border-top: 0; border-bottom: 0; } -.table_stripe tr:nth-child(even) td { +.table__stripe tr:nth-child(even) td { background-color: #cccccc; } -.table_fix { +.table__fix { table-layout: fixed; } caption { @@ -553,7 +567,7 @@ caption { text-align: center; } fieldset { - margin: calc(8px * 2) 0; + margin: 16px 0; padding: 8px; border: 1px solid black; } @@ -884,7 +898,7 @@ nav li { -o-transition: height 0.5s ease; transition: height 0.5s ease; } -.print_body [class^="din"] { +.print_body *[class^="din"] { background-color: white; } .print_body { @@ -1031,6 +1045,10 @@ nav li { .demo__credits { margin: 32px 0 8px 0; } +.demo__button_32 { + width: 32px; + height: 32px; } + .test li::after { content: ""; display: block; diff --git a/global/_common.scss b/global/_common.scss index 439585c..44a218c 100644 --- a/global/_common.scss +++ b/global/_common.scss @@ -147,12 +147,32 @@ .flex { display: flex; + background-color: rgba($alpha_color, .1); } -.flex_child { +.flex__wrap { + @extend .flex; + flex-wrap: wrap; +} + +.flex__row { + @extend .flex; + flex-direction: column; + // align-items: flex-start; + justify-content: flex-start; +} + +.flex__child { flex: 0 1 auto; } +.flex__child_one { + flex: 1; +} + +.flex__child_end { + align-self: flex-end; +} // Colors diff --git a/global/_config.scss b/global/_config.scss index 49f09bd..975005f 100644 --- a/global/_config.scss +++ b/global/_config.scss @@ -5,8 +5,8 @@ // TEXT // ------------------------------------------------------------------------------ -$basic_size: $default_font_size; -$basic_print_size: $default_print_font_size; +$basic_size: 17px !default; +$basic_print_size: 10pt !default; $size_1: $basic_size * 4; @@ -44,56 +44,63 @@ $basic_line: 1; // ), // ); -$head_size_1: 3.1em; -$head_size_2: 2.5em; -$head_size_3: 1.8em; -$head_size_4: 1.35em; +$head_size_1: 3.1em !default; +$head_size_2: 2.5em !default; +$head_size_3: 1.8em !default; +$head_size_4: 1.35em !default; $text_size_1: 1em; $text_size_2: 20; -$text_line_1: $default_line_height; +$text_line_1: 1.5 !default; $head_line_1: $text_line_1; $head_line_2: $text_line_1; $head_line_3: $text_line_1; $head_line_4: $text_line_1; -$print_font_family: #{'Times New Roman', times}; -$monospace_font_family: #{'Courier New', monospace}; +$print_font_family: #{'Times New Roman', times} !default; +$monospace_font_family: #{'Courier New', monospace} !default; -$primary_font_family: $default_font_family; -$secondary_font_family: $default_font_family; -$third_font_family: $monospace_font_family; -$fourth_font_family: $print_font_family; +$primary_font_family: #{'Roboto', 'Segoe UI', 'Liberation Sans', 'Source Sans', 'Trebuchet MS', Helvetica, Arial, sans-serif, sans} !default; +$secondary_font_family: $primary_font_family !default; +$third_font_family: $monospace_font_family !default; +$fourth_font_family: $print_font_family !default; -$basic_indent: 2em; +$basic_indent: 2em !default; // COLORS // ------------------------------------------------------------------------------ -$color_palette: $default_color_palette; +$color_palette: ( + alpha: #fad803, + bravo: #d30a51, + charlie: #273f8b, + delta: #b7e0f0, + echo: #52bed1, + foxtrot: #0c85ff +) !default; @include addDefaultColors; -$darkest_color: $default_darkest_color; -$brightest_color: $default_brightest_color; +$darkest_color: black !default; +$brightest_color: white !default; +$medium_color: lighten($darkest_color, 50%) !default; +$dark_color: lighten($darkest_color, 20%) !default; +$bright_color: darken($brightest_color, 20%) !default; -$basic_font_color: $default_front_color; -$basic_head_color: $default_front_color; +$basic_front_color: $darkest_color !default; +$basic_back_color: $medium_color !default; +$basic_font_color: $basic_front_color !default; +$basic_head_color: $basic_front_color !default; -$basic_link_color: $echo_color; -$basic_highlight_color: $brightest_color; -$basic_action_color: $foxtrot_color; +$basic_link_color: $echo_color !default; +$basic_highlight_color: $brightest_color !default; +$basic_action_color: $foxtrot_color !default; -$basic_front_color: $default_front_color; -$basic_back_color: $default_back_color; -$dark_color: lighten($darkest_color, 20%); -$medium_color: lighten($darkest_color, 50%); -$bright_color: darken($brightest_color, 20%); -$basic_border_color: $default_front_color; +$basic_border_color: $basic_front_color !default; // default shadow colors // $shadow_color: fade-out($medium_color, .5); @@ -110,35 +117,35 @@ $basic_color_map: (); // LAYOUT // ------------------------------------------------------------------------------ -$box_sizing: $default_box_sizing; +$box_sizing: border-box !default; -$z_heaven: 100; -$z_top: 10; -$z_basic: 1; -$z_earth: -100; +$z_heaven: 100 !default; +$z_top: 10 !default; +$z_basic: 1 !default; +$z_earth: -100 !default; -$basic_width: 96%; -$width_small: 80%; -$width_medium: 60%; -$width_large: 48%; +$basic_width: 96% !default; +$width_small: 80% !default; +$width_medium: 60% !default; +$width_large: 48% !default; -$basic_space: $default_space; -$half_space: $basic_space / 2; -$double_space: $basic_space * 2; +$basic_space: 8px !default; +$tiny_space: 1px !default; +$half_space: $basic_space / 2 !default; +$double_space: $basic_space * 2 !default; $space_3: $basic_space * 4; $space_4: $basic_space * 8; $space_5: $basic_space * 16; -$tiny_space: 1px !default; -$basic_margin: $basic_space 0; -$high_margin: calc(#{$basic_space} * 2) 0; +$basic_margin: $basic_space 0 !default; +$high_margin: $double_space 0 !default; -$basic_padding: calc(#{$basic_space} - 3px) $basic_space; -$wide_padding: calc(#{$basic_space} - 1px) calc(#{$basic_space} * 2); +$basic_padding: calc(#{$basic_space} - 3px) $basic_space !default; +$wide_padding: calc(#{$basic_space} - 1px) calc(#{$basic_space} * 2) !default; $basic_corner: $tiny_space; -$basic_border_width: $default_border_width; +$basic_border_width: $tiny_space !default; $border_width_4: $tiny_space * 4; $border_width_8: $tiny_space * 8; $basic_border: $tiny_space solid $basic_border_color; diff --git a/global/_default.scss b/global/_default.scss deleted file mode 100644 index 23644dd..0000000 --- a/global/_default.scss +++ /dev/null @@ -1,32 +0,0 @@ -// Main configuration -// ------------------------------------------------------------------------------ - -$default_font_size: 17px !default; -$default_print_font_size: 10pt !default; - -$default_line_height: 1.5 !default; - -$default_font_family: #{'Roboto', 'Segoe UI', 'Liberation Sans', 'Source Sans', 'Trebuchet MS', Helvetica, Arial, sans-serif, sans} !default; - -$default_color_palette: ( - alpha: #fad803, - bravo: #d30a51, - charlie: #273f8b, - delta: #b7e0f0, - echo: #52bed1, - foxtrot: #0c85ff -) !default; - -$default_darkest_color: black !default; -$default_medium_color: lighten($default_darkest_color, 50%); -$default_brightest_color: white !default; - -$default_front_color: $default_darkest_color !default; -$default_back_color: $default_medium_color !default; - -$default_box_sizing: border-box !default; - -$default_space: 8px !default; -$default_tiny_space: 1px !default; - -$default_border_width: $default_tiny_space !default; diff --git a/modules/demo/_demo_module.scss b/modules/demo/_demo_module.scss index 7ef6617..182a3f3 100644 --- a/modules/demo/_demo_module.scss +++ b/modules/demo/_demo_module.scss @@ -91,3 +91,8 @@ .demo__credits { margin: $space_3 0 $basic_space 0; } + +.demo__button_32 { + width: 32px; + height: 32px; +} diff --git a/modules/navigation/_nav_module.scss b/modules/navigation/_nav_module.scss index 5d8267d..1236da5 100644 --- a/modules/navigation/_nav_module.scss +++ b/modules/navigation/_nav_module.scss @@ -103,7 +103,7 @@ nav { margin: 0 $space_5; li { - @extend .flex_child; + @extend .flex__child; flex-grow: 1; margin: 0; text-align: center; From 483d9b0bd8245f3d5d8b6f1cd9f8827fff298cf7 Mon Sep 17 00:00:00 2001 From: Stephan Hagedorn Date: Tue, 29 Aug 2017 11:09:14 +0200 Subject: [PATCH 049/372] Remove dummy color --- global/_common.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/global/_common.scss b/global/_common.scss index 44a218c..7368e63 100644 --- a/global/_common.scss +++ b/global/_common.scss @@ -147,7 +147,6 @@ .flex { display: flex; - background-color: rgba($alpha_color, .1); } .flex__wrap { From e8ab9a51d7651ea8e0e733eb7fa5a1ea70b2abe8 Mon Sep 17 00:00:00 2001 From: Stephan Hagedorn Date: Fri, 1 Sep 2017 00:16:21 +0200 Subject: [PATCH 050/372] Mainly work on interactive elements --- demo-index.html | 37 ++++++----- elements/_grouping.scss | 9 +++ elements/_interactive.scss | 76 ++++++++++++++++++---- elements/_tables.scss | 4 +- example.css | 126 ++++++++++++++++++++++++++++++++----- global/_config.scss | 73 ++++++++++++--------- mixins/_user_agent.scss | 2 +- 7 files changed, 250 insertions(+), 77 deletions(-) diff --git a/demo-index.html b/demo-index.html index 54b8767..0e01ada 100644 --- a/demo-index.html +++ b/demo-index.html @@ -33,14 +33,14 @@
- Dies ist einfach nur Text.
Weniger wäre Nichts, denn dieser Text ist nicht durch ein spezifisches Element umschlossen. + Dies ist einfach nur Text.
Weniger wäre Nichts, denn dieser Text ist nicht durch ein spezifisches Element umschlossen.

Es wirken nur die Eigenschaften des <body> Elements. Dieses Element umschließt den gesamten Inhalt des Dokumentes und kommt daher nur einmal vor. Inhalte sind normalerweise durch Elemente definiert. Grundlegende Elemente teilen das Dokument zunächst in Abschnitte.

Bereiche

Einen Abschnitt, welcher für sich alleine stehen kann, definiert sich durch <article>. Solch ein Element wird oft detailliert gestaltet, kommt aber auch ohne jegliche Gestaltung aus.

Noch allgemeiner ist das <section> Element. Es schafft Bereiche um Inhalte zu strukturieren.

-

Bestimmte Bereiche haben einen vorgegebene Zweck.
Folgende Bereiche sind vorgegeben:

+

Bestimmte Bereiche haben einen vorgegebene Zweck.
Folgende Bereiche sind vorgegeben:

header.header__page>h1+p+nav.nav__separate_right>ul>(li>a.a__button{Nav $})*4^+nav.nav__right>ul>(li>a.a__button{Nav $})*4
-

Fancy Pants

+

Aufmacher

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis nec consectetur diam. Sed nisl odio, volutpat nec nisi sit amet, commodo faucibus est. Donec lacinia vestibulum sapien. Morbi porttitor nibh quis imperdiet scelerisque. Praesent rutrum quam eu sodales luctus.

Beschreibung bzw. Zusammenhang der Tabelle
table.width_full>tbody>tr>td*2^tr>td[colspan=2]
- +
@@ -186,7 +186,7 @@
Eine
table>tbody>tr>td*2^tr>td[colspan=2]
- +
@@ -348,11 +348,11 @@

Interaktive Elemente können durch das Attribut <readonly> nur lesbar gemacht werden oder mittels <disabled> gänzlich deaktiviert werden.

Das Element <label> ergänzt interaktive Elemente um eine Beschriftung. Wichtig ist hier, dass die Beziehung beider Elemente zu einander deutlich ist.

-
-
+
+
-
+
@@ -449,7 +449,7 @@ 
nav>ul>(li>a.a__button{Punkt $})*4
 nav>ul>(li>a.a__button_border{Stufe $})*4
-
-
+
diff --git a/elements/_grouping.scss b/elements/_grouping.scss index e096a75..f40b6c2 100644 --- a/elements/_grouping.scss +++ b/elements/_grouping.scss @@ -12,21 +12,6 @@ p { } } -.p__column_line { - column-rule: $basic_border_width solid $darkest_color; -} -.p__column_2, .p__column_3 { - @extend p; -} -.p__column_2 { - column-count: 2; - column-gap: $space_3; -} -.p__column_3 { - column-count: 3; - column-gap: $space_4; -} - // Address address { @@ -153,7 +138,7 @@ ul { .list__horizontal { overflow: auto; li { - @extend .float_left; + @extend .float_space_left; } } @@ -199,12 +184,31 @@ div { // width: 100%; } + // Inline .box__inline_left { - @extend .float_left; + @extend .float_space_left; // padding: $basic_space / 2; } + +// Columns +.block__column_line { + column-rule: $basic_border; +} +.block__column_2, .block__column_3 { + @extend p; +} +.block__column_2 { + column-count: 2; + column-gap: $space_3; +} +.block__column_3 { + column-count: 3; + column-gap: $space_4; +} + + // Space and placeholders .box__space { position: relative; @@ -245,22 +249,15 @@ div { background-color: rgba($darkest_color,.1); } + // Data .box__file_tile { - @extend .float_left; + @extend .float_space_left; } + // Flex -.box__column_old { - overflow: auto; - - .column_old { - float: left; - width: 50%; - } -} - -.box__column { +.flex__column_wrap { @extend .flex; .column { diff --git a/elements/_sections.scss b/elements/_sections.scss index ab04a89..8e49649 100644 --- a/elements/_sections.scss +++ b/elements/_sections.scss @@ -25,8 +25,10 @@ body { ::after { box-sizing: inherit; } + &:hover { - .trigger__hover { + + .layer__hover { background-color: transparent; } } @@ -42,6 +44,9 @@ section { .sec__main_center { width: $basic_width; + margin: 0 auto; + padding-top: $space_3; + @media screen and (orientation: landscape) { @media (min-width: $screen_small) { width: $width_small; @@ -53,16 +58,16 @@ section { width: $width_large; } } + @media screen and (orientation: portrait) { @media (min-width: $screen_small) { width: $width_small; } } - margin: 0 auto; - padding-top: $space_3; } aside { + &.right + section { margin-right: calc(#{$basic_aside_width} + #{$basic_space}); } @@ -79,12 +84,15 @@ nav { aside { width: $basic_aside_width; + &.left { float: left; } + &.right { float: right; } + *:first-child { margin-top: 0; } diff --git a/example.css b/example.css index 5933e47..df6ef13 100644 --- a/example.css +++ b/example.css @@ -107,12 +107,16 @@ textarea:not([disabled]):focus { .clear::before, .clear::after { clear: both; } -.float_left, .list__horizontal li, .box__inline_left, .box__file_tile, .nav__horizontal ul li, .nav__center_old ul li, .header__page nav ul li { +.overflow, .nav__horizontal ul, .nav__center_old ul, .header__page nav ul { + overflow: auto; } + +.float_space_left, .list__horizontal li, .box__inline_left, .box__file_tile, .nav__horizontal ul li, .nav__center_old ul li, .header__page nav ul li { float: left; margin-right: 32px; } -.overflow, .nav__horizontal ul, .nav__center_old ul, .header__page nav ul { - overflow: auto; } +.float_half_size { + float: left; + width: 50%; } .x_long { overflow-x: scroll; } @@ -161,7 +165,7 @@ textarea:not([disabled]):focus { transition: background-color .2s ease-in-out; pointer-events: none; } -.flex, .flex__wrap, .flex__row, .box__column, .nav__column ul { +.flex, .flex__wrap, .flex__row, .flex__column_wrap, .nav__column ul { display: flex; } .flex__wrap { @@ -171,7 +175,7 @@ textarea:not([disabled]):focus { flex-direction: column; justify-content: flex-start; } -.flex__child, .box__column .column, .nav__column ul li { +.flex__child, .flex__column_wrap .column, .nav__column ul li { flex: 0 1 auto; } .flex__child_one { @@ -193,7 +197,7 @@ textarea:not([disabled]):focus { color: white; border-color: transparent; } -.span__solo, h6, p, .p__column_2, .p__column_3, caption, li, dt, dd, figcaption, th, td, legend, label { +.span__solo, h6, p, .block__column_2, .block__column_3, caption, li, dt, dd, figcaption, th, td, legend, label { font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; font-size: 1em; line-height: 1.5; } @@ -203,7 +207,7 @@ pre, code, .code__solo, input[type="color"], input[type="date"], input[type="dat font-size: 1em; line-height: 1.5; } -.print_body *[class^="din"] p, .print_body *[class^="din"] .p__column_2, .print_body *[class^="din"] .p__column_3, .print_body *[class^="din"] caption { +.print_body *[class^="din"] p, .print_body *[class^="din"] .block__column_2, .print_body *[class^="din"] .block__column_3, .print_body *[class^="din"] caption { font-family: Courier New, monospace; font-size: 1em; line-height: 1.5; } @@ -255,7 +259,7 @@ body { body ::before, body ::after { box-sizing: inherit; } - body:hover .trigger__hover { + body:hover .layer__hover { background-color: transparent; } .sec__main_center, .demo__intro { @@ -316,24 +320,13 @@ h6 { text-transform: none; font-weight: bold; } -p, .p__column_2, .p__column_3, caption { +p, .block__column_2, .block__column_3, caption { margin: 8px 0; } - p code, .p__column_2 code, .p__column_3 code, caption code { + p code, .block__column_2 code, .block__column_3 code, caption code { padding: 1px 4px; font-size: 1em; line-height: 1; } -.p__column_line { - column-rule: 1px solid black; } - -.p__column_2 { - column-count: 2; - column-gap: 32px; } - -.p__column_3 { - column-count: 3; - column-gap: 64px; } - hr, .hr__hidden, .hr__dotted { margin: 32px auto; border-width: 1px 0 0; @@ -359,9 +352,9 @@ hr, .hr__hidden, .hr__dotted { blockquote { margin: 8px 2em; } -.quote__mark p::before, .quote__mark .p__column_2::before, .quote__mark .p__column_3::before, .quote__mark caption::before { +.quote__mark p::before, .quote__mark .block__column_2::before, .quote__mark .block__column_3::before, .quote__mark caption::before { content: "\201E \0020"; } -.quote__mark p::after, .quote__mark .p__column_2::after, .quote__mark .p__column_3::after, .quote__mark caption::after { +.quote__mark p::after, .quote__mark .block__column_2::after, .quote__mark .block__column_3::after, .quote__mark caption::after { content: "\201C \0020"; } .quote__mark .quote__source::before, .quote__mark .quote__source::after { content: ""; } @@ -415,6 +408,17 @@ figure { .box__main_indent { margin-left: 25%; } +.block__column_line { + column-rule: 1px solid black; } + +.block__column_2 { + column-count: 2; + column-gap: 32px; } + +.block__column_3 { + column-count: 3; + column-gap: 64px; } + .box__space { position: relative; width: 100%; } @@ -448,13 +452,7 @@ figure { background: url("data:image/svg+xml;utf8,") no-repeat; background-color: rgba(0, 0, 0, 0.1); } -.box__column_old { - overflow: auto; } - .box__column_old .column_old { - float: left; - width: 50%; } - -.box__column .column { +.flex__column_wrap .column { flex-grow: 1; } a { @@ -882,7 +880,7 @@ nav li { font-size: 24px; line-height: 1.4em; font-weight: normal; } - .card_body p, .card_body .p__column_2, .card_body .p__column_3, .card_body caption { + .card_body p, .card_body .block__column_2, .card_body .block__column_3, .card_body caption { margin-top: 0; margin-bottom: 16px; font-size: 12px; @@ -994,7 +992,7 @@ nav li { -o-transition: height 0.5s ease; transition: height 0.5s ease; } -.print_body *[class^="din"] { +.print_body [class^="din"] { background-color: white; } .print_body { @@ -1057,7 +1055,7 @@ nav li { flex-direction: row; } .print_body *[class^="din"] .page_foot *:last-child { margin-bottom: 0; } - .print_body *[class^="din"] .page_foot p, .print_body *[class^="din"] .page_foot .p__column_2, .print_body *[class^="din"] .page_foot .p__column_3, .print_body *[class^="din"] .page_foot caption { + .print_body *[class^="din"] .page_foot p, .print_body *[class^="din"] .page_foot .block__column_2, .print_body *[class^="din"] .page_foot .block__column_3, .print_body *[class^="din"] .page_foot caption { flex: 1 0 auto; margin: 0; font-size: 8pt; @@ -1068,7 +1066,7 @@ nav li { font-size: 20pt; line-height: 1; text-align: right; } - .print_body *[class^="din"] .page_foot p:first-child, .print_body *[class^="din"] .page_foot .p__column_2:first-child, .print_body *[class^="din"] .page_foot .p__column_3:first-child, .print_body *[class^="din"] .page_foot caption:first-child { + .print_body *[class^="din"] .page_foot p:first-child, .print_body *[class^="din"] .page_foot .block__column_2:first-child, .print_body *[class^="din"] .page_foot .block__column_3:first-child, .print_body *[class^="din"] .page_foot caption:first-child { text-align: left; } .print_body *[class^="din"] .page_content { margin-top: 10cm; diff --git a/global/_common.scss b/global/_common.scss index 7368e63..6415f2c 100644 --- a/global/_common.scss +++ b/global/_common.scss @@ -68,13 +68,18 @@ } } -.float_left { +.overflow { + overflow: auto; +} + +.float_space_left { float: left; margin-right: $space_3; } -.overflow { - overflow: auto; +.float_half_size { + float: left; + width: 50%; } .x_long { diff --git a/gulpfile.js b/gulpfile.js index 6e07165..da8e356 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -13,10 +13,7 @@ gulp.task('sass', () => sass('./*.scss', {sourcemap: true}) // .on('error', sass.logError) .pipe(plumber(errorReport("sass error"))) -.pipe(sourcemaps.write('./', { - includeContent: false, - sourceRoot: 'source' -})) +.pipe(sourcemaps.write('./')) .pipe(gulp.dest('./')) .pipe(livereload()) ); diff --git a/modules/navigation/_nav_module.scss b/modules/navigation/_nav_module.scss index 1236da5..a8c8fa7 100644 --- a/modules/navigation/_nav_module.scss +++ b/modules/navigation/_nav_module.scss @@ -19,7 +19,7 @@ nav { } li { - @extend .float_left; + @extend .float_space_left; margin-right: $basic_space; margin-bottom: 0; From 7dc73a8f3f490abc63388f03a6b8eb85ccb38297 Mon Sep 17 00:00:00 2001 From: Stephan Hagedorn Date: Fri, 15 Sep 2017 09:13:10 +0200 Subject: [PATCH 052/372] New screen size vars --- global/_config.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/global/_config.scss b/global/_config.scss index 1b19e3f..1da3883 100644 --- a/global/_config.scss +++ b/global/_config.scss @@ -224,7 +224,9 @@ $mobile_landscape: "screen and (max-width: 30em) and (orientation : landscape)"; $screen_small: 1024px; $screen_medium: 1280px; -$screen_large: 1920px; +$screen_large: 1440px; +$screen_huge: 1680px; +$screen_gigantic: 1920px; // VENDOR PREFIX From 5f8b8e3b600339c930b97cba45d29ad1c3aa0a5a Mon Sep 17 00:00:00 2001 From: Stephan Hagedorn Date: Mon, 18 Sep 2017 10:51:11 +0200 Subject: [PATCH 053/372] Addition to media queries --- global/_config.scss | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/global/_config.scss b/global/_config.scss index 1da3883..c79c780 100644 --- a/global/_config.scss +++ b/global/_config.scss @@ -214,14 +214,7 @@ $basic_timing: ease; // HARDWARE BREAKPOINTS // ------------------------------------------------------------------------------ -$tablet: "screen and (max-width: 64em)"; -$tablet_portrait: "screen and (max-width: 50em) and (orientation: portrait)"; -$tablet_landscape: "screen and (max-width: 50em) and (orientation: landscape)"; - -$mobile: "screen and (max-width: 30em)"; -$mobile_portrait: "screen and (max-width: 30em) and (orientation : portrait)"; -$mobile_landscape: "screen and (max-width: 30em) and (orientation : landscape)"; - +$screen_tiny: 768px; $screen_small: 1024px; $screen_medium: 1280px; $screen_large: 1440px; From ebffacd3fdea6d33825c12acf890e7c76093bc08 Mon Sep 17 00:00:00 2001 From: Stephan Hagedorn Date: Mon, 18 Sep 2017 16:58:53 +0200 Subject: [PATCH 054/372] More media query --- _hippie.scss | 1 + demo-index.html | 23 ++++- elements/_sections.scss | 24 ++--- example.css | 111 +++++++++++++++++---- global/_config.scss | 2 + mixins/_all.scss | 3 +- mixins/{_clearflow.scss => _flow.scss} | 4 +- mixins/_media_query.scss | 35 +++++++ modules/breakpoint/_breakpoint_module.scss | 46 +++++++++ modules/demo/_demo_module.scss | 77 ++++++++++++++ 10 files changed, 288 insertions(+), 38 deletions(-) rename mixins/{_clearflow.scss => _flow.scss} (84%) create mode 100644 mixins/_media_query.scss create mode 100644 modules/breakpoint/_breakpoint_module.scss diff --git a/_hippie.scss b/_hippie.scss index d265a47..436c1c9 100644 --- a/_hippie.scss +++ b/_hippie.scss @@ -79,6 +79,7 @@ // in dependency to other styles // Additional modules can be defined here // ----------------------------------------------------------------------------- +@import "modules/breakpoint/breakpoint_module"; @import "modules/navigation/nav_module"; @import "modules/tables/tables_module"; @import "modules/card/card_module"; diff --git a/demo-index.html b/demo-index.html index 7badeca..a31ef51 100644 --- a/demo-index.html +++ b/demo-index.html @@ -424,10 +424,29 @@
-

Einzelne Elemente

+

Medienformat Abfragen

+
+
+
Umbruch bei 
+
+

Telefone und größer

+

Nur Telefone

+

Schreibtafeln hochkant

+

Schreibtafeln und größer

+

Schreibtafeln im Querformat

+

Schreibtafeln quer und größer

+

Nur Arbeitsplatzrechner

+

Arbeitsplatzrechner und größer

+

Richtige Monitore und größer

+
+
+
+
+
+

Sammlung formatierter Elemente

+

Die Elemente werden fortlaufend komplexer

-

Bereiche

h3.txt_light_color+p

Helle Überschrift

Mit normalem Textabsatz

diff --git a/elements/_sections.scss b/elements/_sections.scss index 8e49649..66a8a0b 100644 --- a/elements/_sections.scss +++ b/elements/_sections.scss @@ -47,22 +47,14 @@ section { margin: 0 auto; padding-top: $space_3; - @media screen and (orientation: landscape) { - @media (min-width: $screen_small) { - width: $width_small; - } - @media (min-width: $screen_medium) { - width: $width_medium; - } - @media (min-width: $screen_large) { - width: $width_large; - } + @include forTabletPortraitUp { + width: $width_small; } - - @media screen and (orientation: portrait) { - @media (min-width: $screen_small) { - width: $width_small; - } + @include forTabletLandscapeUp { + width: $width_medium; + } + @include forBigDesktopUp { + width: $width_large; } } @@ -92,7 +84,7 @@ aside { &.right { float: right; } - + *:first-child { margin-top: 0; } diff --git a/example.css b/example.css index df6ef13..8733248 100644 --- a/example.css +++ b/example.css @@ -202,7 +202,7 @@ textarea:not([disabled]):focus { font-size: 1em; line-height: 1.5; } -pre, code, .code__solo, input[type="color"], input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="email"], input[type="month"], input[type="number"], input[type="password"], input[type="search"], input[type="tel"], input[type="text"], input[type="time"], input[type="url"], input[type="week"], input:not([type]), textarea { +pre, code, .demo__query_example:after, .code__solo, input[type="color"], input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="email"], input[type="month"], input[type="number"], input[type="password"], input[type="search"], input[type="tel"], input[type="text"], input[type="time"], input[type="url"], input[type="week"], input:not([type]), textarea { font-family: Courier New, monospace; font-size: 1em; line-height: 1.5; } @@ -266,19 +266,15 @@ body { width: 96%; margin: 0 auto; padding-top: 32px; } -@media screen and (orientation: landscape) and (min-width: 1024px) { - .sec__main_center, .demo__intro { - width: 80%; } } -@media screen and (orientation: landscape) and (min-width: 1280px) { - .sec__main_center, .demo__intro { - width: 60%; } } -@media screen and (orientation: landscape) and (min-width: 1920px) { - .sec__main_center, .demo__intro { - width: 48%; } } - -@media screen and (orientation: portrait) and (min-width: 1024px) { - .sec__main_center, .demo__intro { - width: 80%; } } + @media (min-width: 768px) { + .sec__main_center, .demo__intro { + width: 80%; } } + @media (min-width: 1024px) { + .sec__main_center, .demo__intro { + width: 60%; } } + @media (min-width: 1680px) { + .sec__main_center, .demo__intro { + width: 48%; } } aside.right + section { margin-right: calc(20% + 8px); } @@ -322,7 +318,7 @@ h6 { p, .block__column_2, .block__column_3, caption { margin: 8px 0; } - p code, .block__column_2 code, .block__column_3 code, caption code { + p code, .block__column_2 code, .block__column_3 code, caption code, p .demo__query_example:after, .block__column_2 .demo__query_example:after, .block__column_3 .demo__query_example:after, caption .demo__query_example:after { padding: 1px 4px; font-size: 1em; line-height: 1; } @@ -346,7 +342,7 @@ hr, .hr__hidden, .hr__dotted { border-radius: 1px; padding: 8px; background-color: rgba(255, 255, 255, 0.1); } - .pre__code code { + .pre__code code, .pre__code .demo__query_example:after { background-color: transparent; } blockquote { @@ -493,7 +489,7 @@ b, strong { cite { font-style: italic; } -code { +code, .demo__query_example:after { color: #1f1f1f; background-color: rgba(255, 255, 255, 0.1); } @@ -1143,6 +1139,87 @@ nav li { width: 32px; height: 32px; } +.demo__queries > p, .demo__queries > .block__column_2, .demo__queries > .block__column_3, .demo__queries > caption { + padding: calc(8px - 3px) 8px; } + +.query__phoneUp { + background-color: rgba(0, 0, 0, 0.2); } + +@media (max-width: 767px) { + .query__phoneOnly { + background-color: rgba(0, 0, 0, 0.2); } } + +@media (min-width: 768px) and (max-width: 1023px) { + .query__tabletPortaitOnly { + background-color: rgba(0, 0, 0, 0.2); } } + +@media (min-width: 768px) { + .query__tabletPortraitUp { + background-color: rgba(0, 0, 0, 0.2); } } + +@media (min-width: 1024px) and (max-width: 1279px) { + .query__tabletLandscapeOnly { + background-color: rgba(0, 0, 0, 0.2); } } + +@media (min-width: 1024px) { + .query__tabletLandscapeUp { + background-color: rgba(0, 0, 0, 0.2); } } + +@media (min-width: 1280px) and (max-width: 1679px) { + .query__desktopOnly { + background-color: rgba(0, 0, 0, 0.2); } } + +@media (min-width: 1280px) { + .query__desktopUp { + background-color: rgba(0, 0, 0, 0.2); } } + +@media (min-width: 1680px) { + .query__bigDesktopUp { + background-color: rgba(0, 0, 0, 0.2); } } + +.demo__query_example { + margin-bottom: 32px; + padding: 32px; + text-align: center; } + @media (min-width: 48em) { + .demo__query_example { + background-color: #fad803; } } + @media (min-width: 64em) { + .demo__query_example { + background-color: #d30a51; } } + @media (min-width: 80em) { + .demo__query_example { + background-color: #273f8b; } } + @media (min-width: 90em) { + .demo__query_example { + background-color: #b7e0f0; } } + @media (min-width: 105em) { + .demo__query_example { + background-color: #52bed1; } } + @media (min-width: 120em) { + .demo__query_example { + background-color: #0c85ff; } } + .demo__query_example:after { + content: '< 768px'; + padding: calc(8px - 3px) 8px; + border-radius: 2px; + background-color: rgba(0, 0, 0, 0.2); } + @media (min-width: 48em) { + .demo__query_example:after { + content: '768px'; } } + @media (min-width: 64em) { + .demo__query_example:after { + content: '1024px'; } } + @media (min-width: 80em) { + .demo__query_example:after { + content: '1280px'; } } + @media (min-width: 105em) { + .demo__query_example:after { + content: '1680px'; } } + @media (min-width: 120em) { + .demo__query_example:after { + content: '1920px'; } } + .test li::after { content: ""; display: block; diff --git a/global/_config.scss b/global/_config.scss index c79c780..42757db 100644 --- a/global/_config.scss +++ b/global/_config.scss @@ -153,6 +153,8 @@ $basic_border: $tiny_space solid $basic_border_color; $dotted_border: $tiny_space dotted $basic_border_color; $cell_border: $tiny_space solid $darkest_color; +$basic_corner_radius: $tiny_space * 2; + $basic_aside_width: 20%; diff --git a/mixins/_all.scss b/mixins/_all.scss index cab5eb0..c7955dd 100644 --- a/mixins/_all.scss +++ b/mixins/_all.scss @@ -1,3 +1,4 @@ -@import "clearflow"; +@import "media_query"; +@import "flow"; @import "color"; @import "user_agent"; diff --git a/mixins/_clearflow.scss b/mixins/_flow.scss similarity index 84% rename from mixins/_clearflow.scss rename to mixins/_flow.scss index 404a21c..2264389 100644 --- a/mixins/_clearflow.scss +++ b/mixins/_flow.scss @@ -6,7 +6,7 @@ // // @example scss - Usage // .element { -// @include clearflow; +// @include clearFlow; // } // // @example css - CSS Output @@ -16,7 +16,7 @@ // display: table; // } -@mixin clearflow { +@mixin clearFlow { &::after { content: ""; clear: both; diff --git a/mixins/_media_query.scss b/mixins/_media_query.scss new file mode 100644 index 0000000..72a4d6a --- /dev/null +++ b/mixins/_media_query.scss @@ -0,0 +1,35 @@ +//Sections for Media Queries +@mixin forPhoneOnly { + @media (max-width: #{$screen_tiny - 1}) { @content; } //599px +} +@mixin forTabletPortraitUp { + @media (min-width: $screen_tiny) { @content; } //600px +} +@mixin forTabletPortraitOnly { + @media (min-width: $screen_tiny) and (max-width: #{$screen_small - 1}) { @content; } //600px - 899px +} +@mixin forTabletLandscapeUp { + @media (min-width: $screen_small) { @content; } //900px +} +@mixin forTabletLandscapeOnly { + @media (min-width: $screen_small) and (max-width: #{$screen_medium - 1}) { @content; } //900px - 1199px +} +@mixin forDesktopUp { + @media (min-width: $screen_medium) { @content; } //1200px +} +@mixin forDesktopOnly { + @media (min-width: $screen_medium) and (max-width: #{$screen_huge - 1}) { @content; } //1200px - 1799px +} +@mixin forBigDesktopUp { + @media (min-width: $screen_huge) { @content; } //1800px +} + +//Mobile-first Media Query +@mixin goingLarge($width) { + @media (min-width: $width/16+em) { @content; } +} + +//Desktop-first Media Query +@mixin goingSmall($width) { + @media (max-width: $width/16+em) { @content; } +} diff --git a/modules/breakpoint/_breakpoint_module.scss b/modules/breakpoint/_breakpoint_module.scss new file mode 100644 index 0000000..7c08f7d --- /dev/null +++ b/modules/breakpoint/_breakpoint_module.scss @@ -0,0 +1,46 @@ +.query__goingLarge { + @include goingLarge($screen_tiny) {}; +} + +.query__goingSmall { + @include goingSmall($screen_gigantic) {}; +} + +.query__phoneUp { +} + +.query__phoneOnly { + @include forPhoneOnly {} +} + +.query__tabletPortaitOnly { + @include forTabletPortraitOnly { + } +} + +.query__tabletPortraitUp { + @include forTabletPortraitUp { + } +} + +.query__tabletLandscapeOnly { + @include forTabletLandscapeOnly {} +} + +.query__tabletLandscapeUp { + @include forTabletLandscapeUp {} +} + +.query__desktopOnly { + @include forDesktopOnly { + } +} + +.query__desktopUp { + @include forDesktopUp { + } +} + +.query__bigDesktopUp { + @include forBigDesktopUp {} +} diff --git a/modules/demo/_demo_module.scss b/modules/demo/_demo_module.scss index 182a3f3..c42d290 100644 --- a/modules/demo/_demo_module.scss +++ b/modules/demo/_demo_module.scss @@ -96,3 +96,80 @@ width: 32px; height: 32px; } + + + +.demo__queries > p { + padding: $basic_padding; +} + +.query__phoneUp { + background-color: rgba($basic_front_color, .2); +} + +.query__phoneOnly { + @include forPhoneOnly { background-color: rgba($basic_front_color, .2); } +} + +.query__tabletPortaitOnly { + @include forTabletPortraitOnly { background-color: rgba($basic_front_color, .2); } +} + +.query__tabletPortraitUp { + @include forTabletPortraitUp { background-color: rgba($basic_front_color, .2); } +} + +.query__tabletLandscapeOnly { + @include forTabletLandscapeOnly { background-color: rgba($basic_front_color, .2); } +} + +.query__tabletLandscapeUp { + @include forTabletLandscapeUp { background-color: rgba($basic_front_color, .2); } +} + +.query__desktopOnly { + @include forDesktopOnly { background-color: rgba($basic_front_color, .2); } +} + +.query__desktopUp { + @include forDesktopUp { background-color: rgba($basic_front_color, .2); } +} + +.query__bigDesktopUp { + @include forBigDesktopUp { background-color: rgba($basic_front_color, .2); } +} + +.demo__query_example { + @include goingLarge($screen_tiny/1px) {background-color: $alpha_color; } + @include goingLarge($screen_small/1px) {background-color: $bravo_color; } + @include goingLarge($screen_medium/1px) {background-color: $charlie_color; } + @include goingLarge($screen_large/1px) {background-color: $delta_color; } + @include goingLarge($screen_huge/1px) {background-color: $echo_color; } + @include goingLarge($screen_gigantic/1px) {background-color: $foxtrot_color; } + margin-bottom: $space_3; + padding: $space_3; + text-align: center; + + &:after { + @extend code; + @include goingLarge($screen_tiny/1px) { + & { content: '768px'; } + } + @include goingLarge($screen_small/1px) { + & { content: '1024px'; } + } + @include goingLarge($screen_medium/1px) { + & { content: '1280px'; } + } + @include goingLarge($screen_huge/1px) { + & { content: '1680px'; } + } + @include goingLarge($screen_gigantic/1px) { + & { content: '1920px'; } + } + content: '< 768px'; + padding: $basic_padding; + border-radius: $basic_corner_radius; + background-color: rgba($basic_front_color, .2); + } +} From 3a2140dad69539eedeba3fd5cea579467d109e8e Mon Sep 17 00:00:00 2001 From: Stephan Hagedorn Date: Wed, 20 Sep 2017 17:28:25 +0200 Subject: [PATCH 055/372] New demos --- demo-presentation.html | 41 +++++++++++++++++++++++++++++++++++++++++ elements/_grouping.scss | 2 +- example.css | 3 +++ 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 demo-presentation.html diff --git a/demo-presentation.html b/demo-presentation.html new file mode 100644 index 0000000..69db158 --- /dev/null +++ b/demo-presentation.html @@ -0,0 +1,41 @@ + + + + + + HIPPIE Presentation Demo + + + + + + + + + + + + + +
+
+
Start
+
Seite 2
+
+
+ + + + + + + + + diff --git a/elements/_grouping.scss b/elements/_grouping.scss index f40b6c2..c1f7ab4 100644 --- a/elements/_grouping.scss +++ b/elements/_grouping.scss @@ -165,7 +165,7 @@ div { } .box__page { - + height: 100vh; } .box__info { diff --git a/example.css b/example.css index 8733248..6bde1cd 100644 --- a/example.css +++ b/example.css @@ -396,6 +396,9 @@ ul li { figure { margin: 16px 2em; } +.box__page { + height: 100vh; } + .box__info { padding: 16px 2em; border-right: 8px solid rgba(82, 190, 209, 0.6); From a4a1fbc14dd2fc3c795a2cd948feb45128476a59 Mon Sep 17 00:00:00 2001 From: Stephan Hagedorn Date: Tue, 26 Sep 2017 22:02:10 +0200 Subject: [PATCH 056/372] gulp and file structure overhaul new gulp setup including new npm packages new file structure moved all development files to source/ used files are in build/ now --- .jshintrc | 7 + example.css => build/css/example.css | 2579 ++--- build/css/example.min.css | 2 + build/js/all.min.js | 4 + demo-explorer.html | 11 +- demo-index.html | 27 +- demo-presentation.html | 11 +- demo-raw.html | 35 + gulpfile.js | 128 +- package-lock.json | 8892 ++++++++++------- package.json | 17 +- {code => source/code}/functions.js | 16 +- {code => source/code}/global.js | 7 - {code => source/code}/variables.js | 4 +- .../style/_abovethefold.scss | 4 +- _hippie.scss => source/style/_hippie.scss | 8 +- _settings.scss => source/style/_settings.scss | 0 .../style/elements}/_embedded.scss | 0 .../style/elements}/_grouping.scss | 0 .../style/elements}/_interactive.scss | 0 {elements => source/style/elements}/_new.scss | 0 .../style/elements}/_sections.scss | 0 .../style/elements}/_tables.scss | 0 .../style/elements}/_textlevel.scss | 0 .../style/elements}/_typography.scss | 0 example.scss => source/style/example.scss | 0 .../style/functions}/_all.scss | 6 +- .../style/functions}/_color.scss | 26 +- .../style/functions}/_shade.scss | 48 +- .../style/functions}/_tint.scss | 48 +- {global => source/style/global}/_common.scss | 0 {global => source/style/global}/_config.scss | 0 {mixins => source/style/mixins}/_all.scss | 8 +- {mixins => source/style/mixins}/_color.scss | 40 +- {mixins => source/style/mixins}/_flow.scss | 50 +- .../style/mixins}/_media_query.scss | 70 +- .../style/mixins}/_user_agent.scss | 18 +- .../style/modules}/_vendor.scss | 0 .../breakpoint/_breakpoint_module.scss | 92 +- .../style/modules}/card/_card_module.scss | 0 .../style/modules}/card/_extends.scss | 0 .../style/modules}/card/_mixins.scss | 0 .../style/modules}/demo/_demo_module.scss | 1 + .../style/modules}/editor/_editor_module.scss | 0 .../style/modules}/editor/_extends.scss | 0 .../style/modules}/editor/_mixins.scss | 0 .../explanation/_explanation_module.scss | 0 .../style/modules}/explanation/_extends.scss | 0 .../style/modules}/explanation/_mixins.scss | 0 .../modules}/navigation/_nav_module.scss | 0 .../style/modules}/print/_extends.scss | 0 .../style/modules}/print/_mixins.scss | 0 .../style/modules}/print/_print_module.scss | 0 .../style/modules}/tables/_tables_module.scss | 0 .../jq-sticky-anything.min.js | 0 {other => vendor}/normalize.css | 0 56 files changed, 6912 insertions(+), 5247 deletions(-) create mode 100644 .jshintrc rename example.css => build/css/example.css (93%) create mode 100644 build/css/example.min.css create mode 100644 build/js/all.min.js create mode 100644 demo-raw.html rename {code => source/code}/functions.js (88%) rename {code => source/code}/global.js (97%) rename {code => source/code}/variables.js (88%) rename _abovethefold.scss => source/style/_abovethefold.scss (75%) rename _hippie.scss => source/style/_hippie.scss (94%) rename _settings.scss => source/style/_settings.scss (100%) rename {elements => source/style/elements}/_embedded.scss (100%) rename {elements => source/style/elements}/_grouping.scss (100%) rename {elements => source/style/elements}/_interactive.scss (100%) rename {elements => source/style/elements}/_new.scss (100%) rename {elements => source/style/elements}/_sections.scss (100%) rename {elements => source/style/elements}/_tables.scss (100%) rename {elements => source/style/elements}/_textlevel.scss (100%) rename {elements => source/style/elements}/_typography.scss (100%) rename example.scss => source/style/example.scss (100%) rename {functions => source/style/functions}/_all.scss (94%) rename {functions => source/style/functions}/_color.scss (96%) rename {functions => source/style/functions}/_shade.scss (94%) rename {functions => source/style/functions}/_tint.scss (94%) rename {global => source/style/global}/_common.scss (100%) rename {global => source/style/global}/_config.scss (100%) rename {mixins => source/style/mixins}/_all.scss (95%) rename {mixins => source/style/mixins}/_color.scss (97%) rename {mixins => source/style/mixins}/_flow.scss (94%) rename {mixins => source/style/mixins}/_media_query.scss (96%) rename {mixins => source/style/mixins}/_user_agent.scss (94%) rename {modules => source/style/modules}/_vendor.scss (100%) rename {modules => source/style/modules}/breakpoint/_breakpoint_module.scss (93%) rename {modules => source/style/modules}/card/_card_module.scss (100%) rename {modules => source/style/modules}/card/_extends.scss (100%) rename {modules => source/style/modules}/card/_mixins.scss (100%) rename {modules => source/style/modules}/demo/_demo_module.scss (99%) rename {modules => source/style/modules}/editor/_editor_module.scss (100%) rename {modules => source/style/modules}/editor/_extends.scss (100%) rename {modules => source/style/modules}/editor/_mixins.scss (100%) rename {modules => source/style/modules}/explanation/_explanation_module.scss (100%) rename {modules => source/style/modules}/explanation/_extends.scss (100%) rename {modules => source/style/modules}/explanation/_mixins.scss (100%) rename {modules => source/style/modules}/navigation/_nav_module.scss (100%) rename {modules => source/style/modules}/print/_extends.scss (100%) rename {modules => source/style/modules}/print/_mixins.scss (100%) rename {modules => source/style/modules}/print/_print_module.scss (100%) rename {modules => source/style/modules}/tables/_tables_module.scss (100%) rename {code/vendor => vendor}/jq-sticky-anything.min.js (100%) rename {other => vendor}/normalize.css (100%) diff --git a/.jshintrc b/.jshintrc new file mode 100644 index 0000000..e88e46c --- /dev/null +++ b/.jshintrc @@ -0,0 +1,7 @@ +{ + "undef": true, + "unused": true, + "globals": { + + } +} \ No newline at end of file diff --git a/example.css b/build/css/example.css similarity index 93% rename from example.css rename to build/css/example.css index 6bde1cd..397cd4c 100644 --- a/example.css +++ b/build/css/example.css @@ -1,1276 +1,1303 @@ -@charset "UTF-8"; -/* - * # TABLE OF CONTENTS - * - * - Reset - * - Global functions and mixins - * - Configuration - * - Special modules - * - Basic styles - * - Common - * - Typography - * - * - Sections - * - Grouping - * - Textlevel - * - Embedded - * - Tables - * - Interactive - * - Modules - * - */ -@import url(other/normalize.css); -.sym_glass::before { - content: ""; } - -.sym_music::before { - content: ""; } - -.sym_search::before { - content: ""; } - -.sym_envelope-o::before { - content: ""; } - -.sym_heart::before { - content: ""; } - -a[href]:focus { - outline: 0; } - -area[href]:focus { - outline: 0; } - -button:not([disabled]):focus { - outline: 0; } - -input:not([disabled]):focus { - outline: 0; } - -select:not([disabled]):focus { - outline: 0; } - -textarea:not([disabled]):focus { - outline: 0; } - -*[tabindex]:focus { - outline: 0; } - -/** - * @description - * Generates cross-browser-compatible output for a given element with its value. - * - * @author sthag - * - * @param values - * @returns - * -webkit-: - * ...-: - * - * @example - * .selector - * @include vendor-prefix(hyphens, auto) - */ -.magic { - display: none; } - -.center_50 { - margin-right: 25%; - margin-left: 25%; } - -.center_25 { - margin-right: 37.5%; - margin-left: 37.5%; } - -.width_full, .table__file_simple { - width: 100%; - margin-right: 0; - margin-left: 0; } - -.height_basic { - height: 1024px; } - -.txt_center { - text-align: center !important; } - -.txt_right { - text-align: right !important; } - -.txt_left { - text-align: left !important; } - -.space_right { - margin-right: 32px; } - -.clear { - clear: both; } - .clear::before, .clear::after { - clear: both; } - -.overflow, .nav__horizontal ul, .nav__center_old ul, .header__page nav ul { - overflow: auto; } - -.float_space_left, .list__horizontal li, .box__inline_left, .box__file_tile, .nav__horizontal ul li, .nav__center_old ul li, .header__page nav ul li { - float: left; - margin-right: 32px; } - -.float_half_size { - float: left; - width: 50%; } - -.x_long { - overflow-x: scroll; } - -.pos_full_view, .hover_full_view_change { - position: fixed; - top: 0; - left: 0; - width: 100vw; - height: 100vh; } - -.pos_full_page { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; } - -.pos_abs { - position: absolute; } - -.pos_rel { - position: relative; } - -.pos_fix { - position: fixed; } - -.pos_bottom { - bottom: 0; } - -.pos_full_view { - background-color: rgba(250, 216, 3, 0.5); } - -.pos_full_page { - background-color: rgba(39, 63, 139, 0.25); } - -.hover_back_change { - background-color: #666666; - transition: background-color .2s ease-in-out; } - .hover_back_change:hover { - background-color: gray; } - -.hover_full_view_change { - z-index: 100; - background-color: rgba(0, 0, 0, 0.5); - transition: background-color .2s ease-in-out; - pointer-events: none; } - -.flex, .flex__wrap, .flex__row, .flex__column_wrap, .nav__column ul { - display: flex; } - -.flex__wrap { - flex-wrap: wrap; } - -.flex__row { - flex-direction: column; - justify-content: flex-start; } - -.flex__child, .flex__column_wrap .column, .nav__column ul li { - flex: 0 1 auto; } - -.flex__child_one { - flex: 1; } - -.flex__child_end { - align-self: flex-end; } - -.txt_light_color { - color: #666666; } - -.a__button, .a__button_text, .a__button_border { - display: inline-block; - padding: calc(8px - 3px) 8px; - background-color: rgba(82, 190, 209, 0.2); - border-radius: 1px; } - .a__button:active, .a__button_text:active, .a__button_border:active, .a__button:focus, .a__button_text:focus, .a__button_border:focus, .a__button:hover, .a__button_text:hover, .a__button_border:hover { - background-color: rgba(255, 255, 255, 0.1); - color: white; - border-color: transparent; } - -.span__solo, h6, p, .block__column_2, .block__column_3, caption, li, dt, dd, figcaption, th, td, legend, label { - font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; - font-size: 1em; - line-height: 1.5; } - -pre, code, .demo__query_example:after, .code__solo, input[type="color"], input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="email"], input[type="month"], input[type="number"], input[type="password"], input[type="search"], input[type="tel"], input[type="text"], input[type="time"], input[type="url"], input[type="week"], input:not([type]), textarea { - font-family: Courier New, monospace; - font-size: 1em; - line-height: 1.5; } - -.print_body *[class^="din"] p, .print_body *[class^="din"] .block__column_2, .print_body *[class^="din"] .block__column_3, .print_body *[class^="din"] caption { - font-family: Courier New, monospace; - font-size: 1em; - line-height: 1.5; } - -h1, .print_body .page_date, .print_body .page_no { - font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; - font-size: 3.1em; - font-weight: 300; - line-height: 1.5; } - -h2 { - font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; - font-size: 2.5em; - font-weight: 300; - line-height: 1.5; } - -h3, h4 { - font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; - font-size: 1.8em; - font-weight: 300; - line-height: 1.5; } - -h5 { - font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; - font-size: 1.35em; - font-weight: 300; - line-height: 1.5; } - -.span__solo { - color: black; } - -.table__link .cell__text .shorten { - overflow: hidden; - text-overflow: ellipsis; - -o-text-overflow: ellipsis; } - -html { - height: 100%; } - -body { - position: relative; - box-sizing: border-box; - font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; - font-size: 17px; - line-height: 1; - color: black; - background-color: gray; } - body *, - body ::before, - body ::after { - box-sizing: inherit; } - body:hover .layer__hover { - background-color: transparent; } - -.sec__main_center, .demo__intro { - width: 96%; - margin: 0 auto; - padding-top: 32px; } - @media (min-width: 768px) { - .sec__main_center, .demo__intro { - width: 80%; } } - @media (min-width: 1024px) { - .sec__main_center, .demo__intro { - width: 60%; } } - @media (min-width: 1680px) { - .sec__main_center, .demo__intro { - width: 48%; } } - -aside.right + section { - margin-right: calc(20% + 8px); } -aside.left + section { - margin-left: calc(20% + 8px); } - -aside { - width: 20%; } - aside.left { - float: left; } - aside.right { - float: right; } - aside *:first-child { - margin-top: 0; } - -.header__page { - overflow: auto; } - -h1 { - margin: 128px 0 32px; } - -h2 { - margin: 64px 0 32px; } - -h3 { - margin: 16px 0 16px; - text-transform: uppercase; } - -h4 { - margin: 16px 0 16px; - text-transform: none; } - -h5 { - margin: 16px 0 8px; - text-transform: none; } - -h6 { - margin: 8px 0; - text-transform: none; - font-weight: bold; } - -p, .block__column_2, .block__column_3, caption { - margin: 8px 0; } - p code, .block__column_2 code, .block__column_3 code, caption code, p .demo__query_example:after, .block__column_2 .demo__query_example:after, .block__column_3 .demo__query_example:after, caption .demo__query_example:after { - padding: 1px 4px; - font-size: 1em; - line-height: 1; } - -hr, .hr__hidden, .hr__dotted { - margin: 32px auto; - border-width: 1px 0 0; - border-style: solid; - border-color: black; } - -.hr__hidden { - border-color: transparent; } - -.hr__dotted { - border-style: dotted; } - -.pre__code { - border-color: rgba(255, 255, 255, 0.1); - border-style: dotted; - border-width: 0 0 0 4px; - border-radius: 1px; - padding: 8px; - background-color: rgba(255, 255, 255, 0.1); } - .pre__code code, .pre__code .demo__query_example:after { - background-color: transparent; } - -blockquote { - margin: 8px 2em; } - -.quote__mark p::before, .quote__mark .block__column_2::before, .quote__mark .block__column_3::before, .quote__mark caption::before { - content: "\201E \0020"; } -.quote__mark p::after, .quote__mark .block__column_2::after, .quote__mark .block__column_3::after, .quote__mark caption::after { - content: "\201C \0020"; } -.quote__mark .quote__source::before, .quote__mark .quote__source::after { - content: ""; } - -dl, ul, ol { - margin: 16px 0 8px; } - -ul, ol { - padding-left: 2em; } - -dd { - margin-left: 2em; } - -ul li { - list-style: square; } - -.list__dash li { - list-style: none; - position: relative; } - .list__dash li::before { - content: "_"; - position: absolute; - left: -1em; } - -.list__link li { - margin-bottom: 2px; - text-transform: uppercase; } - .list__link li a { - display: block; - padding: calc(8px - 3px) 8px; - color: black; } - .list__link li a img { - margin-right: 8px; - padding-bottom: .2em; - vertical-align: text-bottom; } - .list__link li a:active, .list__link li a:focus, .list__link li a:hover { - background-color: #0c85ff; - color: white; } - -.list__horizontal { - overflow: auto; } - -figure { - margin: 16px 2em; } - -.box__page { - height: 100vh; } - -.box__info { - padding: 16px 2em; - border-right: 8px solid rgba(82, 190, 209, 0.6); - background-color: rgba(82, 190, 209, 0.1) !important; } - -.box__main_indent { - margin-left: 25%; } - -.block__column_line { - column-rule: 1px solid black; } - -.block__column_2 { - column-count: 2; - column-gap: 32px; } - -.block__column_3 { - column-count: 3; - column-gap: 64px; } - -.box__space { - position: relative; - width: 100%; } - -.box__cube { - float: left; - display: table; - width: 64px; - text-align: center; - vertical-align: middle; } - .box__cube span { - display: table-cell; } - -.box__placeholder { - width: 100%; - height: 64px; - border: 4px solid rgba(0, 0, 0, 0.1); - border-radius: 1px; - padding: 8px; - background-color: rgba(0, 0, 0, 0.1); } - .box__placeholder svg { - vertical-align: top; } - -.box__placeholder_bkg { - width: 100%; - height: 64px; - border: 4px solid rgba(0, 0, 0, 0.1); - border-radius: 1px; - padding: 8px; - /*data:[][;charset=][;base64],*/ - background: url("data:image/svg+xml;utf8,") no-repeat; - background-color: rgba(0, 0, 0, 0.1); } - -.flex__column_wrap .column { - flex-grow: 1; } - -a { - color: #52bed1; - text-decoration: none; } - a:active, a:focus, a:hover { - color: white; } - -.a__line { - border-bottom-width: 1px; - border-bottom-style: dotted; - border-color: black; - background-color: transparent; - color: black; - transition: color 150ms ease; } - .a__line:active, .a__line:focus, .a__line:hover { - background-color: #0c85ff; - color: white; } - -.a__button_text, .a__button_border { - padding: calc(8px - 1px) calc(8px * 2); - background-color: transparent; - color: black; } - -.a__button_border { - border: 1px solid black; } - -i, em { - font-style: italic; } - -.i__bright { - font-style: normal; - color: white; } - -b, strong { - font-weight: 500; } - -cite { - font-style: italic; } - -code, .demo__query_example:after { - color: #1f1f1f; - background-color: rgba(255, 255, 255, 0.1); } - -.code__solo { - padding: 1px 4px; - color: black; } - -mark { - background-color: #fad803; } - -.mark__cursor { - color: white; - background-color: black; } - -::-moz-selection { - color: white; - background-color: black; } - -::selection { - color: white; - background-color: black; } - -img { - vertical-align: top; } - -table { - margin: 16px 0; - border: 1px solid black; - border-collapse: collapse; } - -th, td { - padding: 4px; } - -th { - border: 1px solid black; - text-align: left; } - -.precol { - border-right: 1px solid black; } - -td { - border-right: 1px solid black; - border-bottom: 1px solid black; } - -td:last-child { - border-right: 0; } - -tr:last-child td { - border-bottom: 0; } - -tfoot tr:first-child td { - border-top: 1px solid black; } - -.table__blank { - border: 1px solid transparent; } - .table__blank th, .table__blank td { - border: 1px solid transparent; } - -.table__free { - border: 1px solid transparent; } - -.table__stripe td { - border-top: 0; - border-bottom: 0; } -.table__stripe tr:nth-child(even) td { - background-color: rgba(255, 255, 255, 0.1); } - -.table__fix { - table-layout: fixed; } - -caption { - padding: 4px 0; - border: 1px dotted black; - text-align: center; } - -fieldset { - margin: 16px 0; - padding: 8px; - border: 1px solid black; } - -legend { - padding: 0 4px; } - -input, button, textarea { - margin: 0 32px; } - input[disabled="disabled"], input[disabled], button[disabled="disabled"], button[disabled], textarea[disabled="disabled"], textarea[disabled] { - cursor: not-allowed; } - -label input { - margin-left: 8px; } - -input { - color: #1a1a1a; } - input[disabled="disabled"], input[disabled] { - cursor: not-allowed; } - -input[type="color"], input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="email"], input[type="month"], input[type="number"], input[type="password"], input[type="search"], input[type="tel"], input[type="text"], input[type="time"], input[type="url"], input[type="week"], input:not([type]) { - border: 2px solid white; - padding: 4px; - background-color: #e6e6e6; } - input[type="color"]:hover, input[type="date"]:hover, input[type="datetime"]:hover, input[type="datetime-local"]:hover, input[type="email"]:hover, input[type="month"]:hover, input[type="number"]:hover, input[type="password"]:hover, input[type="search"]:hover, input[type="tel"]:hover, input[type="text"]:hover, input[type="time"]:hover, input[type="url"]:hover, input[type="week"]:hover, input:not([type]):hover { - background-color: white; } - input[type="color"][readonly="readonly"], input[type="color"][readonly], input[type="date"][readonly="readonly"], input[type="date"][readonly], input[type="datetime"][readonly="readonly"], input[type="datetime"][readonly], input[type="datetime-local"][readonly="readonly"], input[type="datetime-local"][readonly], input[type="email"][readonly="readonly"], input[type="email"][readonly], input[type="month"][readonly="readonly"], input[type="month"][readonly], input[type="number"][readonly="readonly"], input[type="number"][readonly], input[type="password"][readonly="readonly"], input[type="password"][readonly], input[type="search"][readonly="readonly"], input[type="search"][readonly], input[type="tel"][readonly="readonly"], input[type="tel"][readonly], input[type="text"][readonly="readonly"], input[type="text"][readonly], input[type="time"][readonly="readonly"], input[type="time"][readonly], input[type="url"][readonly="readonly"], input[type="url"][readonly], input[type="week"][readonly="readonly"], input[type="week"][readonly], input:not([type])[readonly="readonly"], input:not([type])[readonly] { - border-color: #b3b3b3; - background-color: #999999; } - input[type="color"][disabled="disabled"], input[type="color"][disabled], input[type="date"][disabled="disabled"], input[type="date"][disabled], input[type="datetime"][disabled="disabled"], input[type="datetime"][disabled], input[type="datetime-local"][disabled="disabled"], input[type="datetime-local"][disabled], input[type="email"][disabled="disabled"], input[type="email"][disabled], input[type="month"][disabled="disabled"], input[type="month"][disabled], input[type="number"][disabled="disabled"], input[type="number"][disabled], input[type="password"][disabled="disabled"], input[type="password"][disabled], input[type="search"][disabled="disabled"], input[type="search"][disabled], input[type="tel"][disabled="disabled"], input[type="tel"][disabled], input[type="text"][disabled="disabled"], input[type="text"][disabled], input[type="time"][disabled="disabled"], input[type="time"][disabled], input[type="url"][disabled="disabled"], input[type="url"][disabled], input[type="week"][disabled="disabled"], input[type="week"][disabled], input:not([type])[disabled="disabled"], input:not([type])[disabled] { - border-color: transparent; } - -textarea { - border: 2px solid white; - padding: 4px; - background-color: #e6e6e6; } - textarea:hover { - background-color: white; } - textarea[readonly="readonly"], textarea[readonly] { - border-color: #b3b3b3; - background-color: #999999; } - textarea[disabled="disabled"], textarea[disabled] { - border-color: transparent; } - -input[type="color"] { - line-height: 1; } - -input[type="date"] { - line-height: 1; } - -input[type="datetime"] { - line-height: 1; } - -input[type="datetime-local"] { - line-height: 1; } - -input[type="email"] { - line-height: 1; } - -input[type="month"] { - line-height: 1; } - -input[type="number"] { - line-height: 1; } - -input[type="password"] { - line-height: 1; } - -input[type="search"] { - line-height: 1; } - -input[type="tel"] { - line-height: 1; } - -input[type="text"] { - line-height: 1; } - -input[type="time"] { - line-height: 1; } - -input[type="url"] { - line-height: 1; } - -input[type="week"] { - line-height: 1; } - -input:not([type]) { - line-height: 1; } - -button { - padding: calc(8px - 3px) 8px; } - -input[type="button"] { - padding: calc(8px - 3px) 8px; } - -input[type="reset"] { - padding: calc(8px - 3px) 8px; } - -input[type="submit"] { - padding: calc(8px - 3px) 8px; } - -label + input, -.input__label_right { - margin: 0 8px; } - -.label__table, .input__default label { - display: table; } - .label__table input, .input__default label input { - display: table-cell; } - -.input__default label { - margin: 4px 0; } - .input__default label input { - padding: 4px 5px; - border-style: solid; - border-color: transparent; - background-color: #e6e6e6; - color: #1a1a1a; } - .input__default label input:hover { - background-color: black; - color: white; } - -nav ul { - padding-left: 0; } -nav li { - margin-bottom: 8px; - list-style: none; } - -.nav__horizontal ul ul, .nav__center_old ul ul, .header__page nav ul ul { - margin: 8px 0; } -.nav__horizontal ul li, .nav__center_old ul li, .header__page nav ul li { - margin-right: 8px; - margin-bottom: 0; } - .nav__horizontal ul li:last-child, .nav__center_old ul li:last-child, .header__page nav ul li:last-child { - margin-right: 0; } - -.nav__right { - float: right; - margin-left: 8px; } - .nav__right .align_parent { - margin-right: -8px; } - -.nav__separate li { - position: relative; - padding-left: 1px; } - .nav__separate li:not(:first-child)::before { - content: ""; - position: absolute; - width: 1px; - height: 100%; - left: 0; - top: 0; - background-color: black; } - -.nav__separate_right { - float: right; } - .nav__separate_right li { - position: relative; } - .nav__separate_right li:first-child { - padding-left: 17px; } - .nav__separate_right li:first-child::before { - content: ""; - position: absolute; - width: 1px; - height: 100%; - left: 0; - top: 0; - background-color: white; - margin: 0 8px; } - -.nav__center_old { - float: right; - position: relative; - left: -50%; } - .nav__center_old ul { - position: relative; - left: 50%; - text-align: center; } - -.nav__column { - position: relative; - margin: 8px 0; } - .nav__column ul { - margin: 0 128px; } - .nav__column ul li { - flex-grow: 1; - margin: 0; - text-align: center; } - .nav__column ul li a { - display: block; } - -.nav__page_meta { - position: fixed; - right: 0; - bottom: 16px; } - .nav__page_meta ul { - margin: 8px 0; } - .nav__page_meta li { - margin-bottom: 0; } - .nav__page_meta .a_button_meta { - display: inline-block; } - .nav__page_meta .a_button_meta:active, .nav__page_meta .a_button_meta:focus { - background-color: transparent; } - .nav__page_meta .a_button_meta:hover { - background-color: #0c85ff; } - -.header__page nav a:active, .header__page nav a:focus, .header__page nav a:hover { - background-color: rgba(0, 0, 0, 0.2); - color: black; } - -.table__link { - width: 100%; - border: 0; - table-layout: auto; } - .table__link tbody { - border-bottom: 1px solid black; } - .table__link tbody:hover { - background-color: #cccccc; } - .table__link th, .table__link td { - border: 0; } - .table__link .cell__icon { - width: 48px; - text-align: center; } - .table__link .cell__icon img { - vertical-align: text-top; } - .table__link .cell__link { - padding-right: 8px; - padding-left: 8px; } - .table__link .cell__link:hover { - background-color: #0c85ff; } - .table__link .cell__link:hover a:first-child { - display: none; } - .table__link .cell__link:hover a:last-child { - display: block; - color: white; } - .table__link .cell__link a { - display: block; } - .table__link .cell__link a:last-child { - display: none; } - .table__link th:last-child, .table__link .cell__date { - width: 16%; - text-align: center; } - .table__link .cell__text { - padding-right: 8px; - padding-left: 8px; } - .table__link .cell__text div { - width: 100%; } - .table__link .cell__text .shorten { - max-height: 44px; } - -.card_body .bkg_box { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; } - -.card_body { - height: 100%; - /* .full { - position: absolute; - width: 128px; - height: 128px; - top: 16px; - left: 16px; - background-color: #fff; - } - .mark { - float: left; - width: 32px; - height: 32px; - margin-top: 16px; - } - */ } - .card_body .bkg_box { - transition-duration: 800ms; - overflow: hidden; - vertical-align: top; - z-index: -1; } - .card_body .bkg_box > svg { - position: relative; } - .card_body .flex_wrap_center { - display: -webkit-box; - display: -webkit-flex; - display: -moz-box; - display: -ms-flexbox; - display: flex; - -webkit-box-align: center; - -webkit-align-items: center; - -moz-box-align: center; - -ms-flex-align: center; - align-items: center; - -webkit-box-pack: center; - -webkit-justify-content: center; - -moz-box-pack: center; - -ms-flex-pack: center; - justify-content: center; - height: 100%; } - .card_body .flex_content { - position: relative; - padding: 64px 64px 24px 64px; - border: 1px solid #FFF; - background-color: #F5F5F5; - z-index: 40; } - .card_body h1 { - margin: 16px 0; - color: #1E1E1E; - font-size: 24px; - line-height: 1.4em; - font-weight: normal; } - .card_body p, .card_body .block__column_2, .card_body .block__column_3, .card_body caption { - margin-top: 0; - margin-bottom: 16px; - font-size: 12px; - line-height: 1.4em; } - .card_body .marked { - padding-left: 1em; - text-indent: -1em; - text-align: center; } - .card_body .marked::before { - content: "* "; } - .card_body .decent { - color: #666; } - .card_body a { - color: #000; - text-decoration: none; } - .card_body a:hover { - color: #F4F9FA; - background-color: #0C85FF; - text-decoration: none; } - -.wip, .wip_txt { - border-right: 8px solid rgba(220, 20, 60, 0.8); - background-color: rgba(220, 20, 60, 0.1) !important; } - -.wip::before, .wip::after { - content: ""; - display: block; - height: 48px; } - -.exp_expose_pre::after { - content: ""; - display: block; - height: 48px; - background-color: rgba(183, 224, 240, 0.1) !important; } - -.exp_expose_post::before { - content: ""; - display: block; - height: 48px; - background-color: rgba(183, 224, 240, 0.1) !important; } - -.exp_expose::before, .exp_expose::after { - content: ""; - display: block; - height: 48px; - background-color: rgba(183, 224, 240, 0.1) !important; } - -.exp_pop { - display: none; } - -.exp_wrap { - position: relative; } - -.exp_pop { - position: absolute; - z-index: 100; - top: 128px; - left: 128px; - padding: 4px; - border: 4px solid gray; - border-radius: 4px; - background-color: gray; - pointer-events: none; } - -.exp_marker_pop { - position: absolute; - top: -12.75px; - right: -8.5px; - width: 17px; - height: 17px; - border: 1px solid white; - border-radius: 17px; - color: white; - background-color: black; } - -.exp_overlay_btn { - position: fixed; - width: 3em; - height: 2em; - cursor: pointer; } - -.exp_help_btn { - display: table; - right: 16px; - bottom: 16px; - background-color: rgba(0, 0, 0, 0.4); } - .exp_help_btn:hover { - background-color: white; } - .exp_help_btn:hover > .span__solo { - color: black; } - .exp_help_btn .span__solo { - display: table-cell; - color: rgba(255, 255, 255, 0.8); - font-family: Courier New, monospace; - font-size: 1.4em; - text-align: center; - vertical-align: middle; } - -.expose_height { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - background-color: rgba(183, 224, 240, 0.1) !important; - -webkit-transition: height 0.5s ease; - -ms-transition: height 0.5s ease; - -moz-transition: height 0.5s ease; - -o-transition: height 0.5s ease; - transition: height 0.5s ease; } - -.print_body [class^="din"] { - background-color: white; } - -.print_body { - font-size: 10pt; - margin: 10vh 20vw; } -@page { - .print_body { - size: A4; - margin: 1.2cm; } } -@page :first { - .print_body { - size: A4; - margin: 0; } } - .print_body .dina4 { - padding-top: 1.2cm; - padding-right: 1.2cm; - padding-bottom: 1.2cm; - padding-left: 2.4cm; } - .print_body .dina4 .page_head, .print_body .dina4 .page_foot { - right: 1.2cm; - left: 2.4cm; } - .print_body .dina4 .page_head { - top: 1.2cm; } - .print_body .dina4 .page_foot { - bottom: 1.2cm; } - .print_body .dina5 { - padding-top: 0; - padding-right: 0; - padding-bottom: 0; - padding-left: 1.2cm; } - .print_body .dina5 .page_head, .print_body .dina5 .page_foot { - right: 0; - left: 1.2cm; } - .print_body .dina5 .page_head { - top: 0; } - .print_body .dina5 .page_foot { - bottom: 0; } - .print_body .dina6 { - padding-top: 0; - padding-right: 0; - padding-bottom: 0; - padding-left: 1.2cm; } - .print_body .dina6 .page_head, .print_body .dina6 .page_foot { - right: 0; - left: 1.2cm; } - .print_body .dina6 .page_head { - top: 0; } - .print_body .dina6 .page_foot { - bottom: 0; } - .print_body *[class^="din"] { - position: relative; - overflow: auto; - margin: 32px auto; } - .print_body *[class^="din"] .page_head, .print_body *[class^="din"] .page_foot { - position: absolute; } - .print_body *[class^="din"] .page_head { - page: cover; } - .print_body *[class^="din"] .page_foot { - display: flex; - flex-direction: row; } - .print_body *[class^="din"] .page_foot *:last-child { - margin-bottom: 0; } - .print_body *[class^="din"] .page_foot p, .print_body *[class^="din"] .page_foot .block__column_2, .print_body *[class^="din"] .page_foot .block__column_3, .print_body *[class^="din"] .page_foot caption { - flex: 1 0 auto; - margin: 0; - font-size: 8pt; - line-height: 10pt; - text-align: center; } - .print_body *[class^="din"] .page_foot .page_no { - flex: 1 0 auto; - font-size: 20pt; - line-height: 1; - text-align: right; } - .print_body *[class^="din"] .page_foot p:first-child, .print_body *[class^="din"] .page_foot .block__column_2:first-child, .print_body *[class^="din"] .page_foot .block__column_3:first-child, .print_body *[class^="din"] .page_foot caption:first-child { - text-align: left; } - .print_body *[class^="din"] .page_content { - margin-top: 10cm; - margin-bottom: 2cm; } - .print_body .page_title, .print_body .page_date { - font-size: 14pt; } - .print_body .page_title { - margin: 0; } - .print_body .page_date, .print_body .page_no { - float: right; } - .print_body .page_author { - position: absolute; - top: 5cm; - right: 0; - text-align: right; } - .print_body .page_recipient { - position: absolute; - top: 5cm; - left: 0; } - -.demo__intro { - border-top-width: 8px; - border-top-style: solid; - border-color: black; - padding-top: 32px; } - -.demo__header { - padding: 16px; } - .demo__header nav ul { - margin: 0; } - -.header__fancy { - background-color: rgba(211, 10, 81, 0.6); } - .header__fancy nav a { - background-color: rgba(250, 216, 3, 0.6); - color: #fad803; } - .header__fancy nav a:active, .header__fancy nav a:focus, .header__fancy nav a:hover { - background-color: rgba(255, 255, 255, 0.2); - color: white; } - -.header__fix { - position: relative; - top: 0; - width: 100%; - background-color: rgba(39, 63, 139, 0.6); } - .header__fix nav a:active, .header__fix nav a:focus, .header__fix nav a:hover { - background-color: rgba(255, 255, 255, 0.2); - color: white; } - -.demo__footer { - width: 100%; - padding: 16px 0; - background-color: #333333; - color: #cccccc; } - .demo__footer nav a { - color: white; } - -.demo__avatar img { - opacity: 1; - width: 128px; - height: auto; - min-width: 128px; - min-height: 128px; - border-radius: 50%; - background-color: #b7e0f0; } - -.demo__flag { - height: 40vh; } - -.demo__credits { - margin: 32px 0 8px 0; } - -.demo__button_32 { - width: 32px; - height: 32px; } - -.demo__queries > p, .demo__queries > .block__column_2, .demo__queries > .block__column_3, .demo__queries > caption { - padding: calc(8px - 3px) 8px; } - -.query__phoneUp { - background-color: rgba(0, 0, 0, 0.2); } - -@media (max-width: 767px) { - .query__phoneOnly { - background-color: rgba(0, 0, 0, 0.2); } } - -@media (min-width: 768px) and (max-width: 1023px) { - .query__tabletPortaitOnly { - background-color: rgba(0, 0, 0, 0.2); } } - -@media (min-width: 768px) { - .query__tabletPortraitUp { - background-color: rgba(0, 0, 0, 0.2); } } - -@media (min-width: 1024px) and (max-width: 1279px) { - .query__tabletLandscapeOnly { - background-color: rgba(0, 0, 0, 0.2); } } - -@media (min-width: 1024px) { - .query__tabletLandscapeUp { - background-color: rgba(0, 0, 0, 0.2); } } - -@media (min-width: 1280px) and (max-width: 1679px) { - .query__desktopOnly { - background-color: rgba(0, 0, 0, 0.2); } } - -@media (min-width: 1280px) { - .query__desktopUp { - background-color: rgba(0, 0, 0, 0.2); } } - -@media (min-width: 1680px) { - .query__bigDesktopUp { - background-color: rgba(0, 0, 0, 0.2); } } - -.demo__query_example { - margin-bottom: 32px; - padding: 32px; - text-align: center; } - @media (min-width: 48em) { - .demo__query_example { - background-color: #fad803; } } - @media (min-width: 64em) { - .demo__query_example { - background-color: #d30a51; } } - @media (min-width: 80em) { - .demo__query_example { - background-color: #273f8b; } } - @media (min-width: 90em) { - .demo__query_example { - background-color: #b7e0f0; } } - @media (min-width: 105em) { - .demo__query_example { - background-color: #52bed1; } } - @media (min-width: 120em) { - .demo__query_example { - background-color: #0c85ff; } } - .demo__query_example:after { - content: '< 768px'; - padding: calc(8px - 3px) 8px; - border-radius: 2px; - background-color: rgba(0, 0, 0, 0.2); } - @media (min-width: 48em) { - .demo__query_example:after { - content: '768px'; } } - @media (min-width: 64em) { - .demo__query_example:after { - content: '1024px'; } } - @media (min-width: 80em) { - .demo__query_example:after { - content: '1280px'; } } - @media (min-width: 105em) { - .demo__query_example:after { - content: '1680px'; } } - @media (min-width: 120em) { - .demo__query_example:after { - content: '1920px'; } } - -.test li::after { - content: ""; - display: block; - height: 16px; } - -.front_color_1 { - color: #fad803; } - .front_color_1::after { - background-color: #fad803; } - -.front_color_2 { - color: #d30a51; } - .front_color_2::after { - background-color: #d30a51; } - -.front_color_3 { - color: #273f8b; } - .front_color_3::after { - background-color: #273f8b; } - -.front_color_4 { - color: #b7e0f0; } - .front_color_4::after { - background-color: #b7e0f0; } - -.front_color_5 { - color: #52bed1; } - .front_color_5::after { - background-color: #52bed1; } - -.back_color_1, .label_1 { - background-color: #fad803; } - -.back_color_2, .label_2 { - background-color: #d30a51; } - -.back_color_3, .label_3 { - background-color: #273f8b; } - -.back_color_4 { - background-color: #b7e0f0; } - -.back_color_5 { - background-color: #52bed1; } - -.label_1, .label_2, .label_3 { - padding: 0 4px; } - - - -/*# sourceMappingURL=example.css.map */ +@charset "UTF-8"; +/* + * # TABLE OF CONTENTS + * + * - Reset + * - Global functions and mixins + * - Configuration + * - Special modules + * - Basic styles + * - Common + * - Typography + * + * - Sections + * - Grouping + * - Textlevel + * - Embedded + * - Tables + * - Interactive + * - Modules + * + */ +@import url(../../vendor/normalize.css); +.sym_glass::before { + content: ""; } + +.sym_music::before { + content: ""; } + +.sym_search::before { + content: ""; } + +.sym_envelope-o::before { + content: ""; } + +.sym_heart::before { + content: ""; } + +a[href]:focus { + outline: 0; } + +area[href]:focus { + outline: 0; } + +button:not([disabled]):focus { + outline: 0; } + +input:not([disabled]):focus { + outline: 0; } + +select:not([disabled]):focus { + outline: 0; } + +textarea:not([disabled]):focus { + outline: 0; } + +*[tabindex]:focus { + outline: 0; } + +/** + * @description + * Generates cross-browser-compatible output for a given element with its value. + * + * @author sthag + * + * @param values + * @returns + * -webkit-: + * ...-: + * + * @example + * .selector + * @include vendor-prefix(hyphens, auto) + */ +.magic { + display: none; } + +.center_50 { + margin-right: 25%; + margin-left: 25%; } + +.center_25 { + margin-right: 37.5%; + margin-left: 37.5%; } + +.width_full, .table__file_simple { + width: 100%; + margin-right: 0; + margin-left: 0; } + +.height_basic { + height: 1024px; } + +.txt_center { + text-align: center !important; } + +.txt_right { + text-align: right !important; } + +.txt_left { + text-align: left !important; } + +.space_right { + margin-right: 32px; } + +.clear { + clear: both; } + .clear::before, .clear::after { + clear: both; } + +.overflow, .nav__horizontal ul, .nav__center_old ul, .header__page nav ul { + overflow: auto; } + +.float_space_left, .list__horizontal li, .box__inline_left, .box__file_tile, .nav__horizontal ul li, .nav__center_old ul li, .header__page nav ul li { + float: left; + margin-right: 32px; } + +.float_half_size { + float: left; + width: 50%; } + +.x_long { + overflow-x: scroll; } + +.pos_full_view, .hover_full_view_change { + position: fixed; + top: 0; + left: 0; + width: 100vw; + height: 100vh; } + +.pos_full_page { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; } + +.pos_abs { + position: absolute; } + +.pos_rel { + position: relative; } + +.pos_fix { + position: fixed; } + +.pos_bottom { + bottom: 0; } + +.pos_full_view { + background-color: rgba(250, 216, 3, 0.5); } + +.pos_full_page { + background-color: rgba(39, 63, 139, 0.25); } + +.hover_back_change { + background-color: #666666; + -webkit-transition: background-color .2s ease-in-out; + transition: background-color .2s ease-in-out; } + .hover_back_change:hover { + background-color: gray; } + +.hover_full_view_change { + z-index: 100; + background-color: rgba(0, 0, 0, 0.5); + -webkit-transition: background-color .2s ease-in-out; + transition: background-color .2s ease-in-out; + pointer-events: none; } + +.flex, .flex__wrap, .flex__row, .flex__column_wrap, .nav__column ul { + display: -webkit-box; + display: -ms-flexbox; + display: flex; } + +.flex__wrap { + -ms-flex-wrap: wrap; + flex-wrap: wrap; } + +.flex__row { + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + -webkit-box-pack: start; + -ms-flex-pack: start; + justify-content: flex-start; } + +.flex__child, .flex__column_wrap .column, .nav__column ul li { + -webkit-box-flex: 0; + -ms-flex: 0 1 auto; + flex: 0 1 auto; } + +.flex__child_one { + -webkit-box-flex: 1; + -ms-flex: 1; + flex: 1; } + +.flex__child_end { + -ms-flex-item-align: end; + align-self: flex-end; } + +.txt_light_color { + color: #666666; } + +.a__button, .a__button_text, .a__button_border { + display: inline-block; + padding: calc(8px - 3px) 8px; + background-color: rgba(82, 190, 209, 0.2); + border-radius: 1px; } + .a__button:active, .a__button_text:active, .a__button_border:active, .a__button:focus, .a__button_text:focus, .a__button_border:focus, .a__button:hover, .a__button_text:hover, .a__button_border:hover { + background-color: rgba(255, 255, 255, 0.1); + color: white; + border-color: transparent; } + +.span__solo, h6, p, .block__column_2, .block__column_3, caption, li, dt, dd, figcaption, th, td, legend, label { + font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; + font-size: 1em; + line-height: 1.5; } + +pre, code, .demo__query_example:after, .code__solo, input[type="color"], input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="email"], input[type="month"], input[type="number"], input[type="password"], input[type="search"], input[type="tel"], input[type="text"], input[type="time"], input[type="url"], input[type="week"], input:not([type]), textarea { + font-family: Courier New, monospace; + font-size: 1em; + line-height: 1.5; } + +.print_body *[class^="din"] p, .print_body *[class^="din"] .block__column_2, .print_body *[class^="din"] .block__column_3, .print_body *[class^="din"] caption { + font-family: Courier New, monospace; + font-size: 1em; + line-height: 1.5; } + +h1, .print_body .page_date, .print_body .page_no { + font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; + font-size: 3.1em; + font-weight: 300; + line-height: 1.5; } + +h2 { + font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; + font-size: 2.5em; + font-weight: 300; + line-height: 1.5; } + +h3, h4 { + font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; + font-size: 1.8em; + font-weight: 300; + line-height: 1.5; } + +h5 { + font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; + font-size: 1.35em; + font-weight: 300; + line-height: 1.5; } + +.span__solo { + color: black; } + +.table__link .cell__text .shorten { + overflow: hidden; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; } + +html { + height: 100%; } + +body { + position: relative; + -webkit-box-sizing: border-box; + box-sizing: border-box; + font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; + font-size: 17px; + line-height: 1; + color: black; + background-color: gray; } + body *, + body ::before, + body ::after { + -webkit-box-sizing: inherit; + box-sizing: inherit; } + body:hover .layer__hover { + background-color: transparent; } + +.sec__main_center, .demo__intro { + width: 96%; + margin: 0 auto; + padding-top: 32px; } + @media (min-width: 768px) { + .sec__main_center, .demo__intro { + width: 80%; } } + @media (min-width: 1024px) { + .sec__main_center, .demo__intro { + width: 60%; } } + @media (min-width: 1680px) { + .sec__main_center, .demo__intro { + width: 48%; } } + +aside.right + section { + margin-right: calc(20% + 8px); } +aside.left + section { + margin-left: calc(20% + 8px); } + +aside { + width: 20%; } + aside.left { + float: left; } + aside.right { + float: right; } + aside *:first-child { + margin-top: 0; } + +.header__page { + overflow: auto; } + +h1 { + margin: 128px 0 32px; } + +h2 { + margin: 64px 0 32px; } + +h3 { + margin: 16px 0 16px; + text-transform: uppercase; } + +h4 { + margin: 16px 0 16px; + text-transform: none; } + +h5 { + margin: 16px 0 8px; + text-transform: none; } + +h6 { + margin: 8px 0; + text-transform: none; + font-weight: bold; } + +p, .block__column_2, .block__column_3, caption { + margin: 8px 0; } + p code, .block__column_2 code, .block__column_3 code, caption code, p .demo__query_example:after, .block__column_2 .demo__query_example:after, .block__column_3 .demo__query_example:after, caption .demo__query_example:after { + padding: 1px 4px; + font-size: 1em; + line-height: 1; } + +hr, .hr__hidden, .hr__dotted { + margin: 32px auto; + border-width: 1px 0 0; + border-style: solid; + border-color: black; } + +.hr__hidden { + border-color: transparent; } + +.hr__dotted { + border-style: dotted; } + +.pre__code { + border-color: rgba(255, 255, 255, 0.1); + border-style: dotted; + border-width: 0 0 0 4px; + border-radius: 1px; + padding: 8px; + background-color: rgba(255, 255, 255, 0.1); } + .pre__code code, .pre__code .demo__query_example:after { + background-color: transparent; } + +blockquote { + margin: 8px 2em; } + +.quote__mark p::before, .quote__mark .block__column_2::before, .quote__mark .block__column_3::before, .quote__mark caption::before { + content: "\201E \0020"; } +.quote__mark p::after, .quote__mark .block__column_2::after, .quote__mark .block__column_3::after, .quote__mark caption::after { + content: "\201C \0020"; } +.quote__mark .quote__source::before, .quote__mark .quote__source::after { + content: ""; } + +dl, ul, ol { + margin: 16px 0 8px; } + +ul, ol { + padding-left: 2em; } + +dd { + margin-left: 2em; } + +ul li { + list-style: square; } + +.list__dash li { + list-style: none; + position: relative; } + .list__dash li::before { + content: "_"; + position: absolute; + left: -1em; } + +.list__link li { + margin-bottom: 2px; + text-transform: uppercase; } + .list__link li a { + display: block; + padding: calc(8px - 3px) 8px; + color: black; } + .list__link li a img { + margin-right: 8px; + padding-bottom: .2em; + vertical-align: text-bottom; } + .list__link li a:active, .list__link li a:focus, .list__link li a:hover { + background-color: #0c85ff; + color: white; } + +.list__horizontal { + overflow: auto; } + +figure { + margin: 16px 2em; } + +.box__page { + height: 100vh; } + +.box__info { + padding: 16px 2em; + border-right: 8px solid rgba(82, 190, 209, 0.6); + background-color: rgba(82, 190, 209, 0.1) !important; } + +.box__main_indent { + margin-left: 25%; } + +.block__column_line { + -webkit-column-rule: 1px solid black; + column-rule: 1px solid black; } + +.block__column_2 { + -webkit-column-count: 2; + column-count: 2; + -webkit-column-gap: 32px; + column-gap: 32px; } + +.block__column_3 { + -webkit-column-count: 3; + column-count: 3; + -webkit-column-gap: 64px; + column-gap: 64px; } + +.box__space { + position: relative; + width: 100%; } + +.box__cube { + float: left; + display: table; + width: 64px; + text-align: center; + vertical-align: middle; } + .box__cube span { + display: table-cell; } + +.box__placeholder { + width: 100%; + height: 64px; + border: 4px solid rgba(0, 0, 0, 0.1); + border-radius: 1px; + padding: 8px; + background-color: rgba(0, 0, 0, 0.1); } + .box__placeholder svg { + vertical-align: top; } + +.box__placeholder_bkg { + width: 100%; + height: 64px; + border: 4px solid rgba(0, 0, 0, 0.1); + border-radius: 1px; + padding: 8px; + /*data:[][;charset=][;base64],*/ + background: url("data:image/svg+xml;utf8,") no-repeat; + background-color: rgba(0, 0, 0, 0.1); } + +.flex__column_wrap .column { + -webkit-box-flex: 1; + -ms-flex-positive: 1; + flex-grow: 1; } + +a { + color: #52bed1; + text-decoration: none; } + a:active, a:focus, a:hover { + color: white; } + +.a__line { + border-bottom-width: 1px; + border-bottom-style: dotted; + border-color: black; + background-color: transparent; + color: black; + -webkit-transition: color 150ms ease; + transition: color 150ms ease; } + .a__line:active, .a__line:focus, .a__line:hover { + background-color: #0c85ff; + color: white; } + +.a__button_text, .a__button_border { + padding: calc(8px - 1px) calc(8px * 2); + background-color: transparent; + color: black; } + +.a__button_border { + border: 1px solid black; } + +i, em { + font-style: italic; } + +.i__bright { + font-style: normal; + color: white; } + +b, strong { + font-weight: 500; } + +cite { + font-style: italic; } + +code, .demo__query_example:after { + color: #1f1f1f; + background-color: rgba(255, 255, 255, 0.1); } + +.code__solo { + padding: 1px 4px; + color: black; } + +mark { + background-color: #fad803; } + +.mark__cursor { + color: white; + background-color: black; } + +::-moz-selection { + color: white; + background-color: black; } + +::selection { + color: white; + background-color: black; } + +img { + vertical-align: top; } + +table { + margin: 16px 0; + border: 1px solid black; + border-collapse: collapse; } + +th, td { + padding: 4px; } + +th { + border: 1px solid black; + text-align: left; } + +.precol { + border-right: 1px solid black; } + +td { + border-right: 1px solid black; + border-bottom: 1px solid black; } + +td:last-child { + border-right: 0; } + +tr:last-child td { + border-bottom: 0; } + +tfoot tr:first-child td { + border-top: 1px solid black; } + +.table__blank { + border: 1px solid transparent; } + .table__blank th, .table__blank td { + border: 1px solid transparent; } + +.table__free { + border: 1px solid transparent; } + +.table__stripe td { + border-top: 0; + border-bottom: 0; } +.table__stripe tr:nth-child(even) td { + background-color: rgba(255, 255, 255, 0.1); } + +.table__fix { + table-layout: fixed; } + +caption { + padding: 4px 0; + border: 1px dotted black; + text-align: center; } + +fieldset { + margin: 16px 0; + padding: 8px; + border: 1px solid black; } + +legend { + padding: 0 4px; } + +input, button, textarea { + margin: 0 32px; } + input[disabled="disabled"], input[disabled], button[disabled="disabled"], button[disabled], textarea[disabled="disabled"], textarea[disabled] { + cursor: not-allowed; } + +label input { + margin-left: 8px; } + +input { + color: #1a1a1a; } + input[disabled="disabled"], input[disabled] { + cursor: not-allowed; } + +input[type="color"], input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="email"], input[type="month"], input[type="number"], input[type="password"], input[type="search"], input[type="tel"], input[type="text"], input[type="time"], input[type="url"], input[type="week"], input:not([type]) { + border: 2px solid white; + padding: 4px; + background-color: #e6e6e6; } + input[type="color"]:hover, input[type="date"]:hover, input[type="datetime"]:hover, input[type="datetime-local"]:hover, input[type="email"]:hover, input[type="month"]:hover, input[type="number"]:hover, input[type="password"]:hover, input[type="search"]:hover, input[type="tel"]:hover, input[type="text"]:hover, input[type="time"]:hover, input[type="url"]:hover, input[type="week"]:hover, input:not([type]):hover { + background-color: white; } + input[type="color"][readonly="readonly"], input[type="color"][readonly], input[type="date"][readonly="readonly"], input[type="date"][readonly], input[type="datetime"][readonly="readonly"], input[type="datetime"][readonly], input[type="datetime-local"][readonly="readonly"], input[type="datetime-local"][readonly], input[type="email"][readonly="readonly"], input[type="email"][readonly], input[type="month"][readonly="readonly"], input[type="month"][readonly], input[type="number"][readonly="readonly"], input[type="number"][readonly], input[type="password"][readonly="readonly"], input[type="password"][readonly], input[type="search"][readonly="readonly"], input[type="search"][readonly], input[type="tel"][readonly="readonly"], input[type="tel"][readonly], input[type="text"][readonly="readonly"], input[type="text"][readonly], input[type="time"][readonly="readonly"], input[type="time"][readonly], input[type="url"][readonly="readonly"], input[type="url"][readonly], input[type="week"][readonly="readonly"], input[type="week"][readonly], input:not([type])[readonly="readonly"], input:not([type])[readonly] { + border-color: #b3b3b3; + background-color: #999999; } + input[type="color"][disabled="disabled"], input[type="color"][disabled], input[type="date"][disabled="disabled"], input[type="date"][disabled], input[type="datetime"][disabled="disabled"], input[type="datetime"][disabled], input[type="datetime-local"][disabled="disabled"], input[type="datetime-local"][disabled], input[type="email"][disabled="disabled"], input[type="email"][disabled], input[type="month"][disabled="disabled"], input[type="month"][disabled], input[type="number"][disabled="disabled"], input[type="number"][disabled], input[type="password"][disabled="disabled"], input[type="password"][disabled], input[type="search"][disabled="disabled"], input[type="search"][disabled], input[type="tel"][disabled="disabled"], input[type="tel"][disabled], input[type="text"][disabled="disabled"], input[type="text"][disabled], input[type="time"][disabled="disabled"], input[type="time"][disabled], input[type="url"][disabled="disabled"], input[type="url"][disabled], input[type="week"][disabled="disabled"], input[type="week"][disabled], input:not([type])[disabled="disabled"], input:not([type])[disabled] { + border-color: transparent; } + +textarea { + border: 2px solid white; + padding: 4px; + background-color: #e6e6e6; } + textarea:hover { + background-color: white; } + textarea[readonly="readonly"], textarea[readonly] { + border-color: #b3b3b3; + background-color: #999999; } + textarea[disabled="disabled"], textarea[disabled] { + border-color: transparent; } + +input[type="color"] { + line-height: 1; } + +input[type="date"] { + line-height: 1; } + +input[type="datetime"] { + line-height: 1; } + +input[type="datetime-local"] { + line-height: 1; } + +input[type="email"] { + line-height: 1; } + +input[type="month"] { + line-height: 1; } + +input[type="number"] { + line-height: 1; } + +input[type="password"] { + line-height: 1; } + +input[type="search"] { + line-height: 1; } + +input[type="tel"] { + line-height: 1; } + +input[type="text"] { + line-height: 1; } + +input[type="time"] { + line-height: 1; } + +input[type="url"] { + line-height: 1; } + +input[type="week"] { + line-height: 1; } + +input:not([type]) { + line-height: 1; } + +button { + padding: calc(8px - 3px) 8px; } + +input[type="button"] { + padding: calc(8px - 3px) 8px; } + +input[type="reset"] { + padding: calc(8px - 3px) 8px; } + +input[type="submit"] { + padding: calc(8px - 3px) 8px; } + +label + input, +.input__label_right { + margin: 0 8px; } + +.label__table, .input__default label { + display: table; } + .label__table input, .input__default label input { + display: table-cell; } + +.input__default label { + margin: 4px 0; } + .input__default label input { + padding: 4px 5px; + border-style: solid; + border-color: transparent; + background-color: #e6e6e6; + color: #1a1a1a; } + .input__default label input:hover { + background-color: black; + color: white; } + +nav ul { + padding-left: 0; } +nav li { + margin-bottom: 8px; + list-style: none; } + +.nav__horizontal ul ul, .nav__center_old ul ul, .header__page nav ul ul { + margin: 8px 0; } +.nav__horizontal ul li, .nav__center_old ul li, .header__page nav ul li { + margin-right: 8px; + margin-bottom: 0; } + .nav__horizontal ul li:last-child, .nav__center_old ul li:last-child, .header__page nav ul li:last-child { + margin-right: 0; } + +.nav__right { + float: right; + margin-left: 8px; } + .nav__right .align_parent { + margin-right: -8px; } + +.nav__separate li { + position: relative; + padding-left: 1px; } + .nav__separate li:not(:first-child)::before { + content: ""; + position: absolute; + width: 1px; + height: 100%; + left: 0; + top: 0; + background-color: black; } + +.nav__separate_right { + float: right; } + .nav__separate_right li { + position: relative; } + .nav__separate_right li:first-child { + padding-left: 17px; } + .nav__separate_right li:first-child::before { + content: ""; + position: absolute; + width: 1px; + height: 100%; + left: 0; + top: 0; + background-color: white; + margin: 0 8px; } + +.nav__center_old { + float: right; + position: relative; + left: -50%; } + .nav__center_old ul { + position: relative; + left: 50%; + text-align: center; } + +.nav__column { + position: relative; + margin: 8px 0; } + .nav__column ul { + margin: 0 128px; } + .nav__column ul li { + -webkit-box-flex: 1; + -ms-flex-positive: 1; + flex-grow: 1; + margin: 0; + text-align: center; } + .nav__column ul li a { + display: block; } + +.nav__page_meta { + position: fixed; + right: 0; + bottom: 16px; } + .nav__page_meta ul { + margin: 8px 0; } + .nav__page_meta li { + margin-bottom: 0; } + .nav__page_meta .a_button_meta { + display: inline-block; } + .nav__page_meta .a_button_meta:active, .nav__page_meta .a_button_meta:focus { + background-color: transparent; } + .nav__page_meta .a_button_meta:hover { + background-color: #0c85ff; } + +.header__page nav a:active, .header__page nav a:focus, .header__page nav a:hover { + background-color: rgba(0, 0, 0, 0.2); + color: black; } + +.table__link { + width: 100%; + border: 0; + table-layout: auto; } + .table__link tbody { + border-bottom: 1px solid black; } + .table__link tbody:hover { + background-color: #cccccc; } + .table__link th, .table__link td { + border: 0; } + .table__link .cell__icon { + width: 48px; + text-align: center; } + .table__link .cell__icon img { + vertical-align: text-top; } + .table__link .cell__link { + padding-right: 8px; + padding-left: 8px; } + .table__link .cell__link:hover { + background-color: #0c85ff; } + .table__link .cell__link:hover a:first-child { + display: none; } + .table__link .cell__link:hover a:last-child { + display: block; + color: white; } + .table__link .cell__link a { + display: block; } + .table__link .cell__link a:last-child { + display: none; } + .table__link th:last-child, .table__link .cell__date { + width: 16%; + text-align: center; } + .table__link .cell__text { + padding-right: 8px; + padding-left: 8px; } + .table__link .cell__text div { + width: 100%; } + .table__link .cell__text .shorten { + max-height: 44px; } + +.card_body .bkg_box { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; } + +.card_body { + height: 100%; + /* .full { + position: absolute; + width: 128px; + height: 128px; + top: 16px; + left: 16px; + background-color: #fff; + } + .mark { + float: left; + width: 32px; + height: 32px; + margin-top: 16px; + } + */ } + .card_body .bkg_box { + -webkit-transition-duration: 800ms; + transition-duration: 800ms; + overflow: hidden; + vertical-align: top; + z-index: -1; } + .card_body .bkg_box > svg { + position: relative; } + .card_body .flex_wrap_center { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; + height: 100%; } + .card_body .flex_content { + position: relative; + padding: 64px 64px 24px 64px; + border: 1px solid #FFF; + background-color: #F5F5F5; + z-index: 40; } + .card_body h1 { + margin: 16px 0; + color: #1E1E1E; + font-size: 24px; + line-height: 1.4em; + font-weight: normal; } + .card_body p, .card_body .block__column_2, .card_body .block__column_3, .card_body caption { + margin-top: 0; + margin-bottom: 16px; + font-size: 12px; + line-height: 1.4em; } + .card_body .marked { + padding-left: 1em; + text-indent: -1em; + text-align: center; } + .card_body .marked::before { + content: "* "; } + .card_body .decent { + color: #666; } + .card_body a { + color: #000; + text-decoration: none; } + .card_body a:hover { + color: #F4F9FA; + background-color: #0C85FF; + text-decoration: none; } + +.wip, .wip_txt { + border-right: 8px solid rgba(220, 20, 60, 0.8); + background-color: rgba(220, 20, 60, 0.1) !important; } + +.wip::before, .wip::after { + content: ""; + display: block; + height: 48px; } + +.exp_expose_pre::after { + content: ""; + display: block; + height: 48px; + background-color: rgba(183, 224, 240, 0.1) !important; } + +.exp_expose_post::before { + content: ""; + display: block; + height: 48px; + background-color: rgba(183, 224, 240, 0.1) !important; } + +.exp_expose::before, .exp_expose::after { + content: ""; + display: block; + height: 48px; + background-color: rgba(183, 224, 240, 0.1) !important; } + +.exp_pop { + display: none; } + +.exp_wrap { + position: relative; } + +.exp_pop { + position: absolute; + z-index: 100; + top: 128px; + left: 128px; + padding: 4px; + border: 4px solid gray; + border-radius: 4px; + background-color: gray; + pointer-events: none; } + +.exp_marker_pop { + position: absolute; + top: -12.75px; + right: -8.5px; + width: 17px; + height: 17px; + border: 1px solid white; + border-radius: 17px; + color: white; + background-color: black; } + +.exp_overlay_btn { + position: fixed; + width: 3em; + height: 2em; + cursor: pointer; } + +.exp_help_btn { + display: table; + right: 16px; + bottom: 16px; + background-color: rgba(0, 0, 0, 0.4); } + .exp_help_btn:hover { + background-color: white; } + .exp_help_btn:hover > .span__solo { + color: black; } + .exp_help_btn .span__solo { + display: table-cell; + color: rgba(255, 255, 255, 0.8); + font-family: Courier New, monospace; + font-size: 1.4em; + text-align: center; + vertical-align: middle; } + +.expose_height { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + background-color: rgba(183, 224, 240, 0.1) !important; + -webkit-transition: height 0.5s ease; + transition: height 0.5s ease; } + +.print_body *[class^="din"] { + background-color: white; } + +.print_body { + font-size: 10pt; + margin: 10vh 20vw; } +@page { + .print_body { + size: A4; + margin: 1.2cm; } } +@page :first { + .print_body { + size: A4; + margin: 0; } } + .print_body .dina4 { + padding-top: 1.2cm; + padding-right: 1.2cm; + padding-bottom: 1.2cm; + padding-left: 2.4cm; } + .print_body .dina4 .page_head, .print_body .dina4 .page_foot { + right: 1.2cm; + left: 2.4cm; } + .print_body .dina4 .page_head { + top: 1.2cm; } + .print_body .dina4 .page_foot { + bottom: 1.2cm; } + .print_body .dina5 { + padding-top: 0; + padding-right: 0; + padding-bottom: 0; + padding-left: 1.2cm; } + .print_body .dina5 .page_head, .print_body .dina5 .page_foot { + right: 0; + left: 1.2cm; } + .print_body .dina5 .page_head { + top: 0; } + .print_body .dina5 .page_foot { + bottom: 0; } + .print_body .dina6 { + padding-top: 0; + padding-right: 0; + padding-bottom: 0; + padding-left: 1.2cm; } + .print_body .dina6 .page_head, .print_body .dina6 .page_foot { + right: 0; + left: 1.2cm; } + .print_body .dina6 .page_head { + top: 0; } + .print_body .dina6 .page_foot { + bottom: 0; } + .print_body *[class^="din"] { + position: relative; + overflow: auto; + margin: 32px auto; } + .print_body *[class^="din"] .page_head, .print_body *[class^="din"] .page_foot { + position: absolute; } + .print_body *[class^="din"] .page_head { + page: cover; } + .print_body *[class^="din"] .page_foot { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-direction: row; + flex-direction: row; } + .print_body *[class^="din"] .page_foot *:last-child { + margin-bottom: 0; } + .print_body *[class^="din"] .page_foot p, .print_body *[class^="din"] .page_foot .block__column_2, .print_body *[class^="din"] .page_foot .block__column_3, .print_body *[class^="din"] .page_foot caption { + -webkit-box-flex: 1; + -ms-flex: 1 0 auto; + flex: 1 0 auto; + margin: 0; + font-size: 8pt; + line-height: 10pt; + text-align: center; } + .print_body *[class^="din"] .page_foot .page_no { + -webkit-box-flex: 1; + -ms-flex: 1 0 auto; + flex: 1 0 auto; + font-size: 20pt; + line-height: 1; + text-align: right; } + .print_body *[class^="din"] .page_foot p:first-child, .print_body *[class^="din"] .page_foot .block__column_2:first-child, .print_body *[class^="din"] .page_foot .block__column_3:first-child, .print_body *[class^="din"] .page_foot caption:first-child { + text-align: left; } + .print_body *[class^="din"] .page_content { + margin-top: 10cm; + margin-bottom: 2cm; } + .print_body .page_title, .print_body .page_date { + font-size: 14pt; } + .print_body .page_title { + margin: 0; } + .print_body .page_date, .print_body .page_no { + float: right; } + .print_body .page_author { + position: absolute; + top: 5cm; + right: 0; + text-align: right; } + .print_body .page_recipient { + position: absolute; + top: 5cm; + left: 0; } + +.demo__intro { + border-top-width: 8px; + border-top-style: solid; + border-color: black; + padding-top: 32px; } + +.demo__header { + padding: 16px; } + .demo__header nav ul { + margin: 0; } + +.header__fancy { + background-color: rgba(211, 10, 81, 0.6); } + .header__fancy nav a { + background-color: rgba(250, 216, 3, 0.6); + color: #fad803; } + .header__fancy nav a:active, .header__fancy nav a:focus, .header__fancy nav a:hover { + background-color: rgba(255, 255, 255, 0.2); + color: white; } + +.header__fix { + position: relative; + top: 0; + left: 0; + width: 100%; + background-color: rgba(39, 63, 139, 0.6); } + .header__fix nav a:active, .header__fix nav a:focus, .header__fix nav a:hover { + background-color: rgba(255, 255, 255, 0.2); + color: white; } + +.demo__footer { + width: 100%; + padding: 16px 0; + background-color: #333333; + color: #cccccc; } + .demo__footer nav a { + color: white; } + +.demo__avatar img { + opacity: 1; + width: 128px; + height: auto; + min-width: 128px; + min-height: 128px; + border-radius: 50%; + background-color: #b7e0f0; } + +.demo__flag { + height: 40vh; } + +.demo__credits { + margin: 32px 0 8px 0; } + +.demo__button_32 { + width: 32px; + height: 32px; } + +.demo__queries > p, .demo__queries > .block__column_2, .demo__queries > .block__column_3, .demo__queries > caption { + padding: calc(8px - 3px) 8px; } + +.query__phoneUp { + background-color: rgba(0, 0, 0, 0.2); } + +@media (max-width: 767px) { + .query__phoneOnly { + background-color: rgba(0, 0, 0, 0.2); } } + +@media (min-width: 768px) and (max-width: 1023px) { + .query__tabletPortaitOnly { + background-color: rgba(0, 0, 0, 0.2); } } + +@media (min-width: 768px) { + .query__tabletPortraitUp { + background-color: rgba(0, 0, 0, 0.2); } } + +@media (min-width: 1024px) and (max-width: 1279px) { + .query__tabletLandscapeOnly { + background-color: rgba(0, 0, 0, 0.2); } } + +@media (min-width: 1024px) { + .query__tabletLandscapeUp { + background-color: rgba(0, 0, 0, 0.2); } } + +@media (min-width: 1280px) and (max-width: 1679px) { + .query__desktopOnly { + background-color: rgba(0, 0, 0, 0.2); } } + +@media (min-width: 1280px) { + .query__desktopUp { + background-color: rgba(0, 0, 0, 0.2); } } + +@media (min-width: 1680px) { + .query__bigDesktopUp { + background-color: rgba(0, 0, 0, 0.2); } } + +.demo__query_example { + margin-bottom: 32px; + padding: 32px; + text-align: center; } + @media (min-width: 48em) { + .demo__query_example { + background-color: #fad803; } } + @media (min-width: 64em) { + .demo__query_example { + background-color: #d30a51; } } + @media (min-width: 80em) { + .demo__query_example { + background-color: #273f8b; } } + @media (min-width: 90em) { + .demo__query_example { + background-color: #b7e0f0; } } + @media (min-width: 105em) { + .demo__query_example { + background-color: #52bed1; } } + @media (min-width: 120em) { + .demo__query_example { + background-color: #0c85ff; } } + .demo__query_example:after { + content: '< 768px'; + padding: calc(8px - 3px) 8px; + border-radius: 2px; + background-color: rgba(0, 0, 0, 0.2); } + @media (min-width: 48em) { + .demo__query_example:after { + content: '768px'; } } + @media (min-width: 64em) { + .demo__query_example:after { + content: '1024px'; } } + @media (min-width: 80em) { + .demo__query_example:after { + content: '1280px'; } } + @media (min-width: 105em) { + .demo__query_example:after { + content: '1680px'; } } + @media (min-width: 120em) { + .demo__query_example:after { + content: '1920px'; } } + +.test li::after { + content: ""; + display: block; + height: 16px; } + +.front_color_1 { + color: #fad803; } + .front_color_1::after { + background-color: #fad803; } + +.front_color_2 { + color: #d30a51; } + .front_color_2::after { + background-color: #d30a51; } + +.front_color_3 { + color: #273f8b; } + .front_color_3::after { + background-color: #273f8b; } + +.front_color_4 { + color: #b7e0f0; } + .front_color_4::after { + background-color: #b7e0f0; } + +.front_color_5 { + color: #52bed1; } + .front_color_5::after { + background-color: #52bed1; } + +.back_color_1, .label_1 { + background-color: #fad803; } + +.back_color_2, .label_2 { + background-color: #d30a51; } + +.back_color_3, .label_3 { + background-color: #273f8b; } + +.back_color_4 { + background-color: #b7e0f0; } + +.back_color_5 { + background-color: #52bed1; } + +.label_1, .label_2, .label_3 { + padding: 0 4px; } + + diff --git a/build/css/example.min.css b/build/css/example.min.css new file mode 100644 index 0000000..e1619d6 --- /dev/null +++ b/build/css/example.min.css @@ -0,0 +1,2 @@ +@charset "UTF-8";@import url(../../vendor/normalize.css);.sym_glass:before{content:""}.sym_music:before{content:""}.sym_search:before{content:""}.sym_envelope-o:before{content:""}.sym_heart:before{content:""}[tabindex]:focus,a[href]:focus,area[href]:focus,button:not([disabled]):focus,input:not([disabled]):focus,select:not([disabled]):focus,textarea:not([disabled]):focus{outline:0}.magic{display:none}.center_50{margin-right:25%;margin-left:25%}.center_25{margin-right:37.5%;margin-left:37.5%}.table__file_simple,.width_full{width:100%;margin-right:0;margin-left:0}.height_basic{height:1024px}.txt_center{text-align:center!important}.txt_right{text-align:right!important}.txt_left{text-align:left!important}.space_right{margin-right:32px}.clear,.clear:after,.clear:before{clear:both}.header__page nav ul,.nav__center_old ul,.nav__horizontal ul,.overflow{overflow:auto}.box__file_tile,.box__inline_left,.float_space_left,.header__page nav ul li,.list__horizontal li,.nav__center_old ul li,.nav__horizontal ul li{float:left;margin-right:32px}.float_half_size{float:left;width:50%}.x_long{overflow-x:scroll}.hover_full_view_change,.pos_full_view{position:fixed;top:0;left:0;width:100vw;height:100vh}.pos_full_page{top:0;right:0;bottom:0;left:0}.pos_abs,.pos_full_page{position:absolute}.pos_rel{position:relative}.pos_fix{position:fixed}.pos_bottom{bottom:0}.pos_full_view{background-color:rgba(250,216,3,.5)}.pos_full_page{background-color:rgba(39,63,139,.25)}.hover_back_change{background-color:#666;transition:background-color .2s ease-in-out}.hover_back_change:hover{background-color:gray}.hover_full_view_change{z-index:100;background-color:rgba(0,0,0,.5);transition:background-color .2s ease-in-out;pointer-events:none}.flex,.flex__column_wrap,.flex__row,.flex__wrap,.nav__column ul{display:-webkit-box;display:-ms-flexbox;display:flex}.flex__wrap{-ms-flex-wrap:wrap;flex-wrap:wrap}.flex__row{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.flex__child,.flex__column_wrap .column,.nav__column ul li{-webkit-box-flex:0;-ms-flex:0 1 auto;flex:0 1 auto}.flex__child_one{-webkit-box-flex:1;-ms-flex:1;flex:1}.flex__child_end{-ms-flex-item-align:end;align-self:flex-end}.txt_light_color{color:#666}.a__button,.a__button_border,.a__button_text{display:inline-block;padding:5px 8px;background-color:rgba(82,190,209,.2);border-radius:1px}.a__button:active,.a__button:focus,.a__button:hover,.a__button_border:active,.a__button_border:focus,.a__button_border:hover,.a__button_text:active,.a__button_text:focus,.a__button_text:hover{background-color:hsla(0,0%,100%,.1);color:#fff;border-color:transparent}.block__column_2,.block__column_3,.span__solo,caption,dd,dt,figcaption,h6,label,legend,li,p,td,th{font-family:Roboto,Segoe UI,Liberation Sans,Source Sans,Trebuchet MS,Helvetica,Arial,sans-serif;font-size:1em;line-height:1.5}.code__solo,.demo__query_example:after,.print_body [class^=din] .block__column_2,.print_body [class^=din] .block__column_3,.print_body [class^=din] caption,.print_body [class^=din] p,code,input:not([type]),input[type=color],input[type=date],input[type=datetime-local],input[type=datetime],input[type=email],input[type=month],input[type=number],input[type=password],input[type=search],input[type=tel],input[type=text],input[type=time],input[type=url],input[type=week],pre,textarea{font-family:Courier New,monospace;font-size:1em;line-height:1.5}.print_body .page_date,.print_body .page_no,h1{font-size:3.1em}.print_body .page_date,.print_body .page_no,h1,h2{font-family:Roboto,Segoe UI,Liberation Sans,Source Sans,Trebuchet MS,Helvetica,Arial,sans-serif;font-weight:300;line-height:1.5}h2{font-size:2.5em}h3,h4{font-size:1.8em}h3,h4,h5{font-family:Roboto,Segoe UI,Liberation Sans,Source Sans,Trebuchet MS,Helvetica,Arial,sans-serif;font-weight:300;line-height:1.5}h5{font-size:1.35em}.span__solo{color:#000}.table__link .cell__text .shorten{overflow:hidden;text-overflow:ellipsis;-o-text-overflow:ellipsis}html{height:100%}body{position:relative;box-sizing:border-box;font-family:Roboto,Segoe UI,Liberation Sans,Source Sans,Trebuchet MS,Helvetica,Arial,sans-serif;font-size:17px;line-height:1;color:#000;background-color:gray}body *,body :after,body :before{box-sizing:inherit}body:hover .layer__hover{background-color:transparent}.demo__intro,.sec__main_center{width:96%;margin:0 auto;padding-top:32px}@media (min-width:768px){.demo__intro,.sec__main_center{width:80%}}@media (min-width:1024px){.demo__intro,.sec__main_center{width:60%}}@media (min-width:1680px){.demo__intro,.sec__main_center{width:48%}}aside.right+section{margin-right:calc(20% + 8px)}aside.left+section{margin-left:calc(20% + 8px)}aside{width:20%}aside.left{float:left}aside.right{float:right}aside :first-child{margin-top:0}.header__page{overflow:auto}h1{margin:128px 0 32px}h2{margin:64px 0 32px}h3{text-transform:uppercase}h3,h4{margin:16px 0}h4,h5{text-transform:none}h5{margin:16px 0 8px}h6{text-transform:none;font-weight:700}.block__column_2,.block__column_3,caption,h6,p{margin:8px 0}.block__column_2 .demo__query_example:after,.block__column_2 code,.block__column_3 .demo__query_example:after,.block__column_3 code,caption .demo__query_example:after,caption code,p .demo__query_example:after,p code{padding:1px 4px;font-size:1em;line-height:1}.hr__dotted,.hr__hidden,hr{margin:32px auto;border-width:1px 0 0;border-style:solid;border-color:#000}.hr__hidden{border-color:transparent}.hr__dotted,.pre__code{border-style:dotted}.pre__code{border-color:hsla(0,0%,100%,.1);border-width:0 0 0 4px;border-radius:1px;padding:8px;background-color:hsla(0,0%,100%,.1)}.pre__code .demo__query_example:after,.pre__code code{background-color:transparent}blockquote{margin:8px 2em}.quote__mark .block__column_2:before,.quote__mark .block__column_3:before,.quote__mark caption:before,.quote__mark p:before{content:"\201E \0020"}.quote__mark .block__column_2:after,.quote__mark .block__column_3:after,.quote__mark caption:after,.quote__mark p:after{content:"\201C \0020"}.quote__mark .quote__source:after,.quote__mark .quote__source:before{content:""}dl,ol,ul{margin:16px 0 8px}ol,ul{padding-left:2em}dd{margin-left:2em}ul li{list-style:square}.list__dash li{list-style:none;position:relative}.list__dash li:before{content:"_";position:absolute;left:-1em}.list__link li{margin-bottom:2px;text-transform:uppercase}.list__link li a{display:block;padding:5px 8px;color:#000}.list__link li a img{margin-right:8px;padding-bottom:.2em;vertical-align:text-bottom}.list__link li a:active,.list__link li a:focus,.list__link li a:hover{background-color:#0c85ff;color:#fff}.list__horizontal{overflow:auto}figure{margin:16px 2em}.box__page{height:100vh}.box__info{padding:16px 2em;border-right:8px solid rgba(82,190,209,.6);background-color:rgba(82,190,209,.1)!important}.box__main_indent{margin-left:25%}.block__column_line{-webkit-column-rule:1px solid #000;column-rule:1px solid #000}.block__column_2{-webkit-column-count:2;column-count:2;-webkit-column-gap:32px;column-gap:32px}.block__column_3{-webkit-column-count:3;column-count:3;-webkit-column-gap:64px;column-gap:64px}.box__space{position:relative;width:100%}.box__cube{float:left;display:table;width:64px;text-align:center;vertical-align:middle}.box__cube span{display:table-cell}.box__placeholder{width:100%;height:64px;border:4px solid rgba(0,0,0,.1);border-radius:1px;padding:8px;background-color:rgba(0,0,0,.1)}.box__placeholder svg{vertical-align:top}.box__placeholder_bkg{width:100%;height:64px;border:4px solid rgba(0,0,0,.1);border-radius:1px;padding:8px;background:url("data:image/svg+xml;utf8,") no-repeat;background-color:rgba(0,0,0,.1)}.flex__column_wrap .column{-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1}a{color:#52bed1;text-decoration:none}a:active,a:focus,a:hover{color:#fff}.a__line{border-bottom-width:1px;border-bottom-style:dotted;border-color:#000;background-color:transparent;color:#000;transition:color .15s ease}.a__line:active,.a__line:focus,.a__line:hover{background-color:#0c85ff;color:#fff}.a__button_border,.a__button_text{padding:7px 16px;background-color:transparent;color:#000}.a__button_border{border:1px solid #000}em,i{font-style:italic}.i__bright{font-style:normal;color:#fff}b,strong{font-weight:500}cite{font-style:italic}.demo__query_example:after,code{color:#1f1f1f;background-color:hsla(0,0%,100%,.1)}.code__solo{padding:1px 4px;color:#000}mark{background-color:#fad803}.mark__cursor{color:#fff;background-color:#000}::-moz-selection{color:#fff;background-color:#000}::selection{color:#fff;background-color:#000}img{vertical-align:top}table{margin:16px 0;border:1px solid #000;border-collapse:collapse}td,th{padding:4px}th{border:1px solid #000;text-align:left}.precol,td{border-right:1px solid #000}td{border-bottom:1px solid #000}td:last-child{border-right:0}tr:last-child td{border-bottom:0}tfoot tr:first-child td{border-top:1px solid #000}.table__blank,.table__blank td,.table__blank th,.table__free{border:1px solid transparent}.table__stripe td{border-top:0;border-bottom:0}.table__stripe tr:nth-child(2n) td{background-color:hsla(0,0%,100%,.1)}.table__fix{table-layout:fixed}caption{padding:4px 0;border:1px dotted #000;text-align:center}fieldset{margin:16px 0;padding:8px;border:1px solid #000}legend{padding:0 4px}button,input,textarea{margin:0 32px}button[disabled=disabled],button[disabled],input[disabled=disabled],input[disabled],textarea[disabled=disabled],textarea[disabled]{cursor:not-allowed}label input{margin-left:8px}input{color:#1a1a1a}input[disabled=disabled],input[disabled]{cursor:not-allowed}input:not([type]),input[type=color],input[type=date],input[type=datetime-local],input[type=datetime],input[type=email],input[type=month],input[type=number],input[type=password],input[type=search],input[type=tel],input[type=text],input[type=time],input[type=url],input[type=week]{border:2px solid #fff;padding:4px;background-color:#e6e6e6}input:not([type]):hover,input[type=color]:hover,input[type=date]:hover,input[type=datetime-local]:hover,input[type=datetime]:hover,input[type=email]:hover,input[type=month]:hover,input[type=number]:hover,input[type=password]:hover,input[type=search]:hover,input[type=tel]:hover,input[type=text]:hover,input[type=time]:hover,input[type=url]:hover,input[type=week]:hover{background-color:#fff}input:not([type])[readonly=readonly],input:not([type])[readonly],input[type=color][readonly=readonly],input[type=color][readonly],input[type=date][readonly=readonly],input[type=date][readonly],input[type=datetime-local][readonly=readonly],input[type=datetime-local][readonly],input[type=datetime][readonly=readonly],input[type=datetime][readonly],input[type=email][readonly=readonly],input[type=email][readonly],input[type=month][readonly=readonly],input[type=month][readonly],input[type=number][readonly=readonly],input[type=number][readonly],input[type=password][readonly=readonly],input[type=password][readonly],input[type=search][readonly=readonly],input[type=search][readonly],input[type=tel][readonly=readonly],input[type=tel][readonly],input[type=text][readonly=readonly],input[type=text][readonly],input[type=time][readonly=readonly],input[type=time][readonly],input[type=url][readonly=readonly],input[type=url][readonly],input[type=week][readonly=readonly],input[type=week][readonly]{border-color:#b3b3b3;background-color:#999}input:not([type])[disabled=disabled],input:not([type])[disabled],input[type=color][disabled=disabled],input[type=color][disabled],input[type=date][disabled=disabled],input[type=date][disabled],input[type=datetime-local][disabled=disabled],input[type=datetime-local][disabled],input[type=datetime][disabled=disabled],input[type=datetime][disabled],input[type=email][disabled=disabled],input[type=email][disabled],input[type=month][disabled=disabled],input[type=month][disabled],input[type=number][disabled=disabled],input[type=number][disabled],input[type=password][disabled=disabled],input[type=password][disabled],input[type=search][disabled=disabled],input[type=search][disabled],input[type=tel][disabled=disabled],input[type=tel][disabled],input[type=text][disabled=disabled],input[type=text][disabled],input[type=time][disabled=disabled],input[type=time][disabled],input[type=url][disabled=disabled],input[type=url][disabled],input[type=week][disabled=disabled],input[type=week][disabled]{border-color:transparent}textarea{border:2px solid #fff;padding:4px;background-color:#e6e6e6}textarea:hover{background-color:#fff}textarea[readonly=readonly],textarea[readonly]{border-color:#b3b3b3;background-color:#999}textarea[disabled=disabled],textarea[disabled]{border-color:transparent}input:not([type]),input[type=color],input[type=date],input[type=datetime-local],input[type=datetime],input[type=email],input[type=month],input[type=number],input[type=password],input[type=search],input[type=tel],input[type=text],input[type=time],input[type=url],input[type=week]{line-height:1}button,input[type=button],input[type=reset],input[type=submit]{padding:5px 8px}.input__label_right,label+input{margin:0 8px}.input__default label,.label__table{display:table}.input__default label input,.label__table input{display:table-cell}.input__default label{margin:4px 0}.input__default label input{padding:4px 5px;border-style:solid;border-color:transparent;background-color:#e6e6e6;color:#1a1a1a}.input__default label input:hover{background-color:#000;color:#fff}nav ul{padding-left:0}nav li{margin-bottom:8px;list-style:none}.header__page nav ul ul,.nav__center_old ul ul,.nav__horizontal ul ul{margin:8px 0}.header__page nav ul li,.nav__center_old ul li,.nav__horizontal ul li{margin-right:8px;margin-bottom:0}.header__page nav ul li:last-child,.nav__center_old ul li:last-child,.nav__horizontal ul li:last-child{margin-right:0}.nav__right{float:right;margin-left:8px}.nav__right .align_parent{margin-right:-8px}.nav__separate li{position:relative;padding-left:1px}.nav__separate li:not(:first-child):before{content:"";position:absolute;width:1px;height:100%;left:0;top:0;background-color:#000}.nav__separate_right{float:right}.nav__separate_right li{position:relative}.nav__separate_right li:first-child{padding-left:17px}.nav__separate_right li:first-child:before{content:"";position:absolute;width:1px;height:100%;left:0;top:0;background-color:#fff;margin:0 8px}.nav__center_old{float:right;position:relative;left:-50%}.nav__center_old ul{position:relative;left:50%;text-align:center}.nav__column{position:relative;margin:8px 0}.nav__column ul{margin:0 128px}.nav__column ul li{-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;margin:0;text-align:center}.nav__column ul li a{display:block}.nav__page_meta{position:fixed;right:0;bottom:16px}.nav__page_meta ul{margin:8px 0}.nav__page_meta li{margin-bottom:0}.nav__page_meta .a_button_meta{display:inline-block}.nav__page_meta .a_button_meta:active,.nav__page_meta .a_button_meta:focus{background-color:transparent}.nav__page_meta .a_button_meta:hover{background-color:#0c85ff}.header__page nav a:active,.header__page nav a:focus,.header__page nav a:hover{background-color:rgba(0,0,0,.2);color:#000}.table__link{width:100%;border:0;table-layout:auto}.table__link tbody{border-bottom:1px solid #000}.table__link tbody:hover{background-color:#ccc}.table__link td,.table__link th{border:0}.table__link .cell__icon{width:48px;text-align:center}.table__link .cell__icon img{vertical-align:text-top}.table__link .cell__link{padding-right:8px;padding-left:8px}.table__link .cell__link:hover{background-color:#0c85ff}.table__link .cell__link:hover a:first-child{display:none}.table__link .cell__link:hover a:last-child{display:block;color:#fff}.table__link .cell__link a{display:block}.table__link .cell__link a:last-child{display:none}.table__link .cell__date,.table__link th:last-child{width:16%;text-align:center}.table__link .cell__text{padding-right:8px;padding-left:8px}.table__link .cell__text div{width:100%}.table__link .cell__text .shorten{max-height:44px}.card_body .bkg_box{position:absolute;top:0;left:0;width:100%;height:100%}.card_body{height:100%}.card_body .bkg_box{transition-duration:.8s;overflow:hidden;vertical-align:top;z-index:-1}.card_body .bkg_box>svg{position:relative}.card_body .flex_wrap_center{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;height:100%}.card_body .flex_content{position:relative;padding:64px 64px 24px;border:1px solid #fff;background-color:#f5f5f5;z-index:40}.card_body h1{margin:16px 0;color:#1e1e1e;font-size:24px;line-height:1.4em;font-weight:400}.card_body .block__column_2,.card_body .block__column_3,.card_body caption,.card_body p{margin-top:0;margin-bottom:16px;font-size:12px;line-height:1.4em}.card_body .marked{padding-left:1em;text-indent:-1em;text-align:center}.card_body .marked:before{content:"* "}.card_body .decent{color:#666}.card_body a{color:#000;text-decoration:none}.card_body a:hover{color:#f4f9fa;background-color:#0c85ff;text-decoration:none}.wip,.wip_txt{border-right:8px solid rgba(220,20,60,.8);background-color:rgba(220,20,60,.1)!important}.wip:after,.wip:before{content:"";display:block;height:48px}.exp_expose:after,.exp_expose:before,.exp_expose_post:before,.exp_expose_pre:after{content:"";display:block;height:48px;background-color:rgba(183,224,240,.1)!important}.exp_pop{display:none}.exp_wrap{position:relative}.exp_pop{position:absolute;z-index:100;top:128px;left:128px;padding:4px;border:4px solid gray;border-radius:4px;background-color:gray;pointer-events:none}.exp_marker_pop{position:absolute;top:-12.75px;right:-8.5px;width:17px;height:17px;border:1px solid #fff;border-radius:17px;color:#fff;background-color:#000}.exp_overlay_btn{position:fixed;width:3em;height:2em;cursor:pointer}.exp_help_btn{display:table;right:16px;bottom:16px;background-color:rgba(0,0,0,.4)}.exp_help_btn:hover{background-color:#fff}.exp_help_btn:hover>.span__solo{color:#000}.exp_help_btn .span__solo{display:table-cell;color:hsla(0,0%,100%,.8);font-family:Courier New,monospace;font-size:1.4em;text-align:center;vertical-align:middle}.expose_height{position:absolute;top:0;right:0;bottom:0;left:0;background-color:rgba(183,224,240,.1)!important;transition:height .5s ease}.print_body [class^=din]{background-color:#fff}.print_body{font-size:10pt;margin:10vh 20vw}@page{.print_body{size:A4;margin:1.2cm}}@page :first{.print_body{size:A4;margin:0}}.print_body .dina4{padding:1.2cm 1.2cm 1.2cm 2.4cm}.print_body .dina4 .page_foot,.print_body .dina4 .page_head{right:1.2cm;left:2.4cm}.print_body .dina4 .page_head{top:1.2cm}.print_body .dina4 .page_foot{bottom:1.2cm}.print_body .dina5{padding:0 0 0 1.2cm}.print_body .dina5 .page_foot,.print_body .dina5 .page_head{right:0;left:1.2cm}.print_body .dina5 .page_head{top:0}.print_body .dina5 .page_foot{bottom:0}.print_body .dina6{padding:0 0 0 1.2cm}.print_body .dina6 .page_foot,.print_body .dina6 .page_head{right:0;left:1.2cm}.print_body .dina6 .page_head{top:0}.print_body .dina6 .page_foot{bottom:0}.print_body [class^=din]{position:relative;overflow:auto;margin:32px auto}.print_body [class^=din] .page_foot,.print_body [class^=din] .page_head{position:absolute}.print_body [class^=din] .page_head{page:cover}.print_body [class^=din] .page_foot{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.print_body [class^=din] .page_foot :last-child{margin-bottom:0}.print_body [class^=din] .page_foot .block__column_2,.print_body [class^=din] .page_foot .block__column_3,.print_body [class^=din] .page_foot caption,.print_body [class^=din] .page_foot p{-webkit-box-flex:1;-ms-flex:1 0 auto;flex:1 0 auto;margin:0;font-size:8pt;line-height:10pt;text-align:center}.print_body [class^=din] .page_foot .page_no{-webkit-box-flex:1;-ms-flex:1 0 auto;flex:1 0 auto;font-size:20pt;line-height:1;text-align:right}.print_body [class^=din] .page_foot .block__column_2:first-child,.print_body [class^=din] .page_foot .block__column_3:first-child,.print_body [class^=din] .page_foot caption:first-child,.print_body [class^=din] .page_foot p:first-child{text-align:left}.print_body [class^=din] .page_content{margin-top:10cm;margin-bottom:2cm}.print_body .page_date,.print_body .page_title{font-size:14pt}.print_body .page_title{margin:0}.print_body .page_date,.print_body .page_no{float:right}.print_body .page_author{position:absolute;top:5cm;right:0;text-align:right}.print_body .page_recipient{position:absolute;top:5cm;left:0}.demo__intro{border-top-width:8px;border-top-style:solid;border-color:#000;padding-top:32px}.demo__header{padding:16px}.demo__header nav ul{margin:0}.header__fancy{background-color:rgba(211,10,81,.6)}.header__fancy nav a{background-color:rgba(250,216,3,.6);color:#fad803}.header__fancy nav a:active,.header__fancy nav a:focus,.header__fancy nav a:hover{background-color:hsla(0,0%,100%,.2);color:#fff}.header__fix{position:relative;top:0;left:0;width:100%;background-color:rgba(39,63,139,.6)}.header__fix nav a:active,.header__fix nav a:focus,.header__fix nav a:hover{background-color:hsla(0,0%,100%,.2);color:#fff}.demo__footer{width:100%;padding:16px 0;background-color:#333;color:#ccc}.demo__footer nav a{color:#fff}.demo__avatar img{opacity:1;width:128px;height:auto;min-width:128px;min-height:128px;border-radius:50%;background-color:#b7e0f0}.demo__flag{height:40vh}.demo__credits{margin:32px 0 8px}.demo__button_32{width:32px;height:32px}.demo__queries>.block__column_2,.demo__queries>.block__column_3,.demo__queries>caption,.demo__queries>p{padding:5px 8px}.query__phoneUp{background-color:rgba(0,0,0,.2)}@media (max-width:767px){.query__phoneOnly{background-color:rgba(0,0,0,.2)}}@media (min-width:768px) and (max-width:1023px){.query__tabletPortaitOnly{background-color:rgba(0,0,0,.2)}}@media (min-width:768px){.query__tabletPortraitUp{background-color:rgba(0,0,0,.2)}}@media (min-width:1024px) and (max-width:1279px){.query__tabletLandscapeOnly{background-color:rgba(0,0,0,.2)}}@media (min-width:1024px){.query__tabletLandscapeUp{background-color:rgba(0,0,0,.2)}}@media (min-width:1280px) and (max-width:1679px){.query__desktopOnly{background-color:rgba(0,0,0,.2)}}@media (min-width:1280px){.query__desktopUp{background-color:rgba(0,0,0,.2)}}@media (min-width:1680px){.query__bigDesktopUp{background-color:rgba(0,0,0,.2)}}.demo__query_example{margin-bottom:32px;padding:32px;text-align:center}@media (min-width:48em){.demo__query_example{background-color:#fad803}}@media (min-width:64em){.demo__query_example{background-color:#d30a51}}@media (min-width:80em){.demo__query_example{background-color:#273f8b}}@media (min-width:90em){.demo__query_example{background-color:#b7e0f0}}@media (min-width:105em){.demo__query_example{background-color:#52bed1}}@media (min-width:120em){.demo__query_example{background-color:#0c85ff}}.demo__query_example:after{content:"< 768px";padding:5px 8px;border-radius:2px;background-color:rgba(0,0,0,.2)}@media (min-width:48em){.demo__query_example:after{content:"768px"}}@media (min-width:64em){.demo__query_example:after{content:"1024px"}}@media (min-width:80em){.demo__query_example:after{content:"1280px"}}@media (min-width:105em){.demo__query_example:after{content:"1680px"}}@media (min-width:120em){.demo__query_example:after{content:"1920px"}}.test li:after{content:"";display:block;height:16px}.front_color_1{color:#fad803}.front_color_1:after{background-color:#fad803}.front_color_2{color:#d30a51}.front_color_2:after{background-color:#d30a51}.front_color_3{color:#273f8b}.front_color_3:after{background-color:#273f8b}.front_color_4{color:#b7e0f0}.front_color_4:after{background-color:#b7e0f0}.front_color_5{color:#52bed1}.front_color_5:after{background-color:#52bed1}.back_color_1,.label_1{background-color:#fad803}.back_color_2,.label_2{background-color:#d30a51}.back_color_3,.label_3{background-color:#273f8b}.back_color_4{background-color:#b7e0f0}.back_color_5{background-color:#52bed1}.label_1,.label_2,.label_3{padding:0 4px} +/*# sourceMappingURL=example.min.css.map */ diff --git a/build/js/all.min.js b/build/js/all.min.js new file mode 100644 index 0000000..b7dcddb --- /dev/null +++ b/build/js/all.min.js @@ -0,0 +1,4 @@ +var w=Math.max(document.documentElement.clientWidth,window.innerWidth||0),h=Math.max(document.documentElement.clientHeight,window.innerHeight||0),full_view_hover=!1,doc_pos_y=0,basic_ease=600,scroll_y_margin=h; +function setup(){$("#js_tph").length&&full_view_hover&&$("#js_tph").addClass("hover_full_view_change")}function Utils(){}function scrollNav(){$(".nav a").click(function(){$(".active").removeClass("active"),$(this).closest("li").addClass("active");var t=$(this).attr("class");return $("."+t).parent("li").addClass("active"),$("html, body").stop().animate({scrollTop:$($(this).attr("href")).offset().top-160},400),!1}),$(".scrollTop a").scrollTop()}Utils.prototype={constructor:Utils,isElementInView:function(t,s){var l=$(window).scrollTop(),o=l+$(window).height(),i=$(t).offset().top,e=i+$(t).height();return!0===s?le:i<=o&&e>=l}};var Utils=new Utils; +$(document).ready(function(){setup();var e=!1;$(".js_pop").hover(function(){$(this);$(this).attr("emmet"),$(this).next(".exp_pop").show()},function(){$(this).next(".exp_pop").hide()}).mousemove(function(e){$(this).next(".exp_pop").css({top:e.pageY-$(this).next(".exp_pop").outerHeight()-4,left:e.pageX+8})}),$(".exp_help_btn").click(function(t){var s,o;1!=e?(e=!0,$(".js_pop").each(function(e,t){"static"==$(this).css("position")&&($(this).addClass("js_changed_pos"),$(this).css("position","relative")),o=$(this).next(".exp_pop").detach(),(s=$(this).wrap('').parent().prepend('')).after(o)})):($(".js_pop").each(function(e,t){s=$(this).parent(".exp_wrap"),o=s.next(".exp_pop").detach(),s.find(".exp_marker_pop").remove(),$(this).unwrap(".exp_wrap"),$(this).after(o),$(this).hasClass("js_changed_pos")&&($(this).css("position",""),""==$(this).attr("style")&&$(this).removeAttr("style"),$(this).removeClass("js_changed_pos"))}),e=!1),console.log("Explanation mode: "+e)}),$("#js_scrolltop").click(function(e){console.log("scroll to the top"),e.preventDefault(),$("body").animate({scrollTop:0},basic_ease,function(){console.log("arrived at top")})}),$("#js_scrolldown").click(function(e){console.log("scroll down"),e.preventDefault(),$("body").animate({scrollTop:$(document).height()},2*basic_ease,function(){console.log("arrived at bottom")})}),$("#gameIcon").click(function(e){e.preventDefault(),$(this).clone().appendTo("#gameDetail"),$(this).siblings().clone().appendTo("#gameDetail"),$("#gameDetail").removeClass("magic")});var t=0;$(".pass-def dd").each(function(){$(this).find("li").each(function(e){if(0==$(this).children("ul").length){var s=$(this).html();$(this).html(s+''+t+""),t++}})})}),$(document).scroll(function(){doc_pos_y=$(document).scrollTop();var e=scroll_y_margin;doc_pos_y>e?$("#js_scrolltop").parent().removeClass("magic"):$("#js_scrolltop").parent().addClass("magic")}); +//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["variables.js","functions.js","global.js"],"names":["w","Math","max","document","documentElement","clientWidth","window","innerWidth","h","clientHeight","innerHeight","full_view_hover","doc_pos_y","basic_ease","scroll_y_margin","setup","$","length","addClass","Utils","scrollNav","click","removeClass","this","closest","theClass","attr","parent","stop","animate","scrollTop","offset","top","prototype","constructor","isElementInView","element","fullyInView","pageTop","pageBottom","height","elementTop","elementBottom","ready","exp_mode","hover","next","show","hide","mousemove","ev","css","pageY","outerHeight","left","pageX","e","$wrap","$pop","each","i","detach","wrap","prepend","after","find","remove","unwrap","hasClass","removeAttr","console","log","event","preventDefault","clone","appendTo","siblings","index","children","tempContent","html","scroll"],"mappings":"AAAA,IAAIA,EAAIC,KAAKC,IAAIC,SAASC,gBAAgBC,YAAaC,OAAOC,YAAc,GACxEC,EAAIP,KAAKC,IAAIC,SAASC,gBAAgBK,aAAcH,OAAOI,aAAe,GAE1EC,iBAAkB,EAElBC,UAAY,EACZC,WAAa,IACbC,gBAAkBN;ACPtB,SAASO,QACLC,EAAE,WAAWC,QAAUN,iBAEzBK,EAAE,WAAWE,SAAS,0BAexB,SAASC,SAwBT,SAASC,YACRJ,EAAE,UAAUK,MAAM,WAEjBL,EAAE,WAAWM,YAAY,UACzBN,EAAEO,MAAMC,QAAQ,MAAMN,SAAS,UAC/B,IAAIO,EAAWT,EAAEO,MAAMG,KAAK,SAM5B,OALAV,EAAE,IAAIS,GAAUE,OAAO,MAAMT,SAAS,UAEtCF,EAAE,cAAcY,OAAOC,SACrBC,UAAWd,EAAGA,EAAEO,MAAMG,KAAK,SAAUK,SAASC,IAAM,KACnD,MACI,IAERhB,EAAE,gBAAgBc,YAjCnBX,MAAMc,WACFC,YAAaf,MACbgB,gBAAiB,SAAUC,EAASC,GAChC,IAAIC,EAAUtB,EAAEV,QAAQwB,YACpBS,EAAaD,EAAUtB,EAAEV,QAAQkC,SACjCC,EAAazB,EAAEoB,GAASL,SAASC,IACjCU,EAAgBD,EAAazB,EAAEoB,GAASI,SAE5C,OAAoB,IAAhBH,EACSC,EAAUG,GAAgBF,EAAaG,EAEvCD,GAAcF,GAAgBG,GAAiBJ,IAKpE,IAAInB,MAAQ,IAAIA;ACpChBH,EAAGb,UAAWwC,MAAM,WAKnB5B,QAQA,IAAI6B,GAAW,EAGf5B,EAAE,WAAW6B,MACZ,WACa7B,EAAEO,MAEXP,EAAEO,MAAMG,KAAK,SAIhBV,EAAEO,MAAMuB,KAAK,YAAYC,QACvB,WACF/B,EAAEO,MAAMuB,KAAK,YAAYE,SAEzBC,UACD,SAASC,GACRlC,EAAEO,MAAMuB,KAAK,YAAYK,KACxBnB,IAAOkB,EAAGE,MAAQpC,EAAEO,MAAMuB,KAAK,YAAYO,cAAgB,EAC3DC,KAAQJ,EAAGK,MAAQ,MAOtBvC,EAAE,iBAAiBK,MAAM,SAASmC,GACjC,IAAIC,EAAOC,EAEI,GAAZd,GACFA,GAAW,EAEX5B,EAAE,WAAW2C,KAAK,SAASC,EAAGJ,GACC,UAA3BxC,EAAEO,MAAM4B,IAAI,cACdnC,EAAEO,MAAML,SAAS,kBACjBF,EAAEO,MAAM4B,IAAI,WAAY,aAGzBO,EAAO1C,EAAEO,MAAMuB,KAAK,YAAYe,UAChCJ,EAAQzC,EAAEO,MAAMuC,KAAK,kCAAoCnC,SAASoC,QAAQ,yCACpEC,MAAMN,OAIb1C,EAAE,WAAW2C,KAAK,SAASC,EAAGJ,GAC7BC,EAAQzC,EAAEO,MAAMI,OAAO,aACvB+B,EAAOD,EAAMX,KAAK,YAAYe,SAC9BJ,EAAMQ,KAAK,mBAAmBC,SAC9BlD,EAAEO,MAAM4C,OAAO,aACfnD,EAAEO,MAAMyC,MAAMN,GACX1C,EAAEO,MAAM6C,SAAS,oBACnBpD,EAAEO,MAAM4B,IAAI,WAAY,IACI,IAAzBnC,EAAEO,MAAMG,KAAK,UACfV,EAAEO,MAAM8C,WAAW,SAEpBrD,EAAEO,MAAMD,YAAY,qBAItBsB,GAAW,GAGZ0B,QAAQC,IAAI,qBAAsB3B,KAInC5B,EAAE,iBAAiBK,MAAM,SAASmD,GACjCF,QAAQC,IAAI,qBACZC,EAAMC,iBAENzD,EAAE,QAAQa,SAASC,UAAW,GAAIjB,WAAY,WAC5CyD,QAAQC,IAAI,sBAGfvD,EAAE,kBAAkBK,MAAM,SAASmD,GAClCF,QAAQC,IAAI,eACZC,EAAMC,iBACNzD,EAAE,QAAQa,SAASC,UAAWd,EAAEb,UAAUqC,UAAwB,EAAb3B,WAAgB,WACnEyD,QAAQC,IAAI,yBAMfvD,EAAG,aAAcK,MAAM,SAASmD,GAC/BA,EAAMC,iBACNzD,EAAGO,MAAOmD,QAAQC,SAAU,eAC5B3D,EAAGO,MAAOqD,WAAWF,QAAQC,SAAU,eACvC3D,EAAG,eAAgBM,YAAa,WAGjC,IAAIsC,EAAI,EACR5C,EAAG,gBAAiB2C,KAAK,WACxB3C,EAAGO,MAAO0C,KAAM,MAAON,KAAK,SAAUkB,GACrC,GAAK,GAAK7D,EAAGO,MAAOuD,SAAU,MAAO7D,OAAS,CAE7C,IAAI8D,EAAc/D,EAAGO,MAAOyD,OAE5BhE,EAAGO,MAAOyD,KAAMD,EAAa,4BAA+BnB,EAAG,WAC/DA,WAaJ5C,EAAGb,UAAW8E,OAAO,WAGpBrE,UAAYI,EAAGb,UAAW2B,YAE1B,IAAItB,EAAIM,gBAEJF,UAAYJ,EACfQ,EAAE,iBAAiBW,SAASL,YAAY,SAExCN,EAAE,iBAAiBW,SAAST,SAAS","file":"all.min.js","sourcesContent":["var w = Math.max(document.documentElement.clientWidth, window.innerWidth || 0);\r\nvar h = Math.max(document.documentElement.clientHeight, window.innerHeight || 0);\r\n\r\nvar full_view_hover = false;\r\n\r\nvar doc_pos_y = 0;\r\nvar basic_ease = 600;\r\nvar scroll_y_margin = h;\r\n\r\n\r\n// TEST\r\n// var fixed_containers = [];\r\n","function setup() {\r\n\tif($('#js_tph').length && full_view_hover) {\r\n\t\t// $('body').prepend(\"<div id=\\\"js_tph\\\" class=\\\"layer__hover hover_full_view_change\\\"></div>\");\r\n\t\t$('#js_tph').addClass(\"hover_full_view_change\");\r\n\t}\r\n}\r\n\r\n// get document coordinates of the element\r\n// function getCoords(elem) {\r\n//   let box = elem.getBoundingClientRect();\r\n//\r\n//   return {\r\n//     top: box.top + pageYOffset,\r\n//     left: box.left + pageXOffset\r\n//   };\r\n// }\r\n\r\n// https://stackoverflow.com/a/488073/1444149\r\nfunction Utils() {\r\n\r\n}\r\n\r\nUtils.prototype = {\r\n    constructor: Utils,\r\n    isElementInView: function (element, fullyInView) {\r\n        var pageTop = $(window).scrollTop();\r\n        var pageBottom = pageTop + $(window).height();\r\n        var elementTop = $(element).offset().top;\r\n        var elementBottom = elementTop + $(element).height();\r\n\r\n        if (fullyInView === true) {\r\n            return ((pageTop < elementTop) && (pageBottom > elementBottom));\r\n        } else {\r\n            return ((elementTop <= pageBottom) && (elementBottom >= pageTop));\r\n        }\r\n    }\r\n};\r\n\r\nvar Utils = new Utils();\r\n\r\n// TEST\r\n\r\nfunction scrollNav() {\r\n\t$('.nav a').click(function(){\r\n\t\t//Toggle Class\r\n\t\t$(\".active\").removeClass(\"active\");\r\n\t\t$(this).closest('li').addClass(\"active\");\r\n\t\tvar theClass = $(this).attr(\"class\");\r\n\t\t$('.'+theClass).parent('li').addClass('active');\r\n\t\t//Animate\r\n\t\t$('html, body').stop().animate({\r\n\t\t\t\tscrollTop: $( $(this).attr('href') ).offset().top - 160\r\n\t\t}, 400);\r\n\t\treturn false;\r\n\t});\r\n\t$('.scrollTop a').scrollTop();\r\n}\r\n","// DOM ready\r\n// ------------------------------------------------------------------------------\r\n$( document ).ready(function() {\r\n\r\n\t// Setup\r\n\t// ------------------------------------------------------------------------------\r\n\r\n\tsetup();\r\n\r\n\r\n\r\n\t// Modules\r\n\t// ------------------------------------------------------------------------------\r\n\r\n\t// Explanation module scripts\r\n\tvar exp_mode = false;\r\n\r\n\t// Displays explanation popup\r\n\t$(\".js_pop\").hover(\r\n\t\tfunction() {\r\n\t\t\tvar $this = $(this);\r\n\r\n\t\t\tif($(this).attr(\"emmet\")){\r\n\r\n\t\t\t}\r\n\r\n\t\t\t$(this).next(\".exp_pop\").show();\r\n\t\t}, function() {\r\n\t\t\t$(this).next(\".exp_pop\").hide();\r\n\t\t}\r\n\t).mousemove(\r\n\t\tfunction(ev) {\r\n\t\t\t$(this).next(\".exp_pop\").css({\r\n\t\t\t\t\"top\": ev.pageY - $(this).next(\".exp_pop\").outerHeight() - 4,\r\n\t\t\t\t\"left\": ev.pageX + 8\r\n\t\t\t});\r\n\t\t}\r\n\t);\r\n\r\n\t// WIP Activates layer with explanation elements\r\n\t// Besser ::after oder ::before benutzen\r\n\t$(\".exp_help_btn\").click(function(e){\r\n\t\tvar $wrap, $pop;\r\n\r\n\t\tif(exp_mode != true){\r\n\t\t\texp_mode = true;\r\n\r\n\t\t\t$(\".js_pop\").each(function(i, e){\r\n\t\t\t\tif($(this).css(\"position\") == \"static\") {\r\n\t\t\t\t\t$(this).addClass(\"js_changed_pos\");\r\n\t\t\t\t\t$(this).css(\"position\", \"relative\");\r\n\t\t\t\t}\r\n\r\n\t\t\t\t$pop = $(this).next(\".exp_pop\").detach();\r\n\t\t\t\t$wrap = $(this).wrap(\"<span class=\\\"exp_wrap\\\"></span>\").parent().prepend(\"<span class=\\\"exp_marker_pop\\\"></span>\");\r\n\t\t\t\t$wrap.after($pop);\r\n\t\t\t});\r\n\r\n\t\t} else {\r\n\t\t\t$(\".js_pop\").each(function(i, e){\r\n\t\t\t\t$wrap = $(this).parent(\".exp_wrap\");\r\n\t\t\t\t$pop = $wrap.next(\".exp_pop\").detach();\r\n\t\t\t\t$wrap.find(\".exp_marker_pop\").remove();\r\n\t\t\t\t$(this).unwrap(\".exp_wrap\");\r\n\t\t\t\t$(this).after($pop);\r\n\t\t\t\tif($(this).hasClass(\"js_changed_pos\")){\r\n\t\t\t\t\t$(this).css(\"position\", \"\");\r\n\t\t\t\t\tif($(this).attr(\"style\") == \"\") {\r\n\t\t\t\t\t\t$(this).removeAttr(\"style\");\r\n\t\t\t\t\t}\r\n\t\t\t\t\t$(this).removeClass(\"js_changed_pos\");\r\n\t\t\t\t}\r\n\t\t\t});\r\n\r\n\t\t\texp_mode = false;\r\n\r\n\t\t}\r\n\t\tconsole.log(\"Explanation mode: \"+ exp_mode);\r\n\t});\r\n\r\n\t//\tWIP Scroll to top\r\n\t$('#js_scrolltop').click(function(event) {\r\n\t\tconsole.log('scroll to the top');\r\n\t\tevent.preventDefault();\r\n\t\t// $('body').scrollTop();\r\n\t\t$('body').animate({scrollTop: 0}, basic_ease, function() {\r\n\t\t\t console.log('arrived at top');\r\n\t\t});\r\n\t});\r\n\t$('#js_scrolldown').click(function(event) {\r\n\t\tconsole.log('scroll down');\r\n\t\tevent.preventDefault();\r\n\t\t$('body').animate({scrollTop: $(document).height()}, basic_ease * 2, function() {\r\n\t\t\t console.log('arrived at bottom');\r\n\t\t});\r\n\t});\r\n\r\n\r\n\r\n\t$( \"#gameIcon\" ).click(function(event) {\r\n\t\tevent.preventDefault();\r\n\t\t$( this ).clone().appendTo( \"#gameDetail\" );\r\n\t\t$( this ).siblings().clone().appendTo( \"#gameDetail\" );\r\n\t\t$( \"#gameDetail\" ).removeClass( \"magic\" );\r\n\t});\r\n\r\n\tvar i = 0;\r\n\t$( \".pass-def dd\" ).each(function() {\r\n\t\t$( this ).find( \"li\" ).each(function( index ) {\r\n\t\t\tif ( 0 == $( this ).children( \"ul\" ).length ) {\r\n\t\t\t\t//console.log( index + \": \" + $( this ).text() );\r\n\t\t\t\tvar tempContent = $( this ).html();\r\n\t\t\t\t//$( this ).html( \"<span class=\\\"list-count\\\"></span>\" );\r\n\t\t\t\t$( this ).html( tempContent +\"<span class=\\\"list-count\\\">\"+ i +\"</span>\" );\r\n\t\t\t\ti++;\r\n\t\t\t}\r\n\t\t})\r\n\t});\r\n\r\n\r\n\r\n});\r\n\r\n\r\n\r\n// Scroll\r\n// ------------------------------------------------------------------------------\r\n$( document ).scroll(function() {\r\n\r\n\t// Toggle navigation elements\r\n\tdoc_pos_y = $( document ).scrollTop();\r\n\t// console.log(doc_pos_y);\r\n\tvar h = scroll_y_margin;\r\n\t// var demo_margin = $('.header__fix');\r\n\tif (doc_pos_y > h) {\r\n\t\t$('#js_scrolltop').parent().removeClass('magic');\r\n\t} else {\r\n\t\t$('#js_scrolltop').parent().addClass('magic');\r\n\t}\r\n\r\n\r\n\r\n});\r\n"]} diff --git a/demo-explorer.html b/demo-explorer.html index 5b1f6bd..9fbf418 100644 --- a/demo-explorer.html +++ b/demo-explorer.html @@ -11,9 +11,12 @@ + + + - + @@ -143,10 +146,8 @@ src="https://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"> - - - - + + - - - - + + diff --git a/demo-presentation.html b/demo-presentation.html index 69db158..2b6632b 100644 --- a/demo-presentation.html +++ b/demo-presentation.html @@ -11,9 +11,12 @@ + + + - + @@ -28,10 +31,8 @@ src="https://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"> - - - - + + + + + + diff --git a/gulpfile.js b/gulpfile.js index da8e356..900a23d 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,43 +1,105 @@ -const gulp = require('gulp'); -const sass = require('gulp-ruby-sass'); -const sourcemaps = require('gulp-sourcemaps'); -const plumber = require('gulp-plumber'); -const notify = require('gulp-notify'); -const livereload = require('gulp-livereload'); +// Setup project +var source = { + styles: 'source/style/example.scss', + scripts: ['source/code/variables.js', 'source/code/functions.js', 'source/code/global.js', 'source/code/**/*.coffee', '!source/vendor/**/*', ], + images: 'source/art/**/*' +}; +var build = { + styles: 'build/css', + scripts: 'build/js', + images: 'build/art' +} -gulp.task('default', function(){ - console.log('default gulp task...') +// Load plugins +const gulp = require('gulp'), + rename = require('gulp-rename'), + del = require('del'); + concat = require('gulp-concat'), + pump = require('pump'), + sourcemap = require('gulp-sourcemaps'), + prefix = require('gulp-autoprefixer'), + sass = require('gulp-ruby-sass'), + cssnano = require('gulp-cssnano'), + jshint = require('gulp-jshint'), + uglify = require('gulp-uglify'), + // imagemin = require('gulp-imagemin'), + cache = require('gulp-cached'), + remember = require('gulp-remember'), + changed = require('gulp-changed'), + notify = require('gulp-notify'), + browsersync = require('browser-sync').create(); + + +// Task - Clean build directory +gulp.task('clean', function() { + return del([build.scripts, build.styles, 'build/**']); }); -gulp.task('sass', () => -sass('./*.scss', {sourcemap: true}) -// .on('error', sass.logError) -.pipe(plumber(errorReport("sass error"))) -.pipe(sourcemaps.write('./')) -.pipe(gulp.dest('./')) -.pipe(livereload()) +// Task - Styles +gulp.task('styles', () => + sass(source.styles, {sourcemap: true}) + .on('error', sass.logError) + .pipe(prefix('last 2 version')) + .pipe(gulp.dest(build.styles)) + .pipe(rename({suffix: '.min'})) + .pipe(cssnano()) + .pipe(sourcemap.write('.', { + includeContent: false, + sourceRoot: 'source' + })) + .pipe(gulp.dest(build.styles)) + .pipe(browsersync.stream({match: '**/*.css'})) + // .pipe(notify({message: 'Style task complete'})) ); -gulp.task('watch', function() { - livereload.listen(); - gulp.watch('./**/*.scss', ['sass']); - gulp.watch(['*.html']).on('change', livereload.changed); - // gulp.watch('js/src/*.js', ['js']); - // gulp.watch('img/src/*.{png,jpg,gif}', ['img']); - +// Task - Scripts +gulp.task('scripts', function(cb) { + pump([ + gulp.src(source.scripts), + cache('scripts'), + jshint('.jshintrc'), + jshint.reporter('default'), + sourcemap.init(), + uglify(), + remember('scripts'), + concat('all.min.js'), + sourcemap.write(), + gulp.dest(build.scripts), + browsersync.stream() + ], cb); }); -gulp.task('default', ['sass', 'watch']); +// Task - Images +gulp.task('images', function() { + return gulp.src(source.images) + .pipe(changed(cache(imagemin({ + optimizationLevel: 3, + progressive: true, + interlaced: true }))) + ) + .pipe(gulp.dest(build.images)) + .pipe(notify({ message: 'Images task complete' })) + ; +}); +// Watch for file changes +gulp.task('watch', ['clean', 'styles', 'scripts'], function() { + browsersync.init({ + server: ".", + // proxy: "http://verser.vrt/virtual/" + }); + gulp.watch(source.styles, ['styles']); + gulp.watch(source.scripts, ['scripts']).on('change', function(event) { + if (event.type === 'deleted') { + delete cache.caches['scripts'][event.path]; + remember.forget('scripts', event.path); + } + }); + gulp.watch("./*.html").on('change', browsersync.reload); + // gulp.watch(['build/**']).on('change', browsersync.reload); + // gulp.watch(source.images, ['images']); +}); -function errorReport(errTitle) { - return plumber({ - errorHandler: notify.onError({ - // Customizing error title - title: errTitle || "Error running Gulp", - message: "Error: <%= error.message %>", - sound: true - }) - }); -} +// The default task (called when you run `gulp` from cli) +gulp.task('default', ['clean', 'styles', 'scripts']); diff --git a/package-lock.json b/package-lock.json index 283a041..28ea56c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,93 +10,17 @@ "integrity": "sha1-z6I7xYQPkQTOMqZedNt+epdLvuE=", "dev": true, "requires": { - "acorn": "5.1.1", + "acorn": "5.1.2", "css": "2.2.1", "normalize-path": "2.1.1", - "source-map": "0.5.6", + "source-map": "0.5.7", "through2": "2.0.3" }, "dependencies": { "acorn": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz", - "integrity": "sha512-vOk6uEMctu0vQrvuSqFdJyqj1Q0S5VTDL79qtjo+DhRr+1mmaD+tluFSCZqhvi/JUhXSzoZN2BhtstaPEeE8cw==", - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", - "dev": true - }, - "readable-stream": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", - "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", - "dev": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "safe-buffer": "5.1.1", - "string_decoder": "1.0.3", - "util-deprecate": "1.0.2" - } - }, - "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", - "dev": true - }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "dev": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, - "through2": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", - "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", - "dev": true, - "requires": { - "readable-stream": "2.3.3", - "xtend": "4.0.1" - } - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true - }, - "xtend": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.2.tgz", + "integrity": "sha512-o96FZLJBPY1lvTuJylGA9Bk3t/GKPPJG8H0ydQQl01crzwJgspa4AEIq/pVTXigmK0PHVQhiAtn8WMBLL9D2WA==", "dev": true } } @@ -109,84 +33,22 @@ "requires": { "normalize-path": "2.1.1", "through2": "2.0.3" - }, - "dependencies": { - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", - "dev": true - }, - "readable-stream": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", - "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", - "dev": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "safe-buffer": "5.1.1", - "string_decoder": "1.0.3", - "util-deprecate": "1.0.2" - } - }, - "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", - "dev": true - }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "dev": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, - "through2": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", - "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", - "dev": true, - "requires": { - "readable-stream": "2.3.3", - "xtend": "4.0.1" - } - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true - }, - "xtend": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", - "dev": true - } + } + }, + "abbrev": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz", + "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=", + "dev": true + }, + "accepts": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz", + "integrity": "sha1-hiRnWMfdbSGmR0/whKR0DsBesh8=", + "dev": true, + "requires": { + "mime-types": "2.1.17", + "negotiator": "0.6.1" } }, "acorn": { @@ -195,6 +57,28 @@ "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=", "dev": true }, + "after": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/after/-/after-0.8.1.tgz", + "integrity": "sha1-q11PuIP1loFtNRX495HAr0ht1ic=", + "dev": true + }, + "ajv": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", + "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", + "dev": true, + "requires": { + "co": "4.6.0", + "json-stable-stringify": "1.0.1" + } + }, + "alphanum-sort": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz", + "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=", + "dev": true + }, "amdefine": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", @@ -202,17 +86,60 @@ "dev": true }, "ansi-regex": { - "version": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", "dev": true }, "ansi-styles": { - "version": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", "dev": true }, + "anymatch": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", + "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", + "dev": true, + "requires": { + "micromatch": "2.3.11", + "normalize-path": "2.1.1" + } + }, + "archy": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", + "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=", + "dev": true + }, + "argparse": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", + "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=", + "dev": true, + "requires": { + "sprintf-js": "1.0.3" + } + }, + "arr-diff": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", + "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", + "dev": true, + "requires": { + "arr-flatten": "1.1.0" + } + }, + "arr-flatten": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", + "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", + "dev": true + }, "array-differ": { - "version": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=", "dev": true }, @@ -228,129 +155,583 @@ "integrity": "sha1-5zA08A3MH0CHYAj9IP6ud71LfC8=", "dev": true }, + "array-union": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", + "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", + "dev": true, + "requires": { + "array-uniq": "1.0.3" + } + }, "array-uniq": { - "version": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", "dev": true }, + "array-unique": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", + "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", + "dev": true + }, + "arraybuffer.slice": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz", + "integrity": "sha1-8zshWfBTKj8xB6JywMz70a0peco=", + "dev": true + }, + "asn1": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", + "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=", + "dev": true + }, + "assert-plus": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", + "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=", + "dev": true + }, + "async": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", + "dev": true + }, + "async-each": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", + "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=", + "dev": true + }, + "async-each-series": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/async-each-series/-/async-each-series-0.1.1.tgz", + "integrity": "sha1-dhfBkXQB/Yykooqtzj266Yr+tDI=", + "dev": true + }, + "asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", + "dev": true + }, "atob": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/atob/-/atob-1.1.3.tgz", "integrity": "sha1-lfE2KbEsOlGl0hWr3OKqnzL4B3M=", "dev": true }, - "balanced-match": { - "version": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", - "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=", + "autoprefixer": { + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.1.4.tgz", + "integrity": "sha512-MB1XybOJqu1uAwpfSilAa1wSURNc4W310CFKvMj1fNaJBFxr1PGgz72vZaPr9ryKGqs2vYZ6jDyJ0aiGELjsoA==", + "dev": true, + "requires": { + "browserslist": "2.4.0", + "caniuse-lite": "1.0.30000738", + "normalize-range": "0.1.2", + "num2fraction": "1.2.2", + "postcss": "6.0.12", + "postcss-value-parser": "3.3.0" + } + }, + "aws-sign2": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", + "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=", "dev": true }, + "aws4": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", + "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=", + "dev": true + }, + "backo2": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz", + "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=", + "dev": true + }, + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true + }, + "base64-arraybuffer": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz", + "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=", + "dev": true + }, + "base64id": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz", + "integrity": "sha1-As4P3u4M709ACA4ec+g08LG/zj8=", + "dev": true + }, + "batch": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz", + "integrity": "sha1-PzQU84AyF0O/wQQvmoP/HVgk1GQ=", + "dev": true + }, + "bcrypt-pbkdf": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", + "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", + "dev": true, + "optional": true, + "requires": { + "tweetnacl": "0.14.5" + } + }, "beeper": { - "version": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz", "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=", "dev": true }, - "body-parser": { - "version": "1.14.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.14.2.tgz", - "integrity": "sha1-EBXLH+LEQ4WCWVgdtTMy+NDPUPk=", + "better-assert": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz", + "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=", "dev": true, "requires": { - "bytes": "2.2.0", - "content-type": "1.0.2", - "debug": "2.2.0", - "depd": "1.1.1", - "http-errors": "1.3.1", - "iconv-lite": "0.4.13", - "on-finished": "2.3.0", - "qs": "5.2.0", - "raw-body": "2.1.7", - "type-is": "1.6.15" - }, - "dependencies": { - "debug": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", - "dev": true, - "requires": { - "ms": "0.7.1" - } - }, - "ms": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=", - "dev": true - }, - "qs": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz", - "integrity": "sha1-qfMRQq9GjLcrJbMBNrokVoNJFr4=", - "dev": true - } + "callsite": "1.0.0" + } + }, + "binary-extensions": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz", + "integrity": "sha1-muuabF6IY4qtFx4Wf1kAq+JINdA=", + "dev": true + }, + "blob": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz", + "integrity": "sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=", + "dev": true + }, + "boom": { + "version": "2.10.1", + "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", + "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", + "dev": true, + "requires": { + "hoek": "2.16.3" } }, "brace-expansion": { - "version": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz", - "integrity": "sha1-Pv/DxQ4ABTH7cg6v+A8K6O8jz1k=", + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", + "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", "dev": true, "requires": { - "balanced-match": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", - "concat-map": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" + "balanced-match": "1.0.0", + "concat-map": "0.0.1" } }, - "buffer-shims": { - "version": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz", - "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=", + "braces": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", + "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", + "dev": true, + "requires": { + "expand-range": "1.8.2", + "preserve": "0.2.0", + "repeat-element": "1.1.2" + } + }, + "browser-sync": { + "version": "2.18.13", + "resolved": "https://registry.npmjs.org/browser-sync/-/browser-sync-2.18.13.tgz", + "integrity": "sha512-qhdrmgshVGwweogT/bdOKkZDxVxqiF4+9mibaDeAxvDBeoUtdgABk5x7YQ1KCcLRchAfv8AVtp9NuITl5CTNqg==", + "dev": true, + "requires": { + "browser-sync-client": "2.5.1", + "browser-sync-ui": "0.6.3", + "bs-recipes": "1.3.4", + "chokidar": "1.7.0", + "connect": "3.5.0", + "dev-ip": "1.0.1", + "easy-extender": "2.3.2", + "eazy-logger": "3.0.2", + "emitter-steward": "1.0.0", + "fs-extra": "3.0.1", + "http-proxy": "1.15.2", + "immutable": "3.8.1", + "localtunnel": "1.8.3", + "micromatch": "2.3.11", + "opn": "4.0.2", + "portscanner": "2.1.1", + "qs": "6.2.1", + "resp-modifier": "6.0.2", + "rx": "4.1.0", + "serve-index": "1.8.0", + "serve-static": "1.12.2", + "server-destroy": "1.0.1", + "socket.io": "1.6.0", + "socket.io-client": "1.6.0", + "ua-parser-js": "0.7.12", + "yargs": "6.4.0" + } + }, + "browser-sync-client": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.5.1.tgz", + "integrity": "sha1-7BrWmknC4tS2RbGLHAbCmz2a+Os=", + "dev": true, + "requires": { + "etag": "1.8.1", + "fresh": "0.3.0" + } + }, + "browser-sync-ui": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-0.6.3.tgz", + "integrity": "sha1-ZApTfBgGiTA9W+krxHa568RBwLw=", + "dev": true, + "requires": { + "async-each-series": "0.1.1", + "connect-history-api-fallback": "1.3.0", + "immutable": "3.8.1", + "server-destroy": "1.0.1", + "stream-throttle": "0.1.3", + "weinre": "2.0.0-pre-I0Z7U9OV" + } + }, + "browserslist": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.4.0.tgz", + "integrity": "sha512-aM2Gt4x9bVlCUteADBS6JP0F+2tMWKM1jQzUulVROtdFWFIcIVvY76AJbr7GDqy0eDhn+PcnpzzivGxY4qiaKQ==", + "dev": true, + "requires": { + "caniuse-lite": "1.0.30000738", + "electron-to-chromium": "1.3.22" + } + }, + "bs-recipes": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/bs-recipes/-/bs-recipes-1.3.4.tgz", + "integrity": "sha1-DS1NSKcYyMBEdp/cT4lZLci2lYU=", "dev": true }, - "bytes": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.2.0.tgz", - "integrity": "sha1-/TVGSkA/b5EXwt42Cez/nK4ABYg=", + "builtin-modules": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", + "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", + "dev": true + }, + "callsite": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz", + "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=", + "dev": true + }, + "camelcase": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", + "dev": true + }, + "caniuse-api": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz", + "integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=", + "dev": true, + "requires": { + "browserslist": "1.7.7", + "caniuse-db": "1.0.30000738", + "lodash.memoize": "4.1.2", + "lodash.uniq": "4.5.0" + }, + "dependencies": { + "browserslist": { + "version": "1.7.7", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", + "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", + "dev": true, + "requires": { + "caniuse-db": "1.0.30000738", + "electron-to-chromium": "1.3.22" + } + } + } + }, + "caniuse-db": { + "version": "1.0.30000738", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000738.tgz", + "integrity": "sha1-hICavEmjkOWowiSrk2nT+NAaogI=", + "dev": true + }, + "caniuse-lite": { + "version": "1.0.30000738", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000738.tgz", + "integrity": "sha1-GCDDya25oRfjEaW9yh0lvDQojro=", + "dev": true + }, + "caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", "dev": true }, "chalk": { - "version": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "escape-string-regexp": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "has-ansi": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "strip-ansi": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "supports-color": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz" + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" + } + }, + "chokidar": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", + "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", + "dev": true, + "requires": { + "anymatch": "1.3.2", + "async-each": "1.0.1", + "glob-parent": "2.0.0", + "inherits": "2.0.3", + "is-binary-path": "1.0.1", + "is-glob": "2.0.1", + "path-is-absolute": "1.0.1", + "readdirp": "2.1.0" + } + }, + "clap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.3.tgz", + "integrity": "sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==", + "dev": true, + "requires": { + "chalk": "1.1.3" + } + }, + "cli": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz", + "integrity": "sha1-IoF1NPJL+klQw01TLUjsvGIbjBQ=", + "dev": true, + "requires": { + "exit": "0.1.2", + "glob": "7.1.2" + } + }, + "cliui": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", + "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "dev": true, + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" } }, "clone": { - "version": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=", "dev": true }, + "clone-buffer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz", + "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=", + "dev": true + }, "clone-stats": { - "version": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=", "dev": true }, + "cloneable-readable": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.0.0.tgz", + "integrity": "sha1-pikNQT8hemEjL5XkWP84QYz7ARc=", + "dev": true, + "requires": { + "inherits": "2.0.3", + "process-nextick-args": "1.0.7", + "through2": "2.0.3" + } + }, + "co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", + "dev": true + }, + "coa": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz", + "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=", + "dev": true, + "requires": { + "q": "1.5.0" + } + }, + "code-point-at": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", + "dev": true + }, + "color": { + "version": "0.11.4", + "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz", + "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=", + "dev": true, + "requires": { + "clone": "1.0.2", + "color-convert": "1.9.0", + "color-string": "0.3.0" + } + }, + "color-convert": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz", + "integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true + }, + "color-string": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz", + "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "colormin": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz", + "integrity": "sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=", + "dev": true, + "requires": { + "color": "0.11.4", + "css-color-names": "0.0.4", + "has": "1.0.1" + } + }, + "colors": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", + "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=", + "dev": true + }, + "combined-stream": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", + "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", + "dev": true, + "requires": { + "delayed-stream": "1.0.0" + } + }, + "commander": { + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", + "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==", + "dev": true + }, + "component-bind": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz", + "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=", + "dev": true + }, + "component-emitter": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz", + "integrity": "sha1-KWWU8nU9qmOZbSrwjRWpURbJrsM=", + "dev": true + }, + "component-inherit": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz", + "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=", + "dev": true + }, "concat-map": { - "version": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "dev": true }, - "content-type": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz", - "integrity": "sha1-t9ETrueo3Se9IRM8TcJSnfFyHu0=", + "concat-with-sourcemaps": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.0.4.tgz", + "integrity": "sha1-9Vs74q60dgGxCi1SWcz7cP0vHdY=", + "dev": true, + "requires": { + "source-map": "0.5.7" + } + }, + "connect": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/connect/-/connect-3.5.0.tgz", + "integrity": "sha1-s1dSWgtMH1BZnNmD4dnv7qlncZg=", + "dev": true, + "requires": { + "debug": "2.2.0", + "finalhandler": "0.5.0", + "parseurl": "1.3.2", + "utils-merge": "1.0.0" + } + }, + "connect-history-api-fallback": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.3.0.tgz", + "integrity": "sha1-5R0X+PDvDbkKZP20feMFFVbp8Wk=", "dev": true }, + "console-browserify": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", + "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=", + "dev": true, + "requires": { + "date-now": "0.1.4" + } + }, "convert-source-map": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz", "integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=", "dev": true }, + "cookie": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", + "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=", + "dev": true + }, "core-util-is": { - "version": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "dev": true }, @@ -362,7 +743,7 @@ "requires": { "lru-cache": "4.1.1", "shebang-command": "1.2.0", - "which": "https://registry.npmjs.org/which/-/which-1.2.14.tgz" + "which": "1.3.0" }, "dependencies": { "lru-cache": { @@ -377,6 +758,15 @@ } } }, + "cryptiles": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", + "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", + "dev": true, + "requires": { + "boom": "2.10.1" + } + }, "css": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/css/-/css-2.2.1.tgz", @@ -389,12 +779,6 @@ "urix": "0.1.0" }, "dependencies": { - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true - }, "source-map": { "version": "0.1.43", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", @@ -406,13 +790,122 @@ } } }, + "css-color-names": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", + "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=", + "dev": true + }, + "cssnano": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz", + "integrity": "sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=", + "dev": true, + "requires": { + "autoprefixer": "6.7.7", + "decamelize": "1.2.0", + "defined": "1.0.0", + "has": "1.0.1", + "object-assign": "4.1.1", + "postcss": "5.2.17", + "postcss-calc": "5.3.1", + "postcss-colormin": "2.2.2", + "postcss-convert-values": "2.6.1", + "postcss-discard-comments": "2.0.4", + "postcss-discard-duplicates": "2.1.0", + "postcss-discard-empty": "2.1.0", + "postcss-discard-overridden": "0.1.1", + "postcss-discard-unused": "2.2.3", + "postcss-filter-plugins": "2.0.2", + "postcss-merge-idents": "2.1.7", + "postcss-merge-longhand": "2.0.2", + "postcss-merge-rules": "2.1.2", + "postcss-minify-font-values": "1.0.5", + "postcss-minify-gradients": "1.0.5", + "postcss-minify-params": "1.2.2", + "postcss-minify-selectors": "2.1.1", + "postcss-normalize-charset": "1.1.1", + "postcss-normalize-url": "3.0.8", + "postcss-ordered-values": "2.2.3", + "postcss-reduce-idents": "2.4.0", + "postcss-reduce-initial": "1.0.1", + "postcss-reduce-transforms": "1.0.4", + "postcss-svgo": "2.1.6", + "postcss-unique-selectors": "2.0.2", + "postcss-value-parser": "3.3.0", + "postcss-zindex": "2.2.0" + }, + "dependencies": { + "autoprefixer": { + "version": "6.7.7", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz", + "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=", + "dev": true, + "requires": { + "browserslist": "1.7.7", + "caniuse-db": "1.0.30000738", + "normalize-range": "0.1.2", + "num2fraction": "1.2.2", + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0" + } + }, + "browserslist": { + "version": "1.7.7", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", + "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", + "dev": true, + "requires": { + "caniuse-db": "1.0.30000738", + "electron-to-chromium": "1.3.22" + } + }, + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "postcss": { + "version": "5.2.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "csso": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz", + "integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=", + "dev": true, + "requires": { + "clap": "1.2.3", + "source-map": "0.5.7" + } + }, "d": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", "dev": true, "requires": { - "es5-ext": "0.10.27" + "es5-ext": "0.10.30" } }, "dargs": { @@ -421,18 +914,42 @@ "integrity": "sha1-RsJ/+rH/sTeO8hJZchNxn+YCvJM=", "dev": true }, + "dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "dev": true, + "requires": { + "assert-plus": "1.0.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "dev": true + } + } + }, + "date-now": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", + "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=", + "dev": true + }, "dateformat": { - "version": "https://registry.npmjs.org/dateformat/-/dateformat-2.0.0.tgz", - "integrity": "sha1-J0Pjq7XD/CRi5SfcpEXgTp9N7hc=", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz", + "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=", "dev": true }, "debug": { - "version": "2.6.8", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", - "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", "dev": true, "requires": { - "ms": "2.0.0" + "ms": "0.7.1" } }, "debug-fabulous": { @@ -442,7 +959,7 @@ "dev": true, "requires": { "debug": "2.3.0", - "memoizee": "0.4.5", + "memoizee": "0.4.11", "object-assign": "4.1.0" }, "dependencies": { @@ -469,30 +986,176 @@ } } }, + "decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "dev": true + }, + "defaults": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", + "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", + "dev": true, + "requires": { + "clone": "1.0.2" + } + }, + "defined": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz", + "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=", + "dev": true + }, + "del": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz", + "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=", + "dev": true, + "requires": { + "globby": "6.1.0", + "is-path-cwd": "1.0.0", + "is-path-in-cwd": "1.0.0", + "p-map": "1.2.0", + "pify": "3.0.0", + "rimraf": "2.6.2" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + } + } + }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", + "dev": true + }, "depd": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz", "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=", "dev": true }, + "deprecated": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz", + "integrity": "sha1-+cmvVGSvoeepcUWKi97yqpTVuxk=", + "dev": true + }, + "destroy": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", + "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=", + "dev": true + }, + "detect-file": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-0.1.0.tgz", + "integrity": "sha1-STXe39lIhkjgBrASlWbpOGcR6mM=", + "dev": true, + "requires": { + "fs-exists-sync": "0.1.0" + } + }, "detect-newline": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz", "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=", "dev": true }, - "duplexer": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", - "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=", + "dev-ip": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dev-ip/-/dev-ip-1.0.1.tgz", + "integrity": "sha1-p2o+0YVb56ASu4rBbLgPPADcKPA=", "dev": true }, + "dom-serializer": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", + "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", + "dev": true, + "requires": { + "domelementtype": "1.1.3", + "entities": "1.1.1" + }, + "dependencies": { + "domelementtype": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", + "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=", + "dev": true + }, + "entities": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz", + "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=", + "dev": true + } + } + }, + "domelementtype": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz", + "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=", + "dev": true + }, + "domhandler": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz", + "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=", + "dev": true, + "requires": { + "domelementtype": "1.3.0" + } + }, + "domutils": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", + "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", + "dev": true, + "requires": { + "dom-serializer": "0.1.0", + "domelementtype": "1.3.0" + } + }, "duplexer2": { - "version": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=", "dev": true, "requires": { - "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz" + "readable-stream": "1.1.14" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + } } }, "each-async": { @@ -505,16 +1168,212 @@ "set-immediate-shim": "1.0.1" } }, + "easy-extender": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/easy-extender/-/easy-extender-2.3.2.tgz", + "integrity": "sha1-PTJI/r4rFZYHMW2PnPSRwWZIIh0=", + "dev": true, + "requires": { + "lodash": "3.10.1" + } + }, + "eazy-logger": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/eazy-logger/-/eazy-logger-3.0.2.tgz", + "integrity": "sha1-oyWqXlPROiIliJsqxBE7K5Y29Pw=", + "dev": true, + "requires": { + "tfunk": "3.1.0" + } + }, + "ecc-jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", + "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", + "dev": true, + "optional": true, + "requires": { + "jsbn": "0.1.1" + } + }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=", "dev": true }, + "electron-to-chromium": { + "version": "1.3.22", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.22.tgz", + "integrity": "sha1-QyLVLBUUBuPq73StAmdog+hBZBg=", + "dev": true + }, + "emitter-steward": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/emitter-steward/-/emitter-steward-1.0.0.tgz", + "integrity": "sha1-80Ea3pdYp1Zd+Eiy2gy70bRsvWQ=", + "dev": true + }, + "encodeurl": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz", + "integrity": "sha1-eePVhlU0aQn+bw9Fpd5oEDspTSA=", + "dev": true + }, + "end-of-stream": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz", + "integrity": "sha1-jhdyBsPICDfYVjLouTWd/osvbq8=", + "dev": true, + "requires": { + "once": "1.3.3" + }, + "dependencies": { + "once": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", + "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=", + "dev": true, + "requires": { + "wrappy": "1.0.2" + } + } + } + }, + "engine.io": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-1.8.0.tgz", + "integrity": "sha1-PutfJky3XbvsG6rqJtYfWk6s4qo=", + "dev": true, + "requires": { + "accepts": "1.3.3", + "base64id": "0.1.0", + "cookie": "0.3.1", + "debug": "2.3.3", + "engine.io-parser": "1.3.1", + "ws": "1.1.1" + }, + "dependencies": { + "accepts": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz", + "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=", + "dev": true, + "requires": { + "mime-types": "2.1.17", + "negotiator": "0.6.1" + } + }, + "debug": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", + "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", + "dev": true, + "requires": { + "ms": "0.7.2" + } + }, + "ms": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", + "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", + "dev": true + } + } + }, + "engine.io-client": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.0.tgz", + "integrity": "sha1-e3MOQSdBQIdZbZvjyI0rxf22z1w=", + "dev": true, + "requires": { + "component-emitter": "1.2.1", + "component-inherit": "0.0.3", + "debug": "2.3.3", + "engine.io-parser": "1.3.1", + "has-cors": "1.1.0", + "indexof": "0.0.1", + "parsejson": "0.0.3", + "parseqs": "0.0.5", + "parseuri": "0.0.5", + "ws": "1.1.1", + "xmlhttprequest-ssl": "1.5.3", + "yeast": "0.1.2" + }, + "dependencies": { + "component-emitter": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", + "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", + "dev": true + }, + "debug": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", + "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", + "dev": true, + "requires": { + "ms": "0.7.2" + } + }, + "ms": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", + "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", + "dev": true + } + } + }, + "engine.io-parser": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.1.tgz", + "integrity": "sha1-lVTxrjMQfW+9FwylRm0vgz9qB88=", + "dev": true, + "requires": { + "after": "0.8.1", + "arraybuffer.slice": "0.0.6", + "base64-arraybuffer": "0.1.5", + "blob": "0.0.4", + "has-binary": "0.1.6", + "wtf-8": "1.0.0" + }, + "dependencies": { + "has-binary": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.6.tgz", + "integrity": "sha1-JTJvOc+k9hath4eJTjryz7x7bhA=", + "dev": true, + "requires": { + "isarray": "0.0.1" + } + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + } + } + }, + "entities": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz", + "integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY=", + "dev": true + }, + "error-ex": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", + "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", + "dev": true, + "requires": { + "is-arrayish": "0.2.1" + } + }, "es5-ext": { - "version": "0.10.27", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.27.tgz", - "integrity": "sha512-3KXJRYzKXTd7xfFy5uZsJCXue55fAYQ035PRjyYk2PicllxIwcW9l3AbM/eGaw3vgVAUW4tl4xg9AXDEI6yw0w==", + "version": "0.10.30", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.30.tgz", + "integrity": "sha1-cUGhaDZpfbq/qq7uQUlc4p9SyTk=", "dev": true, "requires": { "es6-iterator": "2.0.1", @@ -528,7 +1387,7 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.27", + "es5-ext": "0.10.30", "es6-symbol": "3.1.1" } }, @@ -539,7 +1398,7 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.27" + "es5-ext": "0.10.30" } }, "es6-weak-map": { @@ -549,16 +1408,35 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.27", + "es5-ext": "0.10.30", "es6-iterator": "2.0.1", "es6-symbol": "3.1.1" } }, + "escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=", + "dev": true + }, "escape-string-regexp": { - "version": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", "dev": true }, + "esprima": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", + "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", + "dev": true + }, + "etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", + "dev": true + }, "event-emitter": { "version": "0.3.5", "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", @@ -566,73 +1444,533 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.27" + "es5-ext": "0.10.30" } }, - "event-stream": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", - "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=", + "eventemitter3": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz", + "integrity": "sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg=", + "dev": true + }, + "exit": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", + "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=", + "dev": true + }, + "expand-brackets": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", + "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", "dev": true, "requires": { - "duplexer": "0.1.1", - "from": "0.1.7", - "map-stream": "0.1.0", - "pause-stream": "0.0.11", - "split": "0.3.3", - "stream-combiner": "0.0.4", - "through": "2.3.8" + "is-posix-bracket": "0.1.1" } }, + "expand-range": { + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", + "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", + "dev": true, + "requires": { + "fill-range": "2.2.3" + } + }, + "expand-tilde": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz", + "integrity": "sha1-C4HrqJflo9MdHD0QL48BRB5VlEk=", + "dev": true, + "requires": { + "os-homedir": "1.0.2" + } + }, + "express": { + "version": "2.5.11", + "resolved": "https://registry.npmjs.org/express/-/express-2.5.11.tgz", + "integrity": "sha1-TOjqHzY15p5J8Ou0l7aksKUc5vA=", + "dev": true, + "requires": { + "connect": "1.9.2", + "mime": "1.2.4", + "mkdirp": "0.3.0", + "qs": "0.4.2" + }, + "dependencies": { + "connect": { + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/connect/-/connect-1.9.2.tgz", + "integrity": "sha1-QogKIulDiuWait105Df1iujlKAc=", + "dev": true, + "requires": { + "formidable": "1.0.17", + "mime": "1.2.4", + "qs": "0.4.2" + } + }, + "qs": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-0.4.2.tgz", + "integrity": "sha1-PKxMhh43GoycR3CsI82o3mObjl8=", + "dev": true + } + } + }, + "extend": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", + "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=", + "dev": true + }, + "extglob": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", + "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + }, + "extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", + "dev": true + }, "fancy-log": { - "version": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz", "integrity": "sha1-Rb4X0Cu5kX1gzP/UmVyZnmyMmUg=", "dev": true, "requires": { - "chalk": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "time-stamp": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz" + "chalk": "1.1.3", + "time-stamp": "1.1.0" } }, - "faye-websocket": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.7.3.tgz", - "integrity": "sha1-zEB0x/Sk39A69U3WXDVLE1EyzhE=", + "filename-regex": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", + "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", + "dev": true + }, + "fill-range": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", + "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", "dev": true, "requires": { - "websocket-driver": "0.6.5" + "is-number": "2.1.0", + "isobject": "2.1.0", + "randomatic": "1.1.7", + "repeat-element": "1.1.2", + "repeat-string": "1.6.1" + } + }, + "finalhandler": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz", + "integrity": "sha1-6VCKvs6bbbqHGmlCodeRG5GRGsc=", + "dev": true, + "requires": { + "debug": "2.2.0", + "escape-html": "1.0.3", + "on-finished": "2.3.0", + "statuses": "1.3.1", + "unpipe": "1.0.0" } }, "find-index": { - "version": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz", "integrity": "sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=", "dev": true }, - "from": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz", - "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=", + "find-up": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "dev": true, + "requires": { + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" + } + }, + "findup-sync": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.4.3.tgz", + "integrity": "sha1-QAQ5Kee8YK3wt/SCfExudaDeyhI=", + "dev": true, + "requires": { + "detect-file": "0.1.0", + "is-glob": "2.0.1", + "micromatch": "2.3.11", + "resolve-dir": "0.1.1" + } + }, + "fined": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz", + "integrity": "sha1-s33IRLdqL15wgeiE98CuNE8VNHY=", + "dev": true, + "requires": { + "expand-tilde": "2.0.2", + "is-plain-object": "2.0.4", + "object.defaults": "1.1.0", + "object.pick": "1.3.0", + "parse-filepath": "1.0.1" + }, + "dependencies": { + "expand-tilde": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", + "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", + "dev": true, + "requires": { + "homedir-polyfill": "1.0.1" + } + } + } + }, + "first-chunk-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz", + "integrity": "sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=", "dev": true }, + "flagged-respawn": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.2.tgz", + "integrity": "sha1-/xke3c1wiKZ1smEP/8l2vpuAdLU=", + "dev": true + }, + "flatten": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz", + "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=", + "dev": true + }, + "for-in": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", + "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", + "dev": true + }, + "for-own": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", + "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", + "dev": true, + "requires": { + "for-in": "1.0.2" + } + }, + "forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", + "dev": true + }, + "form-data": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", + "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", + "dev": true, + "requires": { + "asynckit": "0.4.0", + "combined-stream": "1.0.5", + "mime-types": "2.1.17" + } + }, + "formidable": { + "version": "1.0.17", + "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz", + "integrity": "sha1-71SRSQ+UM7cF+qdyScmQKa40hVk=", + "dev": true + }, + "fresh": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz", + "integrity": "sha1-ZR+DjiJCTnVm3hYdg1jKoZn4PU8=", + "dev": true + }, + "fs-exists-sync": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz", + "integrity": "sha1-mC1ok6+RjnLQjeyehnP/K1qNat0=", + "dev": true + }, + "fs-extra": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz", + "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "jsonfile": "3.0.1", + "universalify": "0.1.1" + } + }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true }, + "function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "dev": true + }, + "gaze": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz", + "integrity": "sha1-QLcJU30k0dRXZ9takIaJ3+aaxE8=", + "dev": true, + "requires": { + "globule": "0.1.0" + } + }, + "get-caller-file": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", + "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=", + "dev": true + }, + "getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "dev": true, + "requires": { + "assert-plus": "1.0.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "dev": true + } + } + }, + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "glob-base": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", + "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", + "dev": true, + "requires": { + "glob-parent": "2.0.0", + "is-glob": "2.0.1" + } + }, + "glob-parent": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", + "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", + "dev": true, + "requires": { + "is-glob": "2.0.1" + } + }, + "glob-stream": { + "version": "3.1.18", + "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz", + "integrity": "sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs=", + "dev": true, + "requires": { + "glob": "4.5.3", + "glob2base": "0.0.12", + "minimatch": "2.0.10", + "ordered-read-streams": "0.1.0", + "through2": "0.6.5", + "unique-stream": "1.0.0" + }, + "dependencies": { + "glob": { + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz", + "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=", + "dev": true, + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "2.0.10", + "once": "1.4.0" + } + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "minimatch": { + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", + "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=", + "dev": true, + "requires": { + "brace-expansion": "1.1.8" + } + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + }, + "through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" + } + } + } + }, + "glob-watcher": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz", + "integrity": "sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs=", + "dev": true, + "requires": { + "gaze": "0.5.2" + } + }, "glob2base": { - "version": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz", + "version": "0.0.12", + "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz", "integrity": "sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=", "dev": true, "requires": { - "find-index": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz" + "find-index": "0.1.1" + } + }, + "global-modules": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz", + "integrity": "sha1-6lo77ULG1s6ZWk+KEmm12uIjgo0=", + "dev": true, + "requires": { + "global-prefix": "0.1.5", + "is-windows": "0.2.0" + } + }, + "global-prefix": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz", + "integrity": "sha1-jTvGuNo8qBEqFg2NSW/wRiv+948=", + "dev": true, + "requires": { + "homedir-polyfill": "1.0.1", + "ini": "1.3.4", + "is-windows": "0.2.0", + "which": "1.3.0" + } + }, + "globby": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", + "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", + "dev": true, + "requires": { + "array-union": "1.0.2", + "glob": "7.1.2", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + } + }, + "globule": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz", + "integrity": "sha1-2cjt3h2nnRJaFRt5UzuXhnY0auU=", + "dev": true, + "requires": { + "glob": "3.1.21", + "lodash": "1.0.2", + "minimatch": "0.2.14" + }, + "dependencies": { + "glob": { + "version": "3.1.21", + "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz", + "integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=", + "dev": true, + "requires": { + "graceful-fs": "1.2.3", + "inherits": "1.0.2", + "minimatch": "0.2.14" + } + }, + "graceful-fs": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz", + "integrity": "sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q=", + "dev": true + }, + "inherits": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz", + "integrity": "sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=", + "dev": true + }, + "lodash": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz", + "integrity": "sha1-j1dWDIO1n8JwvT1WG2kAQ0MOJVE=", + "dev": true + }, + "minimatch": { + "version": "0.2.14", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", + "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=", + "dev": true, + "requires": { + "lru-cache": "2.7.3", + "sigmund": "1.0.1" + } + } } }, "glogg": { - "version": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz", "integrity": "sha1-f+DxmfV6yQbPUS/urY+Q7kooT8U=", "dev": true, "requires": { - "sparkles": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz" + "sparkles": "1.0.0" } }, "graceful-fs": { @@ -657,7 +1995,7 @@ "chalk": "1.1.3", "deprecated": "0.0.1", "gulp-util": "3.0.8", - "interpret": "1.0.3", + "interpret": "1.0.4", "liftoff": "2.3.0", "minimist": "1.2.0", "orchestrator": "0.3.8", @@ -668,2015 +2006,122 @@ "vinyl-fs": "0.3.14" }, "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "archy": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", - "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=", - "dev": true - }, - "arr-diff": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", - "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", - "dev": true, - "requires": { - "arr-flatten": "1.1.0" - } - }, - "arr-flatten": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", - "dev": true - }, - "array-differ": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", - "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=", - "dev": true - }, - "array-uniq": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", - "dev": true - }, - "array-unique": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", - "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", - "dev": true - }, - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true - }, - "beeper": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz", - "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=", - "dev": true - }, - "brace-expansion": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", - "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", - "dev": true, - "requires": { - "balanced-match": "1.0.0", - "concat-map": "0.0.1" - } - }, - "braces": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", - "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", - "dev": true, - "requires": { - "expand-range": "1.8.2", - "preserve": "0.2.0", - "repeat-element": "1.1.2" - } - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - } - }, - "clone": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", - "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=", - "dev": true - }, - "clone-stats": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", - "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=", - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true - }, - "dateformat": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.0.0.tgz", - "integrity": "sha1-J0Pjq7XD/CRi5SfcpEXgTp9N7hc=", - "dev": true - }, - "defaults": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", - "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", - "dev": true, - "requires": { - "clone": "1.0.2" - } - }, - "deprecated": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz", - "integrity": "sha1-+cmvVGSvoeepcUWKi97yqpTVuxk=", - "dev": true - }, - "detect-file": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-0.1.0.tgz", - "integrity": "sha1-STXe39lIhkjgBrASlWbpOGcR6mM=", - "dev": true, - "requires": { - "fs-exists-sync": "0.1.0" - } - }, - "duplexer2": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", - "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=", - "dev": true, - "requires": { - "readable-stream": "1.1.14" - } - }, - "end-of-stream": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz", - "integrity": "sha1-jhdyBsPICDfYVjLouTWd/osvbq8=", - "dev": true, - "requires": { - "once": "1.3.3" - } - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, - "expand-brackets": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", - "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", - "dev": true, - "requires": { - "is-posix-bracket": "0.1.1" - } - }, - "expand-range": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", - "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", - "dev": true, - "requires": { - "fill-range": "2.2.3" - } - }, - "expand-tilde": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz", - "integrity": "sha1-C4HrqJflo9MdHD0QL48BRB5VlEk=", - "dev": true, - "requires": { - "os-homedir": "1.0.2" - } - }, - "extend": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", - "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=", - "dev": true - }, - "extglob": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", - "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", - "dev": true, - "requires": { - "is-extglob": "1.0.0" - } - }, - "fancy-log": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz", - "integrity": "sha1-Rb4X0Cu5kX1gzP/UmVyZnmyMmUg=", - "dev": true, - "requires": { - "chalk": "1.1.3", - "time-stamp": "1.1.0" - } - }, - "filename-regex": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", - "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", - "dev": true - }, - "fill-range": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", - "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", - "dev": true, - "requires": { - "is-number": "2.1.0", - "isobject": "2.1.0", - "randomatic": "1.1.7", - "repeat-element": "1.1.2", - "repeat-string": "1.6.1" - } - }, - "find-index": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz", - "integrity": "sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=", - "dev": true - }, - "findup-sync": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.4.3.tgz", - "integrity": "sha1-QAQ5Kee8YK3wt/SCfExudaDeyhI=", - "dev": true, - "requires": { - "detect-file": "0.1.0", - "is-glob": "2.0.1", - "micromatch": "2.3.11", - "resolve-dir": "0.1.1" - } - }, - "fined": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz", - "integrity": "sha1-s33IRLdqL15wgeiE98CuNE8VNHY=", - "dev": true, - "requires": { - "expand-tilde": "2.0.2", - "is-plain-object": "2.0.4", - "object.defaults": "1.1.0", - "object.pick": "1.2.0", - "parse-filepath": "1.0.1" - }, - "dependencies": { - "expand-tilde": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", - "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", - "dev": true, - "requires": { - "homedir-polyfill": "1.0.1" - } - } - } - }, - "first-chunk-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz", - "integrity": "sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=", - "dev": true - }, - "flagged-respawn": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.2.tgz", - "integrity": "sha1-/xke3c1wiKZ1smEP/8l2vpuAdLU=", - "dev": true - }, - "for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", - "dev": true - }, - "for-own": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", - "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", - "dev": true, - "requires": { - "for-in": "1.0.2" - } - }, - "fs-exists-sync": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz", - "integrity": "sha1-mC1ok6+RjnLQjeyehnP/K1qNat0=", - "dev": true - }, - "gaze": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz", - "integrity": "sha1-QLcJU30k0dRXZ9takIaJ3+aaxE8=", - "dev": true, - "requires": { - "globule": "0.1.0" - } - }, - "glob": { - "version": "4.5.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz", - "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=", - "dev": true, - "requires": { - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "2.0.10", - "once": "1.3.3" - } - }, - "glob-base": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", - "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", - "dev": true, - "requires": { - "glob-parent": "2.0.0", - "is-glob": "2.0.1" - } - }, - "glob-parent": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", - "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", - "dev": true, - "requires": { - "is-glob": "2.0.1" - } - }, - "glob-stream": { - "version": "3.1.18", - "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz", - "integrity": "sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs=", - "dev": true, - "requires": { - "glob": "4.5.3", - "glob2base": "0.0.12", - "minimatch": "2.0.10", - "ordered-read-streams": "0.1.0", - "through2": "0.6.5", - "unique-stream": "1.0.0" - }, - "dependencies": { - "readable-stream": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", - "dev": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "0.0.1", - "string_decoder": "0.10.31" - } - }, - "through2": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", - "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", - "dev": true, - "requires": { - "readable-stream": "1.0.34", - "xtend": "4.0.1" - } - } - } - }, - "glob-watcher": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz", - "integrity": "sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs=", - "dev": true, - "requires": { - "gaze": "0.5.2" - } - }, - "glob2base": { - "version": "0.0.12", - "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz", - "integrity": "sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=", - "dev": true, - "requires": { - "find-index": "0.1.1" - } - }, - "global-modules": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz", - "integrity": "sha1-6lo77ULG1s6ZWk+KEmm12uIjgo0=", - "dev": true, - "requires": { - "global-prefix": "0.1.5", - "is-windows": "0.2.0" - } - }, - "global-prefix": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz", - "integrity": "sha1-jTvGuNo8qBEqFg2NSW/wRiv+948=", - "dev": true, - "requires": { - "homedir-polyfill": "1.0.1", - "ini": "1.3.4", - "is-windows": "0.2.0", - "which": "1.3.0" - } - }, - "globule": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz", - "integrity": "sha1-2cjt3h2nnRJaFRt5UzuXhnY0auU=", - "dev": true, - "requires": { - "glob": "3.1.21", - "lodash": "1.0.2", - "minimatch": "0.2.14" - }, - "dependencies": { - "glob": { - "version": "3.1.21", - "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz", - "integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=", - "dev": true, - "requires": { - "graceful-fs": "1.2.3", - "inherits": "1.0.2", - "minimatch": "0.2.14" - } - }, - "graceful-fs": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz", - "integrity": "sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q=", - "dev": true - }, - "inherits": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz", - "integrity": "sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=", - "dev": true - }, - "minimatch": { - "version": "0.2.14", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz", - "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=", - "dev": true, - "requires": { - "lru-cache": "2.7.3", - "sigmund": "1.0.1" - } - } - } - }, - "glogg": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz", - "integrity": "sha1-f+DxmfV6yQbPUS/urY+Q7kooT8U=", - "dev": true, - "requires": { - "sparkles": "1.0.0" - } - }, - "graceful-fs": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz", - "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=", - "dev": true, - "requires": { - "natives": "1.1.0" - } - }, - "gulp-util": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz", - "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=", - "dev": true, - "requires": { - "array-differ": "1.0.0", - "array-uniq": "1.0.3", - "beeper": "1.1.1", - "chalk": "1.1.3", - "dateformat": "2.0.0", - "fancy-log": "1.3.0", - "gulplog": "1.0.0", - "has-gulplog": "0.1.0", - "lodash._reescape": "3.0.0", - "lodash._reevaluate": "3.0.0", - "lodash._reinterpolate": "3.0.0", - "lodash.template": "3.6.2", - "minimist": "1.2.0", - "multipipe": "0.1.2", - "object-assign": "3.0.0", - "replace-ext": "0.0.1", - "through2": "2.0.3", - "vinyl": "0.5.3" - } - }, - "gulplog": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", - "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=", - "dev": true, - "requires": { - "glogg": "1.0.0" - } - }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "has-gulplog": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz", - "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=", - "dev": true, - "requires": { - "sparkles": "1.0.0" - } - }, - "homedir-polyfill": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz", - "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=", - "dev": true, - "requires": { - "parse-passwd": "1.0.0" - } - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, - "requires": { - "once": "1.3.3", - "wrappy": "1.0.2" - } - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true - }, - "ini": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz", - "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=", - "dev": true - }, - "interpret": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz", - "integrity": "sha1-y8NcYu7uc/Gat7EKgBURQBr8D5A=", - "dev": true - }, - "is-absolute": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz", - "integrity": "sha1-IN5p89uULvLYe5wto28XIjWxtes=", - "dev": true, - "requires": { - "is-relative": "0.2.1", - "is-windows": "0.2.0" - } - }, - "is-buffer": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz", - "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=", - "dev": true - }, - "is-dotfile": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", - "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=", - "dev": true - }, - "is-equal-shallow": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", - "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", - "dev": true, - "requires": { - "is-primitive": "2.0.0" - } - }, - "is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", - "dev": true - }, - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "dev": true, - "requires": { - "is-extglob": "1.0.0" - } - }, - "is-number": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", - "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", - "dev": true, - "requires": { - "kind-of": "3.2.2" - } - }, - "is-posix-bracket": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", - "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=", - "dev": true - }, - "is-primitive": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", - "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=", - "dev": true - }, - "is-relative": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz", - "integrity": "sha1-0n9MfVFtF1+2ENuEu+7yPDvJeqU=", - "dev": true, - "requires": { - "is-unc-path": "0.1.2" - } - }, - "is-unc-path": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz", - "integrity": "sha1-arBTpyVzwQJQ/0FqOBTDUXivObk=", - "dev": true, - "requires": { - "unc-path-regex": "0.1.2" - } - }, - "is-utf8": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", - "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", - "dev": true - }, - "is-windows": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz", - "integrity": "sha1-3hqm1j6indJIc3tp8f+LgALSEIw=", - "dev": true - }, - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true - }, - "isobject": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", - "dev": true, - "requires": { - "isarray": "1.0.0" - }, - "dependencies": { - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - } - } - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "1.1.5" - } - }, - "liftoff": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.3.0.tgz", - "integrity": "sha1-qY8v9nGD2Lp8+soQVIvX/wVQs4U=", - "dev": true, - "requires": { - "extend": "3.0.1", - "findup-sync": "0.4.3", - "fined": "1.1.0", - "flagged-respawn": "0.3.2", - "lodash.isplainobject": "4.0.6", - "lodash.isstring": "4.0.1", - "lodash.mapvalues": "4.6.0", - "rechoir": "0.6.2", - "resolve": "1.4.0" - } - }, - "lodash": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz", - "integrity": "sha1-j1dWDIO1n8JwvT1WG2kAQ0MOJVE=", - "dev": true - }, - "lodash._basecopy": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", - "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=", - "dev": true - }, - "lodash._basetostring": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz", - "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=", - "dev": true - }, - "lodash._basevalues": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz", - "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=", - "dev": true - }, - "lodash._getnative": { - "version": "3.9.1", - "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", - "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=", - "dev": true - }, - "lodash._isiterateecall": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", - "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=", - "dev": true - }, - "lodash._reescape": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", - "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=", - "dev": true - }, - "lodash._reevaluate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz", - "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=", - "dev": true - }, - "lodash._reinterpolate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", - "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=", - "dev": true - }, - "lodash._root": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz", - "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=", - "dev": true - }, - "lodash.escape": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz", - "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=", - "dev": true, - "requires": { - "lodash._root": "3.0.1" - } - }, - "lodash.isarguments": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", - "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=", - "dev": true - }, - "lodash.isarray": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", - "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=", - "dev": true - }, - "lodash.isplainobject": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", - "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=", - "dev": true - }, - "lodash.isstring": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", - "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=", - "dev": true - }, - "lodash.keys": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", - "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", - "dev": true, - "requires": { - "lodash._getnative": "3.9.1", - "lodash.isarguments": "3.1.0", - "lodash.isarray": "3.0.4" - } - }, - "lodash.mapvalues": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz", - "integrity": "sha1-G6+lAF3p3W9PJmaMMMo3IwzJaJw=", - "dev": true - }, - "lodash.restparam": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", - "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=", - "dev": true - }, - "lodash.template": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", - "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=", - "dev": true, - "requires": { - "lodash._basecopy": "3.0.1", - "lodash._basetostring": "3.0.1", - "lodash._basevalues": "3.0.0", - "lodash._isiterateecall": "3.0.9", - "lodash._reinterpolate": "3.0.0", - "lodash.escape": "3.2.0", - "lodash.keys": "3.1.2", - "lodash.restparam": "3.6.1", - "lodash.templatesettings": "3.1.1" - } - }, - "lodash.templatesettings": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz", - "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=", - "dev": true, - "requires": { - "lodash._reinterpolate": "3.0.0", - "lodash.escape": "3.2.0" - } - }, - "lru-cache": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz", - "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=", - "dev": true - }, - "map-cache": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", - "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", - "dev": true - }, - "micromatch": { - "version": "2.3.11", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", - "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", - "dev": true, - "requires": { - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "object.omit": "2.0.1", - "parse-glob": "3.0.4", - "regex-cache": "0.4.3" - } - }, - "minimatch": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", - "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=", - "dev": true, - "requires": { - "brace-expansion": "1.1.8" - } - }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, - "requires": { - "minimist": "0.0.8" - }, - "dependencies": { - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true - } - } - }, - "multipipe": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", - "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=", - "dev": true, - "requires": { - "duplexer2": "0.0.2" - } - }, - "natives": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz", - "integrity": "sha1-6f+EFBimsux6SV6TmYT3jxY+bjE=", - "dev": true - }, - "normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, - "requires": { - "remove-trailing-separator": "1.1.0" - } - }, - "object-assign": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", - "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=", - "dev": true - }, - "object.omit": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", - "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", - "dev": true, - "requires": { - "for-own": "0.1.5", - "is-extendable": "0.1.1" - } - }, - "once": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", - "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=", - "dev": true, - "requires": { - "wrappy": "1.0.2" - } - }, - "orchestrator": { - "version": "0.3.8", - "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz", - "integrity": "sha1-FOfp4nZPcxX7rBhOUGx6pt+UrX4=", - "dev": true, - "requires": { - "end-of-stream": "0.1.5", - "sequencify": "0.0.7", - "stream-consume": "0.1.0" - } - }, - "ordered-read-streams": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz", - "integrity": "sha1-/VZamvjrRHO6abbtijQ1LLVS8SY=", - "dev": true - }, - "os-homedir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", - "dev": true - }, - "parse-filepath": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.1.tgz", - "integrity": "sha1-FZ1hVdQ5BNFsEO9piRHaHpGWm3M=", - "dev": true, - "requires": { - "is-absolute": "0.2.6", - "map-cache": "0.2.2", - "path-root": "0.1.1" - } - }, - "parse-glob": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", - "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", - "dev": true, - "requires": { - "glob-base": "0.3.0", - "is-dotfile": "1.0.3", - "is-extglob": "1.0.0", - "is-glob": "2.0.1" - } - }, - "parse-passwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", - "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=", - "dev": true - }, - "path-parse": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", - "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", - "dev": true - }, - "path-root": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz", - "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=", - "dev": true, - "requires": { - "path-root-regex": "0.1.2" - } - }, - "path-root-regex": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz", - "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=", - "dev": true - }, - "preserve": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", - "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=", - "dev": true - }, - "pretty-hrtime": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", - "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=", - "dev": true - }, - "process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", - "dev": true - }, - "randomatic": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", - "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", - "dev": true, - "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" - }, - "dependencies": { - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "1.1.5" - } - } - } - }, - "kind-of": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", - "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", - "dev": true, - "requires": { - "is-buffer": "1.1.5" - } - } - } - }, - "readable-stream": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", - "dev": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "0.0.1", - "string_decoder": "0.10.31" - } - }, - "rechoir": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", - "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", - "dev": true, - "requires": { - "resolve": "1.4.0" - } - }, - "regex-cache": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz", - "integrity": "sha1-mxpsNdTQ3871cRrmUejp09cRQUU=", - "dev": true, - "requires": { - "is-equal-shallow": "0.1.3", - "is-primitive": "2.0.0" - } - }, - "remove-trailing-separator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", - "dev": true - }, - "repeat-element": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", - "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=", - "dev": true - }, - "repeat-string": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", - "dev": true - }, - "replace-ext": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", - "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=", - "dev": true - }, - "resolve": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz", - "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==", - "dev": true, - "requires": { - "path-parse": "1.0.5" - } - }, - "resolve-dir": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz", - "integrity": "sha1-shklmlYC+sXFxJatiUpujMQwJh4=", - "dev": true, - "requires": { - "expand-tilde": "1.2.2", - "global-modules": "0.2.3" - } - }, - "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", - "dev": true - }, "semver": { "version": "4.3.6", "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz", "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=", "dev": true - }, - "sequencify": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz", - "integrity": "sha1-kM/xnQLgcCf9dn9erT57ldHnOAw=", - "dev": true - }, - "sigmund": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", - "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=", - "dev": true - }, - "sparkles": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz", - "integrity": "sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=", - "dev": true - }, - "stream-consume": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz", - "integrity": "sha1-pB6tGm1ggc63n2WwYZAbbY89HQ8=", - "dev": true - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "strip-bom": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz", - "integrity": "sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=", - "dev": true, - "requires": { - "first-chunk-stream": "1.0.0", - "is-utf8": "0.2.1" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - }, - "through2": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", - "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", - "dev": true, - "requires": { - "readable-stream": "2.3.3", - "xtend": "4.0.1" - }, - "dependencies": { - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "readable-stream": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", - "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", - "dev": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "safe-buffer": "5.1.1", - "string_decoder": "1.0.3", - "util-deprecate": "1.0.2" - } - }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "dev": true, - "requires": { - "safe-buffer": "5.1.1" - } - } - } - }, - "tildify": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz", - "integrity": "sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=", - "dev": true, - "requires": { - "os-homedir": "1.0.2" - } - }, - "time-stamp": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz", - "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=", - "dev": true - }, - "unc-path-regex": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", - "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=", - "dev": true - }, - "unique-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz", - "integrity": "sha1-1ZpKdUJ0R9mqbJHnAmP40mpLEEs=", - "dev": true - }, - "user-home": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz", - "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=", - "dev": true - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true - }, - "v8flags": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz", - "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=", - "dev": true, - "requires": { - "user-home": "1.1.1" - } - }, - "vinyl": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz", - "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=", - "dev": true, - "requires": { - "clone": "1.0.2", - "clone-stats": "0.0.1", - "replace-ext": "0.0.1" - } - }, - "vinyl-fs": { - "version": "0.3.14", - "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz", - "integrity": "sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=", - "dev": true, - "requires": { - "defaults": "1.0.3", - "glob-stream": "3.1.18", - "glob-watcher": "0.0.6", - "graceful-fs": "3.0.11", - "mkdirp": "0.5.1", - "strip-bom": "1.0.0", - "through2": "0.6.5", - "vinyl": "0.4.6" - }, - "dependencies": { - "clone": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz", - "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=", - "dev": true - }, - "readable-stream": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", - "dev": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "0.0.1", - "string_decoder": "0.10.31" - } - }, - "through2": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", - "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", - "dev": true, - "requires": { - "readable-stream": "1.0.34", - "xtend": "4.0.1" - } - }, - "vinyl": { - "version": "0.4.6", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz", - "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", - "dev": true, - "requires": { - "clone": "0.2.0", - "clone-stats": "0.0.1" - } - } - } - }, - "which": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", - "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", - "dev": true, - "requires": { - "isexe": "2.0.0" - } - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true - }, - "xtend": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", - "dev": true } } }, - "gulp-livereload": { - "version": "3.8.1", - "resolved": "https://registry.npmjs.org/gulp-livereload/-/gulp-livereload-3.8.1.tgz", - "integrity": "sha1-APdEstdJ0+njdGWJyKRKysd5tQ8=", + "gulp-autoprefixer": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/gulp-autoprefixer/-/gulp-autoprefixer-4.0.0.tgz", + "integrity": "sha1-4AqMVxuF0GUWrCY0G+kN/Z/B6rA=", "dev": true, "requires": { - "chalk": "0.5.1", - "debug": "2.6.8", - "event-stream": "3.3.4", + "autoprefixer": "7.1.4", "gulp-util": "3.0.8", - "lodash.assign": "3.2.0", - "mini-lr": "0.1.9" + "postcss": "6.0.12", + "through2": "2.0.3", + "vinyl-sourcemaps-apply": "0.2.1" + } + }, + "gulp-cached": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/gulp-cached/-/gulp-cached-1.1.1.tgz", + "integrity": "sha1-/nzU+H83YB5gc8/t7lwr2vi2rM4=", + "dev": true, + "requires": { + "lodash.defaults": "4.2.0", + "through2": "2.0.3" + } + }, + "gulp-changed": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/gulp-changed/-/gulp-changed-3.1.0.tgz", + "integrity": "sha1-h80Vk6C7SlEp3C8im+zm2UiMJyo=", + "dev": true, + "requires": { + "gulp-util": "3.0.8", + "pify": "2.3.0", + "through2": "2.0.3" + } + }, + "gulp-concat": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz", + "integrity": "sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=", + "dev": true, + "requires": { + "concat-with-sourcemaps": "1.0.4", + "through2": "2.0.3", + "vinyl": "2.1.0" }, "dependencies": { - "ansi-regex": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz", - "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=", - "dev": true - }, - "ansi-styles": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz", - "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=", - "dev": true - }, - "array-differ": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", - "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=", - "dev": true - }, - "array-uniq": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", - "dev": true - }, - "beeper": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz", - "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=", - "dev": true - }, - "chalk": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz", - "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=", - "dev": true, - "requires": { - "ansi-styles": "1.1.0", - "escape-string-regexp": "1.0.5", - "has-ansi": "0.1.0", - "strip-ansi": "0.3.0", - "supports-color": "0.2.0" - } - }, "clone": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", - "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz", + "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=", "dev": true }, "clone-stats": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", - "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=", - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true - }, - "dateformat": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.0.0.tgz", - "integrity": "sha1-J0Pjq7XD/CRi5SfcpEXgTp9N7hc=", - "dev": true - }, - "duplexer2": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", - "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=", - "dev": true, - "requires": { - "readable-stream": "1.1.14" - } - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, - "fancy-log": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz", - "integrity": "sha1-Rb4X0Cu5kX1gzP/UmVyZnmyMmUg=", - "dev": true, - "requires": { - "chalk": "1.1.3", - "time-stamp": "1.1.0" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - } - }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "glogg": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz", - "integrity": "sha1-f+DxmfV6yQbPUS/urY+Q7kooT8U=", - "dev": true, - "requires": { - "sparkles": "1.0.0" - } - }, - "gulp-util": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz", - "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=", - "dev": true, - "requires": { - "array-differ": "1.0.0", - "array-uniq": "1.0.3", - "beeper": "1.1.1", - "chalk": "1.1.3", - "dateformat": "2.0.0", - "fancy-log": "1.3.0", - "gulplog": "1.0.0", - "has-gulplog": "0.1.0", - "lodash._reescape": "3.0.0", - "lodash._reevaluate": "3.0.0", - "lodash._reinterpolate": "3.0.0", - "lodash.template": "3.6.2", - "minimist": "1.2.0", - "multipipe": "0.1.2", - "object-assign": "3.0.0", - "replace-ext": "0.0.1", - "through2": "2.0.3", - "vinyl": "0.5.3" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - } - }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "gulplog": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", - "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=", - "dev": true, - "requires": { - "glogg": "1.0.0" - } - }, - "has-ansi": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz", - "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=", - "dev": true, - "requires": { - "ansi-regex": "0.2.1" - } - }, - "has-gulplog": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz", - "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=", - "dev": true, - "requires": { - "sparkles": "1.0.0" - } - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz", + "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=", "dev": true }, - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - }, - "lodash._basecopy": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", - "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=", - "dev": true - }, - "lodash._basetostring": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz", - "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=", - "dev": true - }, - "lodash._basevalues": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz", - "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=", - "dev": true - }, - "lodash._getnative": { - "version": "3.9.1", - "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", - "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=", - "dev": true - }, - "lodash._isiterateecall": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", - "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=", - "dev": true - }, - "lodash._reescape": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", - "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=", - "dev": true - }, - "lodash._reevaluate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz", - "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=", - "dev": true - }, - "lodash._reinterpolate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", - "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=", - "dev": true - }, - "lodash._root": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz", - "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=", - "dev": true - }, - "lodash.escape": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz", - "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=", - "dev": true, - "requires": { - "lodash._root": "3.0.1" - } - }, - "lodash.isarguments": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", - "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=", - "dev": true - }, - "lodash.isarray": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", - "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=", - "dev": true - }, - "lodash.keys": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", - "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", - "dev": true, - "requires": { - "lodash._getnative": "3.9.1", - "lodash.isarguments": "3.1.0", - "lodash.isarray": "3.0.4" - } - }, - "lodash.restparam": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", - "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=", - "dev": true - }, - "lodash.template": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", - "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=", - "dev": true, - "requires": { - "lodash._basecopy": "3.0.1", - "lodash._basetostring": "3.0.1", - "lodash._basevalues": "3.0.0", - "lodash._isiterateecall": "3.0.9", - "lodash._reinterpolate": "3.0.0", - "lodash.escape": "3.2.0", - "lodash.keys": "3.1.2", - "lodash.restparam": "3.6.1", - "lodash.templatesettings": "3.1.1" - } - }, - "lodash.templatesettings": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz", - "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=", - "dev": true, - "requires": { - "lodash._reinterpolate": "3.0.0", - "lodash.escape": "3.2.0" - } - }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - }, - "multipipe": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", - "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=", - "dev": true, - "requires": { - "duplexer2": "0.0.2" - } - }, - "object-assign": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", - "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=", - "dev": true - }, - "process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", - "dev": true - }, - "readable-stream": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", - "dev": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "0.0.1", - "string_decoder": "0.10.31" - } - }, "replace-ext": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", - "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=", - "dev": true - }, - "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", - "dev": true - }, - "sparkles": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz", - "integrity": "sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=", - "dev": true - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true - }, - "strip-ansi": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz", - "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=", - "dev": true, - "requires": { - "ansi-regex": "0.2.1" - } - }, - "supports-color": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz", - "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=", - "dev": true - }, - "through2": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", - "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", - "dev": true, - "requires": { - "readable-stream": "2.3.3", - "xtend": "4.0.1" - }, - "dependencies": { - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "readable-stream": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", - "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", - "dev": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "safe-buffer": "5.1.1", - "string_decoder": "1.0.3", - "util-deprecate": "1.0.2" - } - }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "dev": true, - "requires": { - "safe-buffer": "5.1.1" - } - } - } - }, - "time-stamp": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz", - "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=", - "dev": true - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz", + "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=", "dev": true }, "vinyl": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz", - "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.1.0.tgz", + "integrity": "sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw=", "dev": true, "requires": { - "clone": "1.0.2", - "clone-stats": "0.0.1", - "replace-ext": "0.0.1" + "clone": "2.1.1", + "clone-buffer": "1.0.0", + "clone-stats": "1.0.0", + "cloneable-readable": "1.0.0", + "remove-trailing-separator": "1.1.0", + "replace-ext": "1.0.0" } - }, - "xtend": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", + } + } + }, + "gulp-cssnano": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/gulp-cssnano/-/gulp-cssnano-2.1.2.tgz", + "integrity": "sha1-4IoJdx7FRUpUnxoAW90lbLjl4KM=", + "dev": true, + "requires": { + "cssnano": "3.10.0", + "gulp-util": "3.0.8", + "object-assign": "4.1.1", + "vinyl-sourcemaps-apply": "0.2.1" + } + }, + "gulp-jshint": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/gulp-jshint/-/gulp-jshint-2.0.4.tgz", + "integrity": "sha1-84KxhWSxBy3vDJqvdTwUba208Og=", + "dev": true, + "requires": { + "gulp-util": "3.0.8", + "lodash": "4.17.4", + "minimatch": "3.0.4", + "rcloader": "0.2.2", + "through2": "2.0.3" + }, + "dependencies": { + "lodash": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", "dev": true } } @@ -2694,283 +2139,6 @@ "through2": "2.0.3" }, "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "array-differ": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", - "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=", - "dev": true - }, - "array-uniq": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", - "dev": true - }, - "beeper": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz", - "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - } - }, - "clone": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", - "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=", - "dev": true - }, - "clone-stats": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", - "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=", - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true - }, - "dateformat": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.0.0.tgz", - "integrity": "sha1-J0Pjq7XD/CRi5SfcpEXgTp9N7hc=", - "dev": true - }, - "duplexer2": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", - "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=", - "dev": true, - "requires": { - "readable-stream": "1.1.14" - } - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, - "fancy-log": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz", - "integrity": "sha1-Rb4X0Cu5kX1gzP/UmVyZnmyMmUg=", - "dev": true, - "requires": { - "chalk": "1.1.3", - "time-stamp": "1.1.0" - } - }, - "glogg": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz", - "integrity": "sha1-f+DxmfV6yQbPUS/urY+Q7kooT8U=", - "dev": true, - "requires": { - "sparkles": "1.0.0" - } - }, - "gulp-util": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz", - "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=", - "dev": true, - "requires": { - "array-differ": "1.0.0", - "array-uniq": "1.0.3", - "beeper": "1.1.1", - "chalk": "1.1.3", - "dateformat": "2.0.0", - "fancy-log": "1.3.0", - "gulplog": "1.0.0", - "has-gulplog": "0.1.0", - "lodash._reescape": "3.0.0", - "lodash._reevaluate": "3.0.0", - "lodash._reinterpolate": "3.0.0", - "lodash.template": "3.6.2", - "minimist": "1.2.0", - "multipipe": "0.1.2", - "object-assign": "3.0.0", - "replace-ext": "0.0.1", - "through2": "2.0.3", - "vinyl": "0.5.3" - }, - "dependencies": { - "lodash.template": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", - "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=", - "dev": true, - "requires": { - "lodash._basecopy": "3.0.1", - "lodash._basetostring": "3.0.1", - "lodash._basevalues": "3.0.0", - "lodash._isiterateecall": "3.0.9", - "lodash._reinterpolate": "3.0.0", - "lodash.escape": "3.2.0", - "lodash.keys": "3.1.2", - "lodash.restparam": "3.6.1", - "lodash.templatesettings": "3.1.1" - } - } - } - }, - "gulplog": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", - "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=", - "dev": true, - "requires": { - "glogg": "1.0.0" - } - }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "has-gulplog": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz", - "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=", - "dev": true, - "requires": { - "sparkles": "1.0.0" - } - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true - }, - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - }, - "lodash._basecopy": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", - "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=", - "dev": true - }, - "lodash._basetostring": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz", - "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=", - "dev": true - }, - "lodash._basevalues": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz", - "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=", - "dev": true - }, - "lodash._getnative": { - "version": "3.9.1", - "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", - "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=", - "dev": true - }, - "lodash._isiterateecall": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", - "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=", - "dev": true - }, - "lodash._reescape": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", - "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=", - "dev": true - }, - "lodash._reevaluate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz", - "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=", - "dev": true - }, - "lodash._reinterpolate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", - "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=", - "dev": true - }, - "lodash._root": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz", - "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=", - "dev": true - }, - "lodash.escape": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz", - "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=", - "dev": true, - "requires": { - "lodash._root": "3.0.1" - } - }, - "lodash.isarguments": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", - "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=", - "dev": true - }, - "lodash.isarray": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", - "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=", - "dev": true - }, - "lodash.keys": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", - "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", - "dev": true, - "requires": { - "lodash._getnative": "3.9.1", - "lodash.isarguments": "3.1.0", - "lodash.isarray": "3.0.4" - } - }, - "lodash.restparam": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", - "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=", - "dev": true - }, "lodash.template": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz", @@ -2979,506 +2147,39 @@ "requires": { "lodash._reinterpolate": "3.0.0", "lodash.templatesettings": "4.1.0" - }, - "dependencies": { - "lodash.templatesettings": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz", - "integrity": "sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=", - "dev": true, - "requires": { - "lodash._reinterpolate": "3.0.0" - } - } } }, "lodash.templatesettings": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz", - "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz", + "integrity": "sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=", "dev": true, "requires": { - "lodash._reinterpolate": "3.0.0", - "lodash.escape": "3.2.0" + "lodash._reinterpolate": "3.0.0" } - }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - }, - "multipipe": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", - "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=", - "dev": true, - "requires": { - "duplexer2": "0.0.2" - } - }, - "object-assign": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", - "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=", - "dev": true - }, - "process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", - "dev": true - }, - "readable-stream": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", - "dev": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "0.0.1", - "string_decoder": "0.10.31" - } - }, - "replace-ext": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", - "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=", - "dev": true - }, - "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", - "dev": true - }, - "sparkles": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz", - "integrity": "sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=", - "dev": true - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - }, - "through2": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", - "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", - "dev": true, - "requires": { - "readable-stream": "2.3.3", - "xtend": "4.0.1" - }, - "dependencies": { - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "readable-stream": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", - "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", - "dev": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "safe-buffer": "5.1.1", - "string_decoder": "1.0.3", - "util-deprecate": "1.0.2" - } - }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "dev": true, - "requires": { - "safe-buffer": "5.1.1" - } - } - } - }, - "time-stamp": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz", - "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=", - "dev": true - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true - }, - "vinyl": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz", - "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=", - "dev": true, - "requires": { - "clone": "1.0.2", - "clone-stats": "0.0.1", - "replace-ext": "0.0.1" - } - }, - "xtend": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", - "dev": true } } }, - "gulp-plumber": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/gulp-plumber/-/gulp-plumber-1.1.0.tgz", - "integrity": "sha1-8SF2wtBCL2AwbCQv/2oBo5T6ugk=", + "gulp-remember": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/gulp-remember/-/gulp-remember-0.3.1.tgz", + "integrity": "sha1-V3a29kxaHFxNRVVAZyPsjisEB+c=", "dev": true, "requires": { "gulp-util": "3.0.8", - "through2": "2.0.3" + "through2": "0.5.1" }, "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "array-differ": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", - "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=", - "dev": true - }, - "array-uniq": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", - "dev": true - }, - "beeper": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz", - "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - } - }, - "clone": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", - "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=", - "dev": true - }, - "clone-stats": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", - "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=", - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true - }, - "dateformat": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.0.0.tgz", - "integrity": "sha1-J0Pjq7XD/CRi5SfcpEXgTp9N7hc=", - "dev": true - }, - "duplexer2": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", - "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=", - "dev": true, - "requires": { - "readable-stream": "1.1.14" - } - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, - "fancy-log": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz", - "integrity": "sha1-Rb4X0Cu5kX1gzP/UmVyZnmyMmUg=", - "dev": true, - "requires": { - "chalk": "1.1.3", - "time-stamp": "1.1.0" - } - }, - "glogg": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz", - "integrity": "sha1-f+DxmfV6yQbPUS/urY+Q7kooT8U=", - "dev": true, - "requires": { - "sparkles": "1.0.0" - } - }, - "gulp-util": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz", - "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=", - "dev": true, - "requires": { - "array-differ": "1.0.0", - "array-uniq": "1.0.3", - "beeper": "1.1.1", - "chalk": "1.1.3", - "dateformat": "2.0.0", - "fancy-log": "1.3.0", - "gulplog": "1.0.0", - "has-gulplog": "0.1.0", - "lodash._reescape": "3.0.0", - "lodash._reevaluate": "3.0.0", - "lodash._reinterpolate": "3.0.0", - "lodash.template": "3.6.2", - "minimist": "1.2.0", - "multipipe": "0.1.2", - "object-assign": "3.0.0", - "replace-ext": "0.0.1", - "through2": "2.0.3", - "vinyl": "0.5.3" - } - }, - "gulplog": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", - "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=", - "dev": true, - "requires": { - "glogg": "1.0.0" - } - }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "has-gulplog": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz", - "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=", - "dev": true, - "requires": { - "sparkles": "1.0.0" - } - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true - }, "isarray": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", "dev": true }, - "lodash._basecopy": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", - "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=", - "dev": true - }, - "lodash._basetostring": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz", - "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=", - "dev": true - }, - "lodash._basevalues": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz", - "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=", - "dev": true - }, - "lodash._getnative": { - "version": "3.9.1", - "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", - "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=", - "dev": true - }, - "lodash._isiterateecall": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", - "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=", - "dev": true - }, - "lodash._reescape": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", - "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=", - "dev": true - }, - "lodash._reevaluate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz", - "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=", - "dev": true - }, - "lodash._reinterpolate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", - "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=", - "dev": true - }, - "lodash._root": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz", - "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=", - "dev": true - }, - "lodash.escape": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz", - "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=", - "dev": true, - "requires": { - "lodash._root": "3.0.1" - } - }, - "lodash.isarguments": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", - "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=", - "dev": true - }, - "lodash.isarray": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", - "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=", - "dev": true - }, - "lodash.keys": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", - "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", - "dev": true, - "requires": { - "lodash._getnative": "3.9.1", - "lodash.isarguments": "3.1.0", - "lodash.isarray": "3.0.4" - } - }, - "lodash.restparam": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", - "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=", - "dev": true - }, - "lodash.template": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", - "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=", - "dev": true, - "requires": { - "lodash._basecopy": "3.0.1", - "lodash._basetostring": "3.0.1", - "lodash._basevalues": "3.0.0", - "lodash._isiterateecall": "3.0.9", - "lodash._reinterpolate": "3.0.0", - "lodash.escape": "3.2.0", - "lodash.keys": "3.1.2", - "lodash.restparam": "3.6.1", - "lodash.templatesettings": "3.1.1" - } - }, - "lodash.templatesettings": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz", - "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=", - "dev": true, - "requires": { - "lodash._reinterpolate": "3.0.0", - "lodash.escape": "3.2.0" - } - }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - }, - "multipipe": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", - "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=", - "dev": true, - "requires": { - "duplexer2": "0.0.2" - } - }, - "object-assign": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", - "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=", - "dev": true - }, - "process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", - "dev": true - }, "readable-stream": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", "dev": true, "requires": { "core-util-is": "1.0.2", @@ -3487,118 +2188,36 @@ "string_decoder": "0.10.31" } }, - "replace-ext": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", - "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=", - "dev": true - }, - "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", - "dev": true - }, - "sparkles": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz", - "integrity": "sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=", - "dev": true - }, "string_decoder": { "version": "0.10.31", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", "dev": true }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - }, "through2": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", - "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz", + "integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=", "dev": true, "requires": { - "readable-stream": "2.3.3", - "xtend": "4.0.1" - }, - "dependencies": { - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "readable-stream": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", - "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", - "dev": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "safe-buffer": "5.1.1", - "string_decoder": "1.0.3", - "util-deprecate": "1.0.2" - } - }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "dev": true, - "requires": { - "safe-buffer": "5.1.1" - } - } - } - }, - "time-stamp": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz", - "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=", - "dev": true - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true - }, - "vinyl": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz", - "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=", - "dev": true, - "requires": { - "clone": "1.0.2", - "clone-stats": "0.0.1", - "replace-ext": "0.0.1" + "readable-stream": "1.0.34", + "xtend": "3.0.0" } }, "xtend": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz", + "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=", "dev": true } } }, + "gulp-rename": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.2.2.tgz", + "integrity": "sha1-OtRCh2PwXidk3sHGfYaNsnVoeBc=", + "dev": true + }, "gulp-ruby-sass": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/gulp-ruby-sass/-/gulp-ruby-sass-2.1.1.tgz", @@ -3609,52 +2228,21 @@ "cross-spawn": "5.1.0", "dargs": "2.1.0", "each-async": "1.1.1", - "escape-string-regexp": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "escape-string-regexp": "1.0.5", "glob": "7.1.2", - "glob2base": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz", - "gulp-util": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz", + "glob2base": "0.0.12", + "gulp-util": "3.0.8", "md5-hex": "1.3.0", "object-assign": "4.1.1", "os-tmpdir": "1.0.2", "path-exists": "2.1.0", - "rimraf": "2.6.1" - }, - "dependencies": { - "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", - "dev": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "minimatch": "3.0.4", - "once": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", - "path-is-absolute": "1.0.1" - } - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, - "requires": { - "brace-expansion": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz" - } - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true - } + "rimraf": "2.6.2" } }, "gulp-sourcemaps": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.0.tgz", - "integrity": "sha1-fMzomaijv8oVk6M0jQ+/Qd0/UeU=", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.1.tgz", + "integrity": "sha512-1qHCI3hdmsMdq/SUotxwUh/L8YzlI6J9zQ5ifNOtx4Y6KV5y5sGuORv1KZzWhuKtz/mXNh5xLESUtwC4EndCjA==", "dev": true, "requires": { "@gulp-sourcemaps/identity-map": "1.0.1", @@ -3665,100 +2253,12 @@ "debug-fabulous": "0.1.1", "detect-newline": "2.1.0", "graceful-fs": "4.1.11", - "source-map": "0.5.6", + "source-map": "0.5.7", "strip-bom-string": "1.0.0", "through2": "2.0.3", "vinyl": "1.2.0" }, "dependencies": { - "clone": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", - "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=", - "dev": true - }, - "clone-stats": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", - "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=", - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", - "dev": true - }, - "readable-stream": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", - "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", - "dev": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "safe-buffer": "5.1.1", - "string_decoder": "1.0.3", - "util-deprecate": "1.0.2" - } - }, - "replace-ext": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", - "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=", - "dev": true - }, - "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", - "dev": true - }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "dev": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, - "through2": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", - "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", - "dev": true, - "requires": { - "readable-stream": "2.3.3", - "xtend": "4.0.1" - } - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true - }, "vinyl": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz", @@ -3769,108 +2269,454 @@ "clone-stats": "0.0.1", "replace-ext": "0.0.1" } - }, - "xtend": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", + } + } + }, + "gulp-uglify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/gulp-uglify/-/gulp-uglify-3.0.0.tgz", + "integrity": "sha1-DfAzHXKg0wLj434QlIXd3zPG0co=", + "dev": true, + "requires": { + "gulplog": "1.0.0", + "has-gulplog": "0.1.0", + "lodash": "4.17.4", + "make-error-cause": "1.2.2", + "through2": "2.0.3", + "uglify-js": "3.1.2", + "vinyl-sourcemaps-apply": "0.2.1" + }, + "dependencies": { + "lodash": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", "dev": true } } }, "gulp-util": { - "version": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz", "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=", "dev": true, "requires": { - "array-differ": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", - "array-uniq": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "beeper": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz", - "chalk": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "dateformat": "https://registry.npmjs.org/dateformat/-/dateformat-2.0.0.tgz", - "fancy-log": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz", - "gulplog": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", - "has-gulplog": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz", - "lodash._reescape": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", - "lodash._reevaluate": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz", - "lodash._reinterpolate": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", - "lodash.template": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", - "minimist": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "multipipe": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", - "object-assign": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", - "replace-ext": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", - "through2": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", - "vinyl": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz" - } - }, - "gulplog": { - "version": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", - "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=", - "dev": true, - "requires": { - "glogg": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz" - } - }, - "has-ansi": { - "version": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "dev": true, - "requires": { - "ansi-regex": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz" - } - }, - "has-gulplog": { - "version": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz", - "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=", - "dev": true, - "requires": { - "sparkles": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz" - } - }, - "http-errors": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz", - "integrity": "sha1-GX4izevUGYWF6GlO9nhhl7ke2UI=", - "dev": true, - "requires": { - "inherits": "2.0.3", - "statuses": "1.3.1" + "array-differ": "1.0.0", + "array-uniq": "1.0.3", + "beeper": "1.1.1", + "chalk": "1.1.3", + "dateformat": "2.2.0", + "fancy-log": "1.3.0", + "gulplog": "1.0.0", + "has-gulplog": "0.1.0", + "lodash._reescape": "3.0.0", + "lodash._reevaluate": "3.0.0", + "lodash._reinterpolate": "3.0.0", + "lodash.template": "3.6.2", + "minimist": "1.2.0", + "multipipe": "0.1.2", + "object-assign": "3.0.0", + "replace-ext": "0.0.1", + "through2": "2.0.3", + "vinyl": "0.5.3" }, "dependencies": { - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "object-assign": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", + "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=", "dev": true } } }, - "iconv-lite": { - "version": "0.4.13", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz", - "integrity": "sha1-H4irpKsLFQjoMSrMOTRfNumS4vI=", + "gulplog": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", + "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=", + "dev": true, + "requires": { + "glogg": "1.0.0" + } + }, + "har-schema": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz", + "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=", + "dev": true + }, + "har-validator": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz", + "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=", + "dev": true, + "requires": { + "ajv": "4.11.8", + "har-schema": "1.0.5" + } + }, + "has": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz", + "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=", + "dev": true, + "requires": { + "function-bind": "1.1.1" + } + }, + "has-ansi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "has-binary": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz", + "integrity": "sha1-aOYesWIQyVRaClzOBqhzkS/h5ow=", + "dev": true, + "requires": { + "isarray": "0.0.1" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + } + } + }, + "has-cors": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz", + "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=", + "dev": true + }, + "has-flag": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", + "dev": true + }, + "has-gulplog": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz", + "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=", + "dev": true, + "requires": { + "sparkles": "1.0.0" + } + }, + "hawk": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", + "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", + "dev": true, + "requires": { + "boom": "2.10.1", + "cryptiles": "2.0.5", + "hoek": "2.16.3", + "sntp": "1.0.9" + } + }, + "hoek": { + "version": "2.16.3", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", + "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", + "dev": true + }, + "homedir-polyfill": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz", + "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=", + "dev": true, + "requires": { + "parse-passwd": "1.0.0" + } + }, + "hosted-git-info": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", + "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==", + "dev": true + }, + "html-comment-regex": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz", + "integrity": "sha1-ZouTd26q5V696POtRkswekljYl4=", + "dev": true + }, + "htmlparser2": { + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz", + "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=", + "dev": true, + "requires": { + "domelementtype": "1.3.0", + "domhandler": "2.3.0", + "domutils": "1.5.1", + "entities": "1.0.0", + "readable-stream": "1.1.14" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + } + } + }, + "http-errors": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz", + "integrity": "sha1-eIwNLB3iyBuebowBhDtrl+uSB1A=", + "dev": true, + "requires": { + "inherits": "2.0.3", + "setprototypeof": "1.0.2", + "statuses": "1.3.1" + } + }, + "http-proxy": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.15.2.tgz", + "integrity": "sha1-ZC/cr/5S00SNK9o7AHnpQJBk2jE=", + "dev": true, + "requires": { + "eventemitter3": "1.2.0", + "requires-port": "1.0.0" + } + }, + "http-signature": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", + "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", + "dev": true, + "requires": { + "assert-plus": "0.2.0", + "jsprim": "1.4.1", + "sshpk": "1.13.1" + } + }, + "immutable": { + "version": "3.8.1", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.1.tgz", + "integrity": "sha1-IAgH8Rqw9ycQ6khVQt4IgHX2jNI=", + "dev": true + }, + "indexes-of": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz", + "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=", + "dev": true + }, + "indexof": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", + "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=", "dev": true }, "inflight": { - "version": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "requires": { - "once": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", - "wrappy": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" + "once": "1.4.0", + "wrappy": "1.0.2" } }, "inherits": { - "version": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", "dev": true }, + "ini": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz", + "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=", + "dev": true + }, + "interpret": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.4.tgz", + "integrity": "sha1-ggzdWIuGj/sZGoCVBtbJyPISsbA=", + "dev": true + }, + "invert-kv": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", + "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", + "dev": true + }, "is": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz", "integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU=", "dev": true }, + "is-absolute": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz", + "integrity": "sha1-IN5p89uULvLYe5wto28XIjWxtes=", + "dev": true, + "requires": { + "is-relative": "0.2.1", + "is-windows": "0.2.0" + } + }, + "is-absolute-url": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz", + "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=", + "dev": true + }, + "is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", + "dev": true + }, + "is-binary-path": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", + "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", + "dev": true, + "requires": { + "binary-extensions": "1.10.0" + } + }, + "is-buffer": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz", + "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=", + "dev": true + }, + "is-builtin-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", + "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", + "dev": true, + "requires": { + "builtin-modules": "1.1.1" + } + }, + "is-dotfile": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", + "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=", + "dev": true + }, + "is-equal-shallow": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", + "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", + "dev": true, + "requires": { + "is-primitive": "2.0.0" + } + }, + "is-extendable": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", + "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", + "dev": true + }, + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "dev": true, + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + }, + "is-number": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", + "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + } + }, + "is-number-like": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/is-number-like/-/is-number-like-1.0.8.tgz", + "integrity": "sha512-6rZi3ezCyFcn5L71ywzz2bS5b2Igl1En3eTlZlvKjpz1n3IZLAYMbKYAIQgFmEu0GENg92ziU/faEOA/aixjbA==", + "dev": true, + "requires": { + "lodash.isfinite": "3.3.2" + } + }, + "is-path-cwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", + "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=", + "dev": true + }, + "is-path-in-cwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz", + "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=", + "dev": true, + "requires": { + "is-path-inside": "1.0.0" + } + }, + "is-path-inside": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz", + "integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=", + "dev": true, + "requires": { + "path-is-inside": "1.0.2" + } + }, + "is-plain-obj": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", + "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=", + "dev": true + }, "is-plain-object": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", @@ -3888,264 +2734,539 @@ } } }, + "is-posix-bracket": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", + "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=", + "dev": true + }, + "is-primitive": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", + "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=", + "dev": true + }, "is-promise": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", "dev": true }, + "is-relative": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz", + "integrity": "sha1-0n9MfVFtF1+2ENuEu+7yPDvJeqU=", + "dev": true, + "requires": { + "is-unc-path": "0.1.2" + } + }, + "is-svg": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz", + "integrity": "sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=", + "dev": true, + "requires": { + "html-comment-regex": "1.1.1" + } + }, + "is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", + "dev": true + }, + "is-unc-path": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz", + "integrity": "sha1-arBTpyVzwQJQ/0FqOBTDUXivObk=", + "dev": true, + "requires": { + "unc-path-regex": "0.1.2" + } + }, + "is-utf8": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", + "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", + "dev": true + }, + "is-windows": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz", + "integrity": "sha1-3hqm1j6indJIc3tp8f+LgALSEIw=", + "dev": true + }, "isarray": { - "version": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true }, "isexe": { - "version": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, - "livereload-js": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-2.2.2.tgz", - "integrity": "sha1-bIclfmSKtHW8JOoldFftzB+NC8I=", - "dev": true - }, - "lodash._baseassign": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz", - "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=", + "isobject": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", + "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", "dev": true, "requires": { - "lodash._basecopy": "3.0.1", - "lodash.keys": "3.1.2" + "isarray": "1.0.0" + } + }, + "isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", + "dev": true + }, + "js-base64": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.3.2.tgz", + "integrity": "sha512-Y2/+DnfJJXT1/FCwUebUhLWb3QihxiSC42+ctHLGogmW2jPY6LCapMdFZXRvVP2z6qyKW7s6qncE/9gSqZiArw==", + "dev": true + }, + "js-yaml": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz", + "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=", + "dev": true, + "requires": { + "argparse": "1.0.9", + "esprima": "2.7.3" + } + }, + "jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", + "dev": true, + "optional": true + }, + "jshint": { + "version": "2.9.5", + "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.9.5.tgz", + "integrity": "sha1-HnJSkVzmgbQIJ+4UJIxG006apiw=", + "dev": true, + "requires": { + "cli": "1.0.1", + "console-browserify": "1.1.0", + "exit": "0.1.2", + "htmlparser2": "3.8.3", + "lodash": "3.7.0", + "minimatch": "3.0.4", + "shelljs": "0.3.0", + "strip-json-comments": "1.0.4" }, "dependencies": { - "lodash._basecopy": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", - "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=", + "lodash": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz", + "integrity": "sha1-Nni9irmVBXwHreg27S7wh9qBHUU=", "dev": true - }, - "lodash._getnative": { - "version": "3.9.1", - "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", - "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=", + } + } + }, + "json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", + "dev": true + }, + "json-stable-stringify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", + "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", + "dev": true, + "requires": { + "jsonify": "0.0.0" + } + }, + "json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", + "dev": true + }, + "json3": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz", + "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=", + "dev": true + }, + "jsonfile": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz", + "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11" + } + }, + "jsonify": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", + "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", + "dev": true + }, + "jsprim": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "dev": true, + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", "dev": true - }, - "lodash.isarguments": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", - "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=", - "dev": true - }, - "lodash.isarray": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", - "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=", - "dev": true - }, - "lodash.keys": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", - "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", + } + } + }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.5" + } + }, + "lcid": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", + "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "dev": true, + "requires": { + "invert-kv": "1.0.0" + } + }, + "liftoff": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.3.0.tgz", + "integrity": "sha1-qY8v9nGD2Lp8+soQVIvX/wVQs4U=", + "dev": true, + "requires": { + "extend": "3.0.1", + "findup-sync": "0.4.3", + "fined": "1.1.0", + "flagged-respawn": "0.3.2", + "lodash.isplainobject": "4.0.6", + "lodash.isstring": "4.0.1", + "lodash.mapvalues": "4.6.0", + "rechoir": "0.6.2", + "resolve": "1.4.0" + } + }, + "limiter": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.2.tgz", + "integrity": "sha512-JIKZ0xb6fZZYa3deZ0BgXCgX6HgV8Nx3mFGeFHmFWW8Fb2c08e0CyE+G3nalpD0xGvGssjGb1UdFr+PprxZEbw==", + "dev": true + }, + "load-json-file": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" + } + }, + "localtunnel": { + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/localtunnel/-/localtunnel-1.8.3.tgz", + "integrity": "sha1-3MWSL9hWUQN9S94k/ZMkjQsk6wU=", + "dev": true, + "requires": { + "debug": "2.6.8", + "openurl": "1.1.1", + "request": "2.81.0", + "yargs": "3.29.0" + }, + "dependencies": { + "debug": { + "version": "2.6.8", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", + "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=", "dev": true, "requires": { - "lodash._getnative": "3.9.1", - "lodash.isarguments": "3.1.0", - "lodash.isarray": "3.0.4" + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, + "yargs": { + "version": "3.29.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.29.0.tgz", + "integrity": "sha1-GquWYOrnnYuPZ1vK7qtu40ws9pw=", + "dev": true, + "requires": { + "camelcase": "1.2.1", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "os-locale": "1.4.0", + "window-size": "0.1.4", + "y18n": "3.2.1" } } } }, + "lodash": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=", + "dev": true + }, "lodash._basecopy": { - "version": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=", "dev": true }, "lodash._basetostring": { - "version": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz", "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=", "dev": true }, "lodash._basevalues": { - "version": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz", "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=", "dev": true }, - "lodash._bindcallback": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz", - "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4=", - "dev": true - }, - "lodash._createassigner": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz", - "integrity": "sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=", - "dev": true, - "requires": { - "lodash._bindcallback": "3.0.1", - "lodash._isiterateecall": "3.0.9", - "lodash.restparam": "3.6.1" - }, - "dependencies": { - "lodash._isiterateecall": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", - "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=", - "dev": true - }, - "lodash.restparam": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", - "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=", - "dev": true - } - } - }, "lodash._getnative": { - "version": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=", "dev": true }, "lodash._isiterateecall": { - "version": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=", "dev": true }, "lodash._reescape": { - "version": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=", "dev": true }, "lodash._reevaluate": { - "version": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz", "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=", "dev": true }, "lodash._reinterpolate": { - "version": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=", "dev": true }, "lodash._root": { - "version": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz", "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=", "dev": true }, "lodash.assign": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz", - "integrity": "sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=", - "dev": true, - "requires": { - "lodash._baseassign": "3.2.0", - "lodash._createassigner": "3.1.1", - "lodash.keys": "3.1.2" - }, - "dependencies": { - "lodash._getnative": { - "version": "3.9.1", - "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", - "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=", - "dev": true - }, - "lodash.isarguments": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", - "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=", - "dev": true - }, - "lodash.isarray": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", - "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=", - "dev": true - }, - "lodash.keys": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", - "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", - "dev": true, - "requires": { - "lodash._getnative": "3.9.1", - "lodash.isarguments": "3.1.0", - "lodash.isarray": "3.0.4" - } - } - } + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", + "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=", + "dev": true + }, + "lodash.clonedeep": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", + "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", + "dev": true + }, + "lodash.defaults": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", + "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=", + "dev": true }, "lodash.escape": { - "version": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz", "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=", "dev": true, "requires": { - "lodash._root": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz" + "lodash._root": "3.0.1" } }, "lodash.isarguments": { - "version": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=", "dev": true }, "lodash.isarray": { - "version": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=", "dev": true }, + "lodash.isfinite": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz", + "integrity": "sha1-+4m2WpqAKBgz8LdHizpRBPiY67M=", + "dev": true + }, + "lodash.isobject": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz", + "integrity": "sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0=", + "dev": true + }, + "lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=", + "dev": true + }, + "lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=", + "dev": true + }, "lodash.keys": { - "version": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", "dev": true, "requires": { - "lodash._getnative": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", - "lodash.isarguments": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", - "lodash.isarray": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz" + "lodash._getnative": "3.9.1", + "lodash.isarguments": "3.1.0", + "lodash.isarray": "3.0.4" } }, + "lodash.mapvalues": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz", + "integrity": "sha1-G6+lAF3p3W9PJmaMMMo3IwzJaJw=", + "dev": true + }, + "lodash.memoize": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", + "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", + "dev": true + }, + "lodash.merge": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.0.tgz", + "integrity": "sha1-aYhLoUSsM/5plzemCG3v+t0PicU=", + "dev": true + }, "lodash.restparam": { - "version": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=", "dev": true }, "lodash.template": { - "version": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=", "dev": true, "requires": { - "lodash._basecopy": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", - "lodash._basetostring": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz", - "lodash._basevalues": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz", - "lodash._isiterateecall": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", - "lodash._reinterpolate": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", - "lodash.escape": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz", - "lodash.keys": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", - "lodash.restparam": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", - "lodash.templatesettings": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz" + "lodash._basecopy": "3.0.1", + "lodash._basetostring": "3.0.1", + "lodash._basevalues": "3.0.0", + "lodash._isiterateecall": "3.0.9", + "lodash._reinterpolate": "3.0.0", + "lodash.escape": "3.2.0", + "lodash.keys": "3.1.2", + "lodash.restparam": "3.6.1", + "lodash.templatesettings": "3.1.1" } }, "lodash.templatesettings": { - "version": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz", "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=", "dev": true, "requires": { - "lodash._reinterpolate": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", - "lodash.escape": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz" + "lodash._reinterpolate": "3.0.0", + "lodash.escape": "3.2.0" } }, + "lodash.uniq": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", + "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=", + "dev": true + }, + "lru-cache": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz", + "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=", + "dev": true + }, "lru-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz", "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=", "dev": true, "requires": { - "es5-ext": "0.10.27" + "es5-ext": "0.10.30" } }, - "map-stream": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz", - "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=", + "macaddress": { + "version": "0.2.8", + "resolved": "https://registry.npmjs.org/macaddress/-/macaddress-0.2.8.tgz", + "integrity": "sha1-WQTcU3w57G2+/q6QIycTX6hRHxI=", + "dev": true + }, + "make-error": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.0.tgz", + "integrity": "sha1-Uq06M5zPEM5itAQLcI/nByRLi5Y=", + "dev": true + }, + "make-error-cause": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/make-error-cause/-/make-error-cause-1.2.2.tgz", + "integrity": "sha1-3wOI/NCzeBbf8KX7gQiTl3fcvJ0=", + "dev": true, + "requires": { + "make-error": "1.3.0" + } + }, + "map-cache": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", + "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", + "dev": true + }, + "math-expression-evaluator": { + "version": "1.2.17", + "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz", + "integrity": "sha1-3oGf282E3M2PrlnGrreWFbnSZqw=", "dev": true }, "md5-hex": { @@ -4163,20 +3284,14 @@ "integrity": "sha1-givM1l4RfFFPqxdrJZRdVBAKA8M=", "dev": true }, - "media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", - "dev": true - }, "memoizee": { - "version": "0.4.5", - "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.5.tgz", - "integrity": "sha1-G8PqHkvgVt1HXVIZede+PV5bIcg=", + "version": "0.4.11", + "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.11.tgz", + "integrity": "sha1-vemBdmPJ5A/bKk6hw2cpYIeujI8=", "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.27", + "es5-ext": "0.10.30", "es6-weak-map": "2.0.2", "event-emitter": "0.3.5", "is-promise": "2.1.0", @@ -4185,54 +3300,96 @@ "timers-ext": "0.1.2" } }, + "micromatch": { + "version": "2.3.11", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", + "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", + "dev": true, + "requires": { + "arr-diff": "2.0.0", + "array-unique": "0.2.1", + "braces": "1.8.5", + "expand-brackets": "0.1.5", + "extglob": "0.3.2", + "filename-regex": "2.0.1", + "is-extglob": "1.0.0", + "is-glob": "2.0.1", + "kind-of": "3.2.2", + "normalize-path": "2.1.1", + "object.omit": "2.0.1", + "parse-glob": "3.0.4", + "regex-cache": "0.4.4" + } + }, + "mime": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.4.tgz", + "integrity": "sha1-EbX9rynCUJJVF2uArVIClPXekrc=", + "dev": true + }, "mime-db": { - "version": "1.29.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz", - "integrity": "sha1-SNJtI1WJZRcErFkWygYAGRQmaHg=", + "version": "1.30.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz", + "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=", "dev": true }, "mime-types": { - "version": "2.1.16", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz", - "integrity": "sha1-K4WKUuXs1RbbiXrCvodIeDBpjiM=", + "version": "2.1.17", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz", + "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=", "dev": true, "requires": { - "mime-db": "1.29.0" + "mime-db": "1.30.0" } }, - "mini-lr": { - "version": "0.1.9", - "resolved": "https://registry.npmjs.org/mini-lr/-/mini-lr-0.1.9.tgz", - "integrity": "sha1-AhmdJzR5U9H9HW297UJh8Yey0PY=", + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "requires": { - "body-parser": "1.14.2", - "debug": "2.6.8", - "faye-websocket": "0.7.3", - "livereload-js": "2.2.2", - "parseurl": "1.3.1", - "qs": "2.2.5" + "brace-expansion": "1.1.8" } }, "minimist": { - "version": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, + "mkdirp": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz", + "integrity": "sha1-G79asbqCevI1dRQ0kEJkVfSB/h4=", + "dev": true + }, "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", + "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=", "dev": true }, "multipipe": { - "version": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=", "dev": true, "requires": { - "duplexer2": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz" + "duplexer2": "0.0.2" } }, + "natives": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz", + "integrity": "sha1-6f+EFBimsux6SV6TmYT3jxY+bjE=", + "dev": true + }, + "negotiator": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", + "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=", + "dev": true + }, "next-tick": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", @@ -4247,25 +3404,8 @@ "requires": { "growly": "1.3.0", "semver": "5.4.1", - "shellwords": "0.1.0", + "shellwords": "0.1.1", "which": "1.3.0" - }, - "dependencies": { - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true - }, - "which": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", - "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", - "dev": true, - "requires": { - "isexe": "2.0.0" - } - } } }, "node.extend": { @@ -4277,6 +3417,27 @@ "is": "3.2.1" } }, + "nopt": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", + "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", + "dev": true, + "requires": { + "abbrev": "1.1.0" + } + }, + "normalize-package-data": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", + "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", + "dev": true, + "requires": { + "hosted-git-info": "2.5.0", + "is-builtin-module": "1.0.0", + "semver": "5.4.1", + "validate-npm-package-license": "3.0.1" + } + }, "normalize-path": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", @@ -4286,9 +3447,58 @@ "remove-trailing-separator": "1.1.0" } }, + "normalize-range": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", + "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=", + "dev": true + }, + "normalize-url": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz", + "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=", + "dev": true, + "requires": { + "object-assign": "4.1.1", + "prepend-http": "1.0.4", + "query-string": "4.3.4", + "sort-keys": "1.1.2" + } + }, + "num2fraction": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", + "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=", + "dev": true + }, + "number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", + "dev": true + }, + "oauth-sign": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", + "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=", + "dev": true + }, "object-assign": { - "version": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", - "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "dev": true + }, + "object-component": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz", + "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=", + "dev": true + }, + "object-path": { + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.9.2.tgz", + "integrity": "sha1-D9mnT8X60a45aLWGvaXGMr1sBaU=", "dev": true }, "object.defaults": { @@ -4303,12 +3513,6 @@ "isobject": "3.0.1" }, "dependencies": { - "for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", - "dev": true - }, "for-own": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", @@ -4326,29 +3530,30 @@ } } }, - "object.pick": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.2.0.tgz", - "integrity": "sha1-tTkr7peC2m2ft9avr1OXefEjTCs=", + "object.omit": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", + "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", "dev": true, "requires": { - "isobject": "2.1.0" + "for-own": "0.1.5", + "is-extendable": "0.1.1" + } + }, + "object.pick": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", + "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", + "dev": true, + "requires": { + "isobject": "3.0.1" }, "dependencies": { - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, "isobject": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", - "dev": true, - "requires": { - "isarray": "1.0.0" - } + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true } } }, @@ -4362,11 +3567,12 @@ } }, "once": { - "version": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", - "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { - "wrappy": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" + "wrappy": "1.0.2" } }, "onetime": { @@ -4375,16 +3581,141 @@ "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=", "dev": true }, + "openurl": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/openurl/-/openurl-1.1.1.tgz", + "integrity": "sha1-OHW0sO96UsFW8NtB1GCduw+Us4c=", + "dev": true + }, + "opn": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/opn/-/opn-4.0.2.tgz", + "integrity": "sha1-erwi5kTf9jsKltWrfyeQwPAavJU=", + "dev": true, + "requires": { + "object-assign": "4.1.1", + "pinkie-promise": "2.0.1" + } + }, + "options": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz", + "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=", + "dev": true + }, + "orchestrator": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz", + "integrity": "sha1-FOfp4nZPcxX7rBhOUGx6pt+UrX4=", + "dev": true, + "requires": { + "end-of-stream": "0.1.5", + "sequencify": "0.0.7", + "stream-consume": "0.1.0" + } + }, + "ordered-read-streams": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz", + "integrity": "sha1-/VZamvjrRHO6abbtijQ1LLVS8SY=", + "dev": true + }, + "os-homedir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", + "dev": true + }, + "os-locale": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", + "dev": true, + "requires": { + "lcid": "1.0.0" + } + }, "os-tmpdir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true }, + "p-map": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz", + "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==", + "dev": true + }, + "parse-filepath": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.1.tgz", + "integrity": "sha1-FZ1hVdQ5BNFsEO9piRHaHpGWm3M=", + "dev": true, + "requires": { + "is-absolute": "0.2.6", + "map-cache": "0.2.2", + "path-root": "0.1.1" + } + }, + "parse-glob": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", + "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", + "dev": true, + "requires": { + "glob-base": "0.3.0", + "is-dotfile": "1.0.3", + "is-extglob": "1.0.0", + "is-glob": "2.0.1" + } + }, + "parse-json": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "dev": true, + "requires": { + "error-ex": "1.3.1" + } + }, + "parse-passwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", + "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=", + "dev": true + }, + "parsejson": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz", + "integrity": "sha1-q343WfIJ7OmUN5c/fQ8fZK4OZKs=", + "dev": true, + "requires": { + "better-assert": "1.0.2" + } + }, + "parseqs": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz", + "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=", + "dev": true, + "requires": { + "better-assert": "1.0.2" + } + }, + "parseuri": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz", + "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=", + "dev": true, + "requires": { + "better-assert": "1.0.2" + } + }, "parseurl": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz", - "integrity": "sha1-yKuMkiO6NIiKpkopeyiFO+wY2lY=", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz", + "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=", "dev": true }, "path-exists": { @@ -4402,15 +3733,56 @@ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true }, - "pause-stream": { - "version": "0.0.11", - "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", - "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=", + "path-is-inside": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", + "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", + "dev": true + }, + "path-parse": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", + "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", + "dev": true + }, + "path-root": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz", + "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=", "dev": true, "requires": { - "through": "2.3.8" + "path-root-regex": "0.1.2" } }, + "path-root-regex": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz", + "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=", + "dev": true + }, + "path-type": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + } + }, + "performance-now": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", + "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=", + "dev": true + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + }, "pinkie": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", @@ -4426,8 +3798,1098 @@ "pinkie": "2.0.4" } }, + "portscanner": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/portscanner/-/portscanner-2.1.1.tgz", + "integrity": "sha1-6rtAnk3iSVD1oqUW01rnaTQ/u5Y=", + "dev": true, + "requires": { + "async": "1.5.2", + "is-number-like": "1.0.8" + } + }, + "postcss": { + "version": "6.0.12", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.12.tgz", + "integrity": "sha512-K6SLofXEK43FBSyZ6/ExQV7ji24OEw4tEY6x1CAf7+tcoMWJoO24Rf3rVFVpk+5IQL1e1Cy3sTKfg7hXuLzafg==", + "dev": true, + "requires": { + "chalk": "2.1.0", + "source-map": "0.5.7", + "supports-color": "4.4.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "dev": true, + "requires": { + "color-convert": "1.9.0" + } + }, + "chalk": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz", + "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "4.4.0" + } + }, + "supports-color": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", + "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } + } + }, + "postcss-calc": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz", + "integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=", + "dev": true, + "requires": { + "postcss": "5.2.17", + "postcss-message-helpers": "2.0.0", + "reduce-css-calc": "1.3.0" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "postcss": { + "version": "5.2.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "postcss-colormin": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.2.tgz", + "integrity": "sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=", + "dev": true, + "requires": { + "colormin": "1.1.2", + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "postcss": { + "version": "5.2.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "postcss-convert-values": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz", + "integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=", + "dev": true, + "requires": { + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "postcss": { + "version": "5.2.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "postcss-discard-comments": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz", + "integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=", + "dev": true, + "requires": { + "postcss": "5.2.17" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "postcss": { + "version": "5.2.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "postcss-discard-duplicates": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz", + "integrity": "sha1-uavye4isGIFYpesSq8riAmO5GTI=", + "dev": true, + "requires": { + "postcss": "5.2.17" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "postcss": { + "version": "5.2.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "postcss-discard-empty": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz", + "integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=", + "dev": true, + "requires": { + "postcss": "5.2.17" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "postcss": { + "version": "5.2.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "postcss-discard-overridden": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz", + "integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=", + "dev": true, + "requires": { + "postcss": "5.2.17" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "postcss": { + "version": "5.2.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "postcss-discard-unused": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz", + "integrity": "sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=", + "dev": true, + "requires": { + "postcss": "5.2.17", + "uniqs": "2.0.0" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "postcss": { + "version": "5.2.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "postcss-filter-plugins": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz", + "integrity": "sha1-bYWGJTTXNaxCDkqFgG4fXUKG2Ew=", + "dev": true, + "requires": { + "postcss": "5.2.17", + "uniqid": "4.1.1" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "postcss": { + "version": "5.2.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "postcss-merge-idents": { + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz", + "integrity": "sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=", + "dev": true, + "requires": { + "has": "1.0.1", + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "postcss": { + "version": "5.2.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "postcss-merge-longhand": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz", + "integrity": "sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=", + "dev": true, + "requires": { + "postcss": "5.2.17" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "postcss": { + "version": "5.2.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "postcss-merge-rules": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz", + "integrity": "sha1-0d9d+qexrMO+VT8OnhDofGG19yE=", + "dev": true, + "requires": { + "browserslist": "1.7.7", + "caniuse-api": "1.6.1", + "postcss": "5.2.17", + "postcss-selector-parser": "2.2.3", + "vendors": "1.0.1" + }, + "dependencies": { + "browserslist": { + "version": "1.7.7", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", + "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", + "dev": true, + "requires": { + "caniuse-db": "1.0.30000738", + "electron-to-chromium": "1.3.22" + } + }, + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "postcss": { + "version": "5.2.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "postcss-message-helpers": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz", + "integrity": "sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=", + "dev": true + }, + "postcss-minify-font-values": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz", + "integrity": "sha1-S1jttWZB66fIR0qzUmyv17vey2k=", + "dev": true, + "requires": { + "object-assign": "4.1.1", + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "postcss": { + "version": "5.2.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "postcss-minify-gradients": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz", + "integrity": "sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=", + "dev": true, + "requires": { + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "postcss": { + "version": "5.2.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "postcss-minify-params": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz", + "integrity": "sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=", + "dev": true, + "requires": { + "alphanum-sort": "1.0.2", + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0", + "uniqs": "2.0.0" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "postcss": { + "version": "5.2.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "postcss-minify-selectors": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz", + "integrity": "sha1-ssapjAByz5G5MtGkllCBFDEXNb8=", + "dev": true, + "requires": { + "alphanum-sort": "1.0.2", + "has": "1.0.1", + "postcss": "5.2.17", + "postcss-selector-parser": "2.2.3" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "postcss": { + "version": "5.2.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "postcss-normalize-charset": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz", + "integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=", + "dev": true, + "requires": { + "postcss": "5.2.17" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "postcss": { + "version": "5.2.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "postcss-normalize-url": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz", + "integrity": "sha1-EI90s/L82viRov+j6kWSJ5/HgiI=", + "dev": true, + "requires": { + "is-absolute-url": "2.1.0", + "normalize-url": "1.9.1", + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "postcss": { + "version": "5.2.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "postcss-ordered-values": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz", + "integrity": "sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=", + "dev": true, + "requires": { + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "postcss": { + "version": "5.2.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "postcss-reduce-idents": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz", + "integrity": "sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=", + "dev": true, + "requires": { + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "postcss": { + "version": "5.2.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "postcss-reduce-initial": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz", + "integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=", + "dev": true, + "requires": { + "postcss": "5.2.17" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "postcss": { + "version": "5.2.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "postcss-reduce-transforms": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz", + "integrity": "sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=", + "dev": true, + "requires": { + "has": "1.0.1", + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "postcss": { + "version": "5.2.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "postcss-selector-parser": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz", + "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=", + "dev": true, + "requires": { + "flatten": "1.0.2", + "indexes-of": "1.0.1", + "uniq": "1.0.1" + } + }, + "postcss-svgo": { + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz", + "integrity": "sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=", + "dev": true, + "requires": { + "is-svg": "2.1.0", + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0", + "svgo": "0.7.2" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "postcss": { + "version": "5.2.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "postcss-unique-selectors": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz", + "integrity": "sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=", + "dev": true, + "requires": { + "alphanum-sort": "1.0.2", + "postcss": "5.2.17", + "uniqs": "2.0.0" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "postcss": { + "version": "5.2.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "postcss-value-parser": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz", + "integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=", + "dev": true + }, + "postcss-zindex": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz", + "integrity": "sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=", + "dev": true, + "requires": { + "has": "1.0.1", + "postcss": "5.2.17", + "uniqs": "2.0.0" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "postcss": { + "version": "5.2.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "prepend-http": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", + "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=", + "dev": true + }, + "preserve": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", + "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=", + "dev": true + }, + "pretty-hrtime": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", + "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=", + "dev": true + }, "process-nextick-args": { - "version": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", "dev": true }, @@ -4437,40 +4899,223 @@ "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", "dev": true }, - "qs": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/qs/-/qs-2.2.5.tgz", - "integrity": "sha1-EIirr53MCuWuRbcJ5sa1iIsjkjw=", - "dev": true - }, - "raw-body": { - "version": "2.1.7", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz", - "integrity": "sha1-rf6s4uT7MJgFgBTQjActzFl1h3Q=", + "pump": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz", + "integrity": "sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE=", "dev": true, "requires": { - "bytes": "2.4.0", - "iconv-lite": "0.4.13", - "unpipe": "1.0.0" + "end-of-stream": "1.4.0", + "once": "1.4.0" }, "dependencies": { - "bytes": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz", - "integrity": "sha1-fZcZb51br39pNeJZhVSe3SpsIzk=", + "end-of-stream": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz", + "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=", + "dev": true, + "requires": { + "once": "1.4.0" + } + } + } + }, + "punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", + "dev": true + }, + "q": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz", + "integrity": "sha1-3QG6ydBtMObyGa7LglPunr3DCPE=", + "dev": true + }, + "qs": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz", + "integrity": "sha1-zgPF/wk1vB2daanxTL0Y5WjWdiU=", + "dev": true + }, + "query-string": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz", + "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=", + "dev": true, + "requires": { + "object-assign": "4.1.1", + "strict-uri-encode": "1.1.0" + } + }, + "randomatic": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", + "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", + "dev": true, + "requires": { + "is-number": "3.0.0", + "kind-of": "4.0.0" + }, + "dependencies": { + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.5" + } + } + } + }, + "kind-of": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", + "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", + "dev": true, + "requires": { + "is-buffer": "1.1.5" + } + } + } + }, + "range-parser": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", + "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=", + "dev": true + }, + "rcfinder": { + "version": "0.1.9", + "resolved": "https://registry.npmjs.org/rcfinder/-/rcfinder-0.1.9.tgz", + "integrity": "sha1-8+gPOH3fmugK4wpBADKWQuroERU=", + "dev": true, + "requires": { + "lodash.clonedeep": "4.5.0" + } + }, + "rcloader": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/rcloader/-/rcloader-0.2.2.tgz", + "integrity": "sha1-WNIpi0YtC5v9ITPSoex0+9cFxxc=", + "dev": true, + "requires": { + "lodash.assign": "4.2.0", + "lodash.isobject": "3.0.2", + "lodash.merge": "4.6.0", + "rcfinder": "0.1.9" + } + }, + "read-pkg": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "dev": true, + "requires": { + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" + } + }, + "read-pkg-up": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "dev": true, + "requires": { + "find-up": "1.1.2", + "read-pkg": "1.1.0" + } + }, + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "readdirp": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz", + "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "minimatch": "3.0.4", + "readable-stream": "2.3.3", + "set-immediate-shim": "1.0.1" + } + }, + "rechoir": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", + "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", + "dev": true, + "requires": { + "resolve": "1.4.0" + } + }, + "reduce-css-calc": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz", + "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=", + "dev": true, + "requires": { + "balanced-match": "0.4.2", + "math-expression-evaluator": "1.2.17", + "reduce-function-call": "1.0.2" + }, + "dependencies": { + "balanced-match": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", + "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=", "dev": true } } }, - "readable-stream": { - "version": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "reduce-function-call": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz", + "integrity": "sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=", "dev": true, "requires": { - "core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "isarray": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" + "balanced-match": "0.4.2" + }, + "dependencies": { + "balanced-match": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", + "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=", + "dev": true + } + } + }, + "regex-cache": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", + "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", + "dev": true, + "requires": { + "is-equal-shallow": "0.1.3" } }, "remove-trailing-separator": { @@ -4479,54 +5124,140 @@ "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", "dev": true }, + "repeat-element": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", + "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=", + "dev": true + }, + "repeat-string": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", + "dev": true + }, "replace-ext": { - "version": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=", "dev": true }, + "request": { + "version": "2.81.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", + "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", + "dev": true, + "requires": { + "aws-sign2": "0.6.0", + "aws4": "1.6.0", + "caseless": "0.12.0", + "combined-stream": "1.0.5", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.1.4", + "har-validator": "4.2.1", + "hawk": "3.1.3", + "http-signature": "1.1.1", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.17", + "oauth-sign": "0.8.2", + "performance-now": "0.2.0", + "qs": "6.4.0", + "safe-buffer": "5.1.1", + "stringstream": "0.0.5", + "tough-cookie": "2.3.3", + "tunnel-agent": "0.6.0", + "uuid": "3.1.0" + }, + "dependencies": { + "qs": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", + "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=", + "dev": true + } + } + }, + "require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", + "dev": true + }, + "require-main-filename": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", + "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", + "dev": true + }, + "requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", + "dev": true + }, + "resolve": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz", + "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==", + "dev": true, + "requires": { + "path-parse": "1.0.5" + } + }, + "resolve-dir": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz", + "integrity": "sha1-shklmlYC+sXFxJatiUpujMQwJh4=", + "dev": true, + "requires": { + "expand-tilde": "1.2.2", + "global-modules": "0.2.3" + } + }, "resolve-url": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", "dev": true }, + "resp-modifier": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/resp-modifier/-/resp-modifier-6.0.2.tgz", + "integrity": "sha1-sSTeXE+6/LpUH0j/pzlw9KpFa08=", + "dev": true, + "requires": { + "debug": "2.2.0", + "minimatch": "3.0.4" + } + }, "rimraf": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz", - "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", + "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "dev": true, "requires": { "glob": "7.1.2" - }, - "dependencies": { - "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", - "dev": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "minimatch": "3.0.4", - "once": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", - "path-is-absolute": "1.0.1" - } - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, - "requires": { - "brace-expansion": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz" - } - } } }, + "rx": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz", + "integrity": "sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=", + "dev": true + }, "safe-buffer": { - "version": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz", - "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", + "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", + "dev": true + }, + "sax": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", "dev": true }, "semver": { @@ -4535,12 +5266,139 @@ "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==", "dev": true }, + "send": { + "version": "0.15.2", + "resolved": "https://registry.npmjs.org/send/-/send-0.15.2.tgz", + "integrity": "sha1-+R+rRAO8+H5xb3DOtdsvV4vcF9Y=", + "dev": true, + "requires": { + "debug": "2.6.4", + "depd": "1.1.1", + "destroy": "1.0.4", + "encodeurl": "1.0.1", + "escape-html": "1.0.3", + "etag": "1.8.1", + "fresh": "0.5.0", + "http-errors": "1.6.2", + "mime": "1.3.4", + "ms": "1.0.0", + "on-finished": "2.3.0", + "range-parser": "1.2.0", + "statuses": "1.3.1" + }, + "dependencies": { + "debug": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.4.tgz", + "integrity": "sha1-dYaps8OXQcAoKuM0RcTorHRzT+A=", + "dev": true, + "requires": { + "ms": "0.7.3" + }, + "dependencies": { + "ms": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz", + "integrity": "sha1-cIFVpeROM/X9D8U+gdDUCpG+H/8=", + "dev": true + } + } + }, + "fresh": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz", + "integrity": "sha1-9HTKXmqSRtb9jglTz6m5yAWvp44=", + "dev": true + }, + "http-errors": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz", + "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=", + "dev": true, + "requires": { + "depd": "1.1.1", + "inherits": "2.0.3", + "setprototypeof": "1.0.3", + "statuses": "1.3.1" + } + }, + "mime": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz", + "integrity": "sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM=", + "dev": true + }, + "ms": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-1.0.0.tgz", + "integrity": "sha1-Wa3NIu3FQ/e1OBhi0xOHsfS8lHM=", + "dev": true + }, + "setprototypeof": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz", + "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=", + "dev": true + } + } + }, + "sequencify": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz", + "integrity": "sha1-kM/xnQLgcCf9dn9erT57ldHnOAw=", + "dev": true + }, + "serve-index": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.8.0.tgz", + "integrity": "sha1-fF2WwT+xMRAfk8HFd0+FFqHnjTs=", + "dev": true, + "requires": { + "accepts": "1.3.4", + "batch": "0.5.3", + "debug": "2.2.0", + "escape-html": "1.0.3", + "http-errors": "1.5.1", + "mime-types": "2.1.17", + "parseurl": "1.3.2" + } + }, + "serve-static": { + "version": "1.12.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.12.2.tgz", + "integrity": "sha1-5UbicmCBuBtLzsjpCAjrzdMjr7o=", + "dev": true, + "requires": { + "encodeurl": "1.0.1", + "escape-html": "1.0.3", + "parseurl": "1.3.2", + "send": "0.15.2" + } + }, + "server-destroy": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz", + "integrity": "sha1-8Tv5KOQrnD55OD5hzDmYtdFObN0=", + "dev": true + }, + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", + "dev": true + }, "set-immediate-shim": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", "dev": true }, + "setprototypeof": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz", + "integrity": "sha1-gaVSFB7BBLiOic44MQOtXGZWTQg=", + "dev": true + }, "shebang-command": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", @@ -4556,16 +5414,173 @@ "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", "dev": true }, - "shellwords": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.0.tgz", - "integrity": "sha1-Zq/Ue2oSky2Qccv9mKUueFzQuhQ=", + "shelljs": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz", + "integrity": "sha1-NZbmMHp4FUT1kfN9phg2DzHbV7E=", "dev": true }, + "shellwords": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz", + "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==", + "dev": true + }, + "sigmund": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", + "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=", + "dev": true + }, + "sntp": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", + "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", + "dev": true, + "requires": { + "hoek": "2.16.3" + } + }, + "socket.io": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-1.6.0.tgz", + "integrity": "sha1-PkDZMmN+a9kjmBslyvfFPoO24uE=", + "dev": true, + "requires": { + "debug": "2.3.3", + "engine.io": "1.8.0", + "has-binary": "0.1.7", + "object-assign": "4.1.0", + "socket.io-adapter": "0.5.0", + "socket.io-client": "1.6.0", + "socket.io-parser": "2.3.1" + }, + "dependencies": { + "debug": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", + "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", + "dev": true, + "requires": { + "ms": "0.7.2" + } + }, + "ms": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", + "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", + "dev": true + }, + "object-assign": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz", + "integrity": "sha1-ejs9DpgGPUP0wD8uiubNUahog6A=", + "dev": true + } + } + }, + "socket.io-adapter": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz", + "integrity": "sha1-y21LuL7IHhB4uZZ3+c7QBGBmu4s=", + "dev": true, + "requires": { + "debug": "2.3.3", + "socket.io-parser": "2.3.1" + }, + "dependencies": { + "debug": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", + "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", + "dev": true, + "requires": { + "ms": "0.7.2" + } + }, + "ms": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", + "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", + "dev": true + } + } + }, + "socket.io-client": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.6.0.tgz", + "integrity": "sha1-W2aPT3cTBN/u0XkGRwg4b6ZxeFM=", + "dev": true, + "requires": { + "backo2": "1.0.2", + "component-bind": "1.0.0", + "component-emitter": "1.2.1", + "debug": "2.3.3", + "engine.io-client": "1.8.0", + "has-binary": "0.1.7", + "indexof": "0.0.1", + "object-component": "0.0.3", + "parseuri": "0.0.5", + "socket.io-parser": "2.3.1", + "to-array": "0.1.4" + }, + "dependencies": { + "component-emitter": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", + "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", + "dev": true + }, + "debug": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", + "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", + "dev": true, + "requires": { + "ms": "0.7.2" + } + }, + "ms": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", + "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", + "dev": true + } + } + }, + "socket.io-parser": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz", + "integrity": "sha1-3VMgJRA85Clpcya+/WQAX8/ltKA=", + "dev": true, + "requires": { + "component-emitter": "1.1.2", + "debug": "2.2.0", + "isarray": "0.0.1", + "json3": "3.3.2" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + } + } + }, + "sort-keys": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz", + "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=", + "dev": true, + "requires": { + "is-plain-obj": "1.1.0" + } + }, "source-map": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", - "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=", + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, "source-map-resolve": { @@ -4587,17 +5602,60 @@ "dev": true }, "sparkles": { - "version": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz", "integrity": "sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=", "dev": true }, - "split": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz", - "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=", + "spdx-correct": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", + "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", "dev": true, "requires": { - "through": "2.3.8" + "spdx-license-ids": "1.2.2" + } + }, + "spdx-expression-parse": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", + "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=", + "dev": true + }, + "spdx-license-ids": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", + "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=", + "dev": true + }, + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true + }, + "sshpk": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz", + "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=", + "dev": true, + "requires": { + "asn1": "0.2.3", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.1", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.1", + "getpass": "0.1.7", + "jsbn": "0.1.1", + "tweetnacl": "0.14.5" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "dev": true + } } }, "statuses": { @@ -4606,26 +5664,70 @@ "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=", "dev": true }, - "stream-combiner": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz", - "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=", + "stream-consume": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz", + "integrity": "sha1-pB6tGm1ggc63n2WwYZAbbY89HQ8=", + "dev": true + }, + "stream-throttle": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/stream-throttle/-/stream-throttle-0.1.3.tgz", + "integrity": "sha1-rdV8jXzHOoFjDTHNVdOWHPr7qcM=", "dev": true, "requires": { - "duplexer": "0.1.1" + "commander": "2.11.0", + "limiter": "1.1.2" + } + }, + "strict-uri-encode": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", + "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", + "dev": true + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "dev": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" } }, "string_decoder": { - "version": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, + "stringstream": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", + "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=", "dev": true }, "strip-ansi": { - "version": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz" + "ansi-regex": "2.1.1" + } + }, + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "dev": true, + "requires": { + "is-utf8": "0.2.1" } }, "strip-bom-string": { @@ -4634,57 +5736,82 @@ "integrity": "sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI=", "dev": true }, + "strip-json-comments": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz", + "integrity": "sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=", + "dev": true + }, "supports-color": { - "version": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", "dev": true }, - "through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", - "dev": true - }, - "through2": { - "version": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", - "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", + "svgo": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz", + "integrity": "sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=", "dev": true, "requires": { - "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz", - "xtend": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" + "coa": "1.0.4", + "colors": "1.1.2", + "csso": "2.3.2", + "js-yaml": "3.7.0", + "mkdirp": "0.5.1", + "sax": "1.2.4", + "whet.extend": "0.9.9" }, "dependencies": { - "isarray": { - "version": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", "dev": true }, - "readable-stream": { - "version": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz", - "integrity": "sha1-z3jsb0ptHrQ9JkiMrJfwQudLf8g=", + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, "requires": { - "buffer-shims": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz", - "core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz", - "util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" - } - }, - "string_decoder": { - "version": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz", - "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=", - "dev": true, - "requires": { - "safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz" + "minimist": "0.0.8" } } } }, + "tfunk": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/tfunk/-/tfunk-3.1.0.tgz", + "integrity": "sha1-OORBT8ZJd9h6/apy+sttKfgve1s=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "object-path": "0.9.2" + } + }, + "through2": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", + "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", + "dev": true, + "requires": { + "readable-stream": "2.3.3", + "xtend": "4.0.1" + } + }, + "tildify": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz", + "integrity": "sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=", + "dev": true, + "requires": { + "os-homedir": "1.0.2" + } + }, "time-stamp": { - "version": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz", "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=", "dev": true }, @@ -4694,20 +5821,108 @@ "integrity": "sha1-YcxHp2wavTGV8UUn+XjViulMUgQ=", "dev": true, "requires": { - "es5-ext": "0.10.27", + "es5-ext": "0.10.30", "next-tick": "1.0.0" } }, - "type-is": { - "version": "1.6.15", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz", - "integrity": "sha1-yrEPtJCeRByChC6v4a1kbIGARBA=", + "to-array": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz", + "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=", + "dev": true + }, + "tough-cookie": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz", + "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=", "dev": true, "requires": { - "media-typer": "0.3.0", - "mime-types": "2.1.16" + "punycode": "1.4.1" } }, + "tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, + "tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", + "dev": true, + "optional": true + }, + "ua-parser-js": { + "version": "0.7.12", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.12.tgz", + "integrity": "sha1-BMgamb3V3FImPqKdJMa/jUgYpLs=", + "dev": true + }, + "uglify-js": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.2.tgz", + "integrity": "sha512-kKJ8zg7Ivw3DG9Ytgp4+iiSHq3HaHjEQMvyT2x2Bs8kSUwVemj6bPGFp6YWL81f5NAIOLVUKPxBSvqLRGXMpdw==", + "dev": true, + "requires": { + "commander": "2.11.0", + "source-map": "0.5.7" + } + }, + "ultron": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz", + "integrity": "sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po=", + "dev": true + }, + "unc-path-regex": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", + "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=", + "dev": true + }, + "underscore": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz", + "integrity": "sha1-a7rwh3UA02vjTsqlhODbn+8DUgk=", + "dev": true + }, + "uniq": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", + "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=", + "dev": true + }, + "uniqid": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-4.1.1.tgz", + "integrity": "sha1-iSIN32t1GuUrX3JISGNShZa7hME=", + "dev": true, + "requires": { + "macaddress": "0.2.8" + } + }, + "uniqs": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz", + "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=", + "dev": true + }, + "unique-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz", + "integrity": "sha1-1ZpKdUJ0R9mqbJHnAmP40mpLEEs=", + "dev": true + }, + "universalify": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz", + "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=", + "dev": true + }, "unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", @@ -4720,59 +5935,348 @@ "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", "dev": true }, + "user-home": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz", + "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=", + "dev": true + }, "util-deprecate": { - "version": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true }, + "utils-merge": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz", + "integrity": "sha1-ApT7kiu5N1FTVBxPcJYjHyh8ivg=", + "dev": true + }, + "uuid": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", + "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==", + "dev": true + }, + "v8flags": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz", + "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=", + "dev": true, + "requires": { + "user-home": "1.1.1" + } + }, + "validate-npm-package-license": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", + "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", + "dev": true, + "requires": { + "spdx-correct": "1.0.2", + "spdx-expression-parse": "1.0.4" + } + }, + "vendors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.1.tgz", + "integrity": "sha1-N61zyO5Bf7PVgOeFMSMH0nSEfyI=", + "dev": true + }, + "verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "dev": true, + "requires": { + "assert-plus": "1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "1.3.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "dev": true + } + } + }, "vinyl": { - "version": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz", + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz", "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=", "dev": true, "requires": { - "clone": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", - "clone-stats": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", - "replace-ext": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz" + "clone": "1.0.2", + "clone-stats": "0.0.1", + "replace-ext": "0.0.1" } }, - "websocket-driver": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz", - "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=", + "vinyl-fs": { + "version": "0.3.14", + "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz", + "integrity": "sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=", "dev": true, "requires": { - "websocket-extensions": "0.1.1" + "defaults": "1.0.3", + "glob-stream": "3.1.18", + "glob-watcher": "0.0.6", + "graceful-fs": "3.0.11", + "mkdirp": "0.5.1", + "strip-bom": "1.0.0", + "through2": "0.6.5", + "vinyl": "0.4.6" + }, + "dependencies": { + "clone": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz", + "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=", + "dev": true + }, + "graceful-fs": { + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz", + "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=", + "dev": true, + "requires": { + "natives": "1.1.0" + } + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + }, + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, + "requires": { + "minimist": "0.0.8" + } + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + }, + "strip-bom": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz", + "integrity": "sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=", + "dev": true, + "requires": { + "first-chunk-stream": "1.0.0", + "is-utf8": "0.2.1" + } + }, + "through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" + } + }, + "vinyl": { + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz", + "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", + "dev": true, + "requires": { + "clone": "0.2.0", + "clone-stats": "0.0.1" + } + } } }, - "websocket-extensions": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz", - "integrity": "sha1-domUmcGEtu91Q3fC27DNbLVdKec=", + "vinyl-sourcemaps-apply": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz", + "integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=", + "dev": true, + "requires": { + "source-map": "0.5.7" + } + }, + "weinre": { + "version": "2.0.0-pre-I0Z7U9OV", + "resolved": "https://registry.npmjs.org/weinre/-/weinre-2.0.0-pre-I0Z7U9OV.tgz", + "integrity": "sha1-/viqIjkh97QLu71MPtQwL2/QqBM=", + "dev": true, + "requires": { + "express": "2.5.11", + "nopt": "3.0.6", + "underscore": "1.7.0" + } + }, + "whet.extend": { + "version": "0.9.9", + "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz", + "integrity": "sha1-+HfVv2SMl+WqVC+twW1qJZucEaE=", "dev": true }, "which": { - "version": "https://registry.npmjs.org/which/-/which-1.2.14.tgz", - "integrity": "sha1-mofEN48D6CfOyvGs31bHNsAcFOU=", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", + "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", "dev": true, "requires": { - "isexe": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz" + "isexe": "2.0.0" + } + }, + "which-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", + "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=", + "dev": true + }, + "window-size": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz", + "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=", + "dev": true + }, + "wrap-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "dev": true, + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1" } }, "wrappy": { - "version": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true }, + "ws": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz", + "integrity": "sha1-CC3bbGQehdS7RR8D1S8G6r2x8Bg=", + "dev": true, + "requires": { + "options": "0.0.6", + "ultron": "1.0.2" + } + }, + "wtf-8": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz", + "integrity": "sha1-OS2LotDxw00e4tYw8V0O+2jhBIo=", + "dev": true + }, + "xmlhttprequest-ssl": { + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz", + "integrity": "sha1-GFqIjATspGw+QHDZn3tJ3jUomS0=", + "dev": true + }, "xtend": { - "version": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", "dev": true }, + "y18n": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", + "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", + "dev": true + }, "yallist": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", "dev": true + }, + "yargs": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.4.0.tgz", + "integrity": "sha1-gW4ahm1VmMzzTlWW3c4i2S2kkNQ=", + "dev": true, + "requires": { + "camelcase": "3.0.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "os-locale": "1.4.0", + "read-pkg-up": "1.0.1", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "1.0.2", + "which-module": "1.0.0", + "window-size": "0.2.0", + "y18n": "3.2.1", + "yargs-parser": "4.2.1" + }, + "dependencies": { + "camelcase": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", + "dev": true + }, + "window-size": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz", + "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=", + "dev": true + } + } + }, + "yargs-parser": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz", + "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=", + "dev": true, + "requires": { + "camelcase": "3.0.0" + }, + "dependencies": { + "camelcase": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", + "dev": true + } + } + }, + "yeast": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz", + "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=", + "dev": true } } } diff --git a/package.json b/package.json index 26f3784..7db5e98 100644 --- a/package.json +++ b/package.json @@ -17,12 +17,23 @@ }, "homepage": "https://github.com/sthag/hippie#readme", "devDependencies": { + "browser-sync": "^2.18.13", + "del": "^3.0.0", "gulp": "^3.9.1", - "gulp-livereload": "^3.8.1", + "gulp-autoprefixer": "^4.0.0", + "gulp-cached": "^1.1.1", + "gulp-changed": "^3.1.0", + "gulp-concat": "^2.6.1", + "gulp-cssnano": "^2.1.2", + "gulp-jshint": "^2.0.4", "gulp-notify": "^3.0.0", - "gulp-plumber": "^1.1.0", + "gulp-remember": "^0.3.1", + "gulp-rename": "^1.2.2", "gulp-ruby-sass": "^2.1.1", - "gulp-sourcemaps": "^2.6.0" + "gulp-sourcemaps": "^2.6.1", + "gulp-uglify": "^3.0.0", + "jshint": "^2.9.5", + "pump": "^1.0.2" }, "dependencies": {} } diff --git a/code/functions.js b/source/code/functions.js similarity index 88% rename from code/functions.js rename to source/code/functions.js index b1c0a3d..2140f4c 100644 --- a/code/functions.js +++ b/source/code/functions.js @@ -6,14 +6,14 @@ function setup() { } // get document coordinates of the element -function getCoords(elem) { - let box = elem.getBoundingClientRect(); - - return { - top: box.top + pageYOffset, - left: box.left + pageXOffset - }; -} +// function getCoords(elem) { +// let box = elem.getBoundingClientRect(); +// +// return { +// top: box.top + pageYOffset, +// left: box.left + pageXOffset +// }; +// } // https://stackoverflow.com/a/488073/1444149 function Utils() { diff --git a/code/global.js b/source/code/global.js similarity index 97% rename from code/global.js rename to source/code/global.js index 4275707..d0a6e5c 100644 --- a/code/global.js +++ b/source/code/global.js @@ -119,13 +119,6 @@ $( document ).ready(function() { - // jq-sticky-anything - $('#js_demo_fix').stickThis({ - pushup: '#js_demo_stop' - }); - - - }); diff --git a/code/variables.js b/source/code/variables.js similarity index 88% rename from code/variables.js rename to source/code/variables.js index 67e72cd..e716433 100644 --- a/code/variables.js +++ b/source/code/variables.js @@ -1,5 +1,5 @@ -var w = Math.max(document.documentElement.clientWidth, window.innerWidth || 0) -var h = Math.max(document.documentElement.clientHeight, window.innerHeight || 0) +var w = Math.max(document.documentElement.clientWidth, window.innerWidth || 0); +var h = Math.max(document.documentElement.clientHeight, window.innerHeight || 0); var full_view_hover = false; diff --git a/_abovethefold.scss b/source/style/_abovethefold.scss similarity index 75% rename from _abovethefold.scss rename to source/style/_abovethefold.scss index ce51a2a..4b91d99 100644 --- a/_abovethefold.scss +++ b/source/style/_abovethefold.scss @@ -8,9 +8,9 @@ // Reset -// Use a file outside of hippie i.e. other/normalize.css +// Use a file outside of hippie i.e. vendor/normalize.css // ----------------------------------------------------------------------------- -// @import "other/normalize.css"; +// @import "vendor/normalize.css"; diff --git a/_hippie.scss b/source/style/_hippie.scss similarity index 94% rename from _hippie.scss rename to source/style/_hippie.scss index 436c1c9..ab0eeee 100644 --- a/_hippie.scss +++ b/source/style/_hippie.scss @@ -21,10 +21,10 @@ // Reset -// Use a file outside of hippie i.e. other/normalize.css +// Use a file outside of hippie i.e. vendor/normalize.css // ----------------------------------------------------------------------------- -@import "other/normalize.css"; -// @import "other/YOUR-FILES.css"; +@import "../../vendor/normalize.css"; +// @import "vendor/YOUR-FILES.css"; @@ -39,7 +39,7 @@ // Fonts // Use a central file outside of hippie for font definitions with @font-face // ----------------------------------------------------------------------------- -// @import "other/fonts.css"; +// @import "vendor/fonts.css"; diff --git a/_settings.scss b/source/style/_settings.scss similarity index 100% rename from _settings.scss rename to source/style/_settings.scss diff --git a/elements/_embedded.scss b/source/style/elements/_embedded.scss similarity index 100% rename from elements/_embedded.scss rename to source/style/elements/_embedded.scss diff --git a/elements/_grouping.scss b/source/style/elements/_grouping.scss similarity index 100% rename from elements/_grouping.scss rename to source/style/elements/_grouping.scss diff --git a/elements/_interactive.scss b/source/style/elements/_interactive.scss similarity index 100% rename from elements/_interactive.scss rename to source/style/elements/_interactive.scss diff --git a/elements/_new.scss b/source/style/elements/_new.scss similarity index 100% rename from elements/_new.scss rename to source/style/elements/_new.scss diff --git a/elements/_sections.scss b/source/style/elements/_sections.scss similarity index 100% rename from elements/_sections.scss rename to source/style/elements/_sections.scss diff --git a/elements/_tables.scss b/source/style/elements/_tables.scss similarity index 100% rename from elements/_tables.scss rename to source/style/elements/_tables.scss diff --git a/elements/_textlevel.scss b/source/style/elements/_textlevel.scss similarity index 100% rename from elements/_textlevel.scss rename to source/style/elements/_textlevel.scss diff --git a/elements/_typography.scss b/source/style/elements/_typography.scss similarity index 100% rename from elements/_typography.scss rename to source/style/elements/_typography.scss diff --git a/example.scss b/source/style/example.scss similarity index 100% rename from example.scss rename to source/style/example.scss diff --git a/functions/_all.scss b/source/style/functions/_all.scss similarity index 94% rename from functions/_all.scss rename to source/style/functions/_all.scss index 0e63090..4acf406 100644 --- a/functions/_all.scss +++ b/source/style/functions/_all.scss @@ -1,3 +1,3 @@ -@import "color"; -@import "shade"; -@import "tint"; +@import "color"; +@import "shade"; +@import "tint"; diff --git a/functions/_color.scss b/source/style/functions/_color.scss similarity index 96% rename from functions/_color.scss rename to source/style/functions/_color.scss index 0e32ddb..228ed81 100644 --- a/functions/_color.scss +++ b/source/style/functions/_color.scss @@ -1,13 +1,13 @@ -@function createColorMap($color, $percentage, $opacity) { - $map: ( - base: $color, - light: lighten($color, $percentage), - dark: darken($color, $percentage), - trans: transparentize($color, $opacity) - ); - @return $map; -} - -@function basic_color($key: 'alpha') { - @return map-get($color_palette, $key); -} +@function createColorMap($color, $percentage, $opacity) { + $map: ( + base: $color, + light: lighten($color, $percentage), + dark: darken($color, $percentage), + trans: transparentize($color, $opacity) + ); + @return $map; +} + +@function basic_color($key: 'alpha') { + @return map-get($color_palette, $key); +} diff --git a/functions/_shade.scss b/source/style/functions/_shade.scss similarity index 94% rename from functions/_shade.scss rename to source/style/functions/_shade.scss index 34a652b..6607422 100644 --- a/functions/_shade.scss +++ b/source/style/functions/_shade.scss @@ -1,24 +1,24 @@ -@charset "UTF-8"; - -// Mixes a color with black. -// -// @param {Color} $color -// -// @param {Number (Percentage)} $percent -// The amount of black to be mixed in. -// -// @example scss - Usage -// .element { -// background-color: shade(#0c85ff, 60%); -// } -// -// @example css - CSS Output -// .element { -// background-color: #074f99; -// } -// -// @return {Color} - -@function shade($color, $percent) { - @return mix(#000, $color, $percent); -} +@charset "UTF-8"; + +// Mixes a color with black. +// +// @param {Color} $color +// +// @param {Number (Percentage)} $percent +// The amount of black to be mixed in. +// +// @example scss - Usage +// .element { +// background-color: shade(#0c85ff, 60%); +// } +// +// @example css - CSS Output +// .element { +// background-color: #074f99; +// } +// +// @return {Color} + +@function shade($color, $percent) { + @return mix(#000, $color, $percent); +} diff --git a/functions/_tint.scss b/source/style/functions/_tint.scss similarity index 94% rename from functions/_tint.scss rename to source/style/functions/_tint.scss index fa16997..7eee931 100644 --- a/functions/_tint.scss +++ b/source/style/functions/_tint.scss @@ -1,24 +1,24 @@ -@charset "UTF-8"; - -// Mixes a color with white. -// -// @param {Color} $color -// -// @param {Number (Percentage)} $percent -// The amount of white to be mixed in. -// -// @example scss - Usage -// .element { -// background-color: tint(#0c85ff, 40%); -// } -// -// @example css - CSS Output -// .element { -// background-color: #9dceff; -// } -// -// @return {Color} - -@function tint($color, $percent) { - @return mix(#fff, $color, $percent); -} +@charset "UTF-8"; + +// Mixes a color with white. +// +// @param {Color} $color +// +// @param {Number (Percentage)} $percent +// The amount of white to be mixed in. +// +// @example scss - Usage +// .element { +// background-color: tint(#0c85ff, 40%); +// } +// +// @example css - CSS Output +// .element { +// background-color: #9dceff; +// } +// +// @return {Color} + +@function tint($color, $percent) { + @return mix(#fff, $color, $percent); +} diff --git a/global/_common.scss b/source/style/global/_common.scss similarity index 100% rename from global/_common.scss rename to source/style/global/_common.scss diff --git a/global/_config.scss b/source/style/global/_config.scss similarity index 100% rename from global/_config.scss rename to source/style/global/_config.scss diff --git a/mixins/_all.scss b/source/style/mixins/_all.scss similarity index 95% rename from mixins/_all.scss rename to source/style/mixins/_all.scss index c7955dd..0bd8103 100644 --- a/mixins/_all.scss +++ b/source/style/mixins/_all.scss @@ -1,4 +1,4 @@ -@import "media_query"; -@import "flow"; -@import "color"; -@import "user_agent"; +@import "media_query"; +@import "flow"; +@import "color"; +@import "user_agent"; diff --git a/mixins/_color.scss b/source/style/mixins/_color.scss similarity index 97% rename from mixins/_color.scss rename to source/style/mixins/_color.scss index 3822647..0849dc9 100644 --- a/mixins/_color.scss +++ b/source/style/mixins/_color.scss @@ -1,20 +1,20 @@ -@mixin addDefaultColors() { - @if map-has-key($color_palette, alpha) { - $alpha_color: map-get($color_palette, alpha) !global; - } - @if map-has-key($color_palette, bravo) { - $bravo_color: map-get($color_palette, bravo) !global; - } - @if map-has-key($color_palette, charlie) { - $charlie_color: map-get($color_palette, charlie) !global; - } - @if map-has-key($color_palette, delta) { - $delta_color: map-get($color_palette, delta) !global; - } - @if map-has-key($color_palette, echo) { - $echo_color: map-get($color_palette, echo) !global; - } - @if map-has-key($color_palette, foxtrot) { - $foxtrot_color: map-get($color_palette, foxtrot) !global; - } -} +@mixin addDefaultColors() { + @if map-has-key($color_palette, alpha) { + $alpha_color: map-get($color_palette, alpha) !global; + } + @if map-has-key($color_palette, bravo) { + $bravo_color: map-get($color_palette, bravo) !global; + } + @if map-has-key($color_palette, charlie) { + $charlie_color: map-get($color_palette, charlie) !global; + } + @if map-has-key($color_palette, delta) { + $delta_color: map-get($color_palette, delta) !global; + } + @if map-has-key($color_palette, echo) { + $echo_color: map-get($color_palette, echo) !global; + } + @if map-has-key($color_palette, foxtrot) { + $foxtrot_color: map-get($color_palette, foxtrot) !global; + } +} diff --git a/mixins/_flow.scss b/source/style/mixins/_flow.scss similarity index 94% rename from mixins/_flow.scss rename to source/style/mixins/_flow.scss index 2264389..8f9d9e7 100644 --- a/mixins/_flow.scss +++ b/source/style/mixins/_flow.scss @@ -1,25 +1,25 @@ -@charset "UTF-8"; - -// Provides an easy way to include a clearflow for containing floats. -// -// @link http://cssmojo.com/latest_new_clearfix_so_far/ -// -// @example scss - Usage -// .element { -// @include clearFlow; -// } -// -// @example css - CSS Output -// .element::after { -// content: ""; -// clear: both; -// display: table; -// } - -@mixin clearFlow { - &::after { - content: ""; - clear: both; - display: table; - } -} +@charset "UTF-8"; + +// Provides an easy way to include a clearflow for containing floats. +// +// @link http://cssmojo.com/latest_new_clearfix_so_far/ +// +// @example scss - Usage +// .element { +// @include clearFlow; +// } +// +// @example css - CSS Output +// .element::after { +// content: ""; +// clear: both; +// display: table; +// } + +@mixin clearFlow { + &::after { + content: ""; + clear: both; + display: table; + } +} diff --git a/mixins/_media_query.scss b/source/style/mixins/_media_query.scss similarity index 96% rename from mixins/_media_query.scss rename to source/style/mixins/_media_query.scss index 72a4d6a..35ffa22 100644 --- a/mixins/_media_query.scss +++ b/source/style/mixins/_media_query.scss @@ -1,35 +1,35 @@ -//Sections for Media Queries -@mixin forPhoneOnly { - @media (max-width: #{$screen_tiny - 1}) { @content; } //599px -} -@mixin forTabletPortraitUp { - @media (min-width: $screen_tiny) { @content; } //600px -} -@mixin forTabletPortraitOnly { - @media (min-width: $screen_tiny) and (max-width: #{$screen_small - 1}) { @content; } //600px - 899px -} -@mixin forTabletLandscapeUp { - @media (min-width: $screen_small) { @content; } //900px -} -@mixin forTabletLandscapeOnly { - @media (min-width: $screen_small) and (max-width: #{$screen_medium - 1}) { @content; } //900px - 1199px -} -@mixin forDesktopUp { - @media (min-width: $screen_medium) { @content; } //1200px -} -@mixin forDesktopOnly { - @media (min-width: $screen_medium) and (max-width: #{$screen_huge - 1}) { @content; } //1200px - 1799px -} -@mixin forBigDesktopUp { - @media (min-width: $screen_huge) { @content; } //1800px -} - -//Mobile-first Media Query -@mixin goingLarge($width) { - @media (min-width: $width/16+em) { @content; } -} - -//Desktop-first Media Query -@mixin goingSmall($width) { - @media (max-width: $width/16+em) { @content; } -} +//Sections for Media Queries +@mixin forPhoneOnly { + @media (max-width: #{$screen_tiny - 1}) { @content; } //599px +} +@mixin forTabletPortraitUp { + @media (min-width: $screen_tiny) { @content; } //600px +} +@mixin forTabletPortraitOnly { + @media (min-width: $screen_tiny) and (max-width: #{$screen_small - 1}) { @content; } //600px - 899px +} +@mixin forTabletLandscapeUp { + @media (min-width: $screen_small) { @content; } //900px +} +@mixin forTabletLandscapeOnly { + @media (min-width: $screen_small) and (max-width: #{$screen_medium - 1}) { @content; } //900px - 1199px +} +@mixin forDesktopUp { + @media (min-width: $screen_medium) { @content; } //1200px +} +@mixin forDesktopOnly { + @media (min-width: $screen_medium) and (max-width: #{$screen_huge - 1}) { @content; } //1200px - 1799px +} +@mixin forBigDesktopUp { + @media (min-width: $screen_huge) { @content; } //1800px +} + +//Mobile-first Media Query +@mixin goingLarge($width) { + @media (min-width: $width/16+em) { @content; } +} + +//Desktop-first Media Query +@mixin goingSmall($width) { + @media (max-width: $width/16+em) { @content; } +} diff --git a/mixins/_user_agent.scss b/source/style/mixins/_user_agent.scss similarity index 94% rename from mixins/_user_agent.scss rename to source/style/mixins/_user_agent.scss index cb277e6..6701740 100644 --- a/mixins/_user_agent.scss +++ b/source/style/mixins/_user_agent.scss @@ -1,9 +1,9 @@ -@mixin overrideUserAgent() { - @if $no_agent_focus == true { - @each $el in $basic_focus_list { - #{$el}:focus { - outline: 0; - } - } - } -} +@mixin overrideUserAgent() { + @if $no_agent_focus == true { + @each $el in $basic_focus_list { + #{$el}:focus { + outline: 0; + } + } + } +} diff --git a/modules/_vendor.scss b/source/style/modules/_vendor.scss similarity index 100% rename from modules/_vendor.scss rename to source/style/modules/_vendor.scss diff --git a/modules/breakpoint/_breakpoint_module.scss b/source/style/modules/breakpoint/_breakpoint_module.scss similarity index 93% rename from modules/breakpoint/_breakpoint_module.scss rename to source/style/modules/breakpoint/_breakpoint_module.scss index 7c08f7d..dc9c5a4 100644 --- a/modules/breakpoint/_breakpoint_module.scss +++ b/source/style/modules/breakpoint/_breakpoint_module.scss @@ -1,46 +1,46 @@ -.query__goingLarge { - @include goingLarge($screen_tiny) {}; -} - -.query__goingSmall { - @include goingSmall($screen_gigantic) {}; -} - -.query__phoneUp { -} - -.query__phoneOnly { - @include forPhoneOnly {} -} - -.query__tabletPortaitOnly { - @include forTabletPortraitOnly { - } -} - -.query__tabletPortraitUp { - @include forTabletPortraitUp { - } -} - -.query__tabletLandscapeOnly { - @include forTabletLandscapeOnly {} -} - -.query__tabletLandscapeUp { - @include forTabletLandscapeUp {} -} - -.query__desktopOnly { - @include forDesktopOnly { - } -} - -.query__desktopUp { - @include forDesktopUp { - } -} - -.query__bigDesktopUp { - @include forBigDesktopUp {} -} +.query__goingLarge { + @include goingLarge($screen_tiny) {}; +} + +.query__goingSmall { + @include goingSmall($screen_gigantic) {}; +} + +.query__phoneUp { +} + +.query__phoneOnly { + @include forPhoneOnly {} +} + +.query__tabletPortaitOnly { + @include forTabletPortraitOnly { + } +} + +.query__tabletPortraitUp { + @include forTabletPortraitUp { + } +} + +.query__tabletLandscapeOnly { + @include forTabletLandscapeOnly {} +} + +.query__tabletLandscapeUp { + @include forTabletLandscapeUp {} +} + +.query__desktopOnly { + @include forDesktopOnly { + } +} + +.query__desktopUp { + @include forDesktopUp { + } +} + +.query__bigDesktopUp { + @include forBigDesktopUp {} +} diff --git a/modules/card/_card_module.scss b/source/style/modules/card/_card_module.scss similarity index 100% rename from modules/card/_card_module.scss rename to source/style/modules/card/_card_module.scss diff --git a/modules/card/_extends.scss b/source/style/modules/card/_extends.scss similarity index 100% rename from modules/card/_extends.scss rename to source/style/modules/card/_extends.scss diff --git a/modules/card/_mixins.scss b/source/style/modules/card/_mixins.scss similarity index 100% rename from modules/card/_mixins.scss rename to source/style/modules/card/_mixins.scss diff --git a/modules/demo/_demo_module.scss b/source/style/modules/demo/_demo_module.scss similarity index 99% rename from modules/demo/_demo_module.scss rename to source/style/modules/demo/_demo_module.scss index c42d290..9778e09 100644 --- a/modules/demo/_demo_module.scss +++ b/source/style/modules/demo/_demo_module.scss @@ -39,6 +39,7 @@ .header__fix { position: relative; top: 0; + left: 0; width: 100%; background-color: transparentize($charlie_color, .4); diff --git a/modules/editor/_editor_module.scss b/source/style/modules/editor/_editor_module.scss similarity index 100% rename from modules/editor/_editor_module.scss rename to source/style/modules/editor/_editor_module.scss diff --git a/modules/editor/_extends.scss b/source/style/modules/editor/_extends.scss similarity index 100% rename from modules/editor/_extends.scss rename to source/style/modules/editor/_extends.scss diff --git a/modules/editor/_mixins.scss b/source/style/modules/editor/_mixins.scss similarity index 100% rename from modules/editor/_mixins.scss rename to source/style/modules/editor/_mixins.scss diff --git a/modules/explanation/_explanation_module.scss b/source/style/modules/explanation/_explanation_module.scss similarity index 100% rename from modules/explanation/_explanation_module.scss rename to source/style/modules/explanation/_explanation_module.scss diff --git a/modules/explanation/_extends.scss b/source/style/modules/explanation/_extends.scss similarity index 100% rename from modules/explanation/_extends.scss rename to source/style/modules/explanation/_extends.scss diff --git a/modules/explanation/_mixins.scss b/source/style/modules/explanation/_mixins.scss similarity index 100% rename from modules/explanation/_mixins.scss rename to source/style/modules/explanation/_mixins.scss diff --git a/modules/navigation/_nav_module.scss b/source/style/modules/navigation/_nav_module.scss similarity index 100% rename from modules/navigation/_nav_module.scss rename to source/style/modules/navigation/_nav_module.scss diff --git a/modules/print/_extends.scss b/source/style/modules/print/_extends.scss similarity index 100% rename from modules/print/_extends.scss rename to source/style/modules/print/_extends.scss diff --git a/modules/print/_mixins.scss b/source/style/modules/print/_mixins.scss similarity index 100% rename from modules/print/_mixins.scss rename to source/style/modules/print/_mixins.scss diff --git a/modules/print/_print_module.scss b/source/style/modules/print/_print_module.scss similarity index 100% rename from modules/print/_print_module.scss rename to source/style/modules/print/_print_module.scss diff --git a/modules/tables/_tables_module.scss b/source/style/modules/tables/_tables_module.scss similarity index 100% rename from modules/tables/_tables_module.scss rename to source/style/modules/tables/_tables_module.scss diff --git a/code/vendor/jq-sticky-anything.min.js b/vendor/jq-sticky-anything.min.js similarity index 100% rename from code/vendor/jq-sticky-anything.min.js rename to vendor/jq-sticky-anything.min.js diff --git a/other/normalize.css b/vendor/normalize.css similarity index 100% rename from other/normalize.css rename to vendor/normalize.css From 010c8953c299d53db414decdb10fb5a18b17f2f4 Mon Sep 17 00:00:00 2001 From: Stephan Hagedorn Date: Wed, 27 Sep 2017 08:27:36 +0200 Subject: [PATCH 057/372] new index fixed some browser sync settings new index file --- .gitignore | 1 + build/css/example.css | 25 ++++++++- build/css/example.min.css | 2 +- build/js/all.min.js | 4 +- demo-explorer.html | 2 +- demo-presentation.html | 2 +- gulpfile.js | 12 ++-- index.html | 61 +++++++++++++++++++++ source/code/variables.js | 2 +- source/style/elements/_grouping.scss | 4 -- source/style/global/_common.scss | 4 ++ source/style/modules/demo/_demo_module.scss | 15 +++++ 12 files changed, 116 insertions(+), 18 deletions(-) create mode 100644 index.html diff --git a/.gitignore b/.gitignore index facab09..6fdc0ab 100644 --- a/.gitignore +++ b/.gitignore @@ -187,4 +187,5 @@ typings/ # https://interaktionsweise.de/ ################### ################### +build/ art/ diff --git a/build/css/example.css b/build/css/example.css index 397cd4c..79acf5c 100644 --- a/build/css/example.css +++ b/build/css/example.css @@ -90,6 +90,9 @@ textarea:not([disabled]):focus { .height_basic { height: 1024px; } +.height_full { + height: 100vh; } + .txt_center { text-align: center !important; } @@ -413,9 +416,6 @@ ul li { figure { margin: 16px 2em; } -.box__page { - height: 100vh; } - .box__info { padding: 16px 2em; border-right: 8px solid rgba(82, 190, 209, 0.6); @@ -1252,6 +1252,25 @@ nav li { .demo__query_example:after { content: '1920px'; } } +.wrap { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + height: 100%; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; } + +.hello { + -webkit-box-flex: 0; + -ms-flex: 0 1 auto; + flex: 0 1 auto; + padding: 1em 5em; + background-color: rgba(0, 0, 0, 0.25); } + .test li::after { content: ""; display: block; diff --git a/build/css/example.min.css b/build/css/example.min.css index e1619d6..8f235ed 100644 --- a/build/css/example.min.css +++ b/build/css/example.min.css @@ -1,2 +1,2 @@ -@charset "UTF-8";@import url(../../vendor/normalize.css);.sym_glass:before{content:""}.sym_music:before{content:""}.sym_search:before{content:""}.sym_envelope-o:before{content:""}.sym_heart:before{content:""}[tabindex]:focus,a[href]:focus,area[href]:focus,button:not([disabled]):focus,input:not([disabled]):focus,select:not([disabled]):focus,textarea:not([disabled]):focus{outline:0}.magic{display:none}.center_50{margin-right:25%;margin-left:25%}.center_25{margin-right:37.5%;margin-left:37.5%}.table__file_simple,.width_full{width:100%;margin-right:0;margin-left:0}.height_basic{height:1024px}.txt_center{text-align:center!important}.txt_right{text-align:right!important}.txt_left{text-align:left!important}.space_right{margin-right:32px}.clear,.clear:after,.clear:before{clear:both}.header__page nav ul,.nav__center_old ul,.nav__horizontal ul,.overflow{overflow:auto}.box__file_tile,.box__inline_left,.float_space_left,.header__page nav ul li,.list__horizontal li,.nav__center_old ul li,.nav__horizontal ul li{float:left;margin-right:32px}.float_half_size{float:left;width:50%}.x_long{overflow-x:scroll}.hover_full_view_change,.pos_full_view{position:fixed;top:0;left:0;width:100vw;height:100vh}.pos_full_page{top:0;right:0;bottom:0;left:0}.pos_abs,.pos_full_page{position:absolute}.pos_rel{position:relative}.pos_fix{position:fixed}.pos_bottom{bottom:0}.pos_full_view{background-color:rgba(250,216,3,.5)}.pos_full_page{background-color:rgba(39,63,139,.25)}.hover_back_change{background-color:#666;transition:background-color .2s ease-in-out}.hover_back_change:hover{background-color:gray}.hover_full_view_change{z-index:100;background-color:rgba(0,0,0,.5);transition:background-color .2s ease-in-out;pointer-events:none}.flex,.flex__column_wrap,.flex__row,.flex__wrap,.nav__column ul{display:-webkit-box;display:-ms-flexbox;display:flex}.flex__wrap{-ms-flex-wrap:wrap;flex-wrap:wrap}.flex__row{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.flex__child,.flex__column_wrap .column,.nav__column ul li{-webkit-box-flex:0;-ms-flex:0 1 auto;flex:0 1 auto}.flex__child_one{-webkit-box-flex:1;-ms-flex:1;flex:1}.flex__child_end{-ms-flex-item-align:end;align-self:flex-end}.txt_light_color{color:#666}.a__button,.a__button_border,.a__button_text{display:inline-block;padding:5px 8px;background-color:rgba(82,190,209,.2);border-radius:1px}.a__button:active,.a__button:focus,.a__button:hover,.a__button_border:active,.a__button_border:focus,.a__button_border:hover,.a__button_text:active,.a__button_text:focus,.a__button_text:hover{background-color:hsla(0,0%,100%,.1);color:#fff;border-color:transparent}.block__column_2,.block__column_3,.span__solo,caption,dd,dt,figcaption,h6,label,legend,li,p,td,th{font-family:Roboto,Segoe UI,Liberation Sans,Source Sans,Trebuchet MS,Helvetica,Arial,sans-serif;font-size:1em;line-height:1.5}.code__solo,.demo__query_example:after,.print_body [class^=din] .block__column_2,.print_body [class^=din] .block__column_3,.print_body [class^=din] caption,.print_body [class^=din] p,code,input:not([type]),input[type=color],input[type=date],input[type=datetime-local],input[type=datetime],input[type=email],input[type=month],input[type=number],input[type=password],input[type=search],input[type=tel],input[type=text],input[type=time],input[type=url],input[type=week],pre,textarea{font-family:Courier New,monospace;font-size:1em;line-height:1.5}.print_body .page_date,.print_body .page_no,h1{font-size:3.1em}.print_body .page_date,.print_body .page_no,h1,h2{font-family:Roboto,Segoe UI,Liberation Sans,Source Sans,Trebuchet MS,Helvetica,Arial,sans-serif;font-weight:300;line-height:1.5}h2{font-size:2.5em}h3,h4{font-size:1.8em}h3,h4,h5{font-family:Roboto,Segoe UI,Liberation Sans,Source Sans,Trebuchet MS,Helvetica,Arial,sans-serif;font-weight:300;line-height:1.5}h5{font-size:1.35em}.span__solo{color:#000}.table__link .cell__text .shorten{overflow:hidden;text-overflow:ellipsis;-o-text-overflow:ellipsis}html{height:100%}body{position:relative;box-sizing:border-box;font-family:Roboto,Segoe UI,Liberation Sans,Source Sans,Trebuchet MS,Helvetica,Arial,sans-serif;font-size:17px;line-height:1;color:#000;background-color:gray}body *,body :after,body :before{box-sizing:inherit}body:hover .layer__hover{background-color:transparent}.demo__intro,.sec__main_center{width:96%;margin:0 auto;padding-top:32px}@media (min-width:768px){.demo__intro,.sec__main_center{width:80%}}@media (min-width:1024px){.demo__intro,.sec__main_center{width:60%}}@media (min-width:1680px){.demo__intro,.sec__main_center{width:48%}}aside.right+section{margin-right:calc(20% + 8px)}aside.left+section{margin-left:calc(20% + 8px)}aside{width:20%}aside.left{float:left}aside.right{float:right}aside :first-child{margin-top:0}.header__page{overflow:auto}h1{margin:128px 0 32px}h2{margin:64px 0 32px}h3{text-transform:uppercase}h3,h4{margin:16px 0}h4,h5{text-transform:none}h5{margin:16px 0 8px}h6{text-transform:none;font-weight:700}.block__column_2,.block__column_3,caption,h6,p{margin:8px 0}.block__column_2 .demo__query_example:after,.block__column_2 code,.block__column_3 .demo__query_example:after,.block__column_3 code,caption .demo__query_example:after,caption code,p .demo__query_example:after,p code{padding:1px 4px;font-size:1em;line-height:1}.hr__dotted,.hr__hidden,hr{margin:32px auto;border-width:1px 0 0;border-style:solid;border-color:#000}.hr__hidden{border-color:transparent}.hr__dotted,.pre__code{border-style:dotted}.pre__code{border-color:hsla(0,0%,100%,.1);border-width:0 0 0 4px;border-radius:1px;padding:8px;background-color:hsla(0,0%,100%,.1)}.pre__code .demo__query_example:after,.pre__code code{background-color:transparent}blockquote{margin:8px 2em}.quote__mark .block__column_2:before,.quote__mark .block__column_3:before,.quote__mark caption:before,.quote__mark p:before{content:"\201E \0020"}.quote__mark .block__column_2:after,.quote__mark .block__column_3:after,.quote__mark caption:after,.quote__mark p:after{content:"\201C \0020"}.quote__mark .quote__source:after,.quote__mark .quote__source:before{content:""}dl,ol,ul{margin:16px 0 8px}ol,ul{padding-left:2em}dd{margin-left:2em}ul li{list-style:square}.list__dash li{list-style:none;position:relative}.list__dash li:before{content:"_";position:absolute;left:-1em}.list__link li{margin-bottom:2px;text-transform:uppercase}.list__link li a{display:block;padding:5px 8px;color:#000}.list__link li a img{margin-right:8px;padding-bottom:.2em;vertical-align:text-bottom}.list__link li a:active,.list__link li a:focus,.list__link li a:hover{background-color:#0c85ff;color:#fff}.list__horizontal{overflow:auto}figure{margin:16px 2em}.box__page{height:100vh}.box__info{padding:16px 2em;border-right:8px solid rgba(82,190,209,.6);background-color:rgba(82,190,209,.1)!important}.box__main_indent{margin-left:25%}.block__column_line{-webkit-column-rule:1px solid #000;column-rule:1px solid #000}.block__column_2{-webkit-column-count:2;column-count:2;-webkit-column-gap:32px;column-gap:32px}.block__column_3{-webkit-column-count:3;column-count:3;-webkit-column-gap:64px;column-gap:64px}.box__space{position:relative;width:100%}.box__cube{float:left;display:table;width:64px;text-align:center;vertical-align:middle}.box__cube span{display:table-cell}.box__placeholder{width:100%;height:64px;border:4px solid rgba(0,0,0,.1);border-radius:1px;padding:8px;background-color:rgba(0,0,0,.1)}.box__placeholder svg{vertical-align:top}.box__placeholder_bkg{width:100%;height:64px;border:4px solid rgba(0,0,0,.1);border-radius:1px;padding:8px;background:url("data:image/svg+xml;utf8,") no-repeat;background-color:rgba(0,0,0,.1)}.flex__column_wrap .column{-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1}a{color:#52bed1;text-decoration:none}a:active,a:focus,a:hover{color:#fff}.a__line{border-bottom-width:1px;border-bottom-style:dotted;border-color:#000;background-color:transparent;color:#000;transition:color .15s ease}.a__line:active,.a__line:focus,.a__line:hover{background-color:#0c85ff;color:#fff}.a__button_border,.a__button_text{padding:7px 16px;background-color:transparent;color:#000}.a__button_border{border:1px solid #000}em,i{font-style:italic}.i__bright{font-style:normal;color:#fff}b,strong{font-weight:500}cite{font-style:italic}.demo__query_example:after,code{color:#1f1f1f;background-color:hsla(0,0%,100%,.1)}.code__solo{padding:1px 4px;color:#000}mark{background-color:#fad803}.mark__cursor{color:#fff;background-color:#000}::-moz-selection{color:#fff;background-color:#000}::selection{color:#fff;background-color:#000}img{vertical-align:top}table{margin:16px 0;border:1px solid #000;border-collapse:collapse}td,th{padding:4px}th{border:1px solid #000;text-align:left}.precol,td{border-right:1px solid #000}td{border-bottom:1px solid #000}td:last-child{border-right:0}tr:last-child td{border-bottom:0}tfoot tr:first-child td{border-top:1px solid #000}.table__blank,.table__blank td,.table__blank th,.table__free{border:1px solid transparent}.table__stripe td{border-top:0;border-bottom:0}.table__stripe tr:nth-child(2n) td{background-color:hsla(0,0%,100%,.1)}.table__fix{table-layout:fixed}caption{padding:4px 0;border:1px dotted #000;text-align:center}fieldset{margin:16px 0;padding:8px;border:1px solid #000}legend{padding:0 4px}button,input,textarea{margin:0 32px}button[disabled=disabled],button[disabled],input[disabled=disabled],input[disabled],textarea[disabled=disabled],textarea[disabled]{cursor:not-allowed}label input{margin-left:8px}input{color:#1a1a1a}input[disabled=disabled],input[disabled]{cursor:not-allowed}input:not([type]),input[type=color],input[type=date],input[type=datetime-local],input[type=datetime],input[type=email],input[type=month],input[type=number],input[type=password],input[type=search],input[type=tel],input[type=text],input[type=time],input[type=url],input[type=week]{border:2px solid #fff;padding:4px;background-color:#e6e6e6}input:not([type]):hover,input[type=color]:hover,input[type=date]:hover,input[type=datetime-local]:hover,input[type=datetime]:hover,input[type=email]:hover,input[type=month]:hover,input[type=number]:hover,input[type=password]:hover,input[type=search]:hover,input[type=tel]:hover,input[type=text]:hover,input[type=time]:hover,input[type=url]:hover,input[type=week]:hover{background-color:#fff}input:not([type])[readonly=readonly],input:not([type])[readonly],input[type=color][readonly=readonly],input[type=color][readonly],input[type=date][readonly=readonly],input[type=date][readonly],input[type=datetime-local][readonly=readonly],input[type=datetime-local][readonly],input[type=datetime][readonly=readonly],input[type=datetime][readonly],input[type=email][readonly=readonly],input[type=email][readonly],input[type=month][readonly=readonly],input[type=month][readonly],input[type=number][readonly=readonly],input[type=number][readonly],input[type=password][readonly=readonly],input[type=password][readonly],input[type=search][readonly=readonly],input[type=search][readonly],input[type=tel][readonly=readonly],input[type=tel][readonly],input[type=text][readonly=readonly],input[type=text][readonly],input[type=time][readonly=readonly],input[type=time][readonly],input[type=url][readonly=readonly],input[type=url][readonly],input[type=week][readonly=readonly],input[type=week][readonly]{border-color:#b3b3b3;background-color:#999}input:not([type])[disabled=disabled],input:not([type])[disabled],input[type=color][disabled=disabled],input[type=color][disabled],input[type=date][disabled=disabled],input[type=date][disabled],input[type=datetime-local][disabled=disabled],input[type=datetime-local][disabled],input[type=datetime][disabled=disabled],input[type=datetime][disabled],input[type=email][disabled=disabled],input[type=email][disabled],input[type=month][disabled=disabled],input[type=month][disabled],input[type=number][disabled=disabled],input[type=number][disabled],input[type=password][disabled=disabled],input[type=password][disabled],input[type=search][disabled=disabled],input[type=search][disabled],input[type=tel][disabled=disabled],input[type=tel][disabled],input[type=text][disabled=disabled],input[type=text][disabled],input[type=time][disabled=disabled],input[type=time][disabled],input[type=url][disabled=disabled],input[type=url][disabled],input[type=week][disabled=disabled],input[type=week][disabled]{border-color:transparent}textarea{border:2px solid #fff;padding:4px;background-color:#e6e6e6}textarea:hover{background-color:#fff}textarea[readonly=readonly],textarea[readonly]{border-color:#b3b3b3;background-color:#999}textarea[disabled=disabled],textarea[disabled]{border-color:transparent}input:not([type]),input[type=color],input[type=date],input[type=datetime-local],input[type=datetime],input[type=email],input[type=month],input[type=number],input[type=password],input[type=search],input[type=tel],input[type=text],input[type=time],input[type=url],input[type=week]{line-height:1}button,input[type=button],input[type=reset],input[type=submit]{padding:5px 8px}.input__label_right,label+input{margin:0 8px}.input__default label,.label__table{display:table}.input__default label input,.label__table input{display:table-cell}.input__default label{margin:4px 0}.input__default label input{padding:4px 5px;border-style:solid;border-color:transparent;background-color:#e6e6e6;color:#1a1a1a}.input__default label input:hover{background-color:#000;color:#fff}nav ul{padding-left:0}nav li{margin-bottom:8px;list-style:none}.header__page nav ul ul,.nav__center_old ul ul,.nav__horizontal ul ul{margin:8px 0}.header__page nav ul li,.nav__center_old ul li,.nav__horizontal ul li{margin-right:8px;margin-bottom:0}.header__page nav ul li:last-child,.nav__center_old ul li:last-child,.nav__horizontal ul li:last-child{margin-right:0}.nav__right{float:right;margin-left:8px}.nav__right .align_parent{margin-right:-8px}.nav__separate li{position:relative;padding-left:1px}.nav__separate li:not(:first-child):before{content:"";position:absolute;width:1px;height:100%;left:0;top:0;background-color:#000}.nav__separate_right{float:right}.nav__separate_right li{position:relative}.nav__separate_right li:first-child{padding-left:17px}.nav__separate_right li:first-child:before{content:"";position:absolute;width:1px;height:100%;left:0;top:0;background-color:#fff;margin:0 8px}.nav__center_old{float:right;position:relative;left:-50%}.nav__center_old ul{position:relative;left:50%;text-align:center}.nav__column{position:relative;margin:8px 0}.nav__column ul{margin:0 128px}.nav__column ul li{-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;margin:0;text-align:center}.nav__column ul li a{display:block}.nav__page_meta{position:fixed;right:0;bottom:16px}.nav__page_meta ul{margin:8px 0}.nav__page_meta li{margin-bottom:0}.nav__page_meta .a_button_meta{display:inline-block}.nav__page_meta .a_button_meta:active,.nav__page_meta .a_button_meta:focus{background-color:transparent}.nav__page_meta .a_button_meta:hover{background-color:#0c85ff}.header__page nav a:active,.header__page nav a:focus,.header__page nav a:hover{background-color:rgba(0,0,0,.2);color:#000}.table__link{width:100%;border:0;table-layout:auto}.table__link tbody{border-bottom:1px solid #000}.table__link tbody:hover{background-color:#ccc}.table__link td,.table__link th{border:0}.table__link .cell__icon{width:48px;text-align:center}.table__link .cell__icon img{vertical-align:text-top}.table__link .cell__link{padding-right:8px;padding-left:8px}.table__link .cell__link:hover{background-color:#0c85ff}.table__link .cell__link:hover a:first-child{display:none}.table__link .cell__link:hover a:last-child{display:block;color:#fff}.table__link .cell__link a{display:block}.table__link .cell__link a:last-child{display:none}.table__link .cell__date,.table__link th:last-child{width:16%;text-align:center}.table__link .cell__text{padding-right:8px;padding-left:8px}.table__link .cell__text div{width:100%}.table__link .cell__text .shorten{max-height:44px}.card_body .bkg_box{position:absolute;top:0;left:0;width:100%;height:100%}.card_body{height:100%}.card_body .bkg_box{transition-duration:.8s;overflow:hidden;vertical-align:top;z-index:-1}.card_body .bkg_box>svg{position:relative}.card_body .flex_wrap_center{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;height:100%}.card_body .flex_content{position:relative;padding:64px 64px 24px;border:1px solid #fff;background-color:#f5f5f5;z-index:40}.card_body h1{margin:16px 0;color:#1e1e1e;font-size:24px;line-height:1.4em;font-weight:400}.card_body .block__column_2,.card_body .block__column_3,.card_body caption,.card_body p{margin-top:0;margin-bottom:16px;font-size:12px;line-height:1.4em}.card_body .marked{padding-left:1em;text-indent:-1em;text-align:center}.card_body .marked:before{content:"* "}.card_body .decent{color:#666}.card_body a{color:#000;text-decoration:none}.card_body a:hover{color:#f4f9fa;background-color:#0c85ff;text-decoration:none}.wip,.wip_txt{border-right:8px solid rgba(220,20,60,.8);background-color:rgba(220,20,60,.1)!important}.wip:after,.wip:before{content:"";display:block;height:48px}.exp_expose:after,.exp_expose:before,.exp_expose_post:before,.exp_expose_pre:after{content:"";display:block;height:48px;background-color:rgba(183,224,240,.1)!important}.exp_pop{display:none}.exp_wrap{position:relative}.exp_pop{position:absolute;z-index:100;top:128px;left:128px;padding:4px;border:4px solid gray;border-radius:4px;background-color:gray;pointer-events:none}.exp_marker_pop{position:absolute;top:-12.75px;right:-8.5px;width:17px;height:17px;border:1px solid #fff;border-radius:17px;color:#fff;background-color:#000}.exp_overlay_btn{position:fixed;width:3em;height:2em;cursor:pointer}.exp_help_btn{display:table;right:16px;bottom:16px;background-color:rgba(0,0,0,.4)}.exp_help_btn:hover{background-color:#fff}.exp_help_btn:hover>.span__solo{color:#000}.exp_help_btn .span__solo{display:table-cell;color:hsla(0,0%,100%,.8);font-family:Courier New,monospace;font-size:1.4em;text-align:center;vertical-align:middle}.expose_height{position:absolute;top:0;right:0;bottom:0;left:0;background-color:rgba(183,224,240,.1)!important;transition:height .5s ease}.print_body [class^=din]{background-color:#fff}.print_body{font-size:10pt;margin:10vh 20vw}@page{.print_body{size:A4;margin:1.2cm}}@page :first{.print_body{size:A4;margin:0}}.print_body .dina4{padding:1.2cm 1.2cm 1.2cm 2.4cm}.print_body .dina4 .page_foot,.print_body .dina4 .page_head{right:1.2cm;left:2.4cm}.print_body .dina4 .page_head{top:1.2cm}.print_body .dina4 .page_foot{bottom:1.2cm}.print_body .dina5{padding:0 0 0 1.2cm}.print_body .dina5 .page_foot,.print_body .dina5 .page_head{right:0;left:1.2cm}.print_body .dina5 .page_head{top:0}.print_body .dina5 .page_foot{bottom:0}.print_body .dina6{padding:0 0 0 1.2cm}.print_body .dina6 .page_foot,.print_body .dina6 .page_head{right:0;left:1.2cm}.print_body .dina6 .page_head{top:0}.print_body .dina6 .page_foot{bottom:0}.print_body [class^=din]{position:relative;overflow:auto;margin:32px auto}.print_body [class^=din] .page_foot,.print_body [class^=din] .page_head{position:absolute}.print_body [class^=din] .page_head{page:cover}.print_body [class^=din] .page_foot{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.print_body [class^=din] .page_foot :last-child{margin-bottom:0}.print_body [class^=din] .page_foot .block__column_2,.print_body [class^=din] .page_foot .block__column_3,.print_body [class^=din] .page_foot caption,.print_body [class^=din] .page_foot p{-webkit-box-flex:1;-ms-flex:1 0 auto;flex:1 0 auto;margin:0;font-size:8pt;line-height:10pt;text-align:center}.print_body [class^=din] .page_foot .page_no{-webkit-box-flex:1;-ms-flex:1 0 auto;flex:1 0 auto;font-size:20pt;line-height:1;text-align:right}.print_body [class^=din] .page_foot .block__column_2:first-child,.print_body [class^=din] .page_foot .block__column_3:first-child,.print_body [class^=din] .page_foot caption:first-child,.print_body [class^=din] .page_foot p:first-child{text-align:left}.print_body [class^=din] .page_content{margin-top:10cm;margin-bottom:2cm}.print_body .page_date,.print_body .page_title{font-size:14pt}.print_body .page_title{margin:0}.print_body .page_date,.print_body .page_no{float:right}.print_body .page_author{position:absolute;top:5cm;right:0;text-align:right}.print_body .page_recipient{position:absolute;top:5cm;left:0}.demo__intro{border-top-width:8px;border-top-style:solid;border-color:#000;padding-top:32px}.demo__header{padding:16px}.demo__header nav ul{margin:0}.header__fancy{background-color:rgba(211,10,81,.6)}.header__fancy nav a{background-color:rgba(250,216,3,.6);color:#fad803}.header__fancy nav a:active,.header__fancy nav a:focus,.header__fancy nav a:hover{background-color:hsla(0,0%,100%,.2);color:#fff}.header__fix{position:relative;top:0;left:0;width:100%;background-color:rgba(39,63,139,.6)}.header__fix nav a:active,.header__fix nav a:focus,.header__fix nav a:hover{background-color:hsla(0,0%,100%,.2);color:#fff}.demo__footer{width:100%;padding:16px 0;background-color:#333;color:#ccc}.demo__footer nav a{color:#fff}.demo__avatar img{opacity:1;width:128px;height:auto;min-width:128px;min-height:128px;border-radius:50%;background-color:#b7e0f0}.demo__flag{height:40vh}.demo__credits{margin:32px 0 8px}.demo__button_32{width:32px;height:32px}.demo__queries>.block__column_2,.demo__queries>.block__column_3,.demo__queries>caption,.demo__queries>p{padding:5px 8px}.query__phoneUp{background-color:rgba(0,0,0,.2)}@media (max-width:767px){.query__phoneOnly{background-color:rgba(0,0,0,.2)}}@media (min-width:768px) and (max-width:1023px){.query__tabletPortaitOnly{background-color:rgba(0,0,0,.2)}}@media (min-width:768px){.query__tabletPortraitUp{background-color:rgba(0,0,0,.2)}}@media (min-width:1024px) and (max-width:1279px){.query__tabletLandscapeOnly{background-color:rgba(0,0,0,.2)}}@media (min-width:1024px){.query__tabletLandscapeUp{background-color:rgba(0,0,0,.2)}}@media (min-width:1280px) and (max-width:1679px){.query__desktopOnly{background-color:rgba(0,0,0,.2)}}@media (min-width:1280px){.query__desktopUp{background-color:rgba(0,0,0,.2)}}@media (min-width:1680px){.query__bigDesktopUp{background-color:rgba(0,0,0,.2)}}.demo__query_example{margin-bottom:32px;padding:32px;text-align:center}@media (min-width:48em){.demo__query_example{background-color:#fad803}}@media (min-width:64em){.demo__query_example{background-color:#d30a51}}@media (min-width:80em){.demo__query_example{background-color:#273f8b}}@media (min-width:90em){.demo__query_example{background-color:#b7e0f0}}@media (min-width:105em){.demo__query_example{background-color:#52bed1}}@media (min-width:120em){.demo__query_example{background-color:#0c85ff}}.demo__query_example:after{content:"< 768px";padding:5px 8px;border-radius:2px;background-color:rgba(0,0,0,.2)}@media (min-width:48em){.demo__query_example:after{content:"768px"}}@media (min-width:64em){.demo__query_example:after{content:"1024px"}}@media (min-width:80em){.demo__query_example:after{content:"1280px"}}@media (min-width:105em){.demo__query_example:after{content:"1680px"}}@media (min-width:120em){.demo__query_example:after{content:"1920px"}}.test li:after{content:"";display:block;height:16px}.front_color_1{color:#fad803}.front_color_1:after{background-color:#fad803}.front_color_2{color:#d30a51}.front_color_2:after{background-color:#d30a51}.front_color_3{color:#273f8b}.front_color_3:after{background-color:#273f8b}.front_color_4{color:#b7e0f0}.front_color_4:after{background-color:#b7e0f0}.front_color_5{color:#52bed1}.front_color_5:after{background-color:#52bed1}.back_color_1,.label_1{background-color:#fad803}.back_color_2,.label_2{background-color:#d30a51}.back_color_3,.label_3{background-color:#273f8b}.back_color_4{background-color:#b7e0f0}.back_color_5{background-color:#52bed1}.label_1,.label_2,.label_3{padding:0 4px} +@charset "UTF-8";@import url(../../vendor/normalize.css);.sym_glass:before{content:""}.sym_music:before{content:""}.sym_search:before{content:""}.sym_envelope-o:before{content:""}.sym_heart:before{content:""}[tabindex]:focus,a[href]:focus,area[href]:focus,button:not([disabled]):focus,input:not([disabled]):focus,select:not([disabled]):focus,textarea:not([disabled]):focus{outline:0}.magic{display:none}.center_50{margin-right:25%;margin-left:25%}.center_25{margin-right:37.5%;margin-left:37.5%}.table__file_simple,.width_full{width:100%;margin-right:0;margin-left:0}.height_basic{height:1024px}.height_full{height:100vh}.txt_center{text-align:center!important}.txt_right{text-align:right!important}.txt_left{text-align:left!important}.space_right{margin-right:32px}.clear,.clear:after,.clear:before{clear:both}.header__page nav ul,.nav__center_old ul,.nav__horizontal ul,.overflow{overflow:auto}.box__file_tile,.box__inline_left,.float_space_left,.header__page nav ul li,.list__horizontal li,.nav__center_old ul li,.nav__horizontal ul li{float:left;margin-right:32px}.float_half_size{float:left;width:50%}.x_long{overflow-x:scroll}.hover_full_view_change,.pos_full_view{position:fixed;top:0;left:0;width:100vw;height:100vh}.pos_full_page{top:0;right:0;bottom:0;left:0}.pos_abs,.pos_full_page{position:absolute}.pos_rel{position:relative}.pos_fix{position:fixed}.pos_bottom{bottom:0}.pos_full_view{background-color:rgba(250,216,3,.5)}.pos_full_page{background-color:rgba(39,63,139,.25)}.hover_back_change{background-color:#666;transition:background-color .2s ease-in-out}.hover_back_change:hover{background-color:gray}.hover_full_view_change{z-index:100;background-color:rgba(0,0,0,.5);transition:background-color .2s ease-in-out;pointer-events:none}.flex,.flex__column_wrap,.flex__row,.flex__wrap,.nav__column ul{display:-webkit-box;display:-ms-flexbox;display:flex}.flex__wrap{-ms-flex-wrap:wrap;flex-wrap:wrap}.flex__row{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.flex__child,.flex__column_wrap .column,.nav__column ul li{-webkit-box-flex:0;-ms-flex:0 1 auto;flex:0 1 auto}.flex__child_one{-webkit-box-flex:1;-ms-flex:1;flex:1}.flex__child_end{-ms-flex-item-align:end;align-self:flex-end}.txt_light_color{color:#666}.a__button,.a__button_border,.a__button_text{display:inline-block;padding:5px 8px;background-color:rgba(82,190,209,.2);border-radius:1px}.a__button:active,.a__button:focus,.a__button:hover,.a__button_border:active,.a__button_border:focus,.a__button_border:hover,.a__button_text:active,.a__button_text:focus,.a__button_text:hover{background-color:hsla(0,0%,100%,.1);color:#fff;border-color:transparent}.block__column_2,.block__column_3,.span__solo,caption,dd,dt,figcaption,h6,label,legend,li,p,td,th{font-family:Roboto,Segoe UI,Liberation Sans,Source Sans,Trebuchet MS,Helvetica,Arial,sans-serif;font-size:1em;line-height:1.5}.code__solo,.demo__query_example:after,.print_body [class^=din] .block__column_2,.print_body [class^=din] .block__column_3,.print_body [class^=din] caption,.print_body [class^=din] p,code,input:not([type]),input[type=color],input[type=date],input[type=datetime-local],input[type=datetime],input[type=email],input[type=month],input[type=number],input[type=password],input[type=search],input[type=tel],input[type=text],input[type=time],input[type=url],input[type=week],pre,textarea{font-family:Courier New,monospace;font-size:1em;line-height:1.5}.print_body .page_date,.print_body .page_no,h1{font-size:3.1em}.print_body .page_date,.print_body .page_no,h1,h2{font-family:Roboto,Segoe UI,Liberation Sans,Source Sans,Trebuchet MS,Helvetica,Arial,sans-serif;font-weight:300;line-height:1.5}h2{font-size:2.5em}h3,h4{font-size:1.8em}h3,h4,h5{font-family:Roboto,Segoe UI,Liberation Sans,Source Sans,Trebuchet MS,Helvetica,Arial,sans-serif;font-weight:300;line-height:1.5}h5{font-size:1.35em}.span__solo{color:#000}.table__link .cell__text .shorten{overflow:hidden;text-overflow:ellipsis;-o-text-overflow:ellipsis}html{height:100%}body{position:relative;box-sizing:border-box;font-family:Roboto,Segoe UI,Liberation Sans,Source Sans,Trebuchet MS,Helvetica,Arial,sans-serif;font-size:17px;line-height:1;color:#000;background-color:gray}body *,body :after,body :before{box-sizing:inherit}body:hover .layer__hover{background-color:transparent}.demo__intro,.sec__main_center{width:96%;margin:0 auto;padding-top:32px}@media (min-width:768px){.demo__intro,.sec__main_center{width:80%}}@media (min-width:1024px){.demo__intro,.sec__main_center{width:60%}}@media (min-width:1680px){.demo__intro,.sec__main_center{width:48%}}aside.right+section{margin-right:calc(20% + 8px)}aside.left+section{margin-left:calc(20% + 8px)}aside{width:20%}aside.left{float:left}aside.right{float:right}aside :first-child{margin-top:0}.header__page{overflow:auto}h1{margin:128px 0 32px}h2{margin:64px 0 32px}h3{text-transform:uppercase}h3,h4{margin:16px 0}h4,h5{text-transform:none}h5{margin:16px 0 8px}h6{text-transform:none;font-weight:700}.block__column_2,.block__column_3,caption,h6,p{margin:8px 0}.block__column_2 .demo__query_example:after,.block__column_2 code,.block__column_3 .demo__query_example:after,.block__column_3 code,caption .demo__query_example:after,caption code,p .demo__query_example:after,p code{padding:1px 4px;font-size:1em;line-height:1}.hr__dotted,.hr__hidden,hr{margin:32px auto;border-width:1px 0 0;border-style:solid;border-color:#000}.hr__hidden{border-color:transparent}.hr__dotted,.pre__code{border-style:dotted}.pre__code{border-color:hsla(0,0%,100%,.1);border-width:0 0 0 4px;border-radius:1px;padding:8px;background-color:hsla(0,0%,100%,.1)}.pre__code .demo__query_example:after,.pre__code code{background-color:transparent}blockquote{margin:8px 2em}.quote__mark .block__column_2:before,.quote__mark .block__column_3:before,.quote__mark caption:before,.quote__mark p:before{content:"\201E \0020"}.quote__mark .block__column_2:after,.quote__mark .block__column_3:after,.quote__mark caption:after,.quote__mark p:after{content:"\201C \0020"}.quote__mark .quote__source:after,.quote__mark .quote__source:before{content:""}dl,ol,ul{margin:16px 0 8px}ol,ul{padding-left:2em}dd{margin-left:2em}ul li{list-style:square}.list__dash li{list-style:none;position:relative}.list__dash li:before{content:"_";position:absolute;left:-1em}.list__link li{margin-bottom:2px;text-transform:uppercase}.list__link li a{display:block;padding:5px 8px;color:#000}.list__link li a img{margin-right:8px;padding-bottom:.2em;vertical-align:text-bottom}.list__link li a:active,.list__link li a:focus,.list__link li a:hover{background-color:#0c85ff;color:#fff}.list__horizontal{overflow:auto}figure{margin:16px 2em}.box__info{padding:16px 2em;border-right:8px solid rgba(82,190,209,.6);background-color:rgba(82,190,209,.1)!important}.box__main_indent{margin-left:25%}.block__column_line{-webkit-column-rule:1px solid #000;column-rule:1px solid #000}.block__column_2{-webkit-column-count:2;column-count:2;-webkit-column-gap:32px;column-gap:32px}.block__column_3{-webkit-column-count:3;column-count:3;-webkit-column-gap:64px;column-gap:64px}.box__space{position:relative;width:100%}.box__cube{float:left;display:table;width:64px;text-align:center;vertical-align:middle}.box__cube span{display:table-cell}.box__placeholder{width:100%;height:64px;border:4px solid rgba(0,0,0,.1);border-radius:1px;padding:8px;background-color:rgba(0,0,0,.1)}.box__placeholder svg{vertical-align:top}.box__placeholder_bkg{width:100%;height:64px;border:4px solid rgba(0,0,0,.1);border-radius:1px;padding:8px;background:url("data:image/svg+xml;utf8,") no-repeat;background-color:rgba(0,0,0,.1)}.flex__column_wrap .column{-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1}a{color:#52bed1;text-decoration:none}a:active,a:focus,a:hover{color:#fff}.a__line{border-bottom-width:1px;border-bottom-style:dotted;border-color:#000;background-color:transparent;color:#000;transition:color .15s ease}.a__line:active,.a__line:focus,.a__line:hover{background-color:#0c85ff;color:#fff}.a__button_border,.a__button_text{padding:7px 16px;background-color:transparent;color:#000}.a__button_border{border:1px solid #000}em,i{font-style:italic}.i__bright{font-style:normal;color:#fff}b,strong{font-weight:500}cite{font-style:italic}.demo__query_example:after,code{color:#1f1f1f;background-color:hsla(0,0%,100%,.1)}.code__solo{padding:1px 4px;color:#000}mark{background-color:#fad803}.mark__cursor{color:#fff;background-color:#000}::-moz-selection{color:#fff;background-color:#000}::selection{color:#fff;background-color:#000}img{vertical-align:top}table{margin:16px 0;border:1px solid #000;border-collapse:collapse}td,th{padding:4px}th{border:1px solid #000;text-align:left}.precol,td{border-right:1px solid #000}td{border-bottom:1px solid #000}td:last-child{border-right:0}tr:last-child td{border-bottom:0}tfoot tr:first-child td{border-top:1px solid #000}.table__blank,.table__blank td,.table__blank th,.table__free{border:1px solid transparent}.table__stripe td{border-top:0;border-bottom:0}.table__stripe tr:nth-child(2n) td{background-color:hsla(0,0%,100%,.1)}.table__fix{table-layout:fixed}caption{padding:4px 0;border:1px dotted #000;text-align:center}fieldset{margin:16px 0;padding:8px;border:1px solid #000}legend{padding:0 4px}button,input,textarea{margin:0 32px}button[disabled=disabled],button[disabled],input[disabled=disabled],input[disabled],textarea[disabled=disabled],textarea[disabled]{cursor:not-allowed}label input{margin-left:8px}input{color:#1a1a1a}input[disabled=disabled],input[disabled]{cursor:not-allowed}input:not([type]),input[type=color],input[type=date],input[type=datetime-local],input[type=datetime],input[type=email],input[type=month],input[type=number],input[type=password],input[type=search],input[type=tel],input[type=text],input[type=time],input[type=url],input[type=week]{border:2px solid #fff;padding:4px;background-color:#e6e6e6}input:not([type]):hover,input[type=color]:hover,input[type=date]:hover,input[type=datetime-local]:hover,input[type=datetime]:hover,input[type=email]:hover,input[type=month]:hover,input[type=number]:hover,input[type=password]:hover,input[type=search]:hover,input[type=tel]:hover,input[type=text]:hover,input[type=time]:hover,input[type=url]:hover,input[type=week]:hover{background-color:#fff}input:not([type])[readonly=readonly],input:not([type])[readonly],input[type=color][readonly=readonly],input[type=color][readonly],input[type=date][readonly=readonly],input[type=date][readonly],input[type=datetime-local][readonly=readonly],input[type=datetime-local][readonly],input[type=datetime][readonly=readonly],input[type=datetime][readonly],input[type=email][readonly=readonly],input[type=email][readonly],input[type=month][readonly=readonly],input[type=month][readonly],input[type=number][readonly=readonly],input[type=number][readonly],input[type=password][readonly=readonly],input[type=password][readonly],input[type=search][readonly=readonly],input[type=search][readonly],input[type=tel][readonly=readonly],input[type=tel][readonly],input[type=text][readonly=readonly],input[type=text][readonly],input[type=time][readonly=readonly],input[type=time][readonly],input[type=url][readonly=readonly],input[type=url][readonly],input[type=week][readonly=readonly],input[type=week][readonly]{border-color:#b3b3b3;background-color:#999}input:not([type])[disabled=disabled],input:not([type])[disabled],input[type=color][disabled=disabled],input[type=color][disabled],input[type=date][disabled=disabled],input[type=date][disabled],input[type=datetime-local][disabled=disabled],input[type=datetime-local][disabled],input[type=datetime][disabled=disabled],input[type=datetime][disabled],input[type=email][disabled=disabled],input[type=email][disabled],input[type=month][disabled=disabled],input[type=month][disabled],input[type=number][disabled=disabled],input[type=number][disabled],input[type=password][disabled=disabled],input[type=password][disabled],input[type=search][disabled=disabled],input[type=search][disabled],input[type=tel][disabled=disabled],input[type=tel][disabled],input[type=text][disabled=disabled],input[type=text][disabled],input[type=time][disabled=disabled],input[type=time][disabled],input[type=url][disabled=disabled],input[type=url][disabled],input[type=week][disabled=disabled],input[type=week][disabled]{border-color:transparent}textarea{border:2px solid #fff;padding:4px;background-color:#e6e6e6}textarea:hover{background-color:#fff}textarea[readonly=readonly],textarea[readonly]{border-color:#b3b3b3;background-color:#999}textarea[disabled=disabled],textarea[disabled]{border-color:transparent}input:not([type]),input[type=color],input[type=date],input[type=datetime-local],input[type=datetime],input[type=email],input[type=month],input[type=number],input[type=password],input[type=search],input[type=tel],input[type=text],input[type=time],input[type=url],input[type=week]{line-height:1}button,input[type=button],input[type=reset],input[type=submit]{padding:5px 8px}.input__label_right,label+input{margin:0 8px}.input__default label,.label__table{display:table}.input__default label input,.label__table input{display:table-cell}.input__default label{margin:4px 0}.input__default label input{padding:4px 5px;border-style:solid;border-color:transparent;background-color:#e6e6e6;color:#1a1a1a}.input__default label input:hover{background-color:#000;color:#fff}nav ul{padding-left:0}nav li{margin-bottom:8px;list-style:none}.header__page nav ul ul,.nav__center_old ul ul,.nav__horizontal ul ul{margin:8px 0}.header__page nav ul li,.nav__center_old ul li,.nav__horizontal ul li{margin-right:8px;margin-bottom:0}.header__page nav ul li:last-child,.nav__center_old ul li:last-child,.nav__horizontal ul li:last-child{margin-right:0}.nav__right{float:right;margin-left:8px}.nav__right .align_parent{margin-right:-8px}.nav__separate li{position:relative;padding-left:1px}.nav__separate li:not(:first-child):before{content:"";position:absolute;width:1px;height:100%;left:0;top:0;background-color:#000}.nav__separate_right{float:right}.nav__separate_right li{position:relative}.nav__separate_right li:first-child{padding-left:17px}.nav__separate_right li:first-child:before{content:"";position:absolute;width:1px;height:100%;left:0;top:0;background-color:#fff;margin:0 8px}.nav__center_old{float:right;position:relative;left:-50%}.nav__center_old ul{position:relative;left:50%;text-align:center}.nav__column{position:relative;margin:8px 0}.nav__column ul{margin:0 128px}.nav__column ul li{-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;margin:0;text-align:center}.nav__column ul li a{display:block}.nav__page_meta{position:fixed;right:0;bottom:16px}.nav__page_meta ul{margin:8px 0}.nav__page_meta li{margin-bottom:0}.nav__page_meta .a_button_meta{display:inline-block}.nav__page_meta .a_button_meta:active,.nav__page_meta .a_button_meta:focus{background-color:transparent}.nav__page_meta .a_button_meta:hover{background-color:#0c85ff}.header__page nav a:active,.header__page nav a:focus,.header__page nav a:hover{background-color:rgba(0,0,0,.2);color:#000}.table__link{width:100%;border:0;table-layout:auto}.table__link tbody{border-bottom:1px solid #000}.table__link tbody:hover{background-color:#ccc}.table__link td,.table__link th{border:0}.table__link .cell__icon{width:48px;text-align:center}.table__link .cell__icon img{vertical-align:text-top}.table__link .cell__link{padding-right:8px;padding-left:8px}.table__link .cell__link:hover{background-color:#0c85ff}.table__link .cell__link:hover a:first-child{display:none}.table__link .cell__link:hover a:last-child{display:block;color:#fff}.table__link .cell__link a{display:block}.table__link .cell__link a:last-child{display:none}.table__link .cell__date,.table__link th:last-child{width:16%;text-align:center}.table__link .cell__text{padding-right:8px;padding-left:8px}.table__link .cell__text div{width:100%}.table__link .cell__text .shorten{max-height:44px}.card_body .bkg_box{position:absolute;top:0;left:0;width:100%;height:100%}.card_body{height:100%}.card_body .bkg_box{transition-duration:.8s;overflow:hidden;vertical-align:top;z-index:-1}.card_body .bkg_box>svg{position:relative}.card_body .flex_wrap_center{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;height:100%}.card_body .flex_content{position:relative;padding:64px 64px 24px;border:1px solid #fff;background-color:#f5f5f5;z-index:40}.card_body h1{margin:16px 0;color:#1e1e1e;font-size:24px;line-height:1.4em;font-weight:400}.card_body .block__column_2,.card_body .block__column_3,.card_body caption,.card_body p{margin-top:0;margin-bottom:16px;font-size:12px;line-height:1.4em}.card_body .marked{padding-left:1em;text-indent:-1em;text-align:center}.card_body .marked:before{content:"* "}.card_body .decent{color:#666}.card_body a{color:#000;text-decoration:none}.card_body a:hover{color:#f4f9fa;background-color:#0c85ff;text-decoration:none}.wip,.wip_txt{border-right:8px solid rgba(220,20,60,.8);background-color:rgba(220,20,60,.1)!important}.wip:after,.wip:before{content:"";display:block;height:48px}.exp_expose:after,.exp_expose:before,.exp_expose_post:before,.exp_expose_pre:after{content:"";display:block;height:48px;background-color:rgba(183,224,240,.1)!important}.exp_pop{display:none}.exp_wrap{position:relative}.exp_pop{position:absolute;z-index:100;top:128px;left:128px;padding:4px;border:4px solid gray;border-radius:4px;background-color:gray;pointer-events:none}.exp_marker_pop{position:absolute;top:-12.75px;right:-8.5px;width:17px;height:17px;border:1px solid #fff;border-radius:17px;color:#fff;background-color:#000}.exp_overlay_btn{position:fixed;width:3em;height:2em;cursor:pointer}.exp_help_btn{display:table;right:16px;bottom:16px;background-color:rgba(0,0,0,.4)}.exp_help_btn:hover{background-color:#fff}.exp_help_btn:hover>.span__solo{color:#000}.exp_help_btn .span__solo{display:table-cell;color:hsla(0,0%,100%,.8);font-family:Courier New,monospace;font-size:1.4em;text-align:center;vertical-align:middle}.expose_height{position:absolute;top:0;right:0;bottom:0;left:0;background-color:rgba(183,224,240,.1)!important;transition:height .5s ease}.print_body [class^=din]{background-color:#fff}.print_body{font-size:10pt;margin:10vh 20vw}@page{.print_body{size:A4;margin:1.2cm}}@page :first{.print_body{size:A4;margin:0}}.print_body .dina4{padding:1.2cm 1.2cm 1.2cm 2.4cm}.print_body .dina4 .page_foot,.print_body .dina4 .page_head{right:1.2cm;left:2.4cm}.print_body .dina4 .page_head{top:1.2cm}.print_body .dina4 .page_foot{bottom:1.2cm}.print_body .dina5{padding:0 0 0 1.2cm}.print_body .dina5 .page_foot,.print_body .dina5 .page_head{right:0;left:1.2cm}.print_body .dina5 .page_head{top:0}.print_body .dina5 .page_foot{bottom:0}.print_body .dina6{padding:0 0 0 1.2cm}.print_body .dina6 .page_foot,.print_body .dina6 .page_head{right:0;left:1.2cm}.print_body .dina6 .page_head{top:0}.print_body .dina6 .page_foot{bottom:0}.print_body [class^=din]{position:relative;overflow:auto;margin:32px auto}.print_body [class^=din] .page_foot,.print_body [class^=din] .page_head{position:absolute}.print_body [class^=din] .page_head{page:cover}.print_body [class^=din] .page_foot{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.print_body [class^=din] .page_foot :last-child{margin-bottom:0}.print_body [class^=din] .page_foot .block__column_2,.print_body [class^=din] .page_foot .block__column_3,.print_body [class^=din] .page_foot caption,.print_body [class^=din] .page_foot p{-webkit-box-flex:1;-ms-flex:1 0 auto;flex:1 0 auto;margin:0;font-size:8pt;line-height:10pt;text-align:center}.print_body [class^=din] .page_foot .page_no{-webkit-box-flex:1;-ms-flex:1 0 auto;flex:1 0 auto;font-size:20pt;line-height:1;text-align:right}.print_body [class^=din] .page_foot .block__column_2:first-child,.print_body [class^=din] .page_foot .block__column_3:first-child,.print_body [class^=din] .page_foot caption:first-child,.print_body [class^=din] .page_foot p:first-child{text-align:left}.print_body [class^=din] .page_content{margin-top:10cm;margin-bottom:2cm}.print_body .page_date,.print_body .page_title{font-size:14pt}.print_body .page_title{margin:0}.print_body .page_date,.print_body .page_no{float:right}.print_body .page_author{position:absolute;top:5cm;right:0;text-align:right}.print_body .page_recipient{position:absolute;top:5cm;left:0}.demo__intro{border-top-width:8px;border-top-style:solid;border-color:#000;padding-top:32px}.demo__header{padding:16px}.demo__header nav ul{margin:0}.header__fancy{background-color:rgba(211,10,81,.6)}.header__fancy nav a{background-color:rgba(250,216,3,.6);color:#fad803}.header__fancy nav a:active,.header__fancy nav a:focus,.header__fancy nav a:hover{background-color:hsla(0,0%,100%,.2);color:#fff}.header__fix{position:relative;top:0;left:0;width:100%;background-color:rgba(39,63,139,.6)}.header__fix nav a:active,.header__fix nav a:focus,.header__fix nav a:hover{background-color:hsla(0,0%,100%,.2);color:#fff}.demo__footer{width:100%;padding:16px 0;background-color:#333;color:#ccc}.demo__footer nav a{color:#fff}.demo__avatar img{opacity:1;width:128px;height:auto;min-width:128px;min-height:128px;border-radius:50%;background-color:#b7e0f0}.demo__flag{height:40vh}.demo__credits{margin:32px 0 8px}.demo__button_32{width:32px;height:32px}.demo__queries>.block__column_2,.demo__queries>.block__column_3,.demo__queries>caption,.demo__queries>p{padding:5px 8px}.query__phoneUp{background-color:rgba(0,0,0,.2)}@media (max-width:767px){.query__phoneOnly{background-color:rgba(0,0,0,.2)}}@media (min-width:768px) and (max-width:1023px){.query__tabletPortaitOnly{background-color:rgba(0,0,0,.2)}}@media (min-width:768px){.query__tabletPortraitUp{background-color:rgba(0,0,0,.2)}}@media (min-width:1024px) and (max-width:1279px){.query__tabletLandscapeOnly{background-color:rgba(0,0,0,.2)}}@media (min-width:1024px){.query__tabletLandscapeUp{background-color:rgba(0,0,0,.2)}}@media (min-width:1280px) and (max-width:1679px){.query__desktopOnly{background-color:rgba(0,0,0,.2)}}@media (min-width:1280px){.query__desktopUp{background-color:rgba(0,0,0,.2)}}@media (min-width:1680px){.query__bigDesktopUp{background-color:rgba(0,0,0,.2)}}.demo__query_example{margin-bottom:32px;padding:32px;text-align:center}@media (min-width:48em){.demo__query_example{background-color:#fad803}}@media (min-width:64em){.demo__query_example{background-color:#d30a51}}@media (min-width:80em){.demo__query_example{background-color:#273f8b}}@media (min-width:90em){.demo__query_example{background-color:#b7e0f0}}@media (min-width:105em){.demo__query_example{background-color:#52bed1}}@media (min-width:120em){.demo__query_example{background-color:#0c85ff}}.demo__query_example:after{content:"< 768px";padding:5px 8px;border-radius:2px;background-color:rgba(0,0,0,.2)}@media (min-width:48em){.demo__query_example:after{content:"768px"}}@media (min-width:64em){.demo__query_example:after{content:"1024px"}}@media (min-width:80em){.demo__query_example:after{content:"1280px"}}@media (min-width:105em){.demo__query_example:after{content:"1680px"}}@media (min-width:120em){.demo__query_example:after{content:"1920px"}}.wrap{display:-webkit-box;display:-ms-flexbox;display:flex;height:100%;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.hello{-webkit-box-flex:0;-ms-flex:0 1 auto;flex:0 1 auto;padding:1em 5em;background-color:rgba(0,0,0,.25)}.test li:after{content:"";display:block;height:16px}.front_color_1{color:#fad803}.front_color_1:after{background-color:#fad803}.front_color_2{color:#d30a51}.front_color_2:after{background-color:#d30a51}.front_color_3{color:#273f8b}.front_color_3:after{background-color:#273f8b}.front_color_4{color:#b7e0f0}.front_color_4:after{background-color:#b7e0f0}.front_color_5{color:#52bed1}.front_color_5:after{background-color:#52bed1}.back_color_1,.label_1{background-color:#fad803}.back_color_2,.label_2{background-color:#d30a51}.back_color_3,.label_3{background-color:#273f8b}.back_color_4{background-color:#b7e0f0}.back_color_5{background-color:#52bed1}.label_1,.label_2,.label_3{padding:0 4px} /*# sourceMappingURL=example.min.css.map */ diff --git a/build/js/all.min.js b/build/js/all.min.js index b7dcddb..ae076c6 100644 --- a/build/js/all.min.js +++ b/build/js/all.min.js @@ -1,4 +1,4 @@ -var w=Math.max(document.documentElement.clientWidth,window.innerWidth||0),h=Math.max(document.documentElement.clientHeight,window.innerHeight||0),full_view_hover=!1,doc_pos_y=0,basic_ease=600,scroll_y_margin=h; +var w=Math.max(document.documentElement.clientWidth,window.innerWidth||0),h=Math.max(document.documentElement.clientHeight,window.innerHeight||0),full_view_hover=!0,doc_pos_y=0,basic_ease=600,scroll_y_margin=h; function setup(){$("#js_tph").length&&full_view_hover&&$("#js_tph").addClass("hover_full_view_change")}function Utils(){}function scrollNav(){$(".nav a").click(function(){$(".active").removeClass("active"),$(this).closest("li").addClass("active");var t=$(this).attr("class");return $("."+t).parent("li").addClass("active"),$("html, body").stop().animate({scrollTop:$($(this).attr("href")).offset().top-160},400),!1}),$(".scrollTop a").scrollTop()}Utils.prototype={constructor:Utils,isElementInView:function(t,s){var l=$(window).scrollTop(),o=l+$(window).height(),i=$(t).offset().top,e=i+$(t).height();return!0===s?le:i<=o&&e>=l}};var Utils=new Utils; $(document).ready(function(){setup();var e=!1;$(".js_pop").hover(function(){$(this);$(this).attr("emmet"),$(this).next(".exp_pop").show()},function(){$(this).next(".exp_pop").hide()}).mousemove(function(e){$(this).next(".exp_pop").css({top:e.pageY-$(this).next(".exp_pop").outerHeight()-4,left:e.pageX+8})}),$(".exp_help_btn").click(function(t){var s,o;1!=e?(e=!0,$(".js_pop").each(function(e,t){"static"==$(this).css("position")&&($(this).addClass("js_changed_pos"),$(this).css("position","relative")),o=$(this).next(".exp_pop").detach(),(s=$(this).wrap('').parent().prepend('')).after(o)})):($(".js_pop").each(function(e,t){s=$(this).parent(".exp_wrap"),o=s.next(".exp_pop").detach(),s.find(".exp_marker_pop").remove(),$(this).unwrap(".exp_wrap"),$(this).after(o),$(this).hasClass("js_changed_pos")&&($(this).css("position",""),""==$(this).attr("style")&&$(this).removeAttr("style"),$(this).removeClass("js_changed_pos"))}),e=!1),console.log("Explanation mode: "+e)}),$("#js_scrolltop").click(function(e){console.log("scroll to the top"),e.preventDefault(),$("body").animate({scrollTop:0},basic_ease,function(){console.log("arrived at top")})}),$("#js_scrolldown").click(function(e){console.log("scroll down"),e.preventDefault(),$("body").animate({scrollTop:$(document).height()},2*basic_ease,function(){console.log("arrived at bottom")})}),$("#gameIcon").click(function(e){e.preventDefault(),$(this).clone().appendTo("#gameDetail"),$(this).siblings().clone().appendTo("#gameDetail"),$("#gameDetail").removeClass("magic")});var t=0;$(".pass-def dd").each(function(){$(this).find("li").each(function(e){if(0==$(this).children("ul").length){var s=$(this).html();$(this).html(s+''+t+""),t++}})})}),$(document).scroll(function(){doc_pos_y=$(document).scrollTop();var e=scroll_y_margin;doc_pos_y>e?$("#js_scrolltop").parent().removeClass("magic"):$("#js_scrolltop").parent().addClass("magic")}); -//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["variables.js","functions.js","global.js"],"names":["w","Math","max","document","documentElement","clientWidth","window","innerWidth","h","clientHeight","innerHeight","full_view_hover","doc_pos_y","basic_ease","scroll_y_margin","setup","$","length","addClass","Utils","scrollNav","click","removeClass","this","closest","theClass","attr","parent","stop","animate","scrollTop","offset","top","prototype","constructor","isElementInView","element","fullyInView","pageTop","pageBottom","height","elementTop","elementBottom","ready","exp_mode","hover","next","show","hide","mousemove","ev","css","pageY","outerHeight","left","pageX","e","$wrap","$pop","each","i","detach","wrap","prepend","after","find","remove","unwrap","hasClass","removeAttr","console","log","event","preventDefault","clone","appendTo","siblings","index","children","tempContent","html","scroll"],"mappings":"AAAA,IAAIA,EAAIC,KAAKC,IAAIC,SAASC,gBAAgBC,YAAaC,OAAOC,YAAc,GACxEC,EAAIP,KAAKC,IAAIC,SAASC,gBAAgBK,aAAcH,OAAOI,aAAe,GAE1EC,iBAAkB,EAElBC,UAAY,EACZC,WAAa,IACbC,gBAAkBN;ACPtB,SAASO,QACLC,EAAE,WAAWC,QAAUN,iBAEzBK,EAAE,WAAWE,SAAS,0BAexB,SAASC,SAwBT,SAASC,YACRJ,EAAE,UAAUK,MAAM,WAEjBL,EAAE,WAAWM,YAAY,UACzBN,EAAEO,MAAMC,QAAQ,MAAMN,SAAS,UAC/B,IAAIO,EAAWT,EAAEO,MAAMG,KAAK,SAM5B,OALAV,EAAE,IAAIS,GAAUE,OAAO,MAAMT,SAAS,UAEtCF,EAAE,cAAcY,OAAOC,SACrBC,UAAWd,EAAGA,EAAEO,MAAMG,KAAK,SAAUK,SAASC,IAAM,KACnD,MACI,IAERhB,EAAE,gBAAgBc,YAjCnBX,MAAMc,WACFC,YAAaf,MACbgB,gBAAiB,SAAUC,EAASC,GAChC,IAAIC,EAAUtB,EAAEV,QAAQwB,YACpBS,EAAaD,EAAUtB,EAAEV,QAAQkC,SACjCC,EAAazB,EAAEoB,GAASL,SAASC,IACjCU,EAAgBD,EAAazB,EAAEoB,GAASI,SAE5C,OAAoB,IAAhBH,EACSC,EAAUG,GAAgBF,EAAaG,EAEvCD,GAAcF,GAAgBG,GAAiBJ,IAKpE,IAAInB,MAAQ,IAAIA;ACpChBH,EAAGb,UAAWwC,MAAM,WAKnB5B,QAQA,IAAI6B,GAAW,EAGf5B,EAAE,WAAW6B,MACZ,WACa7B,EAAEO,MAEXP,EAAEO,MAAMG,KAAK,SAIhBV,EAAEO,MAAMuB,KAAK,YAAYC,QACvB,WACF/B,EAAEO,MAAMuB,KAAK,YAAYE,SAEzBC,UACD,SAASC,GACRlC,EAAEO,MAAMuB,KAAK,YAAYK,KACxBnB,IAAOkB,EAAGE,MAAQpC,EAAEO,MAAMuB,KAAK,YAAYO,cAAgB,EAC3DC,KAAQJ,EAAGK,MAAQ,MAOtBvC,EAAE,iBAAiBK,MAAM,SAASmC,GACjC,IAAIC,EAAOC,EAEI,GAAZd,GACFA,GAAW,EAEX5B,EAAE,WAAW2C,KAAK,SAASC,EAAGJ,GACC,UAA3BxC,EAAEO,MAAM4B,IAAI,cACdnC,EAAEO,MAAML,SAAS,kBACjBF,EAAEO,MAAM4B,IAAI,WAAY,aAGzBO,EAAO1C,EAAEO,MAAMuB,KAAK,YAAYe,UAChCJ,EAAQzC,EAAEO,MAAMuC,KAAK,kCAAoCnC,SAASoC,QAAQ,yCACpEC,MAAMN,OAIb1C,EAAE,WAAW2C,KAAK,SAASC,EAAGJ,GAC7BC,EAAQzC,EAAEO,MAAMI,OAAO,aACvB+B,EAAOD,EAAMX,KAAK,YAAYe,SAC9BJ,EAAMQ,KAAK,mBAAmBC,SAC9BlD,EAAEO,MAAM4C,OAAO,aACfnD,EAAEO,MAAMyC,MAAMN,GACX1C,EAAEO,MAAM6C,SAAS,oBACnBpD,EAAEO,MAAM4B,IAAI,WAAY,IACI,IAAzBnC,EAAEO,MAAMG,KAAK,UACfV,EAAEO,MAAM8C,WAAW,SAEpBrD,EAAEO,MAAMD,YAAY,qBAItBsB,GAAW,GAGZ0B,QAAQC,IAAI,qBAAsB3B,KAInC5B,EAAE,iBAAiBK,MAAM,SAASmD,GACjCF,QAAQC,IAAI,qBACZC,EAAMC,iBAENzD,EAAE,QAAQa,SAASC,UAAW,GAAIjB,WAAY,WAC5CyD,QAAQC,IAAI,sBAGfvD,EAAE,kBAAkBK,MAAM,SAASmD,GAClCF,QAAQC,IAAI,eACZC,EAAMC,iBACNzD,EAAE,QAAQa,SAASC,UAAWd,EAAEb,UAAUqC,UAAwB,EAAb3B,WAAgB,WACnEyD,QAAQC,IAAI,yBAMfvD,EAAG,aAAcK,MAAM,SAASmD,GAC/BA,EAAMC,iBACNzD,EAAGO,MAAOmD,QAAQC,SAAU,eAC5B3D,EAAGO,MAAOqD,WAAWF,QAAQC,SAAU,eACvC3D,EAAG,eAAgBM,YAAa,WAGjC,IAAIsC,EAAI,EACR5C,EAAG,gBAAiB2C,KAAK,WACxB3C,EAAGO,MAAO0C,KAAM,MAAON,KAAK,SAAUkB,GACrC,GAAK,GAAK7D,EAAGO,MAAOuD,SAAU,MAAO7D,OAAS,CAE7C,IAAI8D,EAAc/D,EAAGO,MAAOyD,OAE5BhE,EAAGO,MAAOyD,KAAMD,EAAa,4BAA+BnB,EAAG,WAC/DA,WAaJ5C,EAAGb,UAAW8E,OAAO,WAGpBrE,UAAYI,EAAGb,UAAW2B,YAE1B,IAAItB,EAAIM,gBAEJF,UAAYJ,EACfQ,EAAE,iBAAiBW,SAASL,YAAY,SAExCN,EAAE,iBAAiBW,SAAST,SAAS","file":"all.min.js","sourcesContent":["var w = Math.max(document.documentElement.clientWidth, window.innerWidth || 0);\r\nvar h = Math.max(document.documentElement.clientHeight, window.innerHeight || 0);\r\n\r\nvar full_view_hover = false;\r\n\r\nvar doc_pos_y = 0;\r\nvar basic_ease = 600;\r\nvar scroll_y_margin = h;\r\n\r\n\r\n// TEST\r\n// var fixed_containers = [];\r\n","function setup() {\r\n\tif($('#js_tph').length && full_view_hover) {\r\n\t\t// $('body').prepend(\"<div id=\\\"js_tph\\\" class=\\\"layer__hover hover_full_view_change\\\"></div>\");\r\n\t\t$('#js_tph').addClass(\"hover_full_view_change\");\r\n\t}\r\n}\r\n\r\n// get document coordinates of the element\r\n// function getCoords(elem) {\r\n//   let box = elem.getBoundingClientRect();\r\n//\r\n//   return {\r\n//     top: box.top + pageYOffset,\r\n//     left: box.left + pageXOffset\r\n//   };\r\n// }\r\n\r\n// https://stackoverflow.com/a/488073/1444149\r\nfunction Utils() {\r\n\r\n}\r\n\r\nUtils.prototype = {\r\n    constructor: Utils,\r\n    isElementInView: function (element, fullyInView) {\r\n        var pageTop = $(window).scrollTop();\r\n        var pageBottom = pageTop + $(window).height();\r\n        var elementTop = $(element).offset().top;\r\n        var elementBottom = elementTop + $(element).height();\r\n\r\n        if (fullyInView === true) {\r\n            return ((pageTop < elementTop) && (pageBottom > elementBottom));\r\n        } else {\r\n            return ((elementTop <= pageBottom) && (elementBottom >= pageTop));\r\n        }\r\n    }\r\n};\r\n\r\nvar Utils = new Utils();\r\n\r\n// TEST\r\n\r\nfunction scrollNav() {\r\n\t$('.nav a').click(function(){\r\n\t\t//Toggle Class\r\n\t\t$(\".active\").removeClass(\"active\");\r\n\t\t$(this).closest('li').addClass(\"active\");\r\n\t\tvar theClass = $(this).attr(\"class\");\r\n\t\t$('.'+theClass).parent('li').addClass('active');\r\n\t\t//Animate\r\n\t\t$('html, body').stop().animate({\r\n\t\t\t\tscrollTop: $( $(this).attr('href') ).offset().top - 160\r\n\t\t}, 400);\r\n\t\treturn false;\r\n\t});\r\n\t$('.scrollTop a').scrollTop();\r\n}\r\n","// DOM ready\r\n// ------------------------------------------------------------------------------\r\n$( document ).ready(function() {\r\n\r\n\t// Setup\r\n\t// ------------------------------------------------------------------------------\r\n\r\n\tsetup();\r\n\r\n\r\n\r\n\t// Modules\r\n\t// ------------------------------------------------------------------------------\r\n\r\n\t// Explanation module scripts\r\n\tvar exp_mode = false;\r\n\r\n\t// Displays explanation popup\r\n\t$(\".js_pop\").hover(\r\n\t\tfunction() {\r\n\t\t\tvar $this = $(this);\r\n\r\n\t\t\tif($(this).attr(\"emmet\")){\r\n\r\n\t\t\t}\r\n\r\n\t\t\t$(this).next(\".exp_pop\").show();\r\n\t\t}, function() {\r\n\t\t\t$(this).next(\".exp_pop\").hide();\r\n\t\t}\r\n\t).mousemove(\r\n\t\tfunction(ev) {\r\n\t\t\t$(this).next(\".exp_pop\").css({\r\n\t\t\t\t\"top\": ev.pageY - $(this).next(\".exp_pop\").outerHeight() - 4,\r\n\t\t\t\t\"left\": ev.pageX + 8\r\n\t\t\t});\r\n\t\t}\r\n\t);\r\n\r\n\t// WIP Activates layer with explanation elements\r\n\t// Besser ::after oder ::before benutzen\r\n\t$(\".exp_help_btn\").click(function(e){\r\n\t\tvar $wrap, $pop;\r\n\r\n\t\tif(exp_mode != true){\r\n\t\t\texp_mode = true;\r\n\r\n\t\t\t$(\".js_pop\").each(function(i, e){\r\n\t\t\t\tif($(this).css(\"position\") == \"static\") {\r\n\t\t\t\t\t$(this).addClass(\"js_changed_pos\");\r\n\t\t\t\t\t$(this).css(\"position\", \"relative\");\r\n\t\t\t\t}\r\n\r\n\t\t\t\t$pop = $(this).next(\".exp_pop\").detach();\r\n\t\t\t\t$wrap = $(this).wrap(\"<span class=\\\"exp_wrap\\\"></span>\").parent().prepend(\"<span class=\\\"exp_marker_pop\\\"></span>\");\r\n\t\t\t\t$wrap.after($pop);\r\n\t\t\t});\r\n\r\n\t\t} else {\r\n\t\t\t$(\".js_pop\").each(function(i, e){\r\n\t\t\t\t$wrap = $(this).parent(\".exp_wrap\");\r\n\t\t\t\t$pop = $wrap.next(\".exp_pop\").detach();\r\n\t\t\t\t$wrap.find(\".exp_marker_pop\").remove();\r\n\t\t\t\t$(this).unwrap(\".exp_wrap\");\r\n\t\t\t\t$(this).after($pop);\r\n\t\t\t\tif($(this).hasClass(\"js_changed_pos\")){\r\n\t\t\t\t\t$(this).css(\"position\", \"\");\r\n\t\t\t\t\tif($(this).attr(\"style\") == \"\") {\r\n\t\t\t\t\t\t$(this).removeAttr(\"style\");\r\n\t\t\t\t\t}\r\n\t\t\t\t\t$(this).removeClass(\"js_changed_pos\");\r\n\t\t\t\t}\r\n\t\t\t});\r\n\r\n\t\t\texp_mode = false;\r\n\r\n\t\t}\r\n\t\tconsole.log(\"Explanation mode: \"+ exp_mode);\r\n\t});\r\n\r\n\t//\tWIP Scroll to top\r\n\t$('#js_scrolltop').click(function(event) {\r\n\t\tconsole.log('scroll to the top');\r\n\t\tevent.preventDefault();\r\n\t\t// $('body').scrollTop();\r\n\t\t$('body').animate({scrollTop: 0}, basic_ease, function() {\r\n\t\t\t console.log('arrived at top');\r\n\t\t});\r\n\t});\r\n\t$('#js_scrolldown').click(function(event) {\r\n\t\tconsole.log('scroll down');\r\n\t\tevent.preventDefault();\r\n\t\t$('body').animate({scrollTop: $(document).height()}, basic_ease * 2, function() {\r\n\t\t\t console.log('arrived at bottom');\r\n\t\t});\r\n\t});\r\n\r\n\r\n\r\n\t$( \"#gameIcon\" ).click(function(event) {\r\n\t\tevent.preventDefault();\r\n\t\t$( this ).clone().appendTo( \"#gameDetail\" );\r\n\t\t$( this ).siblings().clone().appendTo( \"#gameDetail\" );\r\n\t\t$( \"#gameDetail\" ).removeClass( \"magic\" );\r\n\t});\r\n\r\n\tvar i = 0;\r\n\t$( \".pass-def dd\" ).each(function() {\r\n\t\t$( this ).find( \"li\" ).each(function( index ) {\r\n\t\t\tif ( 0 == $( this ).children( \"ul\" ).length ) {\r\n\t\t\t\t//console.log( index + \": \" + $( this ).text() );\r\n\t\t\t\tvar tempContent = $( this ).html();\r\n\t\t\t\t//$( this ).html( \"<span class=\\\"list-count\\\"></span>\" );\r\n\t\t\t\t$( this ).html( tempContent +\"<span class=\\\"list-count\\\">\"+ i +\"</span>\" );\r\n\t\t\t\ti++;\r\n\t\t\t}\r\n\t\t})\r\n\t});\r\n\r\n\r\n\r\n});\r\n\r\n\r\n\r\n// Scroll\r\n// ------------------------------------------------------------------------------\r\n$( document ).scroll(function() {\r\n\r\n\t// Toggle navigation elements\r\n\tdoc_pos_y = $( document ).scrollTop();\r\n\t// console.log(doc_pos_y);\r\n\tvar h = scroll_y_margin;\r\n\t// var demo_margin = $('.header__fix');\r\n\tif (doc_pos_y > h) {\r\n\t\t$('#js_scrolltop').parent().removeClass('magic');\r\n\t} else {\r\n\t\t$('#js_scrolltop').parent().addClass('magic');\r\n\t}\r\n\r\n\r\n\r\n});\r\n"]} +//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["variables.js","functions.js","global.js"],"names":["w","Math","max","document","documentElement","clientWidth","window","innerWidth","h","clientHeight","innerHeight","full_view_hover","doc_pos_y","basic_ease","scroll_y_margin","setup","$","length","addClass","Utils","scrollNav","click","removeClass","this","closest","theClass","attr","parent","stop","animate","scrollTop","offset","top","prototype","constructor","isElementInView","element","fullyInView","pageTop","pageBottom","height","elementTop","elementBottom","ready","exp_mode","hover","next","show","hide","mousemove","ev","css","pageY","outerHeight","left","pageX","e","$wrap","$pop","each","i","detach","wrap","prepend","after","find","remove","unwrap","hasClass","removeAttr","console","log","event","preventDefault","clone","appendTo","siblings","index","children","tempContent","html","scroll"],"mappings":"AAAA,IAAIA,EAAIC,KAAKC,IAAIC,SAASC,gBAAgBC,YAAaC,OAAOC,YAAc,GACxEC,EAAIP,KAAKC,IAAIC,SAASC,gBAAgBK,aAAcH,OAAOI,aAAe,GAE1EC,iBAAkB,EAElBC,UAAY,EACZC,WAAa,IACbC,gBAAkBN;ACPtB,SAASO,QACLC,EAAE,WAAWC,QAAUN,iBAEzBK,EAAE,WAAWE,SAAS,0BAexB,SAASC,SAwBT,SAASC,YACRJ,EAAE,UAAUK,MAAM,WAEjBL,EAAE,WAAWM,YAAY,UACzBN,EAAEO,MAAMC,QAAQ,MAAMN,SAAS,UAC/B,IAAIO,EAAWT,EAAEO,MAAMG,KAAK,SAM5B,OALAV,EAAE,IAAIS,GAAUE,OAAO,MAAMT,SAAS,UAEtCF,EAAE,cAAcY,OAAOC,SACrBC,UAAWd,EAAGA,EAAEO,MAAMG,KAAK,SAAUK,SAASC,IAAM,KACnD,MACI,IAERhB,EAAE,gBAAgBc,YAjCnBX,MAAMc,WACFC,YAAaf,MACbgB,gBAAiB,SAAUC,EAASC,GAChC,IAAIC,EAAUtB,EAAEV,QAAQwB,YACpBS,EAAaD,EAAUtB,EAAEV,QAAQkC,SACjCC,EAAazB,EAAEoB,GAASL,SAASC,IACjCU,EAAgBD,EAAazB,EAAEoB,GAASI,SAE5C,OAAoB,IAAhBH,EACSC,EAAUG,GAAgBF,EAAaG,EAEvCD,GAAcF,GAAgBG,GAAiBJ,IAKpE,IAAInB,MAAQ,IAAIA;ACpChBH,EAAGb,UAAWwC,MAAM,WAKnB5B,QAQA,IAAI6B,GAAW,EAGf5B,EAAE,WAAW6B,MACZ,WACa7B,EAAEO,MAEXP,EAAEO,MAAMG,KAAK,SAIhBV,EAAEO,MAAMuB,KAAK,YAAYC,QACvB,WACF/B,EAAEO,MAAMuB,KAAK,YAAYE,SAEzBC,UACD,SAASC,GACRlC,EAAEO,MAAMuB,KAAK,YAAYK,KACxBnB,IAAOkB,EAAGE,MAAQpC,EAAEO,MAAMuB,KAAK,YAAYO,cAAgB,EAC3DC,KAAQJ,EAAGK,MAAQ,MAOtBvC,EAAE,iBAAiBK,MAAM,SAASmC,GACjC,IAAIC,EAAOC,EAEI,GAAZd,GACFA,GAAW,EAEX5B,EAAE,WAAW2C,KAAK,SAASC,EAAGJ,GACC,UAA3BxC,EAAEO,MAAM4B,IAAI,cACdnC,EAAEO,MAAML,SAAS,kBACjBF,EAAEO,MAAM4B,IAAI,WAAY,aAGzBO,EAAO1C,EAAEO,MAAMuB,KAAK,YAAYe,UAChCJ,EAAQzC,EAAEO,MAAMuC,KAAK,kCAAoCnC,SAASoC,QAAQ,yCACpEC,MAAMN,OAIb1C,EAAE,WAAW2C,KAAK,SAASC,EAAGJ,GAC7BC,EAAQzC,EAAEO,MAAMI,OAAO,aACvB+B,EAAOD,EAAMX,KAAK,YAAYe,SAC9BJ,EAAMQ,KAAK,mBAAmBC,SAC9BlD,EAAEO,MAAM4C,OAAO,aACfnD,EAAEO,MAAMyC,MAAMN,GACX1C,EAAEO,MAAM6C,SAAS,oBACnBpD,EAAEO,MAAM4B,IAAI,WAAY,IACI,IAAzBnC,EAAEO,MAAMG,KAAK,UACfV,EAAEO,MAAM8C,WAAW,SAEpBrD,EAAEO,MAAMD,YAAY,qBAItBsB,GAAW,GAGZ0B,QAAQC,IAAI,qBAAsB3B,KAInC5B,EAAE,iBAAiBK,MAAM,SAASmD,GACjCF,QAAQC,IAAI,qBACZC,EAAMC,iBAENzD,EAAE,QAAQa,SAASC,UAAW,GAAIjB,WAAY,WAC5CyD,QAAQC,IAAI,sBAGfvD,EAAE,kBAAkBK,MAAM,SAASmD,GAClCF,QAAQC,IAAI,eACZC,EAAMC,iBACNzD,EAAE,QAAQa,SAASC,UAAWd,EAAEb,UAAUqC,UAAwB,EAAb3B,WAAgB,WACnEyD,QAAQC,IAAI,yBAMfvD,EAAG,aAAcK,MAAM,SAASmD,GAC/BA,EAAMC,iBACNzD,EAAGO,MAAOmD,QAAQC,SAAU,eAC5B3D,EAAGO,MAAOqD,WAAWF,QAAQC,SAAU,eACvC3D,EAAG,eAAgBM,YAAa,WAGjC,IAAIsC,EAAI,EACR5C,EAAG,gBAAiB2C,KAAK,WACxB3C,EAAGO,MAAO0C,KAAM,MAAON,KAAK,SAAUkB,GACrC,GAAK,GAAK7D,EAAGO,MAAOuD,SAAU,MAAO7D,OAAS,CAE7C,IAAI8D,EAAc/D,EAAGO,MAAOyD,OAE5BhE,EAAGO,MAAOyD,KAAMD,EAAa,4BAA+BnB,EAAG,WAC/DA,WAaJ5C,EAAGb,UAAW8E,OAAO,WAGpBrE,UAAYI,EAAGb,UAAW2B,YAE1B,IAAItB,EAAIM,gBAEJF,UAAYJ,EACfQ,EAAE,iBAAiBW,SAASL,YAAY,SAExCN,EAAE,iBAAiBW,SAAST,SAAS","file":"all.min.js","sourcesContent":["var w = Math.max(document.documentElement.clientWidth, window.innerWidth || 0);\r\nvar h = Math.max(document.documentElement.clientHeight, window.innerHeight || 0);\r\n\r\nvar full_view_hover = true;\r\n\r\nvar doc_pos_y = 0;\r\nvar basic_ease = 600;\r\nvar scroll_y_margin = h;\r\n\r\n\r\n// TEST\r\n// var fixed_containers = [];\r\n","function setup() {\r\n\tif($('#js_tph').length && full_view_hover) {\r\n\t\t// $('body').prepend(\"<div id=\\\"js_tph\\\" class=\\\"layer__hover hover_full_view_change\\\"></div>\");\r\n\t\t$('#js_tph').addClass(\"hover_full_view_change\");\r\n\t}\r\n}\r\n\r\n// get document coordinates of the element\r\n// function getCoords(elem) {\r\n//   let box = elem.getBoundingClientRect();\r\n//\r\n//   return {\r\n//     top: box.top + pageYOffset,\r\n//     left: box.left + pageXOffset\r\n//   };\r\n// }\r\n\r\n// https://stackoverflow.com/a/488073/1444149\r\nfunction Utils() {\r\n\r\n}\r\n\r\nUtils.prototype = {\r\n    constructor: Utils,\r\n    isElementInView: function (element, fullyInView) {\r\n        var pageTop = $(window).scrollTop();\r\n        var pageBottom = pageTop + $(window).height();\r\n        var elementTop = $(element).offset().top;\r\n        var elementBottom = elementTop + $(element).height();\r\n\r\n        if (fullyInView === true) {\r\n            return ((pageTop < elementTop) && (pageBottom > elementBottom));\r\n        } else {\r\n            return ((elementTop <= pageBottom) && (elementBottom >= pageTop));\r\n        }\r\n    }\r\n};\r\n\r\nvar Utils = new Utils();\r\n\r\n// TEST\r\n\r\nfunction scrollNav() {\r\n\t$('.nav a').click(function(){\r\n\t\t//Toggle Class\r\n\t\t$(\".active\").removeClass(\"active\");\r\n\t\t$(this).closest('li').addClass(\"active\");\r\n\t\tvar theClass = $(this).attr(\"class\");\r\n\t\t$('.'+theClass).parent('li').addClass('active');\r\n\t\t//Animate\r\n\t\t$('html, body').stop().animate({\r\n\t\t\t\tscrollTop: $( $(this).attr('href') ).offset().top - 160\r\n\t\t}, 400);\r\n\t\treturn false;\r\n\t});\r\n\t$('.scrollTop a').scrollTop();\r\n}\r\n","// DOM ready\r\n// ------------------------------------------------------------------------------\r\n$( document ).ready(function() {\r\n\r\n\t// Setup\r\n\t// ------------------------------------------------------------------------------\r\n\r\n\tsetup();\r\n\r\n\r\n\r\n\t// Modules\r\n\t// ------------------------------------------------------------------------------\r\n\r\n\t// Explanation module scripts\r\n\tvar exp_mode = false;\r\n\r\n\t// Displays explanation popup\r\n\t$(\".js_pop\").hover(\r\n\t\tfunction() {\r\n\t\t\tvar $this = $(this);\r\n\r\n\t\t\tif($(this).attr(\"emmet\")){\r\n\r\n\t\t\t}\r\n\r\n\t\t\t$(this).next(\".exp_pop\").show();\r\n\t\t}, function() {\r\n\t\t\t$(this).next(\".exp_pop\").hide();\r\n\t\t}\r\n\t).mousemove(\r\n\t\tfunction(ev) {\r\n\t\t\t$(this).next(\".exp_pop\").css({\r\n\t\t\t\t\"top\": ev.pageY - $(this).next(\".exp_pop\").outerHeight() - 4,\r\n\t\t\t\t\"left\": ev.pageX + 8\r\n\t\t\t});\r\n\t\t}\r\n\t);\r\n\r\n\t// WIP Activates layer with explanation elements\r\n\t// Besser ::after oder ::before benutzen\r\n\t$(\".exp_help_btn\").click(function(e){\r\n\t\tvar $wrap, $pop;\r\n\r\n\t\tif(exp_mode != true){\r\n\t\t\texp_mode = true;\r\n\r\n\t\t\t$(\".js_pop\").each(function(i, e){\r\n\t\t\t\tif($(this).css(\"position\") == \"static\") {\r\n\t\t\t\t\t$(this).addClass(\"js_changed_pos\");\r\n\t\t\t\t\t$(this).css(\"position\", \"relative\");\r\n\t\t\t\t}\r\n\r\n\t\t\t\t$pop = $(this).next(\".exp_pop\").detach();\r\n\t\t\t\t$wrap = $(this).wrap(\"<span class=\\\"exp_wrap\\\"></span>\").parent().prepend(\"<span class=\\\"exp_marker_pop\\\"></span>\");\r\n\t\t\t\t$wrap.after($pop);\r\n\t\t\t});\r\n\r\n\t\t} else {\r\n\t\t\t$(\".js_pop\").each(function(i, e){\r\n\t\t\t\t$wrap = $(this).parent(\".exp_wrap\");\r\n\t\t\t\t$pop = $wrap.next(\".exp_pop\").detach();\r\n\t\t\t\t$wrap.find(\".exp_marker_pop\").remove();\r\n\t\t\t\t$(this).unwrap(\".exp_wrap\");\r\n\t\t\t\t$(this).after($pop);\r\n\t\t\t\tif($(this).hasClass(\"js_changed_pos\")){\r\n\t\t\t\t\t$(this).css(\"position\", \"\");\r\n\t\t\t\t\tif($(this).attr(\"style\") == \"\") {\r\n\t\t\t\t\t\t$(this).removeAttr(\"style\");\r\n\t\t\t\t\t}\r\n\t\t\t\t\t$(this).removeClass(\"js_changed_pos\");\r\n\t\t\t\t}\r\n\t\t\t});\r\n\r\n\t\t\texp_mode = false;\r\n\r\n\t\t}\r\n\t\tconsole.log(\"Explanation mode: \"+ exp_mode);\r\n\t});\r\n\r\n\t//\tWIP Scroll to top\r\n\t$('#js_scrolltop').click(function(event) {\r\n\t\tconsole.log('scroll to the top');\r\n\t\tevent.preventDefault();\r\n\t\t// $('body').scrollTop();\r\n\t\t$('body').animate({scrollTop: 0}, basic_ease, function() {\r\n\t\t\t console.log('arrived at top');\r\n\t\t});\r\n\t});\r\n\t$('#js_scrolldown').click(function(event) {\r\n\t\tconsole.log('scroll down');\r\n\t\tevent.preventDefault();\r\n\t\t$('body').animate({scrollTop: $(document).height()}, basic_ease * 2, function() {\r\n\t\t\t console.log('arrived at bottom');\r\n\t\t});\r\n\t});\r\n\r\n\r\n\r\n\t$( \"#gameIcon\" ).click(function(event) {\r\n\t\tevent.preventDefault();\r\n\t\t$( this ).clone().appendTo( \"#gameDetail\" );\r\n\t\t$( this ).siblings().clone().appendTo( \"#gameDetail\" );\r\n\t\t$( \"#gameDetail\" ).removeClass( \"magic\" );\r\n\t});\r\n\r\n\tvar i = 0;\r\n\t$( \".pass-def dd\" ).each(function() {\r\n\t\t$( this ).find( \"li\" ).each(function( index ) {\r\n\t\t\tif ( 0 == $( this ).children( \"ul\" ).length ) {\r\n\t\t\t\t//console.log( index + \": \" + $( this ).text() );\r\n\t\t\t\tvar tempContent = $( this ).html();\r\n\t\t\t\t//$( this ).html( \"<span class=\\\"list-count\\\"></span>\" );\r\n\t\t\t\t$( this ).html( tempContent +\"<span class=\\\"list-count\\\">\"+ i +\"</span>\" );\r\n\t\t\t\ti++;\r\n\t\t\t}\r\n\t\t})\r\n\t});\r\n\r\n\r\n\r\n});\r\n\r\n\r\n\r\n// Scroll\r\n// ------------------------------------------------------------------------------\r\n$( document ).scroll(function() {\r\n\r\n\t// Toggle navigation elements\r\n\tdoc_pos_y = $( document ).scrollTop();\r\n\t// console.log(doc_pos_y);\r\n\tvar h = scroll_y_margin;\r\n\t// var demo_margin = $('.header__fix');\r\n\tif (doc_pos_y > h) {\r\n\t\t$('#js_scrolltop').parent().removeClass('magic');\r\n\t} else {\r\n\t\t$('#js_scrolltop').parent().addClass('magic');\r\n\t}\r\n\r\n\r\n\r\n});\r\n"]} diff --git a/demo-explorer.html b/demo-explorer.html index 9fbf418..ac11fc7 100644 --- a/demo-explorer.html +++ b/demo-explorer.html @@ -20,7 +20,7 @@ -
+
diff --git a/demo-presentation.html b/demo-presentation.html index 2b6632b..2ace0de 100644 --- a/demo-presentation.html +++ b/demo-presentation.html @@ -20,7 +20,7 @@ -
+
Start
Seite 2
diff --git a/gulpfile.js b/gulpfile.js index 900a23d..1594c90 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,5 +1,7 @@ // Setup project var source = { + markup: '*.html', + watch: 'source/style/**/*.scss', styles: 'source/style/example.scss', scripts: ['source/code/variables.js', 'source/code/functions.js', 'source/code/global.js', 'source/code/**/*.coffee', '!source/vendor/**/*', ], images: 'source/art/**/*' @@ -84,19 +86,19 @@ gulp.task('images', function() { // Watch for file changes gulp.task('watch', ['clean', 'styles', 'scripts'], function() { - browsersync.init({ - server: ".", - // proxy: "http://verser.vrt/virtual/" + browsersync.init({ + server: "./", + // proxy: "http://verser.vrt/virtual/" }); - gulp.watch(source.styles, ['styles']); + gulp.watch(source.watch, ['styles']); gulp.watch(source.scripts, ['scripts']).on('change', function(event) { if (event.type === 'deleted') { delete cache.caches['scripts'][event.path]; remember.forget('scripts', event.path); } }); - gulp.watch("./*.html").on('change', browsersync.reload); + gulp.watch(source.markup).on('change', browsersync.reload); // gulp.watch(['build/**']).on('change', browsersync.reload); // gulp.watch(source.images, ['images']); }); diff --git a/index.html b/index.html new file mode 100644 index 0000000..92e858a --- /dev/null +++ b/index.html @@ -0,0 +1,61 @@ + + + + + + HIPPIE Index + + + + + + + + + + + + + + + + +
+ +
+ +
+ + + + + + + diff --git a/source/code/variables.js b/source/code/variables.js index e716433..fe6b9d0 100644 --- a/source/code/variables.js +++ b/source/code/variables.js @@ -1,7 +1,7 @@ var w = Math.max(document.documentElement.clientWidth, window.innerWidth || 0); var h = Math.max(document.documentElement.clientHeight, window.innerHeight || 0); -var full_view_hover = false; +var full_view_hover = true; var doc_pos_y = 0; var basic_ease = 600; diff --git a/source/style/elements/_grouping.scss b/source/style/elements/_grouping.scss index c1f7ab4..46cfe54 100644 --- a/source/style/elements/_grouping.scss +++ b/source/style/elements/_grouping.scss @@ -164,10 +164,6 @@ div { } -.box__page { - height: 100vh; -} - .box__info { padding: $double_space $basic_indent; border-right: $basic_space solid rgba($echo_color, .6); diff --git a/source/style/global/_common.scss b/source/style/global/_common.scss index 6415f2c..43e82d3 100644 --- a/source/style/global/_common.scss +++ b/source/style/global/_common.scss @@ -41,6 +41,10 @@ height: 1024px; } +.height_full { + height: 100vh; +} + .txt_center { text-align: center !important; } diff --git a/source/style/modules/demo/_demo_module.scss b/source/style/modules/demo/_demo_module.scss index 9778e09..e699dae 100644 --- a/source/style/modules/demo/_demo_module.scss +++ b/source/style/modules/demo/_demo_module.scss @@ -174,3 +174,18 @@ background-color: rgba($basic_front_color, .2); } } + +// Index +// ----------------------------------------------------------------------------- +.wrap { + display: flex; + height: 100%; + align-items: center; + justify-content: center; +} + +.hello { + flex: 0 1 auto; + padding: 1em 5em; + background-color: rgba(black, .25); +} From 8b0fd6f9b9e71e020b1a03a37e77a0f2e67cdea2 Mon Sep 17 00:00:00 2001 From: Stephan Hagedorn Date: Wed, 27 Sep 2017 11:28:34 +0200 Subject: [PATCH 058/372] build should not be in the repo --- build/css/example.css | 2644 ++++++++++++++++++++--------------------- build/js/all.min.js | 2 +- package-lock.json | 18 +- 3 files changed, 1332 insertions(+), 1332 deletions(-) diff --git a/build/css/example.css b/build/css/example.css index 79acf5c..de7f7d6 100644 --- a/build/css/example.css +++ b/build/css/example.css @@ -1,1322 +1,1322 @@ -@charset "UTF-8"; -/* - * # TABLE OF CONTENTS - * - * - Reset - * - Global functions and mixins - * - Configuration - * - Special modules - * - Basic styles - * - Common - * - Typography - * - * - Sections - * - Grouping - * - Textlevel - * - Embedded - * - Tables - * - Interactive - * - Modules - * - */ -@import url(../../vendor/normalize.css); -.sym_glass::before { - content: ""; } - -.sym_music::before { - content: ""; } - -.sym_search::before { - content: ""; } - -.sym_envelope-o::before { - content: ""; } - -.sym_heart::before { - content: ""; } - -a[href]:focus { - outline: 0; } - -area[href]:focus { - outline: 0; } - -button:not([disabled]):focus { - outline: 0; } - -input:not([disabled]):focus { - outline: 0; } - -select:not([disabled]):focus { - outline: 0; } - -textarea:not([disabled]):focus { - outline: 0; } - -*[tabindex]:focus { - outline: 0; } - -/** - * @description - * Generates cross-browser-compatible output for a given element with its value. - * - * @author sthag - * - * @param values - * @returns - * -webkit-: - * ...-: - * - * @example - * .selector - * @include vendor-prefix(hyphens, auto) - */ -.magic { - display: none; } - -.center_50 { - margin-right: 25%; - margin-left: 25%; } - -.center_25 { - margin-right: 37.5%; - margin-left: 37.5%; } - -.width_full, .table__file_simple { - width: 100%; - margin-right: 0; - margin-left: 0; } - -.height_basic { - height: 1024px; } - -.height_full { - height: 100vh; } - -.txt_center { - text-align: center !important; } - -.txt_right { - text-align: right !important; } - -.txt_left { - text-align: left !important; } - -.space_right { - margin-right: 32px; } - -.clear { - clear: both; } - .clear::before, .clear::after { - clear: both; } - -.overflow, .nav__horizontal ul, .nav__center_old ul, .header__page nav ul { - overflow: auto; } - -.float_space_left, .list__horizontal li, .box__inline_left, .box__file_tile, .nav__horizontal ul li, .nav__center_old ul li, .header__page nav ul li { - float: left; - margin-right: 32px; } - -.float_half_size { - float: left; - width: 50%; } - -.x_long { - overflow-x: scroll; } - -.pos_full_view, .hover_full_view_change { - position: fixed; - top: 0; - left: 0; - width: 100vw; - height: 100vh; } - -.pos_full_page { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; } - -.pos_abs { - position: absolute; } - -.pos_rel { - position: relative; } - -.pos_fix { - position: fixed; } - -.pos_bottom { - bottom: 0; } - -.pos_full_view { - background-color: rgba(250, 216, 3, 0.5); } - -.pos_full_page { - background-color: rgba(39, 63, 139, 0.25); } - -.hover_back_change { - background-color: #666666; - -webkit-transition: background-color .2s ease-in-out; - transition: background-color .2s ease-in-out; } - .hover_back_change:hover { - background-color: gray; } - -.hover_full_view_change { - z-index: 100; - background-color: rgba(0, 0, 0, 0.5); - -webkit-transition: background-color .2s ease-in-out; - transition: background-color .2s ease-in-out; - pointer-events: none; } - -.flex, .flex__wrap, .flex__row, .flex__column_wrap, .nav__column ul { - display: -webkit-box; - display: -ms-flexbox; - display: flex; } - -.flex__wrap { - -ms-flex-wrap: wrap; - flex-wrap: wrap; } - -.flex__row { - -webkit-box-orient: vertical; - -webkit-box-direction: normal; - -ms-flex-direction: column; - flex-direction: column; - -webkit-box-pack: start; - -ms-flex-pack: start; - justify-content: flex-start; } - -.flex__child, .flex__column_wrap .column, .nav__column ul li { - -webkit-box-flex: 0; - -ms-flex: 0 1 auto; - flex: 0 1 auto; } - -.flex__child_one { - -webkit-box-flex: 1; - -ms-flex: 1; - flex: 1; } - -.flex__child_end { - -ms-flex-item-align: end; - align-self: flex-end; } - -.txt_light_color { - color: #666666; } - -.a__button, .a__button_text, .a__button_border { - display: inline-block; - padding: calc(8px - 3px) 8px; - background-color: rgba(82, 190, 209, 0.2); - border-radius: 1px; } - .a__button:active, .a__button_text:active, .a__button_border:active, .a__button:focus, .a__button_text:focus, .a__button_border:focus, .a__button:hover, .a__button_text:hover, .a__button_border:hover { - background-color: rgba(255, 255, 255, 0.1); - color: white; - border-color: transparent; } - -.span__solo, h6, p, .block__column_2, .block__column_3, caption, li, dt, dd, figcaption, th, td, legend, label { - font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; - font-size: 1em; - line-height: 1.5; } - -pre, code, .demo__query_example:after, .code__solo, input[type="color"], input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="email"], input[type="month"], input[type="number"], input[type="password"], input[type="search"], input[type="tel"], input[type="text"], input[type="time"], input[type="url"], input[type="week"], input:not([type]), textarea { - font-family: Courier New, monospace; - font-size: 1em; - line-height: 1.5; } - -.print_body *[class^="din"] p, .print_body *[class^="din"] .block__column_2, .print_body *[class^="din"] .block__column_3, .print_body *[class^="din"] caption { - font-family: Courier New, monospace; - font-size: 1em; - line-height: 1.5; } - -h1, .print_body .page_date, .print_body .page_no { - font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; - font-size: 3.1em; - font-weight: 300; - line-height: 1.5; } - -h2 { - font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; - font-size: 2.5em; - font-weight: 300; - line-height: 1.5; } - -h3, h4 { - font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; - font-size: 1.8em; - font-weight: 300; - line-height: 1.5; } - -h5 { - font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; - font-size: 1.35em; - font-weight: 300; - line-height: 1.5; } - -.span__solo { - color: black; } - -.table__link .cell__text .shorten { - overflow: hidden; - text-overflow: ellipsis; - -o-text-overflow: ellipsis; } - -html { - height: 100%; } - -body { - position: relative; - -webkit-box-sizing: border-box; - box-sizing: border-box; - font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; - font-size: 17px; - line-height: 1; - color: black; - background-color: gray; } - body *, - body ::before, - body ::after { - -webkit-box-sizing: inherit; - box-sizing: inherit; } - body:hover .layer__hover { - background-color: transparent; } - -.sec__main_center, .demo__intro { - width: 96%; - margin: 0 auto; - padding-top: 32px; } - @media (min-width: 768px) { - .sec__main_center, .demo__intro { - width: 80%; } } - @media (min-width: 1024px) { - .sec__main_center, .demo__intro { - width: 60%; } } - @media (min-width: 1680px) { - .sec__main_center, .demo__intro { - width: 48%; } } - -aside.right + section { - margin-right: calc(20% + 8px); } -aside.left + section { - margin-left: calc(20% + 8px); } - -aside { - width: 20%; } - aside.left { - float: left; } - aside.right { - float: right; } - aside *:first-child { - margin-top: 0; } - -.header__page { - overflow: auto; } - -h1 { - margin: 128px 0 32px; } - -h2 { - margin: 64px 0 32px; } - -h3 { - margin: 16px 0 16px; - text-transform: uppercase; } - -h4 { - margin: 16px 0 16px; - text-transform: none; } - -h5 { - margin: 16px 0 8px; - text-transform: none; } - -h6 { - margin: 8px 0; - text-transform: none; - font-weight: bold; } - -p, .block__column_2, .block__column_3, caption { - margin: 8px 0; } - p code, .block__column_2 code, .block__column_3 code, caption code, p .demo__query_example:after, .block__column_2 .demo__query_example:after, .block__column_3 .demo__query_example:after, caption .demo__query_example:after { - padding: 1px 4px; - font-size: 1em; - line-height: 1; } - -hr, .hr__hidden, .hr__dotted { - margin: 32px auto; - border-width: 1px 0 0; - border-style: solid; - border-color: black; } - -.hr__hidden { - border-color: transparent; } - -.hr__dotted { - border-style: dotted; } - -.pre__code { - border-color: rgba(255, 255, 255, 0.1); - border-style: dotted; - border-width: 0 0 0 4px; - border-radius: 1px; - padding: 8px; - background-color: rgba(255, 255, 255, 0.1); } - .pre__code code, .pre__code .demo__query_example:after { - background-color: transparent; } - -blockquote { - margin: 8px 2em; } - -.quote__mark p::before, .quote__mark .block__column_2::before, .quote__mark .block__column_3::before, .quote__mark caption::before { - content: "\201E \0020"; } -.quote__mark p::after, .quote__mark .block__column_2::after, .quote__mark .block__column_3::after, .quote__mark caption::after { - content: "\201C \0020"; } -.quote__mark .quote__source::before, .quote__mark .quote__source::after { - content: ""; } - -dl, ul, ol { - margin: 16px 0 8px; } - -ul, ol { - padding-left: 2em; } - -dd { - margin-left: 2em; } - -ul li { - list-style: square; } - -.list__dash li { - list-style: none; - position: relative; } - .list__dash li::before { - content: "_"; - position: absolute; - left: -1em; } - -.list__link li { - margin-bottom: 2px; - text-transform: uppercase; } - .list__link li a { - display: block; - padding: calc(8px - 3px) 8px; - color: black; } - .list__link li a img { - margin-right: 8px; - padding-bottom: .2em; - vertical-align: text-bottom; } - .list__link li a:active, .list__link li a:focus, .list__link li a:hover { - background-color: #0c85ff; - color: white; } - -.list__horizontal { - overflow: auto; } - -figure { - margin: 16px 2em; } - -.box__info { - padding: 16px 2em; - border-right: 8px solid rgba(82, 190, 209, 0.6); - background-color: rgba(82, 190, 209, 0.1) !important; } - -.box__main_indent { - margin-left: 25%; } - -.block__column_line { - -webkit-column-rule: 1px solid black; - column-rule: 1px solid black; } - -.block__column_2 { - -webkit-column-count: 2; - column-count: 2; - -webkit-column-gap: 32px; - column-gap: 32px; } - -.block__column_3 { - -webkit-column-count: 3; - column-count: 3; - -webkit-column-gap: 64px; - column-gap: 64px; } - -.box__space { - position: relative; - width: 100%; } - -.box__cube { - float: left; - display: table; - width: 64px; - text-align: center; - vertical-align: middle; } - .box__cube span { - display: table-cell; } - -.box__placeholder { - width: 100%; - height: 64px; - border: 4px solid rgba(0, 0, 0, 0.1); - border-radius: 1px; - padding: 8px; - background-color: rgba(0, 0, 0, 0.1); } - .box__placeholder svg { - vertical-align: top; } - -.box__placeholder_bkg { - width: 100%; - height: 64px; - border: 4px solid rgba(0, 0, 0, 0.1); - border-radius: 1px; - padding: 8px; - /*data:[][;charset=][;base64],*/ - background: url("data:image/svg+xml;utf8,") no-repeat; - background-color: rgba(0, 0, 0, 0.1); } - -.flex__column_wrap .column { - -webkit-box-flex: 1; - -ms-flex-positive: 1; - flex-grow: 1; } - -a { - color: #52bed1; - text-decoration: none; } - a:active, a:focus, a:hover { - color: white; } - -.a__line { - border-bottom-width: 1px; - border-bottom-style: dotted; - border-color: black; - background-color: transparent; - color: black; - -webkit-transition: color 150ms ease; - transition: color 150ms ease; } - .a__line:active, .a__line:focus, .a__line:hover { - background-color: #0c85ff; - color: white; } - -.a__button_text, .a__button_border { - padding: calc(8px - 1px) calc(8px * 2); - background-color: transparent; - color: black; } - -.a__button_border { - border: 1px solid black; } - -i, em { - font-style: italic; } - -.i__bright { - font-style: normal; - color: white; } - -b, strong { - font-weight: 500; } - -cite { - font-style: italic; } - -code, .demo__query_example:after { - color: #1f1f1f; - background-color: rgba(255, 255, 255, 0.1); } - -.code__solo { - padding: 1px 4px; - color: black; } - -mark { - background-color: #fad803; } - -.mark__cursor { - color: white; - background-color: black; } - -::-moz-selection { - color: white; - background-color: black; } - -::selection { - color: white; - background-color: black; } - -img { - vertical-align: top; } - -table { - margin: 16px 0; - border: 1px solid black; - border-collapse: collapse; } - -th, td { - padding: 4px; } - -th { - border: 1px solid black; - text-align: left; } - -.precol { - border-right: 1px solid black; } - -td { - border-right: 1px solid black; - border-bottom: 1px solid black; } - -td:last-child { - border-right: 0; } - -tr:last-child td { - border-bottom: 0; } - -tfoot tr:first-child td { - border-top: 1px solid black; } - -.table__blank { - border: 1px solid transparent; } - .table__blank th, .table__blank td { - border: 1px solid transparent; } - -.table__free { - border: 1px solid transparent; } - -.table__stripe td { - border-top: 0; - border-bottom: 0; } -.table__stripe tr:nth-child(even) td { - background-color: rgba(255, 255, 255, 0.1); } - -.table__fix { - table-layout: fixed; } - -caption { - padding: 4px 0; - border: 1px dotted black; - text-align: center; } - -fieldset { - margin: 16px 0; - padding: 8px; - border: 1px solid black; } - -legend { - padding: 0 4px; } - -input, button, textarea { - margin: 0 32px; } - input[disabled="disabled"], input[disabled], button[disabled="disabled"], button[disabled], textarea[disabled="disabled"], textarea[disabled] { - cursor: not-allowed; } - -label input { - margin-left: 8px; } - -input { - color: #1a1a1a; } - input[disabled="disabled"], input[disabled] { - cursor: not-allowed; } - -input[type="color"], input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="email"], input[type="month"], input[type="number"], input[type="password"], input[type="search"], input[type="tel"], input[type="text"], input[type="time"], input[type="url"], input[type="week"], input:not([type]) { - border: 2px solid white; - padding: 4px; - background-color: #e6e6e6; } - input[type="color"]:hover, input[type="date"]:hover, input[type="datetime"]:hover, input[type="datetime-local"]:hover, input[type="email"]:hover, input[type="month"]:hover, input[type="number"]:hover, input[type="password"]:hover, input[type="search"]:hover, input[type="tel"]:hover, input[type="text"]:hover, input[type="time"]:hover, input[type="url"]:hover, input[type="week"]:hover, input:not([type]):hover { - background-color: white; } - input[type="color"][readonly="readonly"], input[type="color"][readonly], input[type="date"][readonly="readonly"], input[type="date"][readonly], input[type="datetime"][readonly="readonly"], input[type="datetime"][readonly], input[type="datetime-local"][readonly="readonly"], input[type="datetime-local"][readonly], input[type="email"][readonly="readonly"], input[type="email"][readonly], input[type="month"][readonly="readonly"], input[type="month"][readonly], input[type="number"][readonly="readonly"], input[type="number"][readonly], input[type="password"][readonly="readonly"], input[type="password"][readonly], input[type="search"][readonly="readonly"], input[type="search"][readonly], input[type="tel"][readonly="readonly"], input[type="tel"][readonly], input[type="text"][readonly="readonly"], input[type="text"][readonly], input[type="time"][readonly="readonly"], input[type="time"][readonly], input[type="url"][readonly="readonly"], input[type="url"][readonly], input[type="week"][readonly="readonly"], input[type="week"][readonly], input:not([type])[readonly="readonly"], input:not([type])[readonly] { - border-color: #b3b3b3; - background-color: #999999; } - input[type="color"][disabled="disabled"], input[type="color"][disabled], input[type="date"][disabled="disabled"], input[type="date"][disabled], input[type="datetime"][disabled="disabled"], input[type="datetime"][disabled], input[type="datetime-local"][disabled="disabled"], input[type="datetime-local"][disabled], input[type="email"][disabled="disabled"], input[type="email"][disabled], input[type="month"][disabled="disabled"], input[type="month"][disabled], input[type="number"][disabled="disabled"], input[type="number"][disabled], input[type="password"][disabled="disabled"], input[type="password"][disabled], input[type="search"][disabled="disabled"], input[type="search"][disabled], input[type="tel"][disabled="disabled"], input[type="tel"][disabled], input[type="text"][disabled="disabled"], input[type="text"][disabled], input[type="time"][disabled="disabled"], input[type="time"][disabled], input[type="url"][disabled="disabled"], input[type="url"][disabled], input[type="week"][disabled="disabled"], input[type="week"][disabled], input:not([type])[disabled="disabled"], input:not([type])[disabled] { - border-color: transparent; } - -textarea { - border: 2px solid white; - padding: 4px; - background-color: #e6e6e6; } - textarea:hover { - background-color: white; } - textarea[readonly="readonly"], textarea[readonly] { - border-color: #b3b3b3; - background-color: #999999; } - textarea[disabled="disabled"], textarea[disabled] { - border-color: transparent; } - -input[type="color"] { - line-height: 1; } - -input[type="date"] { - line-height: 1; } - -input[type="datetime"] { - line-height: 1; } - -input[type="datetime-local"] { - line-height: 1; } - -input[type="email"] { - line-height: 1; } - -input[type="month"] { - line-height: 1; } - -input[type="number"] { - line-height: 1; } - -input[type="password"] { - line-height: 1; } - -input[type="search"] { - line-height: 1; } - -input[type="tel"] { - line-height: 1; } - -input[type="text"] { - line-height: 1; } - -input[type="time"] { - line-height: 1; } - -input[type="url"] { - line-height: 1; } - -input[type="week"] { - line-height: 1; } - -input:not([type]) { - line-height: 1; } - -button { - padding: calc(8px - 3px) 8px; } - -input[type="button"] { - padding: calc(8px - 3px) 8px; } - -input[type="reset"] { - padding: calc(8px - 3px) 8px; } - -input[type="submit"] { - padding: calc(8px - 3px) 8px; } - -label + input, -.input__label_right { - margin: 0 8px; } - -.label__table, .input__default label { - display: table; } - .label__table input, .input__default label input { - display: table-cell; } - -.input__default label { - margin: 4px 0; } - .input__default label input { - padding: 4px 5px; - border-style: solid; - border-color: transparent; - background-color: #e6e6e6; - color: #1a1a1a; } - .input__default label input:hover { - background-color: black; - color: white; } - -nav ul { - padding-left: 0; } -nav li { - margin-bottom: 8px; - list-style: none; } - -.nav__horizontal ul ul, .nav__center_old ul ul, .header__page nav ul ul { - margin: 8px 0; } -.nav__horizontal ul li, .nav__center_old ul li, .header__page nav ul li { - margin-right: 8px; - margin-bottom: 0; } - .nav__horizontal ul li:last-child, .nav__center_old ul li:last-child, .header__page nav ul li:last-child { - margin-right: 0; } - -.nav__right { - float: right; - margin-left: 8px; } - .nav__right .align_parent { - margin-right: -8px; } - -.nav__separate li { - position: relative; - padding-left: 1px; } - .nav__separate li:not(:first-child)::before { - content: ""; - position: absolute; - width: 1px; - height: 100%; - left: 0; - top: 0; - background-color: black; } - -.nav__separate_right { - float: right; } - .nav__separate_right li { - position: relative; } - .nav__separate_right li:first-child { - padding-left: 17px; } - .nav__separate_right li:first-child::before { - content: ""; - position: absolute; - width: 1px; - height: 100%; - left: 0; - top: 0; - background-color: white; - margin: 0 8px; } - -.nav__center_old { - float: right; - position: relative; - left: -50%; } - .nav__center_old ul { - position: relative; - left: 50%; - text-align: center; } - -.nav__column { - position: relative; - margin: 8px 0; } - .nav__column ul { - margin: 0 128px; } - .nav__column ul li { - -webkit-box-flex: 1; - -ms-flex-positive: 1; - flex-grow: 1; - margin: 0; - text-align: center; } - .nav__column ul li a { - display: block; } - -.nav__page_meta { - position: fixed; - right: 0; - bottom: 16px; } - .nav__page_meta ul { - margin: 8px 0; } - .nav__page_meta li { - margin-bottom: 0; } - .nav__page_meta .a_button_meta { - display: inline-block; } - .nav__page_meta .a_button_meta:active, .nav__page_meta .a_button_meta:focus { - background-color: transparent; } - .nav__page_meta .a_button_meta:hover { - background-color: #0c85ff; } - -.header__page nav a:active, .header__page nav a:focus, .header__page nav a:hover { - background-color: rgba(0, 0, 0, 0.2); - color: black; } - -.table__link { - width: 100%; - border: 0; - table-layout: auto; } - .table__link tbody { - border-bottom: 1px solid black; } - .table__link tbody:hover { - background-color: #cccccc; } - .table__link th, .table__link td { - border: 0; } - .table__link .cell__icon { - width: 48px; - text-align: center; } - .table__link .cell__icon img { - vertical-align: text-top; } - .table__link .cell__link { - padding-right: 8px; - padding-left: 8px; } - .table__link .cell__link:hover { - background-color: #0c85ff; } - .table__link .cell__link:hover a:first-child { - display: none; } - .table__link .cell__link:hover a:last-child { - display: block; - color: white; } - .table__link .cell__link a { - display: block; } - .table__link .cell__link a:last-child { - display: none; } - .table__link th:last-child, .table__link .cell__date { - width: 16%; - text-align: center; } - .table__link .cell__text { - padding-right: 8px; - padding-left: 8px; } - .table__link .cell__text div { - width: 100%; } - .table__link .cell__text .shorten { - max-height: 44px; } - -.card_body .bkg_box { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; } - -.card_body { - height: 100%; - /* .full { - position: absolute; - width: 128px; - height: 128px; - top: 16px; - left: 16px; - background-color: #fff; - } - .mark { - float: left; - width: 32px; - height: 32px; - margin-top: 16px; - } - */ } - .card_body .bkg_box { - -webkit-transition-duration: 800ms; - transition-duration: 800ms; - overflow: hidden; - vertical-align: top; - z-index: -1; } - .card_body .bkg_box > svg { - position: relative; } - .card_body .flex_wrap_center { - display: -webkit-box; - display: -ms-flexbox; - display: flex; - -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; - -webkit-box-pack: center; - -ms-flex-pack: center; - justify-content: center; - height: 100%; } - .card_body .flex_content { - position: relative; - padding: 64px 64px 24px 64px; - border: 1px solid #FFF; - background-color: #F5F5F5; - z-index: 40; } - .card_body h1 { - margin: 16px 0; - color: #1E1E1E; - font-size: 24px; - line-height: 1.4em; - font-weight: normal; } - .card_body p, .card_body .block__column_2, .card_body .block__column_3, .card_body caption { - margin-top: 0; - margin-bottom: 16px; - font-size: 12px; - line-height: 1.4em; } - .card_body .marked { - padding-left: 1em; - text-indent: -1em; - text-align: center; } - .card_body .marked::before { - content: "* "; } - .card_body .decent { - color: #666; } - .card_body a { - color: #000; - text-decoration: none; } - .card_body a:hover { - color: #F4F9FA; - background-color: #0C85FF; - text-decoration: none; } - -.wip, .wip_txt { - border-right: 8px solid rgba(220, 20, 60, 0.8); - background-color: rgba(220, 20, 60, 0.1) !important; } - -.wip::before, .wip::after { - content: ""; - display: block; - height: 48px; } - -.exp_expose_pre::after { - content: ""; - display: block; - height: 48px; - background-color: rgba(183, 224, 240, 0.1) !important; } - -.exp_expose_post::before { - content: ""; - display: block; - height: 48px; - background-color: rgba(183, 224, 240, 0.1) !important; } - -.exp_expose::before, .exp_expose::after { - content: ""; - display: block; - height: 48px; - background-color: rgba(183, 224, 240, 0.1) !important; } - -.exp_pop { - display: none; } - -.exp_wrap { - position: relative; } - -.exp_pop { - position: absolute; - z-index: 100; - top: 128px; - left: 128px; - padding: 4px; - border: 4px solid gray; - border-radius: 4px; - background-color: gray; - pointer-events: none; } - -.exp_marker_pop { - position: absolute; - top: -12.75px; - right: -8.5px; - width: 17px; - height: 17px; - border: 1px solid white; - border-radius: 17px; - color: white; - background-color: black; } - -.exp_overlay_btn { - position: fixed; - width: 3em; - height: 2em; - cursor: pointer; } - -.exp_help_btn { - display: table; - right: 16px; - bottom: 16px; - background-color: rgba(0, 0, 0, 0.4); } - .exp_help_btn:hover { - background-color: white; } - .exp_help_btn:hover > .span__solo { - color: black; } - .exp_help_btn .span__solo { - display: table-cell; - color: rgba(255, 255, 255, 0.8); - font-family: Courier New, monospace; - font-size: 1.4em; - text-align: center; - vertical-align: middle; } - -.expose_height { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - background-color: rgba(183, 224, 240, 0.1) !important; - -webkit-transition: height 0.5s ease; - transition: height 0.5s ease; } - -.print_body *[class^="din"] { - background-color: white; } - -.print_body { - font-size: 10pt; - margin: 10vh 20vw; } -@page { - .print_body { - size: A4; - margin: 1.2cm; } } -@page :first { - .print_body { - size: A4; - margin: 0; } } - .print_body .dina4 { - padding-top: 1.2cm; - padding-right: 1.2cm; - padding-bottom: 1.2cm; - padding-left: 2.4cm; } - .print_body .dina4 .page_head, .print_body .dina4 .page_foot { - right: 1.2cm; - left: 2.4cm; } - .print_body .dina4 .page_head { - top: 1.2cm; } - .print_body .dina4 .page_foot { - bottom: 1.2cm; } - .print_body .dina5 { - padding-top: 0; - padding-right: 0; - padding-bottom: 0; - padding-left: 1.2cm; } - .print_body .dina5 .page_head, .print_body .dina5 .page_foot { - right: 0; - left: 1.2cm; } - .print_body .dina5 .page_head { - top: 0; } - .print_body .dina5 .page_foot { - bottom: 0; } - .print_body .dina6 { - padding-top: 0; - padding-right: 0; - padding-bottom: 0; - padding-left: 1.2cm; } - .print_body .dina6 .page_head, .print_body .dina6 .page_foot { - right: 0; - left: 1.2cm; } - .print_body .dina6 .page_head { - top: 0; } - .print_body .dina6 .page_foot { - bottom: 0; } - .print_body *[class^="din"] { - position: relative; - overflow: auto; - margin: 32px auto; } - .print_body *[class^="din"] .page_head, .print_body *[class^="din"] .page_foot { - position: absolute; } - .print_body *[class^="din"] .page_head { - page: cover; } - .print_body *[class^="din"] .page_foot { - display: -webkit-box; - display: -ms-flexbox; - display: flex; - -webkit-box-orient: horizontal; - -webkit-box-direction: normal; - -ms-flex-direction: row; - flex-direction: row; } - .print_body *[class^="din"] .page_foot *:last-child { - margin-bottom: 0; } - .print_body *[class^="din"] .page_foot p, .print_body *[class^="din"] .page_foot .block__column_2, .print_body *[class^="din"] .page_foot .block__column_3, .print_body *[class^="din"] .page_foot caption { - -webkit-box-flex: 1; - -ms-flex: 1 0 auto; - flex: 1 0 auto; - margin: 0; - font-size: 8pt; - line-height: 10pt; - text-align: center; } - .print_body *[class^="din"] .page_foot .page_no { - -webkit-box-flex: 1; - -ms-flex: 1 0 auto; - flex: 1 0 auto; - font-size: 20pt; - line-height: 1; - text-align: right; } - .print_body *[class^="din"] .page_foot p:first-child, .print_body *[class^="din"] .page_foot .block__column_2:first-child, .print_body *[class^="din"] .page_foot .block__column_3:first-child, .print_body *[class^="din"] .page_foot caption:first-child { - text-align: left; } - .print_body *[class^="din"] .page_content { - margin-top: 10cm; - margin-bottom: 2cm; } - .print_body .page_title, .print_body .page_date { - font-size: 14pt; } - .print_body .page_title { - margin: 0; } - .print_body .page_date, .print_body .page_no { - float: right; } - .print_body .page_author { - position: absolute; - top: 5cm; - right: 0; - text-align: right; } - .print_body .page_recipient { - position: absolute; - top: 5cm; - left: 0; } - -.demo__intro { - border-top-width: 8px; - border-top-style: solid; - border-color: black; - padding-top: 32px; } - -.demo__header { - padding: 16px; } - .demo__header nav ul { - margin: 0; } - -.header__fancy { - background-color: rgba(211, 10, 81, 0.6); } - .header__fancy nav a { - background-color: rgba(250, 216, 3, 0.6); - color: #fad803; } - .header__fancy nav a:active, .header__fancy nav a:focus, .header__fancy nav a:hover { - background-color: rgba(255, 255, 255, 0.2); - color: white; } - -.header__fix { - position: relative; - top: 0; - left: 0; - width: 100%; - background-color: rgba(39, 63, 139, 0.6); } - .header__fix nav a:active, .header__fix nav a:focus, .header__fix nav a:hover { - background-color: rgba(255, 255, 255, 0.2); - color: white; } - -.demo__footer { - width: 100%; - padding: 16px 0; - background-color: #333333; - color: #cccccc; } - .demo__footer nav a { - color: white; } - -.demo__avatar img { - opacity: 1; - width: 128px; - height: auto; - min-width: 128px; - min-height: 128px; - border-radius: 50%; - background-color: #b7e0f0; } - -.demo__flag { - height: 40vh; } - -.demo__credits { - margin: 32px 0 8px 0; } - -.demo__button_32 { - width: 32px; - height: 32px; } - -.demo__queries > p, .demo__queries > .block__column_2, .demo__queries > .block__column_3, .demo__queries > caption { - padding: calc(8px - 3px) 8px; } - -.query__phoneUp { - background-color: rgba(0, 0, 0, 0.2); } - -@media (max-width: 767px) { - .query__phoneOnly { - background-color: rgba(0, 0, 0, 0.2); } } - -@media (min-width: 768px) and (max-width: 1023px) { - .query__tabletPortaitOnly { - background-color: rgba(0, 0, 0, 0.2); } } - -@media (min-width: 768px) { - .query__tabletPortraitUp { - background-color: rgba(0, 0, 0, 0.2); } } - -@media (min-width: 1024px) and (max-width: 1279px) { - .query__tabletLandscapeOnly { - background-color: rgba(0, 0, 0, 0.2); } } - -@media (min-width: 1024px) { - .query__tabletLandscapeUp { - background-color: rgba(0, 0, 0, 0.2); } } - -@media (min-width: 1280px) and (max-width: 1679px) { - .query__desktopOnly { - background-color: rgba(0, 0, 0, 0.2); } } - -@media (min-width: 1280px) { - .query__desktopUp { - background-color: rgba(0, 0, 0, 0.2); } } - -@media (min-width: 1680px) { - .query__bigDesktopUp { - background-color: rgba(0, 0, 0, 0.2); } } - -.demo__query_example { - margin-bottom: 32px; - padding: 32px; - text-align: center; } - @media (min-width: 48em) { - .demo__query_example { - background-color: #fad803; } } - @media (min-width: 64em) { - .demo__query_example { - background-color: #d30a51; } } - @media (min-width: 80em) { - .demo__query_example { - background-color: #273f8b; } } - @media (min-width: 90em) { - .demo__query_example { - background-color: #b7e0f0; } } - @media (min-width: 105em) { - .demo__query_example { - background-color: #52bed1; } } - @media (min-width: 120em) { - .demo__query_example { - background-color: #0c85ff; } } - .demo__query_example:after { - content: '< 768px'; - padding: calc(8px - 3px) 8px; - border-radius: 2px; - background-color: rgba(0, 0, 0, 0.2); } - @media (min-width: 48em) { - .demo__query_example:after { - content: '768px'; } } - @media (min-width: 64em) { - .demo__query_example:after { - content: '1024px'; } } - @media (min-width: 80em) { - .demo__query_example:after { - content: '1280px'; } } - @media (min-width: 105em) { - .demo__query_example:after { - content: '1680px'; } } - @media (min-width: 120em) { - .demo__query_example:after { - content: '1920px'; } } - -.wrap { - display: -webkit-box; - display: -ms-flexbox; - display: flex; - height: 100%; - -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; - -webkit-box-pack: center; - -ms-flex-pack: center; - justify-content: center; } - -.hello { - -webkit-box-flex: 0; - -ms-flex: 0 1 auto; - flex: 0 1 auto; - padding: 1em 5em; - background-color: rgba(0, 0, 0, 0.25); } - -.test li::after { - content: ""; - display: block; - height: 16px; } - -.front_color_1 { - color: #fad803; } - .front_color_1::after { - background-color: #fad803; } - -.front_color_2 { - color: #d30a51; } - .front_color_2::after { - background-color: #d30a51; } - -.front_color_3 { - color: #273f8b; } - .front_color_3::after { - background-color: #273f8b; } - -.front_color_4 { - color: #b7e0f0; } - .front_color_4::after { - background-color: #b7e0f0; } - -.front_color_5 { - color: #52bed1; } - .front_color_5::after { - background-color: #52bed1; } - -.back_color_1, .label_1 { - background-color: #fad803; } - -.back_color_2, .label_2 { - background-color: #d30a51; } - -.back_color_3, .label_3 { - background-color: #273f8b; } - -.back_color_4 { - background-color: #b7e0f0; } - -.back_color_5 { - background-color: #52bed1; } - -.label_1, .label_2, .label_3 { - padding: 0 4px; } - - +@charset "UTF-8"; +/* + * # TABLE OF CONTENTS + * + * - Reset + * - Global functions and mixins + * - Configuration + * - Special modules + * - Basic styles + * - Common + * - Typography + * + * - Sections + * - Grouping + * - Textlevel + * - Embedded + * - Tables + * - Interactive + * - Modules + * + */ +@import url(../../vendor/normalize.css); +.sym_glass::before { + content: ""; } + +.sym_music::before { + content: ""; } + +.sym_search::before { + content: ""; } + +.sym_envelope-o::before { + content: ""; } + +.sym_heart::before { + content: ""; } + +a[href]:focus { + outline: 0; } + +area[href]:focus { + outline: 0; } + +button:not([disabled]):focus { + outline: 0; } + +input:not([disabled]):focus { + outline: 0; } + +select:not([disabled]):focus { + outline: 0; } + +textarea:not([disabled]):focus { + outline: 0; } + +*[tabindex]:focus { + outline: 0; } + +/** + * @description + * Generates cross-browser-compatible output for a given element with its value. + * + * @author sthag + * + * @param values + * @returns + * -webkit-: + * ...-: + * + * @example + * .selector + * @include vendor-prefix(hyphens, auto) + */ +.magic { + display: none; } + +.center_50 { + margin-right: 25%; + margin-left: 25%; } + +.center_25 { + margin-right: 37.5%; + margin-left: 37.5%; } + +.width_full, .table__file_simple { + width: 100%; + margin-right: 0; + margin-left: 0; } + +.height_basic { + height: 1024px; } + +.height_full { + height: 100vh; } + +.txt_center { + text-align: center !important; } + +.txt_right { + text-align: right !important; } + +.txt_left { + text-align: left !important; } + +.space_right { + margin-right: 32px; } + +.clear { + clear: both; } + .clear::before, .clear::after { + clear: both; } + +.overflow, .nav__horizontal ul, .nav__center_old ul, .header__page nav ul { + overflow: auto; } + +.float_space_left, .list__horizontal li, .box__inline_left, .box__file_tile, .nav__horizontal ul li, .nav__center_old ul li, .header__page nav ul li { + float: left; + margin-right: 32px; } + +.float_half_size { + float: left; + width: 50%; } + +.x_long { + overflow-x: scroll; } + +.pos_full_view, .hover_full_view_change { + position: fixed; + top: 0; + left: 0; + width: 100vw; + height: 100vh; } + +.pos_full_page { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; } + +.pos_abs { + position: absolute; } + +.pos_rel { + position: relative; } + +.pos_fix { + position: fixed; } + +.pos_bottom { + bottom: 0; } + +.pos_full_view { + background-color: rgba(250, 216, 3, 0.5); } + +.pos_full_page { + background-color: rgba(39, 63, 139, 0.25); } + +.hover_back_change { + background-color: #666666; + -webkit-transition: background-color .2s ease-in-out; + transition: background-color .2s ease-in-out; } + .hover_back_change:hover { + background-color: gray; } + +.hover_full_view_change { + z-index: 100; + background-color: rgba(0, 0, 0, 0.5); + -webkit-transition: background-color .2s ease-in-out; + transition: background-color .2s ease-in-out; + pointer-events: none; } + +.flex, .flex__wrap, .flex__row, .flex__column_wrap, .nav__column ul { + display: -webkit-box; + display: -ms-flexbox; + display: flex; } + +.flex__wrap { + -ms-flex-wrap: wrap; + flex-wrap: wrap; } + +.flex__row { + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + -webkit-box-pack: start; + -ms-flex-pack: start; + justify-content: flex-start; } + +.flex__child, .flex__column_wrap .column, .nav__column ul li { + -webkit-box-flex: 0; + -ms-flex: 0 1 auto; + flex: 0 1 auto; } + +.flex__child_one { + -webkit-box-flex: 1; + -ms-flex: 1; + flex: 1; } + +.flex__child_end { + -ms-flex-item-align: end; + align-self: flex-end; } + +.txt_light_color { + color: #666666; } + +.a__button, .a__button_text, .a__button_border { + display: inline-block; + padding: calc(8px - 3px) 8px; + background-color: rgba(82, 190, 209, 0.2); + border-radius: 1px; } + .a__button:active, .a__button_text:active, .a__button_border:active, .a__button:focus, .a__button_text:focus, .a__button_border:focus, .a__button:hover, .a__button_text:hover, .a__button_border:hover { + background-color: rgba(255, 255, 255, 0.1); + color: white; + border-color: transparent; } + +.span__solo, h6, p, .block__column_2, .block__column_3, caption, li, dt, dd, figcaption, th, td, legend, label { + font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; + font-size: 1em; + line-height: 1.5; } + +pre, code, .demo__query_example:after, .code__solo, input[type="color"], input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="email"], input[type="month"], input[type="number"], input[type="password"], input[type="search"], input[type="tel"], input[type="text"], input[type="time"], input[type="url"], input[type="week"], input:not([type]), textarea { + font-family: Courier New, monospace; + font-size: 1em; + line-height: 1.5; } + +.print_body *[class^="din"] p, .print_body *[class^="din"] .block__column_2, .print_body *[class^="din"] .block__column_3, .print_body *[class^="din"] caption { + font-family: Courier New, monospace; + font-size: 1em; + line-height: 1.5; } + +h1, .print_body .page_date, .print_body .page_no { + font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; + font-size: 3.1em; + font-weight: 300; + line-height: 1.5; } + +h2 { + font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; + font-size: 2.5em; + font-weight: 300; + line-height: 1.5; } + +h3, h4 { + font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; + font-size: 1.8em; + font-weight: 300; + line-height: 1.5; } + +h5 { + font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; + font-size: 1.35em; + font-weight: 300; + line-height: 1.5; } + +.span__solo { + color: black; } + +.table__link .cell__text .shorten { + overflow: hidden; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; } + +html { + height: 100%; } + +body { + position: relative; + -webkit-box-sizing: border-box; + box-sizing: border-box; + font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; + font-size: 17px; + line-height: 1; + color: black; + background-color: gray; } + body *, + body ::before, + body ::after { + -webkit-box-sizing: inherit; + box-sizing: inherit; } + body:hover .layer__hover { + background-color: transparent; } + +.sec__main_center, .demo__intro { + width: 96%; + margin: 0 auto; + padding-top: 32px; } + @media (min-width: 768px) { + .sec__main_center, .demo__intro { + width: 80%; } } + @media (min-width: 1024px) { + .sec__main_center, .demo__intro { + width: 60%; } } + @media (min-width: 1680px) { + .sec__main_center, .demo__intro { + width: 48%; } } + +aside.right + section { + margin-right: calc(20% + 8px); } +aside.left + section { + margin-left: calc(20% + 8px); } + +aside { + width: 20%; } + aside.left { + float: left; } + aside.right { + float: right; } + aside *:first-child { + margin-top: 0; } + +.header__page { + overflow: auto; } + +h1 { + margin: 128px 0 32px; } + +h2 { + margin: 64px 0 32px; } + +h3 { + margin: 16px 0 16px; + text-transform: uppercase; } + +h4 { + margin: 16px 0 16px; + text-transform: none; } + +h5 { + margin: 16px 0 8px; + text-transform: none; } + +h6 { + margin: 8px 0; + text-transform: none; + font-weight: bold; } + +p, .block__column_2, .block__column_3, caption { + margin: 8px 0; } + p code, .block__column_2 code, .block__column_3 code, caption code, p .demo__query_example:after, .block__column_2 .demo__query_example:after, .block__column_3 .demo__query_example:after, caption .demo__query_example:after { + padding: 1px 4px; + font-size: 1em; + line-height: 1; } + +hr, .hr__hidden, .hr__dotted { + margin: 32px auto; + border-width: 1px 0 0; + border-style: solid; + border-color: black; } + +.hr__hidden { + border-color: transparent; } + +.hr__dotted { + border-style: dotted; } + +.pre__code { + border-color: rgba(255, 255, 255, 0.1); + border-style: dotted; + border-width: 0 0 0 4px; + border-radius: 1px; + padding: 8px; + background-color: rgba(255, 255, 255, 0.1); } + .pre__code code, .pre__code .demo__query_example:after { + background-color: transparent; } + +blockquote { + margin: 8px 2em; } + +.quote__mark p::before, .quote__mark .block__column_2::before, .quote__mark .block__column_3::before, .quote__mark caption::before { + content: "\201E \0020"; } +.quote__mark p::after, .quote__mark .block__column_2::after, .quote__mark .block__column_3::after, .quote__mark caption::after { + content: "\201C \0020"; } +.quote__mark .quote__source::before, .quote__mark .quote__source::after { + content: ""; } + +dl, ul, ol { + margin: 16px 0 8px; } + +ul, ol { + padding-left: 2em; } + +dd { + margin-left: 2em; } + +ul li { + list-style: square; } + +.list__dash li { + list-style: none; + position: relative; } + .list__dash li::before { + content: "_"; + position: absolute; + left: -1em; } + +.list__link li { + margin-bottom: 2px; + text-transform: uppercase; } + .list__link li a { + display: block; + padding: calc(8px - 3px) 8px; + color: black; } + .list__link li a img { + margin-right: 8px; + padding-bottom: .2em; + vertical-align: text-bottom; } + .list__link li a:active, .list__link li a:focus, .list__link li a:hover { + background-color: #0c85ff; + color: white; } + +.list__horizontal { + overflow: auto; } + +figure { + margin: 16px 2em; } + +.box__info { + padding: 16px 2em; + border-right: 8px solid rgba(82, 190, 209, 0.6); + background-color: rgba(82, 190, 209, 0.1) !important; } + +.box__main_indent { + margin-left: 25%; } + +.block__column_line { + -webkit-column-rule: 1px solid black; + column-rule: 1px solid black; } + +.block__column_2 { + -webkit-column-count: 2; + column-count: 2; + -webkit-column-gap: 32px; + column-gap: 32px; } + +.block__column_3 { + -webkit-column-count: 3; + column-count: 3; + -webkit-column-gap: 64px; + column-gap: 64px; } + +.box__space { + position: relative; + width: 100%; } + +.box__cube { + float: left; + display: table; + width: 64px; + text-align: center; + vertical-align: middle; } + .box__cube span { + display: table-cell; } + +.box__placeholder { + width: 100%; + height: 64px; + border: 4px solid rgba(0, 0, 0, 0.1); + border-radius: 1px; + padding: 8px; + background-color: rgba(0, 0, 0, 0.1); } + .box__placeholder svg { + vertical-align: top; } + +.box__placeholder_bkg { + width: 100%; + height: 64px; + border: 4px solid rgba(0, 0, 0, 0.1); + border-radius: 1px; + padding: 8px; + /*data:[][;charset=][;base64],*/ + background: url("data:image/svg+xml;utf8,") no-repeat; + background-color: rgba(0, 0, 0, 0.1); } + +.flex__column_wrap .column { + -webkit-box-flex: 1; + -ms-flex-positive: 1; + flex-grow: 1; } + +a { + color: #52bed1; + text-decoration: none; } + a:active, a:focus, a:hover { + color: white; } + +.a__line { + border-bottom-width: 1px; + border-bottom-style: dotted; + border-color: black; + background-color: transparent; + color: black; + -webkit-transition: color 150ms ease; + transition: color 150ms ease; } + .a__line:active, .a__line:focus, .a__line:hover { + background-color: #0c85ff; + color: white; } + +.a__button_text, .a__button_border { + padding: calc(8px - 1px) calc(8px * 2); + background-color: transparent; + color: black; } + +.a__button_border { + border: 1px solid black; } + +i, em { + font-style: italic; } + +.i__bright { + font-style: normal; + color: white; } + +b, strong { + font-weight: 500; } + +cite { + font-style: italic; } + +code, .demo__query_example:after { + color: #1f1f1f; + background-color: rgba(255, 255, 255, 0.1); } + +.code__solo { + padding: 1px 4px; + color: black; } + +mark { + background-color: #fad803; } + +.mark__cursor { + color: white; + background-color: black; } + +::-moz-selection { + color: white; + background-color: black; } + +::selection { + color: white; + background-color: black; } + +img { + vertical-align: top; } + +table { + margin: 16px 0; + border: 1px solid black; + border-collapse: collapse; } + +th, td { + padding: 4px; } + +th { + border: 1px solid black; + text-align: left; } + +.precol { + border-right: 1px solid black; } + +td { + border-right: 1px solid black; + border-bottom: 1px solid black; } + +td:last-child { + border-right: 0; } + +tr:last-child td { + border-bottom: 0; } + +tfoot tr:first-child td { + border-top: 1px solid black; } + +.table__blank { + border: 1px solid transparent; } + .table__blank th, .table__blank td { + border: 1px solid transparent; } + +.table__free { + border: 1px solid transparent; } + +.table__stripe td { + border-top: 0; + border-bottom: 0; } +.table__stripe tr:nth-child(even) td { + background-color: rgba(255, 255, 255, 0.1); } + +.table__fix { + table-layout: fixed; } + +caption { + padding: 4px 0; + border: 1px dotted black; + text-align: center; } + +fieldset { + margin: 16px 0; + padding: 8px; + border: 1px solid black; } + +legend { + padding: 0 4px; } + +input, button, textarea { + margin: 0 32px; } + input[disabled="disabled"], input[disabled], button[disabled="disabled"], button[disabled], textarea[disabled="disabled"], textarea[disabled] { + cursor: not-allowed; } + +label input { + margin-left: 8px; } + +input { + color: #1a1a1a; } + input[disabled="disabled"], input[disabled] { + cursor: not-allowed; } + +input[type="color"], input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="email"], input[type="month"], input[type="number"], input[type="password"], input[type="search"], input[type="tel"], input[type="text"], input[type="time"], input[type="url"], input[type="week"], input:not([type]) { + border: 2px solid white; + padding: 4px; + background-color: #e6e6e6; } + input[type="color"]:hover, input[type="date"]:hover, input[type="datetime"]:hover, input[type="datetime-local"]:hover, input[type="email"]:hover, input[type="month"]:hover, input[type="number"]:hover, input[type="password"]:hover, input[type="search"]:hover, input[type="tel"]:hover, input[type="text"]:hover, input[type="time"]:hover, input[type="url"]:hover, input[type="week"]:hover, input:not([type]):hover { + background-color: white; } + input[type="color"][readonly="readonly"], input[type="color"][readonly], input[type="date"][readonly="readonly"], input[type="date"][readonly], input[type="datetime"][readonly="readonly"], input[type="datetime"][readonly], input[type="datetime-local"][readonly="readonly"], input[type="datetime-local"][readonly], input[type="email"][readonly="readonly"], input[type="email"][readonly], input[type="month"][readonly="readonly"], input[type="month"][readonly], input[type="number"][readonly="readonly"], input[type="number"][readonly], input[type="password"][readonly="readonly"], input[type="password"][readonly], input[type="search"][readonly="readonly"], input[type="search"][readonly], input[type="tel"][readonly="readonly"], input[type="tel"][readonly], input[type="text"][readonly="readonly"], input[type="text"][readonly], input[type="time"][readonly="readonly"], input[type="time"][readonly], input[type="url"][readonly="readonly"], input[type="url"][readonly], input[type="week"][readonly="readonly"], input[type="week"][readonly], input:not([type])[readonly="readonly"], input:not([type])[readonly] { + border-color: #b3b3b3; + background-color: #999999; } + input[type="color"][disabled="disabled"], input[type="color"][disabled], input[type="date"][disabled="disabled"], input[type="date"][disabled], input[type="datetime"][disabled="disabled"], input[type="datetime"][disabled], input[type="datetime-local"][disabled="disabled"], input[type="datetime-local"][disabled], input[type="email"][disabled="disabled"], input[type="email"][disabled], input[type="month"][disabled="disabled"], input[type="month"][disabled], input[type="number"][disabled="disabled"], input[type="number"][disabled], input[type="password"][disabled="disabled"], input[type="password"][disabled], input[type="search"][disabled="disabled"], input[type="search"][disabled], input[type="tel"][disabled="disabled"], input[type="tel"][disabled], input[type="text"][disabled="disabled"], input[type="text"][disabled], input[type="time"][disabled="disabled"], input[type="time"][disabled], input[type="url"][disabled="disabled"], input[type="url"][disabled], input[type="week"][disabled="disabled"], input[type="week"][disabled], input:not([type])[disabled="disabled"], input:not([type])[disabled] { + border-color: transparent; } + +textarea { + border: 2px solid white; + padding: 4px; + background-color: #e6e6e6; } + textarea:hover { + background-color: white; } + textarea[readonly="readonly"], textarea[readonly] { + border-color: #b3b3b3; + background-color: #999999; } + textarea[disabled="disabled"], textarea[disabled] { + border-color: transparent; } + +input[type="color"] { + line-height: 1; } + +input[type="date"] { + line-height: 1; } + +input[type="datetime"] { + line-height: 1; } + +input[type="datetime-local"] { + line-height: 1; } + +input[type="email"] { + line-height: 1; } + +input[type="month"] { + line-height: 1; } + +input[type="number"] { + line-height: 1; } + +input[type="password"] { + line-height: 1; } + +input[type="search"] { + line-height: 1; } + +input[type="tel"] { + line-height: 1; } + +input[type="text"] { + line-height: 1; } + +input[type="time"] { + line-height: 1; } + +input[type="url"] { + line-height: 1; } + +input[type="week"] { + line-height: 1; } + +input:not([type]) { + line-height: 1; } + +button { + padding: calc(8px - 3px) 8px; } + +input[type="button"] { + padding: calc(8px - 3px) 8px; } + +input[type="reset"] { + padding: calc(8px - 3px) 8px; } + +input[type="submit"] { + padding: calc(8px - 3px) 8px; } + +label + input, +.input__label_right { + margin: 0 8px; } + +.label__table, .input__default label { + display: table; } + .label__table input, .input__default label input { + display: table-cell; } + +.input__default label { + margin: 4px 0; } + .input__default label input { + padding: 4px 5px; + border-style: solid; + border-color: transparent; + background-color: #e6e6e6; + color: #1a1a1a; } + .input__default label input:hover { + background-color: black; + color: white; } + +nav ul { + padding-left: 0; } +nav li { + margin-bottom: 8px; + list-style: none; } + +.nav__horizontal ul ul, .nav__center_old ul ul, .header__page nav ul ul { + margin: 8px 0; } +.nav__horizontal ul li, .nav__center_old ul li, .header__page nav ul li { + margin-right: 8px; + margin-bottom: 0; } + .nav__horizontal ul li:last-child, .nav__center_old ul li:last-child, .header__page nav ul li:last-child { + margin-right: 0; } + +.nav__right { + float: right; + margin-left: 8px; } + .nav__right .align_parent { + margin-right: -8px; } + +.nav__separate li { + position: relative; + padding-left: 1px; } + .nav__separate li:not(:first-child)::before { + content: ""; + position: absolute; + width: 1px; + height: 100%; + left: 0; + top: 0; + background-color: black; } + +.nav__separate_right { + float: right; } + .nav__separate_right li { + position: relative; } + .nav__separate_right li:first-child { + padding-left: 17px; } + .nav__separate_right li:first-child::before { + content: ""; + position: absolute; + width: 1px; + height: 100%; + left: 0; + top: 0; + background-color: white; + margin: 0 8px; } + +.nav__center_old { + float: right; + position: relative; + left: -50%; } + .nav__center_old ul { + position: relative; + left: 50%; + text-align: center; } + +.nav__column { + position: relative; + margin: 8px 0; } + .nav__column ul { + margin: 0 128px; } + .nav__column ul li { + -webkit-box-flex: 1; + -ms-flex-positive: 1; + flex-grow: 1; + margin: 0; + text-align: center; } + .nav__column ul li a { + display: block; } + +.nav__page_meta { + position: fixed; + right: 0; + bottom: 16px; } + .nav__page_meta ul { + margin: 8px 0; } + .nav__page_meta li { + margin-bottom: 0; } + .nav__page_meta .a_button_meta { + display: inline-block; } + .nav__page_meta .a_button_meta:active, .nav__page_meta .a_button_meta:focus { + background-color: transparent; } + .nav__page_meta .a_button_meta:hover { + background-color: #0c85ff; } + +.header__page nav a:active, .header__page nav a:focus, .header__page nav a:hover { + background-color: rgba(0, 0, 0, 0.2); + color: black; } + +.table__link { + width: 100%; + border: 0; + table-layout: auto; } + .table__link tbody { + border-bottom: 1px solid black; } + .table__link tbody:hover { + background-color: #cccccc; } + .table__link th, .table__link td { + border: 0; } + .table__link .cell__icon { + width: 48px; + text-align: center; } + .table__link .cell__icon img { + vertical-align: text-top; } + .table__link .cell__link { + padding-right: 8px; + padding-left: 8px; } + .table__link .cell__link:hover { + background-color: #0c85ff; } + .table__link .cell__link:hover a:first-child { + display: none; } + .table__link .cell__link:hover a:last-child { + display: block; + color: white; } + .table__link .cell__link a { + display: block; } + .table__link .cell__link a:last-child { + display: none; } + .table__link th:last-child, .table__link .cell__date { + width: 16%; + text-align: center; } + .table__link .cell__text { + padding-right: 8px; + padding-left: 8px; } + .table__link .cell__text div { + width: 100%; } + .table__link .cell__text .shorten { + max-height: 44px; } + +.card_body .bkg_box { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; } + +.card_body { + height: 100%; + /* .full { + position: absolute; + width: 128px; + height: 128px; + top: 16px; + left: 16px; + background-color: #fff; + } + .mark { + float: left; + width: 32px; + height: 32px; + margin-top: 16px; + } + */ } + .card_body .bkg_box { + -webkit-transition-duration: 800ms; + transition-duration: 800ms; + overflow: hidden; + vertical-align: top; + z-index: -1; } + .card_body .bkg_box > svg { + position: relative; } + .card_body .flex_wrap_center { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; + height: 100%; } + .card_body .flex_content { + position: relative; + padding: 64px 64px 24px 64px; + border: 1px solid #FFF; + background-color: #F5F5F5; + z-index: 40; } + .card_body h1 { + margin: 16px 0; + color: #1E1E1E; + font-size: 24px; + line-height: 1.4em; + font-weight: normal; } + .card_body p, .card_body .block__column_2, .card_body .block__column_3, .card_body caption { + margin-top: 0; + margin-bottom: 16px; + font-size: 12px; + line-height: 1.4em; } + .card_body .marked { + padding-left: 1em; + text-indent: -1em; + text-align: center; } + .card_body .marked::before { + content: "* "; } + .card_body .decent { + color: #666; } + .card_body a { + color: #000; + text-decoration: none; } + .card_body a:hover { + color: #F4F9FA; + background-color: #0C85FF; + text-decoration: none; } + +.wip, .wip_txt { + border-right: 8px solid rgba(220, 20, 60, 0.8); + background-color: rgba(220, 20, 60, 0.1) !important; } + +.wip::before, .wip::after { + content: ""; + display: block; + height: 48px; } + +.exp_expose_pre::after { + content: ""; + display: block; + height: 48px; + background-color: rgba(183, 224, 240, 0.1) !important; } + +.exp_expose_post::before { + content: ""; + display: block; + height: 48px; + background-color: rgba(183, 224, 240, 0.1) !important; } + +.exp_expose::before, .exp_expose::after { + content: ""; + display: block; + height: 48px; + background-color: rgba(183, 224, 240, 0.1) !important; } + +.exp_pop { + display: none; } + +.exp_wrap { + position: relative; } + +.exp_pop { + position: absolute; + z-index: 100; + top: 128px; + left: 128px; + padding: 4px; + border: 4px solid gray; + border-radius: 4px; + background-color: gray; + pointer-events: none; } + +.exp_marker_pop { + position: absolute; + top: -12.75px; + right: -8.5px; + width: 17px; + height: 17px; + border: 1px solid white; + border-radius: 17px; + color: white; + background-color: black; } + +.exp_overlay_btn { + position: fixed; + width: 3em; + height: 2em; + cursor: pointer; } + +.exp_help_btn { + display: table; + right: 16px; + bottom: 16px; + background-color: rgba(0, 0, 0, 0.4); } + .exp_help_btn:hover { + background-color: white; } + .exp_help_btn:hover > .span__solo { + color: black; } + .exp_help_btn .span__solo { + display: table-cell; + color: rgba(255, 255, 255, 0.8); + font-family: Courier New, monospace; + font-size: 1.4em; + text-align: center; + vertical-align: middle; } + +.expose_height { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + background-color: rgba(183, 224, 240, 0.1) !important; + -webkit-transition: height 0.5s ease; + transition: height 0.5s ease; } + +.print_body [class^="din"] { + background-color: white; } + +.print_body { + font-size: 10pt; + margin: 10vh 20vw; } +@page { + .print_body { + size: A4; + margin: 1.2cm; } } +@page :first { + .print_body { + size: A4; + margin: 0; } } + .print_body .dina4 { + padding-top: 1.2cm; + padding-right: 1.2cm; + padding-bottom: 1.2cm; + padding-left: 2.4cm; } + .print_body .dina4 .page_head, .print_body .dina4 .page_foot { + right: 1.2cm; + left: 2.4cm; } + .print_body .dina4 .page_head { + top: 1.2cm; } + .print_body .dina4 .page_foot { + bottom: 1.2cm; } + .print_body .dina5 { + padding-top: 0; + padding-right: 0; + padding-bottom: 0; + padding-left: 1.2cm; } + .print_body .dina5 .page_head, .print_body .dina5 .page_foot { + right: 0; + left: 1.2cm; } + .print_body .dina5 .page_head { + top: 0; } + .print_body .dina5 .page_foot { + bottom: 0; } + .print_body .dina6 { + padding-top: 0; + padding-right: 0; + padding-bottom: 0; + padding-left: 1.2cm; } + .print_body .dina6 .page_head, .print_body .dina6 .page_foot { + right: 0; + left: 1.2cm; } + .print_body .dina6 .page_head { + top: 0; } + .print_body .dina6 .page_foot { + bottom: 0; } + .print_body *[class^="din"] { + position: relative; + overflow: auto; + margin: 32px auto; } + .print_body *[class^="din"] .page_head, .print_body *[class^="din"] .page_foot { + position: absolute; } + .print_body *[class^="din"] .page_head { + page: cover; } + .print_body *[class^="din"] .page_foot { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-direction: row; + flex-direction: row; } + .print_body *[class^="din"] .page_foot *:last-child { + margin-bottom: 0; } + .print_body *[class^="din"] .page_foot p, .print_body *[class^="din"] .page_foot .block__column_2, .print_body *[class^="din"] .page_foot .block__column_3, .print_body *[class^="din"] .page_foot caption { + -webkit-box-flex: 1; + -ms-flex: 1 0 auto; + flex: 1 0 auto; + margin: 0; + font-size: 8pt; + line-height: 10pt; + text-align: center; } + .print_body *[class^="din"] .page_foot .page_no { + -webkit-box-flex: 1; + -ms-flex: 1 0 auto; + flex: 1 0 auto; + font-size: 20pt; + line-height: 1; + text-align: right; } + .print_body *[class^="din"] .page_foot p:first-child, .print_body *[class^="din"] .page_foot .block__column_2:first-child, .print_body *[class^="din"] .page_foot .block__column_3:first-child, .print_body *[class^="din"] .page_foot caption:first-child { + text-align: left; } + .print_body *[class^="din"] .page_content { + margin-top: 10cm; + margin-bottom: 2cm; } + .print_body .page_title, .print_body .page_date { + font-size: 14pt; } + .print_body .page_title { + margin: 0; } + .print_body .page_date, .print_body .page_no { + float: right; } + .print_body .page_author { + position: absolute; + top: 5cm; + right: 0; + text-align: right; } + .print_body .page_recipient { + position: absolute; + top: 5cm; + left: 0; } + +.demo__intro { + border-top-width: 8px; + border-top-style: solid; + border-color: black; + padding-top: 32px; } + +.demo__header { + padding: 16px; } + .demo__header nav ul { + margin: 0; } + +.header__fancy { + background-color: rgba(211, 10, 81, 0.6); } + .header__fancy nav a { + background-color: rgba(250, 216, 3, 0.6); + color: #fad803; } + .header__fancy nav a:active, .header__fancy nav a:focus, .header__fancy nav a:hover { + background-color: rgba(255, 255, 255, 0.2); + color: white; } + +.header__fix { + position: relative; + top: 0; + left: 0; + width: 100%; + background-color: rgba(39, 63, 139, 0.6); } + .header__fix nav a:active, .header__fix nav a:focus, .header__fix nav a:hover { + background-color: rgba(255, 255, 255, 0.2); + color: white; } + +.demo__footer { + width: 100%; + padding: 16px 0; + background-color: #333333; + color: #cccccc; } + .demo__footer nav a { + color: white; } + +.demo__avatar img { + opacity: 1; + width: 128px; + height: auto; + min-width: 128px; + min-height: 128px; + border-radius: 50%; + background-color: #b7e0f0; } + +.demo__flag { + height: 40vh; } + +.demo__credits { + margin: 32px 0 8px 0; } + +.demo__button_32 { + width: 32px; + height: 32px; } + +.demo__queries > p, .demo__queries > .block__column_2, .demo__queries > .block__column_3, .demo__queries > caption { + padding: calc(8px - 3px) 8px; } + +.query__phoneUp { + background-color: rgba(0, 0, 0, 0.2); } + +@media (max-width: 767px) { + .query__phoneOnly { + background-color: rgba(0, 0, 0, 0.2); } } + +@media (min-width: 768px) and (max-width: 1023px) { + .query__tabletPortaitOnly { + background-color: rgba(0, 0, 0, 0.2); } } + +@media (min-width: 768px) { + .query__tabletPortraitUp { + background-color: rgba(0, 0, 0, 0.2); } } + +@media (min-width: 1024px) and (max-width: 1279px) { + .query__tabletLandscapeOnly { + background-color: rgba(0, 0, 0, 0.2); } } + +@media (min-width: 1024px) { + .query__tabletLandscapeUp { + background-color: rgba(0, 0, 0, 0.2); } } + +@media (min-width: 1280px) and (max-width: 1679px) { + .query__desktopOnly { + background-color: rgba(0, 0, 0, 0.2); } } + +@media (min-width: 1280px) { + .query__desktopUp { + background-color: rgba(0, 0, 0, 0.2); } } + +@media (min-width: 1680px) { + .query__bigDesktopUp { + background-color: rgba(0, 0, 0, 0.2); } } + +.demo__query_example { + margin-bottom: 32px; + padding: 32px; + text-align: center; } + @media (min-width: 48em) { + .demo__query_example { + background-color: #fad803; } } + @media (min-width: 64em) { + .demo__query_example { + background-color: #d30a51; } } + @media (min-width: 80em) { + .demo__query_example { + background-color: #273f8b; } } + @media (min-width: 90em) { + .demo__query_example { + background-color: #b7e0f0; } } + @media (min-width: 105em) { + .demo__query_example { + background-color: #52bed1; } } + @media (min-width: 120em) { + .demo__query_example { + background-color: #0c85ff; } } + .demo__query_example:after { + content: '< 768px'; + padding: calc(8px - 3px) 8px; + border-radius: 2px; + background-color: rgba(0, 0, 0, 0.2); } + @media (min-width: 48em) { + .demo__query_example:after { + content: '768px'; } } + @media (min-width: 64em) { + .demo__query_example:after { + content: '1024px'; } } + @media (min-width: 80em) { + .demo__query_example:after { + content: '1280px'; } } + @media (min-width: 105em) { + .demo__query_example:after { + content: '1680px'; } } + @media (min-width: 120em) { + .demo__query_example:after { + content: '1920px'; } } + +.wrap { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + height: 100%; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-pack: center; + -ms-flex-pack: center; + justify-content: center; } + +.hello { + -webkit-box-flex: 0; + -ms-flex: 0 1 auto; + flex: 0 1 auto; + padding: 1em 5em; + background-color: rgba(0, 0, 0, 0.25); } + +.test li::after { + content: ""; + display: block; + height: 16px; } + +.front_color_1 { + color: #fad803; } + .front_color_1::after { + background-color: #fad803; } + +.front_color_2 { + color: #d30a51; } + .front_color_2::after { + background-color: #d30a51; } + +.front_color_3 { + color: #273f8b; } + .front_color_3::after { + background-color: #273f8b; } + +.front_color_4 { + color: #b7e0f0; } + .front_color_4::after { + background-color: #b7e0f0; } + +.front_color_5 { + color: #52bed1; } + .front_color_5::after { + background-color: #52bed1; } + +.back_color_1, .label_1 { + background-color: #fad803; } + +.back_color_2, .label_2 { + background-color: #d30a51; } + +.back_color_3, .label_3 { + background-color: #273f8b; } + +.back_color_4 { + background-color: #b7e0f0; } + +.back_color_5 { + background-color: #52bed1; } + +.label_1, .label_2, .label_3 { + padding: 0 4px; } + + diff --git a/build/js/all.min.js b/build/js/all.min.js index ae076c6..b7f3b70 100644 --- a/build/js/all.min.js +++ b/build/js/all.min.js @@ -1,4 +1,4 @@ var w=Math.max(document.documentElement.clientWidth,window.innerWidth||0),h=Math.max(document.documentElement.clientHeight,window.innerHeight||0),full_view_hover=!0,doc_pos_y=0,basic_ease=600,scroll_y_margin=h; function setup(){$("#js_tph").length&&full_view_hover&&$("#js_tph").addClass("hover_full_view_change")}function Utils(){}function scrollNav(){$(".nav a").click(function(){$(".active").removeClass("active"),$(this).closest("li").addClass("active");var t=$(this).attr("class");return $("."+t).parent("li").addClass("active"),$("html, body").stop().animate({scrollTop:$($(this).attr("href")).offset().top-160},400),!1}),$(".scrollTop a").scrollTop()}Utils.prototype={constructor:Utils,isElementInView:function(t,s){var l=$(window).scrollTop(),o=l+$(window).height(),i=$(t).offset().top,e=i+$(t).height();return!0===s?le:i<=o&&e>=l}};var Utils=new Utils; $(document).ready(function(){setup();var e=!1;$(".js_pop").hover(function(){$(this);$(this).attr("emmet"),$(this).next(".exp_pop").show()},function(){$(this).next(".exp_pop").hide()}).mousemove(function(e){$(this).next(".exp_pop").css({top:e.pageY-$(this).next(".exp_pop").outerHeight()-4,left:e.pageX+8})}),$(".exp_help_btn").click(function(t){var s,o;1!=e?(e=!0,$(".js_pop").each(function(e,t){"static"==$(this).css("position")&&($(this).addClass("js_changed_pos"),$(this).css("position","relative")),o=$(this).next(".exp_pop").detach(),(s=$(this).wrap('').parent().prepend('')).after(o)})):($(".js_pop").each(function(e,t){s=$(this).parent(".exp_wrap"),o=s.next(".exp_pop").detach(),s.find(".exp_marker_pop").remove(),$(this).unwrap(".exp_wrap"),$(this).after(o),$(this).hasClass("js_changed_pos")&&($(this).css("position",""),""==$(this).attr("style")&&$(this).removeAttr("style"),$(this).removeClass("js_changed_pos"))}),e=!1),console.log("Explanation mode: "+e)}),$("#js_scrolltop").click(function(e){console.log("scroll to the top"),e.preventDefault(),$("body").animate({scrollTop:0},basic_ease,function(){console.log("arrived at top")})}),$("#js_scrolldown").click(function(e){console.log("scroll down"),e.preventDefault(),$("body").animate({scrollTop:$(document).height()},2*basic_ease,function(){console.log("arrived at bottom")})}),$("#gameIcon").click(function(e){e.preventDefault(),$(this).clone().appendTo("#gameDetail"),$(this).siblings().clone().appendTo("#gameDetail"),$("#gameDetail").removeClass("magic")});var t=0;$(".pass-def dd").each(function(){$(this).find("li").each(function(e){if(0==$(this).children("ul").length){var s=$(this).html();$(this).html(s+''+t+""),t++}})})}),$(document).scroll(function(){doc_pos_y=$(document).scrollTop();var e=scroll_y_margin;doc_pos_y>e?$("#js_scrolltop").parent().removeClass("magic"):$("#js_scrolltop").parent().addClass("magic")}); -//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["variables.js","functions.js","global.js"],"names":["w","Math","max","document","documentElement","clientWidth","window","innerWidth","h","clientHeight","innerHeight","full_view_hover","doc_pos_y","basic_ease","scroll_y_margin","setup","$","length","addClass","Utils","scrollNav","click","removeClass","this","closest","theClass","attr","parent","stop","animate","scrollTop","offset","top","prototype","constructor","isElementInView","element","fullyInView","pageTop","pageBottom","height","elementTop","elementBottom","ready","exp_mode","hover","next","show","hide","mousemove","ev","css","pageY","outerHeight","left","pageX","e","$wrap","$pop","each","i","detach","wrap","prepend","after","find","remove","unwrap","hasClass","removeAttr","console","log","event","preventDefault","clone","appendTo","siblings","index","children","tempContent","html","scroll"],"mappings":"AAAA,IAAIA,EAAIC,KAAKC,IAAIC,SAASC,gBAAgBC,YAAaC,OAAOC,YAAc,GACxEC,EAAIP,KAAKC,IAAIC,SAASC,gBAAgBK,aAAcH,OAAOI,aAAe,GAE1EC,iBAAkB,EAElBC,UAAY,EACZC,WAAa,IACbC,gBAAkBN;ACPtB,SAASO,QACLC,EAAE,WAAWC,QAAUN,iBAEzBK,EAAE,WAAWE,SAAS,0BAexB,SAASC,SAwBT,SAASC,YACRJ,EAAE,UAAUK,MAAM,WAEjBL,EAAE,WAAWM,YAAY,UACzBN,EAAEO,MAAMC,QAAQ,MAAMN,SAAS,UAC/B,IAAIO,EAAWT,EAAEO,MAAMG,KAAK,SAM5B,OALAV,EAAE,IAAIS,GAAUE,OAAO,MAAMT,SAAS,UAEtCF,EAAE,cAAcY,OAAOC,SACrBC,UAAWd,EAAGA,EAAEO,MAAMG,KAAK,SAAUK,SAASC,IAAM,KACnD,MACI,IAERhB,EAAE,gBAAgBc,YAjCnBX,MAAMc,WACFC,YAAaf,MACbgB,gBAAiB,SAAUC,EAASC,GAChC,IAAIC,EAAUtB,EAAEV,QAAQwB,YACpBS,EAAaD,EAAUtB,EAAEV,QAAQkC,SACjCC,EAAazB,EAAEoB,GAASL,SAASC,IACjCU,EAAgBD,EAAazB,EAAEoB,GAASI,SAE5C,OAAoB,IAAhBH,EACSC,EAAUG,GAAgBF,EAAaG,EAEvCD,GAAcF,GAAgBG,GAAiBJ,IAKpE,IAAInB,MAAQ,IAAIA;ACpChBH,EAAGb,UAAWwC,MAAM,WAKnB5B,QAQA,IAAI6B,GAAW,EAGf5B,EAAE,WAAW6B,MACZ,WACa7B,EAAEO,MAEXP,EAAEO,MAAMG,KAAK,SAIhBV,EAAEO,MAAMuB,KAAK,YAAYC,QACvB,WACF/B,EAAEO,MAAMuB,KAAK,YAAYE,SAEzBC,UACD,SAASC,GACRlC,EAAEO,MAAMuB,KAAK,YAAYK,KACxBnB,IAAOkB,EAAGE,MAAQpC,EAAEO,MAAMuB,KAAK,YAAYO,cAAgB,EAC3DC,KAAQJ,EAAGK,MAAQ,MAOtBvC,EAAE,iBAAiBK,MAAM,SAASmC,GACjC,IAAIC,EAAOC,EAEI,GAAZd,GACFA,GAAW,EAEX5B,EAAE,WAAW2C,KAAK,SAASC,EAAGJ,GACC,UAA3BxC,EAAEO,MAAM4B,IAAI,cACdnC,EAAEO,MAAML,SAAS,kBACjBF,EAAEO,MAAM4B,IAAI,WAAY,aAGzBO,EAAO1C,EAAEO,MAAMuB,KAAK,YAAYe,UAChCJ,EAAQzC,EAAEO,MAAMuC,KAAK,kCAAoCnC,SAASoC,QAAQ,yCACpEC,MAAMN,OAIb1C,EAAE,WAAW2C,KAAK,SAASC,EAAGJ,GAC7BC,EAAQzC,EAAEO,MAAMI,OAAO,aACvB+B,EAAOD,EAAMX,KAAK,YAAYe,SAC9BJ,EAAMQ,KAAK,mBAAmBC,SAC9BlD,EAAEO,MAAM4C,OAAO,aACfnD,EAAEO,MAAMyC,MAAMN,GACX1C,EAAEO,MAAM6C,SAAS,oBACnBpD,EAAEO,MAAM4B,IAAI,WAAY,IACI,IAAzBnC,EAAEO,MAAMG,KAAK,UACfV,EAAEO,MAAM8C,WAAW,SAEpBrD,EAAEO,MAAMD,YAAY,qBAItBsB,GAAW,GAGZ0B,QAAQC,IAAI,qBAAsB3B,KAInC5B,EAAE,iBAAiBK,MAAM,SAASmD,GACjCF,QAAQC,IAAI,qBACZC,EAAMC,iBAENzD,EAAE,QAAQa,SAASC,UAAW,GAAIjB,WAAY,WAC5CyD,QAAQC,IAAI,sBAGfvD,EAAE,kBAAkBK,MAAM,SAASmD,GAClCF,QAAQC,IAAI,eACZC,EAAMC,iBACNzD,EAAE,QAAQa,SAASC,UAAWd,EAAEb,UAAUqC,UAAwB,EAAb3B,WAAgB,WACnEyD,QAAQC,IAAI,yBAMfvD,EAAG,aAAcK,MAAM,SAASmD,GAC/BA,EAAMC,iBACNzD,EAAGO,MAAOmD,QAAQC,SAAU,eAC5B3D,EAAGO,MAAOqD,WAAWF,QAAQC,SAAU,eACvC3D,EAAG,eAAgBM,YAAa,WAGjC,IAAIsC,EAAI,EACR5C,EAAG,gBAAiB2C,KAAK,WACxB3C,EAAGO,MAAO0C,KAAM,MAAON,KAAK,SAAUkB,GACrC,GAAK,GAAK7D,EAAGO,MAAOuD,SAAU,MAAO7D,OAAS,CAE7C,IAAI8D,EAAc/D,EAAGO,MAAOyD,OAE5BhE,EAAGO,MAAOyD,KAAMD,EAAa,4BAA+BnB,EAAG,WAC/DA,WAaJ5C,EAAGb,UAAW8E,OAAO,WAGpBrE,UAAYI,EAAGb,UAAW2B,YAE1B,IAAItB,EAAIM,gBAEJF,UAAYJ,EACfQ,EAAE,iBAAiBW,SAASL,YAAY,SAExCN,EAAE,iBAAiBW,SAAST,SAAS","file":"all.min.js","sourcesContent":["var w = Math.max(document.documentElement.clientWidth, window.innerWidth || 0);\r\nvar h = Math.max(document.documentElement.clientHeight, window.innerHeight || 0);\r\n\r\nvar full_view_hover = true;\r\n\r\nvar doc_pos_y = 0;\r\nvar basic_ease = 600;\r\nvar scroll_y_margin = h;\r\n\r\n\r\n// TEST\r\n// var fixed_containers = [];\r\n","function setup() {\r\n\tif($('#js_tph').length && full_view_hover) {\r\n\t\t// $('body').prepend(\"<div id=\\\"js_tph\\\" class=\\\"layer__hover hover_full_view_change\\\"></div>\");\r\n\t\t$('#js_tph').addClass(\"hover_full_view_change\");\r\n\t}\r\n}\r\n\r\n// get document coordinates of the element\r\n// function getCoords(elem) {\r\n//   let box = elem.getBoundingClientRect();\r\n//\r\n//   return {\r\n//     top: box.top + pageYOffset,\r\n//     left: box.left + pageXOffset\r\n//   };\r\n// }\r\n\r\n// https://stackoverflow.com/a/488073/1444149\r\nfunction Utils() {\r\n\r\n}\r\n\r\nUtils.prototype = {\r\n    constructor: Utils,\r\n    isElementInView: function (element, fullyInView) {\r\n        var pageTop = $(window).scrollTop();\r\n        var pageBottom = pageTop + $(window).height();\r\n        var elementTop = $(element).offset().top;\r\n        var elementBottom = elementTop + $(element).height();\r\n\r\n        if (fullyInView === true) {\r\n            return ((pageTop < elementTop) && (pageBottom > elementBottom));\r\n        } else {\r\n            return ((elementTop <= pageBottom) && (elementBottom >= pageTop));\r\n        }\r\n    }\r\n};\r\n\r\nvar Utils = new Utils();\r\n\r\n// TEST\r\n\r\nfunction scrollNav() {\r\n\t$('.nav a').click(function(){\r\n\t\t//Toggle Class\r\n\t\t$(\".active\").removeClass(\"active\");\r\n\t\t$(this).closest('li').addClass(\"active\");\r\n\t\tvar theClass = $(this).attr(\"class\");\r\n\t\t$('.'+theClass).parent('li').addClass('active');\r\n\t\t//Animate\r\n\t\t$('html, body').stop().animate({\r\n\t\t\t\tscrollTop: $( $(this).attr('href') ).offset().top - 160\r\n\t\t}, 400);\r\n\t\treturn false;\r\n\t});\r\n\t$('.scrollTop a').scrollTop();\r\n}\r\n","// DOM ready\r\n// ------------------------------------------------------------------------------\r\n$( document ).ready(function() {\r\n\r\n\t// Setup\r\n\t// ------------------------------------------------------------------------------\r\n\r\n\tsetup();\r\n\r\n\r\n\r\n\t// Modules\r\n\t// ------------------------------------------------------------------------------\r\n\r\n\t// Explanation module scripts\r\n\tvar exp_mode = false;\r\n\r\n\t// Displays explanation popup\r\n\t$(\".js_pop\").hover(\r\n\t\tfunction() {\r\n\t\t\tvar $this = $(this);\r\n\r\n\t\t\tif($(this).attr(\"emmet\")){\r\n\r\n\t\t\t}\r\n\r\n\t\t\t$(this).next(\".exp_pop\").show();\r\n\t\t}, function() {\r\n\t\t\t$(this).next(\".exp_pop\").hide();\r\n\t\t}\r\n\t).mousemove(\r\n\t\tfunction(ev) {\r\n\t\t\t$(this).next(\".exp_pop\").css({\r\n\t\t\t\t\"top\": ev.pageY - $(this).next(\".exp_pop\").outerHeight() - 4,\r\n\t\t\t\t\"left\": ev.pageX + 8\r\n\t\t\t});\r\n\t\t}\r\n\t);\r\n\r\n\t// WIP Activates layer with explanation elements\r\n\t// Besser ::after oder ::before benutzen\r\n\t$(\".exp_help_btn\").click(function(e){\r\n\t\tvar $wrap, $pop;\r\n\r\n\t\tif(exp_mode != true){\r\n\t\t\texp_mode = true;\r\n\r\n\t\t\t$(\".js_pop\").each(function(i, e){\r\n\t\t\t\tif($(this).css(\"position\") == \"static\") {\r\n\t\t\t\t\t$(this).addClass(\"js_changed_pos\");\r\n\t\t\t\t\t$(this).css(\"position\", \"relative\");\r\n\t\t\t\t}\r\n\r\n\t\t\t\t$pop = $(this).next(\".exp_pop\").detach();\r\n\t\t\t\t$wrap = $(this).wrap(\"<span class=\\\"exp_wrap\\\"></span>\").parent().prepend(\"<span class=\\\"exp_marker_pop\\\"></span>\");\r\n\t\t\t\t$wrap.after($pop);\r\n\t\t\t});\r\n\r\n\t\t} else {\r\n\t\t\t$(\".js_pop\").each(function(i, e){\r\n\t\t\t\t$wrap = $(this).parent(\".exp_wrap\");\r\n\t\t\t\t$pop = $wrap.next(\".exp_pop\").detach();\r\n\t\t\t\t$wrap.find(\".exp_marker_pop\").remove();\r\n\t\t\t\t$(this).unwrap(\".exp_wrap\");\r\n\t\t\t\t$(this).after($pop);\r\n\t\t\t\tif($(this).hasClass(\"js_changed_pos\")){\r\n\t\t\t\t\t$(this).css(\"position\", \"\");\r\n\t\t\t\t\tif($(this).attr(\"style\") == \"\") {\r\n\t\t\t\t\t\t$(this).removeAttr(\"style\");\r\n\t\t\t\t\t}\r\n\t\t\t\t\t$(this).removeClass(\"js_changed_pos\");\r\n\t\t\t\t}\r\n\t\t\t});\r\n\r\n\t\t\texp_mode = false;\r\n\r\n\t\t}\r\n\t\tconsole.log(\"Explanation mode: \"+ exp_mode);\r\n\t});\r\n\r\n\t//\tWIP Scroll to top\r\n\t$('#js_scrolltop').click(function(event) {\r\n\t\tconsole.log('scroll to the top');\r\n\t\tevent.preventDefault();\r\n\t\t// $('body').scrollTop();\r\n\t\t$('body').animate({scrollTop: 0}, basic_ease, function() {\r\n\t\t\t console.log('arrived at top');\r\n\t\t});\r\n\t});\r\n\t$('#js_scrolldown').click(function(event) {\r\n\t\tconsole.log('scroll down');\r\n\t\tevent.preventDefault();\r\n\t\t$('body').animate({scrollTop: $(document).height()}, basic_ease * 2, function() {\r\n\t\t\t console.log('arrived at bottom');\r\n\t\t});\r\n\t});\r\n\r\n\r\n\r\n\t$( \"#gameIcon\" ).click(function(event) {\r\n\t\tevent.preventDefault();\r\n\t\t$( this ).clone().appendTo( \"#gameDetail\" );\r\n\t\t$( this ).siblings().clone().appendTo( \"#gameDetail\" );\r\n\t\t$( \"#gameDetail\" ).removeClass( \"magic\" );\r\n\t});\r\n\r\n\tvar i = 0;\r\n\t$( \".pass-def dd\" ).each(function() {\r\n\t\t$( this ).find( \"li\" ).each(function( index ) {\r\n\t\t\tif ( 0 == $( this ).children( \"ul\" ).length ) {\r\n\t\t\t\t//console.log( index + \": \" + $( this ).text() );\r\n\t\t\t\tvar tempContent = $( this ).html();\r\n\t\t\t\t//$( this ).html( \"<span class=\\\"list-count\\\"></span>\" );\r\n\t\t\t\t$( this ).html( tempContent +\"<span class=\\\"list-count\\\">\"+ i +\"</span>\" );\r\n\t\t\t\ti++;\r\n\t\t\t}\r\n\t\t})\r\n\t});\r\n\r\n\r\n\r\n});\r\n\r\n\r\n\r\n// Scroll\r\n// ------------------------------------------------------------------------------\r\n$( document ).scroll(function() {\r\n\r\n\t// Toggle navigation elements\r\n\tdoc_pos_y = $( document ).scrollTop();\r\n\t// console.log(doc_pos_y);\r\n\tvar h = scroll_y_margin;\r\n\t// var demo_margin = $('.header__fix');\r\n\tif (doc_pos_y > h) {\r\n\t\t$('#js_scrolltop').parent().removeClass('magic');\r\n\t} else {\r\n\t\t$('#js_scrolltop').parent().addClass('magic');\r\n\t}\r\n\r\n\r\n\r\n});\r\n"]} +//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["variables.js","functions.js","global.js"],"names":["w","Math","max","document","documentElement","clientWidth","window","innerWidth","h","clientHeight","innerHeight","full_view_hover","doc_pos_y","basic_ease","scroll_y_margin","setup","$","length","addClass","Utils","scrollNav","click","removeClass","this","closest","theClass","attr","parent","stop","animate","scrollTop","offset","top","prototype","constructor","isElementInView","element","fullyInView","pageTop","pageBottom","height","elementTop","elementBottom","ready","exp_mode","hover","next","show","hide","mousemove","ev","css","pageY","outerHeight","left","pageX","e","$wrap","$pop","each","i","detach","wrap","prepend","after","find","remove","unwrap","hasClass","removeAttr","console","log","event","preventDefault","clone","appendTo","siblings","index","children","tempContent","html","scroll"],"mappings":"AAAA,IAAIA,EAAIC,KAAKC,IAAIC,SAASC,gBAAgBC,YAAaC,OAAOC,YAAc,GACxEC,EAAIP,KAAKC,IAAIC,SAASC,gBAAgBK,aAAcH,OAAOI,aAAe,GAE1EC,iBAAkB,EAElBC,UAAY,EACZC,WAAa,IACbC,gBAAkBN;ACPtB,SAASO,QACLC,EAAE,WAAWC,QAAUN,iBAEzBK,EAAE,WAAWE,SAAS,0BAexB,SAASC,SAwBT,SAASC,YACRJ,EAAE,UAAUK,MAAM,WAEjBL,EAAE,WAAWM,YAAY,UACzBN,EAAEO,MAAMC,QAAQ,MAAMN,SAAS,UAC/B,IAAIO,EAAWT,EAAEO,MAAMG,KAAK,SAM5B,OALAV,EAAE,IAAIS,GAAUE,OAAO,MAAMT,SAAS,UAEtCF,EAAE,cAAcY,OAAOC,SACrBC,UAAWd,EAAGA,EAAEO,MAAMG,KAAK,SAAUK,SAASC,IAAM,KACnD,MACI,IAERhB,EAAE,gBAAgBc,YAjCnBX,MAAMc,WACFC,YAAaf,MACbgB,gBAAiB,SAAUC,EAASC,GAChC,IAAIC,EAAUtB,EAAEV,QAAQwB,YACpBS,EAAaD,EAAUtB,EAAEV,QAAQkC,SACjCC,EAAazB,EAAEoB,GAASL,SAASC,IACjCU,EAAgBD,EAAazB,EAAEoB,GAASI,SAE5C,OAAoB,IAAhBH,EACSC,EAAUG,GAAgBF,EAAaG,EAEvCD,GAAcF,GAAgBG,GAAiBJ,IAKpE,IAAInB,MAAQ,IAAIA;ACpChBH,EAAGb,UAAWwC,MAAM,WAKnB5B,QAQA,IAAI6B,GAAW,EAGf5B,EAAE,WAAW6B,MACZ,WACa7B,EAAEO,MAEXP,EAAEO,MAAMG,KAAK,SAIhBV,EAAEO,MAAMuB,KAAK,YAAYC,QACvB,WACF/B,EAAEO,MAAMuB,KAAK,YAAYE,SAEzBC,UACD,SAASC,GACRlC,EAAEO,MAAMuB,KAAK,YAAYK,KACxBnB,IAAOkB,EAAGE,MAAQpC,EAAEO,MAAMuB,KAAK,YAAYO,cAAgB,EAC3DC,KAAQJ,EAAGK,MAAQ,MAOtBvC,EAAE,iBAAiBK,MAAM,SAASmC,GACjC,IAAIC,EAAOC,EAEI,GAAZd,GACFA,GAAW,EAEX5B,EAAE,WAAW2C,KAAK,SAASC,EAAGJ,GACC,UAA3BxC,EAAEO,MAAM4B,IAAI,cACdnC,EAAEO,MAAML,SAAS,kBACjBF,EAAEO,MAAM4B,IAAI,WAAY,aAGzBO,EAAO1C,EAAEO,MAAMuB,KAAK,YAAYe,UAChCJ,EAAQzC,EAAEO,MAAMuC,KAAK,kCAAoCnC,SAASoC,QAAQ,yCACpEC,MAAMN,OAIb1C,EAAE,WAAW2C,KAAK,SAASC,EAAGJ,GAC7BC,EAAQzC,EAAEO,MAAMI,OAAO,aACvB+B,EAAOD,EAAMX,KAAK,YAAYe,SAC9BJ,EAAMQ,KAAK,mBAAmBC,SAC9BlD,EAAEO,MAAM4C,OAAO,aACfnD,EAAEO,MAAMyC,MAAMN,GACX1C,EAAEO,MAAM6C,SAAS,oBACnBpD,EAAEO,MAAM4B,IAAI,WAAY,IACI,IAAzBnC,EAAEO,MAAMG,KAAK,UACfV,EAAEO,MAAM8C,WAAW,SAEpBrD,EAAEO,MAAMD,YAAY,qBAItBsB,GAAW,GAGZ0B,QAAQC,IAAI,qBAAsB3B,KAInC5B,EAAE,iBAAiBK,MAAM,SAASmD,GACjCF,QAAQC,IAAI,qBACZC,EAAMC,iBAENzD,EAAE,QAAQa,SAASC,UAAW,GAAIjB,WAAY,WAC5CyD,QAAQC,IAAI,sBAGfvD,EAAE,kBAAkBK,MAAM,SAASmD,GAClCF,QAAQC,IAAI,eACZC,EAAMC,iBACNzD,EAAE,QAAQa,SAASC,UAAWd,EAAEb,UAAUqC,UAAwB,EAAb3B,WAAgB,WACnEyD,QAAQC,IAAI,yBAMfvD,EAAG,aAAcK,MAAM,SAASmD,GAC/BA,EAAMC,iBACNzD,EAAGO,MAAOmD,QAAQC,SAAU,eAC5B3D,EAAGO,MAAOqD,WAAWF,QAAQC,SAAU,eACvC3D,EAAG,eAAgBM,YAAa,WAGjC,IAAIsC,EAAI,EACR5C,EAAG,gBAAiB2C,KAAK,WACxB3C,EAAGO,MAAO0C,KAAM,MAAON,KAAK,SAAUkB,GACrC,GAAK,GAAK7D,EAAGO,MAAOuD,SAAU,MAAO7D,OAAS,CAE7C,IAAI8D,EAAc/D,EAAGO,MAAOyD,OAE5BhE,EAAGO,MAAOyD,KAAMD,EAAa,4BAA+BnB,EAAG,WAC/DA,WAaJ5C,EAAGb,UAAW8E,OAAO,WAGpBrE,UAAYI,EAAGb,UAAW2B,YAE1B,IAAItB,EAAIM,gBAEJF,UAAYJ,EACfQ,EAAE,iBAAiBW,SAASL,YAAY,SAExCN,EAAE,iBAAiBW,SAAST,SAAS","file":"all.min.js","sourcesContent":["var w = Math.max(document.documentElement.clientWidth, window.innerWidth || 0);\nvar h = Math.max(document.documentElement.clientHeight, window.innerHeight || 0);\n\nvar full_view_hover = true;\n\nvar doc_pos_y = 0;\nvar basic_ease = 600;\nvar scroll_y_margin = h;\n\n\n// TEST\n// var fixed_containers = [];\n","function setup() {\n\tif($('#js_tph').length && full_view_hover) {\n\t\t// $('body').prepend(\"<div id=\\\"js_tph\\\" class=\\\"layer__hover hover_full_view_change\\\"></div>\");\n\t\t$('#js_tph').addClass(\"hover_full_view_change\");\n\t}\n}\n\n// get document coordinates of the element\n// function getCoords(elem) {\n//   let box = elem.getBoundingClientRect();\n//\n//   return {\n//     top: box.top + pageYOffset,\n//     left: box.left + pageXOffset\n//   };\n// }\n\n// https://stackoverflow.com/a/488073/1444149\nfunction Utils() {\n\n}\n\nUtils.prototype = {\n    constructor: Utils,\n    isElementInView: function (element, fullyInView) {\n        var pageTop = $(window).scrollTop();\n        var pageBottom = pageTop + $(window).height();\n        var elementTop = $(element).offset().top;\n        var elementBottom = elementTop + $(element).height();\n\n        if (fullyInView === true) {\n            return ((pageTop < elementTop) && (pageBottom > elementBottom));\n        } else {\n            return ((elementTop <= pageBottom) && (elementBottom >= pageTop));\n        }\n    }\n};\n\nvar Utils = new Utils();\n\n// TEST\n\nfunction scrollNav() {\n\t$('.nav a').click(function(){\n\t\t//Toggle Class\n\t\t$(\".active\").removeClass(\"active\");\n\t\t$(this).closest('li').addClass(\"active\");\n\t\tvar theClass = $(this).attr(\"class\");\n\t\t$('.'+theClass).parent('li').addClass('active');\n\t\t//Animate\n\t\t$('html, body').stop().animate({\n\t\t\t\tscrollTop: $( $(this).attr('href') ).offset().top - 160\n\t\t}, 400);\n\t\treturn false;\n\t});\n\t$('.scrollTop a').scrollTop();\n}\n","// DOM ready\n// ------------------------------------------------------------------------------\n$( document ).ready(function() {\n\n\t// Setup\n\t// ------------------------------------------------------------------------------\n\n\tsetup();\n\n\n\n\t// Modules\n\t// ------------------------------------------------------------------------------\n\n\t// Explanation module scripts\n\tvar exp_mode = false;\n\n\t// Displays explanation popup\n\t$(\".js_pop\").hover(\n\t\tfunction() {\n\t\t\tvar $this = $(this);\n\n\t\t\tif($(this).attr(\"emmet\")){\n\n\t\t\t}\n\n\t\t\t$(this).next(\".exp_pop\").show();\n\t\t}, function() {\n\t\t\t$(this).next(\".exp_pop\").hide();\n\t\t}\n\t).mousemove(\n\t\tfunction(ev) {\n\t\t\t$(this).next(\".exp_pop\").css({\n\t\t\t\t\"top\": ev.pageY - $(this).next(\".exp_pop\").outerHeight() - 4,\n\t\t\t\t\"left\": ev.pageX + 8\n\t\t\t});\n\t\t}\n\t);\n\n\t// WIP Activates layer with explanation elements\n\t// Besser ::after oder ::before benutzen\n\t$(\".exp_help_btn\").click(function(e){\n\t\tvar $wrap, $pop;\n\n\t\tif(exp_mode != true){\n\t\t\texp_mode = true;\n\n\t\t\t$(\".js_pop\").each(function(i, e){\n\t\t\t\tif($(this).css(\"position\") == \"static\") {\n\t\t\t\t\t$(this).addClass(\"js_changed_pos\");\n\t\t\t\t\t$(this).css(\"position\", \"relative\");\n\t\t\t\t}\n\n\t\t\t\t$pop = $(this).next(\".exp_pop\").detach();\n\t\t\t\t$wrap = $(this).wrap(\"<span class=\\\"exp_wrap\\\"></span>\").parent().prepend(\"<span class=\\\"exp_marker_pop\\\"></span>\");\n\t\t\t\t$wrap.after($pop);\n\t\t\t});\n\n\t\t} else {\n\t\t\t$(\".js_pop\").each(function(i, e){\n\t\t\t\t$wrap = $(this).parent(\".exp_wrap\");\n\t\t\t\t$pop = $wrap.next(\".exp_pop\").detach();\n\t\t\t\t$wrap.find(\".exp_marker_pop\").remove();\n\t\t\t\t$(this).unwrap(\".exp_wrap\");\n\t\t\t\t$(this).after($pop);\n\t\t\t\tif($(this).hasClass(\"js_changed_pos\")){\n\t\t\t\t\t$(this).css(\"position\", \"\");\n\t\t\t\t\tif($(this).attr(\"style\") == \"\") {\n\t\t\t\t\t\t$(this).removeAttr(\"style\");\n\t\t\t\t\t}\n\t\t\t\t\t$(this).removeClass(\"js_changed_pos\");\n\t\t\t\t}\n\t\t\t});\n\n\t\t\texp_mode = false;\n\n\t\t}\n\t\tconsole.log(\"Explanation mode: \"+ exp_mode);\n\t});\n\n\t//\tWIP Scroll to top\n\t$('#js_scrolltop').click(function(event) {\n\t\tconsole.log('scroll to the top');\n\t\tevent.preventDefault();\n\t\t// $('body').scrollTop();\n\t\t$('body').animate({scrollTop: 0}, basic_ease, function() {\n\t\t\t console.log('arrived at top');\n\t\t});\n\t});\n\t$('#js_scrolldown').click(function(event) {\n\t\tconsole.log('scroll down');\n\t\tevent.preventDefault();\n\t\t$('body').animate({scrollTop: $(document).height()}, basic_ease * 2, function() {\n\t\t\t console.log('arrived at bottom');\n\t\t});\n\t});\n\n\n\n\t$( \"#gameIcon\" ).click(function(event) {\n\t\tevent.preventDefault();\n\t\t$( this ).clone().appendTo( \"#gameDetail\" );\n\t\t$( this ).siblings().clone().appendTo( \"#gameDetail\" );\n\t\t$( \"#gameDetail\" ).removeClass( \"magic\" );\n\t});\n\n\tvar i = 0;\n\t$( \".pass-def dd\" ).each(function() {\n\t\t$( this ).find( \"li\" ).each(function( index ) {\n\t\t\tif ( 0 == $( this ).children( \"ul\" ).length ) {\n\t\t\t\t//console.log( index + \": \" + $( this ).text() );\n\t\t\t\tvar tempContent = $( this ).html();\n\t\t\t\t//$( this ).html( \"<span class=\\\"list-count\\\"></span>\" );\n\t\t\t\t$( this ).html( tempContent +\"<span class=\\\"list-count\\\">\"+ i +\"</span>\" );\n\t\t\t\ti++;\n\t\t\t}\n\t\t})\n\t});\n\n\n\n});\n\n\n\n// Scroll\n// ------------------------------------------------------------------------------\n$( document ).scroll(function() {\n\n\t// Toggle navigation elements\n\tdoc_pos_y = $( document ).scrollTop();\n\t// console.log(doc_pos_y);\n\tvar h = scroll_y_margin;\n\t// var demo_margin = $('.header__fix');\n\tif (doc_pos_y > h) {\n\t\t$('#js_scrolltop').parent().removeClass('magic');\n\t} else {\n\t\t$('#js_scrolltop').parent().addClass('magic');\n\t}\n\n\n\n});\n"]} diff --git a/package-lock.json b/package-lock.json index 28ea56c..a84b39c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5686,6 +5686,15 @@ "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", "dev": true }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", @@ -5697,15 +5706,6 @@ "strip-ansi": "3.0.1" } }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "dev": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, "stringstream": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", From a2fa4f1b2f005edab282783c1f5a70d53f7a9e26 Mon Sep 17 00:00:00 2001 From: Stephan Hagedorn Date: Wed, 27 Sep 2017 11:30:31 +0200 Subject: [PATCH 059/372] removed build folder --- build/css/example.css | 1322 ------------------------------------- build/css/example.min.css | 2 - build/js/all.min.js | 4 - 3 files changed, 1328 deletions(-) delete mode 100644 build/css/example.css delete mode 100644 build/css/example.min.css delete mode 100644 build/js/all.min.js diff --git a/build/css/example.css b/build/css/example.css deleted file mode 100644 index de7f7d6..0000000 --- a/build/css/example.css +++ /dev/null @@ -1,1322 +0,0 @@ -@charset "UTF-8"; -/* - * # TABLE OF CONTENTS - * - * - Reset - * - Global functions and mixins - * - Configuration - * - Special modules - * - Basic styles - * - Common - * - Typography - * - * - Sections - * - Grouping - * - Textlevel - * - Embedded - * - Tables - * - Interactive - * - Modules - * - */ -@import url(../../vendor/normalize.css); -.sym_glass::before { - content: ""; } - -.sym_music::before { - content: ""; } - -.sym_search::before { - content: ""; } - -.sym_envelope-o::before { - content: ""; } - -.sym_heart::before { - content: ""; } - -a[href]:focus { - outline: 0; } - -area[href]:focus { - outline: 0; } - -button:not([disabled]):focus { - outline: 0; } - -input:not([disabled]):focus { - outline: 0; } - -select:not([disabled]):focus { - outline: 0; } - -textarea:not([disabled]):focus { - outline: 0; } - -*[tabindex]:focus { - outline: 0; } - -/** - * @description - * Generates cross-browser-compatible output for a given element with its value. - * - * @author sthag - * - * @param values - * @returns - * -webkit-: - * ...-: - * - * @example - * .selector - * @include vendor-prefix(hyphens, auto) - */ -.magic { - display: none; } - -.center_50 { - margin-right: 25%; - margin-left: 25%; } - -.center_25 { - margin-right: 37.5%; - margin-left: 37.5%; } - -.width_full, .table__file_simple { - width: 100%; - margin-right: 0; - margin-left: 0; } - -.height_basic { - height: 1024px; } - -.height_full { - height: 100vh; } - -.txt_center { - text-align: center !important; } - -.txt_right { - text-align: right !important; } - -.txt_left { - text-align: left !important; } - -.space_right { - margin-right: 32px; } - -.clear { - clear: both; } - .clear::before, .clear::after { - clear: both; } - -.overflow, .nav__horizontal ul, .nav__center_old ul, .header__page nav ul { - overflow: auto; } - -.float_space_left, .list__horizontal li, .box__inline_left, .box__file_tile, .nav__horizontal ul li, .nav__center_old ul li, .header__page nav ul li { - float: left; - margin-right: 32px; } - -.float_half_size { - float: left; - width: 50%; } - -.x_long { - overflow-x: scroll; } - -.pos_full_view, .hover_full_view_change { - position: fixed; - top: 0; - left: 0; - width: 100vw; - height: 100vh; } - -.pos_full_page { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; } - -.pos_abs { - position: absolute; } - -.pos_rel { - position: relative; } - -.pos_fix { - position: fixed; } - -.pos_bottom { - bottom: 0; } - -.pos_full_view { - background-color: rgba(250, 216, 3, 0.5); } - -.pos_full_page { - background-color: rgba(39, 63, 139, 0.25); } - -.hover_back_change { - background-color: #666666; - -webkit-transition: background-color .2s ease-in-out; - transition: background-color .2s ease-in-out; } - .hover_back_change:hover { - background-color: gray; } - -.hover_full_view_change { - z-index: 100; - background-color: rgba(0, 0, 0, 0.5); - -webkit-transition: background-color .2s ease-in-out; - transition: background-color .2s ease-in-out; - pointer-events: none; } - -.flex, .flex__wrap, .flex__row, .flex__column_wrap, .nav__column ul { - display: -webkit-box; - display: -ms-flexbox; - display: flex; } - -.flex__wrap { - -ms-flex-wrap: wrap; - flex-wrap: wrap; } - -.flex__row { - -webkit-box-orient: vertical; - -webkit-box-direction: normal; - -ms-flex-direction: column; - flex-direction: column; - -webkit-box-pack: start; - -ms-flex-pack: start; - justify-content: flex-start; } - -.flex__child, .flex__column_wrap .column, .nav__column ul li { - -webkit-box-flex: 0; - -ms-flex: 0 1 auto; - flex: 0 1 auto; } - -.flex__child_one { - -webkit-box-flex: 1; - -ms-flex: 1; - flex: 1; } - -.flex__child_end { - -ms-flex-item-align: end; - align-self: flex-end; } - -.txt_light_color { - color: #666666; } - -.a__button, .a__button_text, .a__button_border { - display: inline-block; - padding: calc(8px - 3px) 8px; - background-color: rgba(82, 190, 209, 0.2); - border-radius: 1px; } - .a__button:active, .a__button_text:active, .a__button_border:active, .a__button:focus, .a__button_text:focus, .a__button_border:focus, .a__button:hover, .a__button_text:hover, .a__button_border:hover { - background-color: rgba(255, 255, 255, 0.1); - color: white; - border-color: transparent; } - -.span__solo, h6, p, .block__column_2, .block__column_3, caption, li, dt, dd, figcaption, th, td, legend, label { - font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; - font-size: 1em; - line-height: 1.5; } - -pre, code, .demo__query_example:after, .code__solo, input[type="color"], input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="email"], input[type="month"], input[type="number"], input[type="password"], input[type="search"], input[type="tel"], input[type="text"], input[type="time"], input[type="url"], input[type="week"], input:not([type]), textarea { - font-family: Courier New, monospace; - font-size: 1em; - line-height: 1.5; } - -.print_body *[class^="din"] p, .print_body *[class^="din"] .block__column_2, .print_body *[class^="din"] .block__column_3, .print_body *[class^="din"] caption { - font-family: Courier New, monospace; - font-size: 1em; - line-height: 1.5; } - -h1, .print_body .page_date, .print_body .page_no { - font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; - font-size: 3.1em; - font-weight: 300; - line-height: 1.5; } - -h2 { - font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; - font-size: 2.5em; - font-weight: 300; - line-height: 1.5; } - -h3, h4 { - font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; - font-size: 1.8em; - font-weight: 300; - line-height: 1.5; } - -h5 { - font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; - font-size: 1.35em; - font-weight: 300; - line-height: 1.5; } - -.span__solo { - color: black; } - -.table__link .cell__text .shorten { - overflow: hidden; - text-overflow: ellipsis; - -o-text-overflow: ellipsis; } - -html { - height: 100%; } - -body { - position: relative; - -webkit-box-sizing: border-box; - box-sizing: border-box; - font-family: Roboto, Segoe UI, Liberation Sans, Source Sans, Trebuchet MS, Helvetica, Arial, sans-serif, sans; - font-size: 17px; - line-height: 1; - color: black; - background-color: gray; } - body *, - body ::before, - body ::after { - -webkit-box-sizing: inherit; - box-sizing: inherit; } - body:hover .layer__hover { - background-color: transparent; } - -.sec__main_center, .demo__intro { - width: 96%; - margin: 0 auto; - padding-top: 32px; } - @media (min-width: 768px) { - .sec__main_center, .demo__intro { - width: 80%; } } - @media (min-width: 1024px) { - .sec__main_center, .demo__intro { - width: 60%; } } - @media (min-width: 1680px) { - .sec__main_center, .demo__intro { - width: 48%; } } - -aside.right + section { - margin-right: calc(20% + 8px); } -aside.left + section { - margin-left: calc(20% + 8px); } - -aside { - width: 20%; } - aside.left { - float: left; } - aside.right { - float: right; } - aside *:first-child { - margin-top: 0; } - -.header__page { - overflow: auto; } - -h1 { - margin: 128px 0 32px; } - -h2 { - margin: 64px 0 32px; } - -h3 { - margin: 16px 0 16px; - text-transform: uppercase; } - -h4 { - margin: 16px 0 16px; - text-transform: none; } - -h5 { - margin: 16px 0 8px; - text-transform: none; } - -h6 { - margin: 8px 0; - text-transform: none; - font-weight: bold; } - -p, .block__column_2, .block__column_3, caption { - margin: 8px 0; } - p code, .block__column_2 code, .block__column_3 code, caption code, p .demo__query_example:after, .block__column_2 .demo__query_example:after, .block__column_3 .demo__query_example:after, caption .demo__query_example:after { - padding: 1px 4px; - font-size: 1em; - line-height: 1; } - -hr, .hr__hidden, .hr__dotted { - margin: 32px auto; - border-width: 1px 0 0; - border-style: solid; - border-color: black; } - -.hr__hidden { - border-color: transparent; } - -.hr__dotted { - border-style: dotted; } - -.pre__code { - border-color: rgba(255, 255, 255, 0.1); - border-style: dotted; - border-width: 0 0 0 4px; - border-radius: 1px; - padding: 8px; - background-color: rgba(255, 255, 255, 0.1); } - .pre__code code, .pre__code .demo__query_example:after { - background-color: transparent; } - -blockquote { - margin: 8px 2em; } - -.quote__mark p::before, .quote__mark .block__column_2::before, .quote__mark .block__column_3::before, .quote__mark caption::before { - content: "\201E \0020"; } -.quote__mark p::after, .quote__mark .block__column_2::after, .quote__mark .block__column_3::after, .quote__mark caption::after { - content: "\201C \0020"; } -.quote__mark .quote__source::before, .quote__mark .quote__source::after { - content: ""; } - -dl, ul, ol { - margin: 16px 0 8px; } - -ul, ol { - padding-left: 2em; } - -dd { - margin-left: 2em; } - -ul li { - list-style: square; } - -.list__dash li { - list-style: none; - position: relative; } - .list__dash li::before { - content: "_"; - position: absolute; - left: -1em; } - -.list__link li { - margin-bottom: 2px; - text-transform: uppercase; } - .list__link li a { - display: block; - padding: calc(8px - 3px) 8px; - color: black; } - .list__link li a img { - margin-right: 8px; - padding-bottom: .2em; - vertical-align: text-bottom; } - .list__link li a:active, .list__link li a:focus, .list__link li a:hover { - background-color: #0c85ff; - color: white; } - -.list__horizontal { - overflow: auto; } - -figure { - margin: 16px 2em; } - -.box__info { - padding: 16px 2em; - border-right: 8px solid rgba(82, 190, 209, 0.6); - background-color: rgba(82, 190, 209, 0.1) !important; } - -.box__main_indent { - margin-left: 25%; } - -.block__column_line { - -webkit-column-rule: 1px solid black; - column-rule: 1px solid black; } - -.block__column_2 { - -webkit-column-count: 2; - column-count: 2; - -webkit-column-gap: 32px; - column-gap: 32px; } - -.block__column_3 { - -webkit-column-count: 3; - column-count: 3; - -webkit-column-gap: 64px; - column-gap: 64px; } - -.box__space { - position: relative; - width: 100%; } - -.box__cube { - float: left; - display: table; - width: 64px; - text-align: center; - vertical-align: middle; } - .box__cube span { - display: table-cell; } - -.box__placeholder { - width: 100%; - height: 64px; - border: 4px solid rgba(0, 0, 0, 0.1); - border-radius: 1px; - padding: 8px; - background-color: rgba(0, 0, 0, 0.1); } - .box__placeholder svg { - vertical-align: top; } - -.box__placeholder_bkg { - width: 100%; - height: 64px; - border: 4px solid rgba(0, 0, 0, 0.1); - border-radius: 1px; - padding: 8px; - /*data:[][;charset=][;base64],*/ - background: url("data:image/svg+xml;utf8,") no-repeat; - background-color: rgba(0, 0, 0, 0.1); } - -.flex__column_wrap .column { - -webkit-box-flex: 1; - -ms-flex-positive: 1; - flex-grow: 1; } - -a { - color: #52bed1; - text-decoration: none; } - a:active, a:focus, a:hover { - color: white; } - -.a__line { - border-bottom-width: 1px; - border-bottom-style: dotted; - border-color: black; - background-color: transparent; - color: black; - -webkit-transition: color 150ms ease; - transition: color 150ms ease; } - .a__line:active, .a__line:focus, .a__line:hover { - background-color: #0c85ff; - color: white; } - -.a__button_text, .a__button_border { - padding: calc(8px - 1px) calc(8px * 2); - background-color: transparent; - color: black; } - -.a__button_border { - border: 1px solid black; } - -i, em { - font-style: italic; } - -.i__bright { - font-style: normal; - color: white; } - -b, strong { - font-weight: 500; } - -cite { - font-style: italic; } - -code, .demo__query_example:after { - color: #1f1f1f; - background-color: rgba(255, 255, 255, 0.1); } - -.code__solo { - padding: 1px 4px; - color: black; } - -mark { - background-color: #fad803; } - -.mark__cursor { - color: white; - background-color: black; } - -::-moz-selection { - color: white; - background-color: black; } - -::selection { - color: white; - background-color: black; } - -img { - vertical-align: top; } - -table { - margin: 16px 0; - border: 1px solid black; - border-collapse: collapse; } - -th, td { - padding: 4px; } - -th { - border: 1px solid black; - text-align: left; } - -.precol { - border-right: 1px solid black; } - -td { - border-right: 1px solid black; - border-bottom: 1px solid black; } - -td:last-child { - border-right: 0; } - -tr:last-child td { - border-bottom: 0; } - -tfoot tr:first-child td { - border-top: 1px solid black; } - -.table__blank { - border: 1px solid transparent; } - .table__blank th, .table__blank td { - border: 1px solid transparent; } - -.table__free { - border: 1px solid transparent; } - -.table__stripe td { - border-top: 0; - border-bottom: 0; } -.table__stripe tr:nth-child(even) td { - background-color: rgba(255, 255, 255, 0.1); } - -.table__fix { - table-layout: fixed; } - -caption { - padding: 4px 0; - border: 1px dotted black; - text-align: center; } - -fieldset { - margin: 16px 0; - padding: 8px; - border: 1px solid black; } - -legend { - padding: 0 4px; } - -input, button, textarea { - margin: 0 32px; } - input[disabled="disabled"], input[disabled], button[disabled="disabled"], button[disabled], textarea[disabled="disabled"], textarea[disabled] { - cursor: not-allowed; } - -label input { - margin-left: 8px; } - -input { - color: #1a1a1a; } - input[disabled="disabled"], input[disabled] { - cursor: not-allowed; } - -input[type="color"], input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="email"], input[type="month"], input[type="number"], input[type="password"], input[type="search"], input[type="tel"], input[type="text"], input[type="time"], input[type="url"], input[type="week"], input:not([type]) { - border: 2px solid white; - padding: 4px; - background-color: #e6e6e6; } - input[type="color"]:hover, input[type="date"]:hover, input[type="datetime"]:hover, input[type="datetime-local"]:hover, input[type="email"]:hover, input[type="month"]:hover, input[type="number"]:hover, input[type="password"]:hover, input[type="search"]:hover, input[type="tel"]:hover, input[type="text"]:hover, input[type="time"]:hover, input[type="url"]:hover, input[type="week"]:hover, input:not([type]):hover { - background-color: white; } - input[type="color"][readonly="readonly"], input[type="color"][readonly], input[type="date"][readonly="readonly"], input[type="date"][readonly], input[type="datetime"][readonly="readonly"], input[type="datetime"][readonly], input[type="datetime-local"][readonly="readonly"], input[type="datetime-local"][readonly], input[type="email"][readonly="readonly"], input[type="email"][readonly], input[type="month"][readonly="readonly"], input[type="month"][readonly], input[type="number"][readonly="readonly"], input[type="number"][readonly], input[type="password"][readonly="readonly"], input[type="password"][readonly], input[type="search"][readonly="readonly"], input[type="search"][readonly], input[type="tel"][readonly="readonly"], input[type="tel"][readonly], input[type="text"][readonly="readonly"], input[type="text"][readonly], input[type="time"][readonly="readonly"], input[type="time"][readonly], input[type="url"][readonly="readonly"], input[type="url"][readonly], input[type="week"][readonly="readonly"], input[type="week"][readonly], input:not([type])[readonly="readonly"], input:not([type])[readonly] { - border-color: #b3b3b3; - background-color: #999999; } - input[type="color"][disabled="disabled"], input[type="color"][disabled], input[type="date"][disabled="disabled"], input[type="date"][disabled], input[type="datetime"][disabled="disabled"], input[type="datetime"][disabled], input[type="datetime-local"][disabled="disabled"], input[type="datetime-local"][disabled], input[type="email"][disabled="disabled"], input[type="email"][disabled], input[type="month"][disabled="disabled"], input[type="month"][disabled], input[type="number"][disabled="disabled"], input[type="number"][disabled], input[type="password"][disabled="disabled"], input[type="password"][disabled], input[type="search"][disabled="disabled"], input[type="search"][disabled], input[type="tel"][disabled="disabled"], input[type="tel"][disabled], input[type="text"][disabled="disabled"], input[type="text"][disabled], input[type="time"][disabled="disabled"], input[type="time"][disabled], input[type="url"][disabled="disabled"], input[type="url"][disabled], input[type="week"][disabled="disabled"], input[type="week"][disabled], input:not([type])[disabled="disabled"], input:not([type])[disabled] { - border-color: transparent; } - -textarea { - border: 2px solid white; - padding: 4px; - background-color: #e6e6e6; } - textarea:hover { - background-color: white; } - textarea[readonly="readonly"], textarea[readonly] { - border-color: #b3b3b3; - background-color: #999999; } - textarea[disabled="disabled"], textarea[disabled] { - border-color: transparent; } - -input[type="color"] { - line-height: 1; } - -input[type="date"] { - line-height: 1; } - -input[type="datetime"] { - line-height: 1; } - -input[type="datetime-local"] { - line-height: 1; } - -input[type="email"] { - line-height: 1; } - -input[type="month"] { - line-height: 1; } - -input[type="number"] { - line-height: 1; } - -input[type="password"] { - line-height: 1; } - -input[type="search"] { - line-height: 1; } - -input[type="tel"] { - line-height: 1; } - -input[type="text"] { - line-height: 1; } - -input[type="time"] { - line-height: 1; } - -input[type="url"] { - line-height: 1; } - -input[type="week"] { - line-height: 1; } - -input:not([type]) { - line-height: 1; } - -button { - padding: calc(8px - 3px) 8px; } - -input[type="button"] { - padding: calc(8px - 3px) 8px; } - -input[type="reset"] { - padding: calc(8px - 3px) 8px; } - -input[type="submit"] { - padding: calc(8px - 3px) 8px; } - -label + input, -.input__label_right { - margin: 0 8px; } - -.label__table, .input__default label { - display: table; } - .label__table input, .input__default label input { - display: table-cell; } - -.input__default label { - margin: 4px 0; } - .input__default label input { - padding: 4px 5px; - border-style: solid; - border-color: transparent; - background-color: #e6e6e6; - color: #1a1a1a; } - .input__default label input:hover { - background-color: black; - color: white; } - -nav ul { - padding-left: 0; } -nav li { - margin-bottom: 8px; - list-style: none; } - -.nav__horizontal ul ul, .nav__center_old ul ul, .header__page nav ul ul { - margin: 8px 0; } -.nav__horizontal ul li, .nav__center_old ul li, .header__page nav ul li { - margin-right: 8px; - margin-bottom: 0; } - .nav__horizontal ul li:last-child, .nav__center_old ul li:last-child, .header__page nav ul li:last-child { - margin-right: 0; } - -.nav__right { - float: right; - margin-left: 8px; } - .nav__right .align_parent { - margin-right: -8px; } - -.nav__separate li { - position: relative; - padding-left: 1px; } - .nav__separate li:not(:first-child)::before { - content: ""; - position: absolute; - width: 1px; - height: 100%; - left: 0; - top: 0; - background-color: black; } - -.nav__separate_right { - float: right; } - .nav__separate_right li { - position: relative; } - .nav__separate_right li:first-child { - padding-left: 17px; } - .nav__separate_right li:first-child::before { - content: ""; - position: absolute; - width: 1px; - height: 100%; - left: 0; - top: 0; - background-color: white; - margin: 0 8px; } - -.nav__center_old { - float: right; - position: relative; - left: -50%; } - .nav__center_old ul { - position: relative; - left: 50%; - text-align: center; } - -.nav__column { - position: relative; - margin: 8px 0; } - .nav__column ul { - margin: 0 128px; } - .nav__column ul li { - -webkit-box-flex: 1; - -ms-flex-positive: 1; - flex-grow: 1; - margin: 0; - text-align: center; } - .nav__column ul li a { - display: block; } - -.nav__page_meta { - position: fixed; - right: 0; - bottom: 16px; } - .nav__page_meta ul { - margin: 8px 0; } - .nav__page_meta li { - margin-bottom: 0; } - .nav__page_meta .a_button_meta { - display: inline-block; } - .nav__page_meta .a_button_meta:active, .nav__page_meta .a_button_meta:focus { - background-color: transparent; } - .nav__page_meta .a_button_meta:hover { - background-color: #0c85ff; } - -.header__page nav a:active, .header__page nav a:focus, .header__page nav a:hover { - background-color: rgba(0, 0, 0, 0.2); - color: black; } - -.table__link { - width: 100%; - border: 0; - table-layout: auto; } - .table__link tbody { - border-bottom: 1px solid black; } - .table__link tbody:hover { - background-color: #cccccc; } - .table__link th, .table__link td { - border: 0; } - .table__link .cell__icon { - width: 48px; - text-align: center; } - .table__link .cell__icon img { - vertical-align: text-top; } - .table__link .cell__link { - padding-right: 8px; - padding-left: 8px; } - .table__link .cell__link:hover { - background-color: #0c85ff; } - .table__link .cell__link:hover a:first-child { - display: none; } - .table__link .cell__link:hover a:last-child { - display: block; - color: white; } - .table__link .cell__link a { - display: block; } - .table__link .cell__link a:last-child { - display: none; } - .table__link th:last-child, .table__link .cell__date { - width: 16%; - text-align: center; } - .table__link .cell__text { - padding-right: 8px; - padding-left: 8px; } - .table__link .cell__text div { - width: 100%; } - .table__link .cell__text .shorten { - max-height: 44px; } - -.card_body .bkg_box { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; } - -.card_body { - height: 100%; - /* .full { - position: absolute; - width: 128px; - height: 128px; - top: 16px; - left: 16px; - background-color: #fff; - } - .mark { - float: left; - width: 32px; - height: 32px; - margin-top: 16px; - } - */ } - .card_body .bkg_box { - -webkit-transition-duration: 800ms; - transition-duration: 800ms; - overflow: hidden; - vertical-align: top; - z-index: -1; } - .card_body .bkg_box > svg { - position: relative; } - .card_body .flex_wrap_center { - display: -webkit-box; - display: -ms-flexbox; - display: flex; - -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; - -webkit-box-pack: center; - -ms-flex-pack: center; - justify-content: center; - height: 100%; } - .card_body .flex_content { - position: relative; - padding: 64px 64px 24px 64px; - border: 1px solid #FFF; - background-color: #F5F5F5; - z-index: 40; } - .card_body h1 { - margin: 16px 0; - color: #1E1E1E; - font-size: 24px; - line-height: 1.4em; - font-weight: normal; } - .card_body p, .card_body .block__column_2, .card_body .block__column_3, .card_body caption { - margin-top: 0; - margin-bottom: 16px; - font-size: 12px; - line-height: 1.4em; } - .card_body .marked { - padding-left: 1em; - text-indent: -1em; - text-align: center; } - .card_body .marked::before { - content: "* "; } - .card_body .decent { - color: #666; } - .card_body a { - color: #000; - text-decoration: none; } - .card_body a:hover { - color: #F4F9FA; - background-color: #0C85FF; - text-decoration: none; } - -.wip, .wip_txt { - border-right: 8px solid rgba(220, 20, 60, 0.8); - background-color: rgba(220, 20, 60, 0.1) !important; } - -.wip::before, .wip::after { - content: ""; - display: block; - height: 48px; } - -.exp_expose_pre::after { - content: ""; - display: block; - height: 48px; - background-color: rgba(183, 224, 240, 0.1) !important; } - -.exp_expose_post::before { - content: ""; - display: block; - height: 48px; - background-color: rgba(183, 224, 240, 0.1) !important; } - -.exp_expose::before, .exp_expose::after { - content: ""; - display: block; - height: 48px; - background-color: rgba(183, 224, 240, 0.1) !important; } - -.exp_pop { - display: none; } - -.exp_wrap { - position: relative; } - -.exp_pop { - position: absolute; - z-index: 100; - top: 128px; - left: 128px; - padding: 4px; - border: 4px solid gray; - border-radius: 4px; - background-color: gray; - pointer-events: none; } - -.exp_marker_pop { - position: absolute; - top: -12.75px; - right: -8.5px; - width: 17px; - height: 17px; - border: 1px solid white; - border-radius: 17px; - color: white; - background-color: black; } - -.exp_overlay_btn { - position: fixed; - width: 3em; - height: 2em; - cursor: pointer; } - -.exp_help_btn { - display: table; - right: 16px; - bottom: 16px; - background-color: rgba(0, 0, 0, 0.4); } - .exp_help_btn:hover { - background-color: white; } - .exp_help_btn:hover > .span__solo { - color: black; } - .exp_help_btn .span__solo { - display: table-cell; - color: rgba(255, 255, 255, 0.8); - font-family: Courier New, monospace; - font-size: 1.4em; - text-align: center; - vertical-align: middle; } - -.expose_height { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - background-color: rgba(183, 224, 240, 0.1) !important; - -webkit-transition: height 0.5s ease; - transition: height 0.5s ease; } - -.print_body [class^="din"] { - background-color: white; } - -.print_body { - font-size: 10pt; - margin: 10vh 20vw; } -@page { - .print_body { - size: A4; - margin: 1.2cm; } } -@page :first { - .print_body { - size: A4; - margin: 0; } } - .print_body .dina4 { - padding-top: 1.2cm; - padding-right: 1.2cm; - padding-bottom: 1.2cm; - padding-left: 2.4cm; } - .print_body .dina4 .page_head, .print_body .dina4 .page_foot { - right: 1.2cm; - left: 2.4cm; } - .print_body .dina4 .page_head { - top: 1.2cm; } - .print_body .dina4 .page_foot { - bottom: 1.2cm; } - .print_body .dina5 { - padding-top: 0; - padding-right: 0; - padding-bottom: 0; - padding-left: 1.2cm; } - .print_body .dina5 .page_head, .print_body .dina5 .page_foot { - right: 0; - left: 1.2cm; } - .print_body .dina5 .page_head { - top: 0; } - .print_body .dina5 .page_foot { - bottom: 0; } - .print_body .dina6 { - padding-top: 0; - padding-right: 0; - padding-bottom: 0; - padding-left: 1.2cm; } - .print_body .dina6 .page_head, .print_body .dina6 .page_foot { - right: 0; - left: 1.2cm; } - .print_body .dina6 .page_head { - top: 0; } - .print_body .dina6 .page_foot { - bottom: 0; } - .print_body *[class^="din"] { - position: relative; - overflow: auto; - margin: 32px auto; } - .print_body *[class^="din"] .page_head, .print_body *[class^="din"] .page_foot { - position: absolute; } - .print_body *[class^="din"] .page_head { - page: cover; } - .print_body *[class^="din"] .page_foot { - display: -webkit-box; - display: -ms-flexbox; - display: flex; - -webkit-box-orient: horizontal; - -webkit-box-direction: normal; - -ms-flex-direction: row; - flex-direction: row; } - .print_body *[class^="din"] .page_foot *:last-child { - margin-bottom: 0; } - .print_body *[class^="din"] .page_foot p, .print_body *[class^="din"] .page_foot .block__column_2, .print_body *[class^="din"] .page_foot .block__column_3, .print_body *[class^="din"] .page_foot caption { - -webkit-box-flex: 1; - -ms-flex: 1 0 auto; - flex: 1 0 auto; - margin: 0; - font-size: 8pt; - line-height: 10pt; - text-align: center; } - .print_body *[class^="din"] .page_foot .page_no { - -webkit-box-flex: 1; - -ms-flex: 1 0 auto; - flex: 1 0 auto; - font-size: 20pt; - line-height: 1; - text-align: right; } - .print_body *[class^="din"] .page_foot p:first-child, .print_body *[class^="din"] .page_foot .block__column_2:first-child, .print_body *[class^="din"] .page_foot .block__column_3:first-child, .print_body *[class^="din"] .page_foot caption:first-child { - text-align: left; } - .print_body *[class^="din"] .page_content { - margin-top: 10cm; - margin-bottom: 2cm; } - .print_body .page_title, .print_body .page_date { - font-size: 14pt; } - .print_body .page_title { - margin: 0; } - .print_body .page_date, .print_body .page_no { - float: right; } - .print_body .page_author { - position: absolute; - top: 5cm; - right: 0; - text-align: right; } - .print_body .page_recipient { - position: absolute; - top: 5cm; - left: 0; } - -.demo__intro { - border-top-width: 8px; - border-top-style: solid; - border-color: black; - padding-top: 32px; } - -.demo__header { - padding: 16px; } - .demo__header nav ul { - margin: 0; } - -.header__fancy { - background-color: rgba(211, 10, 81, 0.6); } - .header__fancy nav a { - background-color: rgba(250, 216, 3, 0.6); - color: #fad803; } - .header__fancy nav a:active, .header__fancy nav a:focus, .header__fancy nav a:hover { - background-color: rgba(255, 255, 255, 0.2); - color: white; } - -.header__fix { - position: relative; - top: 0; - left: 0; - width: 100%; - background-color: rgba(39, 63, 139, 0.6); } - .header__fix nav a:active, .header__fix nav a:focus, .header__fix nav a:hover { - background-color: rgba(255, 255, 255, 0.2); - color: white; } - -.demo__footer { - width: 100%; - padding: 16px 0; - background-color: #333333; - color: #cccccc; } - .demo__footer nav a { - color: white; } - -.demo__avatar img { - opacity: 1; - width: 128px; - height: auto; - min-width: 128px; - min-height: 128px; - border-radius: 50%; - background-color: #b7e0f0; } - -.demo__flag { - height: 40vh; } - -.demo__credits { - margin: 32px 0 8px 0; } - -.demo__button_32 { - width: 32px; - height: 32px; } - -.demo__queries > p, .demo__queries > .block__column_2, .demo__queries > .block__column_3, .demo__queries > caption { - padding: calc(8px - 3px) 8px; } - -.query__phoneUp { - background-color: rgba(0, 0, 0, 0.2); } - -@media (max-width: 767px) { - .query__phoneOnly { - background-color: rgba(0, 0, 0, 0.2); } } - -@media (min-width: 768px) and (max-width: 1023px) { - .query__tabletPortaitOnly { - background-color: rgba(0, 0, 0, 0.2); } } - -@media (min-width: 768px) { - .query__tabletPortraitUp { - background-color: rgba(0, 0, 0, 0.2); } } - -@media (min-width: 1024px) and (max-width: 1279px) { - .query__tabletLandscapeOnly { - background-color: rgba(0, 0, 0, 0.2); } } - -@media (min-width: 1024px) { - .query__tabletLandscapeUp { - background-color: rgba(0, 0, 0, 0.2); } } - -@media (min-width: 1280px) and (max-width: 1679px) { - .query__desktopOnly { - background-color: rgba(0, 0, 0, 0.2); } } - -@media (min-width: 1280px) { - .query__desktopUp { - background-color: rgba(0, 0, 0, 0.2); } } - -@media (min-width: 1680px) { - .query__bigDesktopUp { - background-color: rgba(0, 0, 0, 0.2); } } - -.demo__query_example { - margin-bottom: 32px; - padding: 32px; - text-align: center; } - @media (min-width: 48em) { - .demo__query_example { - background-color: #fad803; } } - @media (min-width: 64em) { - .demo__query_example { - background-color: #d30a51; } } - @media (min-width: 80em) { - .demo__query_example { - background-color: #273f8b; } } - @media (min-width: 90em) { - .demo__query_example { - background-color: #b7e0f0; } } - @media (min-width: 105em) { - .demo__query_example { - background-color: #52bed1; } } - @media (min-width: 120em) { - .demo__query_example { - background-color: #0c85ff; } } - .demo__query_example:after { - content: '< 768px'; - padding: calc(8px - 3px) 8px; - border-radius: 2px; - background-color: rgba(0, 0, 0, 0.2); } - @media (min-width: 48em) { - .demo__query_example:after { - content: '768px'; } } - @media (min-width: 64em) { - .demo__query_example:after { - content: '1024px'; } } - @media (min-width: 80em) { - .demo__query_example:after { - content: '1280px'; } } - @media (min-width: 105em) { - .demo__query_example:after { - content: '1680px'; } } - @media (min-width: 120em) { - .demo__query_example:after { - content: '1920px'; } } - -.wrap { - display: -webkit-box; - display: -ms-flexbox; - display: flex; - height: 100%; - -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; - -webkit-box-pack: center; - -ms-flex-pack: center; - justify-content: center; } - -.hello { - -webkit-box-flex: 0; - -ms-flex: 0 1 auto; - flex: 0 1 auto; - padding: 1em 5em; - background-color: rgba(0, 0, 0, 0.25); } - -.test li::after { - content: ""; - display: block; - height: 16px; } - -.front_color_1 { - color: #fad803; } - .front_color_1::after { - background-color: #fad803; } - -.front_color_2 { - color: #d30a51; } - .front_color_2::after { - background-color: #d30a51; } - -.front_color_3 { - color: #273f8b; } - .front_color_3::after { - background-color: #273f8b; } - -.front_color_4 { - color: #b7e0f0; } - .front_color_4::after { - background-color: #b7e0f0; } - -.front_color_5 { - color: #52bed1; } - .front_color_5::after { - background-color: #52bed1; } - -.back_color_1, .label_1 { - background-color: #fad803; } - -.back_color_2, .label_2 { - background-color: #d30a51; } - -.back_color_3, .label_3 { - background-color: #273f8b; } - -.back_color_4 { - background-color: #b7e0f0; } - -.back_color_5 { - background-color: #52bed1; } - -.label_1, .label_2, .label_3 { - padding: 0 4px; } - - diff --git a/build/css/example.min.css b/build/css/example.min.css deleted file mode 100644 index 8f235ed..0000000 --- a/build/css/example.min.css +++ /dev/null @@ -1,2 +0,0 @@ -@charset "UTF-8";@import url(../../vendor/normalize.css);.sym_glass:before{content:""}.sym_music:before{content:""}.sym_search:before{content:""}.sym_envelope-o:before{content:""}.sym_heart:before{content:""}[tabindex]:focus,a[href]:focus,area[href]:focus,button:not([disabled]):focus,input:not([disabled]):focus,select:not([disabled]):focus,textarea:not([disabled]):focus{outline:0}.magic{display:none}.center_50{margin-right:25%;margin-left:25%}.center_25{margin-right:37.5%;margin-left:37.5%}.table__file_simple,.width_full{width:100%;margin-right:0;margin-left:0}.height_basic{height:1024px}.height_full{height:100vh}.txt_center{text-align:center!important}.txt_right{text-align:right!important}.txt_left{text-align:left!important}.space_right{margin-right:32px}.clear,.clear:after,.clear:before{clear:both}.header__page nav ul,.nav__center_old ul,.nav__horizontal ul,.overflow{overflow:auto}.box__file_tile,.box__inline_left,.float_space_left,.header__page nav ul li,.list__horizontal li,.nav__center_old ul li,.nav__horizontal ul li{float:left;margin-right:32px}.float_half_size{float:left;width:50%}.x_long{overflow-x:scroll}.hover_full_view_change,.pos_full_view{position:fixed;top:0;left:0;width:100vw;height:100vh}.pos_full_page{top:0;right:0;bottom:0;left:0}.pos_abs,.pos_full_page{position:absolute}.pos_rel{position:relative}.pos_fix{position:fixed}.pos_bottom{bottom:0}.pos_full_view{background-color:rgba(250,216,3,.5)}.pos_full_page{background-color:rgba(39,63,139,.25)}.hover_back_change{background-color:#666;transition:background-color .2s ease-in-out}.hover_back_change:hover{background-color:gray}.hover_full_view_change{z-index:100;background-color:rgba(0,0,0,.5);transition:background-color .2s ease-in-out;pointer-events:none}.flex,.flex__column_wrap,.flex__row,.flex__wrap,.nav__column ul{display:-webkit-box;display:-ms-flexbox;display:flex}.flex__wrap{-ms-flex-wrap:wrap;flex-wrap:wrap}.flex__row{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.flex__child,.flex__column_wrap .column,.nav__column ul li{-webkit-box-flex:0;-ms-flex:0 1 auto;flex:0 1 auto}.flex__child_one{-webkit-box-flex:1;-ms-flex:1;flex:1}.flex__child_end{-ms-flex-item-align:end;align-self:flex-end}.txt_light_color{color:#666}.a__button,.a__button_border,.a__button_text{display:inline-block;padding:5px 8px;background-color:rgba(82,190,209,.2);border-radius:1px}.a__button:active,.a__button:focus,.a__button:hover,.a__button_border:active,.a__button_border:focus,.a__button_border:hover,.a__button_text:active,.a__button_text:focus,.a__button_text:hover{background-color:hsla(0,0%,100%,.1);color:#fff;border-color:transparent}.block__column_2,.block__column_3,.span__solo,caption,dd,dt,figcaption,h6,label,legend,li,p,td,th{font-family:Roboto,Segoe UI,Liberation Sans,Source Sans,Trebuchet MS,Helvetica,Arial,sans-serif;font-size:1em;line-height:1.5}.code__solo,.demo__query_example:after,.print_body [class^=din] .block__column_2,.print_body [class^=din] .block__column_3,.print_body [class^=din] caption,.print_body [class^=din] p,code,input:not([type]),input[type=color],input[type=date],input[type=datetime-local],input[type=datetime],input[type=email],input[type=month],input[type=number],input[type=password],input[type=search],input[type=tel],input[type=text],input[type=time],input[type=url],input[type=week],pre,textarea{font-family:Courier New,monospace;font-size:1em;line-height:1.5}.print_body .page_date,.print_body .page_no,h1{font-size:3.1em}.print_body .page_date,.print_body .page_no,h1,h2{font-family:Roboto,Segoe UI,Liberation Sans,Source Sans,Trebuchet MS,Helvetica,Arial,sans-serif;font-weight:300;line-height:1.5}h2{font-size:2.5em}h3,h4{font-size:1.8em}h3,h4,h5{font-family:Roboto,Segoe UI,Liberation Sans,Source Sans,Trebuchet MS,Helvetica,Arial,sans-serif;font-weight:300;line-height:1.5}h5{font-size:1.35em}.span__solo{color:#000}.table__link .cell__text .shorten{overflow:hidden;text-overflow:ellipsis;-o-text-overflow:ellipsis}html{height:100%}body{position:relative;box-sizing:border-box;font-family:Roboto,Segoe UI,Liberation Sans,Source Sans,Trebuchet MS,Helvetica,Arial,sans-serif;font-size:17px;line-height:1;color:#000;background-color:gray}body *,body :after,body :before{box-sizing:inherit}body:hover .layer__hover{background-color:transparent}.demo__intro,.sec__main_center{width:96%;margin:0 auto;padding-top:32px}@media (min-width:768px){.demo__intro,.sec__main_center{width:80%}}@media (min-width:1024px){.demo__intro,.sec__main_center{width:60%}}@media (min-width:1680px){.demo__intro,.sec__main_center{width:48%}}aside.right+section{margin-right:calc(20% + 8px)}aside.left+section{margin-left:calc(20% + 8px)}aside{width:20%}aside.left{float:left}aside.right{float:right}aside :first-child{margin-top:0}.header__page{overflow:auto}h1{margin:128px 0 32px}h2{margin:64px 0 32px}h3{text-transform:uppercase}h3,h4{margin:16px 0}h4,h5{text-transform:none}h5{margin:16px 0 8px}h6{text-transform:none;font-weight:700}.block__column_2,.block__column_3,caption,h6,p{margin:8px 0}.block__column_2 .demo__query_example:after,.block__column_2 code,.block__column_3 .demo__query_example:after,.block__column_3 code,caption .demo__query_example:after,caption code,p .demo__query_example:after,p code{padding:1px 4px;font-size:1em;line-height:1}.hr__dotted,.hr__hidden,hr{margin:32px auto;border-width:1px 0 0;border-style:solid;border-color:#000}.hr__hidden{border-color:transparent}.hr__dotted,.pre__code{border-style:dotted}.pre__code{border-color:hsla(0,0%,100%,.1);border-width:0 0 0 4px;border-radius:1px;padding:8px;background-color:hsla(0,0%,100%,.1)}.pre__code .demo__query_example:after,.pre__code code{background-color:transparent}blockquote{margin:8px 2em}.quote__mark .block__column_2:before,.quote__mark .block__column_3:before,.quote__mark caption:before,.quote__mark p:before{content:"\201E \0020"}.quote__mark .block__column_2:after,.quote__mark .block__column_3:after,.quote__mark caption:after,.quote__mark p:after{content:"\201C \0020"}.quote__mark .quote__source:after,.quote__mark .quote__source:before{content:""}dl,ol,ul{margin:16px 0 8px}ol,ul{padding-left:2em}dd{margin-left:2em}ul li{list-style:square}.list__dash li{list-style:none;position:relative}.list__dash li:before{content:"_";position:absolute;left:-1em}.list__link li{margin-bottom:2px;text-transform:uppercase}.list__link li a{display:block;padding:5px 8px;color:#000}.list__link li a img{margin-right:8px;padding-bottom:.2em;vertical-align:text-bottom}.list__link li a:active,.list__link li a:focus,.list__link li a:hover{background-color:#0c85ff;color:#fff}.list__horizontal{overflow:auto}figure{margin:16px 2em}.box__info{padding:16px 2em;border-right:8px solid rgba(82,190,209,.6);background-color:rgba(82,190,209,.1)!important}.box__main_indent{margin-left:25%}.block__column_line{-webkit-column-rule:1px solid #000;column-rule:1px solid #000}.block__column_2{-webkit-column-count:2;column-count:2;-webkit-column-gap:32px;column-gap:32px}.block__column_3{-webkit-column-count:3;column-count:3;-webkit-column-gap:64px;column-gap:64px}.box__space{position:relative;width:100%}.box__cube{float:left;display:table;width:64px;text-align:center;vertical-align:middle}.box__cube span{display:table-cell}.box__placeholder{width:100%;height:64px;border:4px solid rgba(0,0,0,.1);border-radius:1px;padding:8px;background-color:rgba(0,0,0,.1)}.box__placeholder svg{vertical-align:top}.box__placeholder_bkg{width:100%;height:64px;border:4px solid rgba(0,0,0,.1);border-radius:1px;padding:8px;background:url("data:image/svg+xml;utf8,") no-repeat;background-color:rgba(0,0,0,.1)}.flex__column_wrap .column{-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1}a{color:#52bed1;text-decoration:none}a:active,a:focus,a:hover{color:#fff}.a__line{border-bottom-width:1px;border-bottom-style:dotted;border-color:#000;background-color:transparent;color:#000;transition:color .15s ease}.a__line:active,.a__line:focus,.a__line:hover{background-color:#0c85ff;color:#fff}.a__button_border,.a__button_text{padding:7px 16px;background-color:transparent;color:#000}.a__button_border{border:1px solid #000}em,i{font-style:italic}.i__bright{font-style:normal;color:#fff}b,strong{font-weight:500}cite{font-style:italic}.demo__query_example:after,code{color:#1f1f1f;background-color:hsla(0,0%,100%,.1)}.code__solo{padding:1px 4px;color:#000}mark{background-color:#fad803}.mark__cursor{color:#fff;background-color:#000}::-moz-selection{color:#fff;background-color:#000}::selection{color:#fff;background-color:#000}img{vertical-align:top}table{margin:16px 0;border:1px solid #000;border-collapse:collapse}td,th{padding:4px}th{border:1px solid #000;text-align:left}.precol,td{border-right:1px solid #000}td{border-bottom:1px solid #000}td:last-child{border-right:0}tr:last-child td{border-bottom:0}tfoot tr:first-child td{border-top:1px solid #000}.table__blank,.table__blank td,.table__blank th,.table__free{border:1px solid transparent}.table__stripe td{border-top:0;border-bottom:0}.table__stripe tr:nth-child(2n) td{background-color:hsla(0,0%,100%,.1)}.table__fix{table-layout:fixed}caption{padding:4px 0;border:1px dotted #000;text-align:center}fieldset{margin:16px 0;padding:8px;border:1px solid #000}legend{padding:0 4px}button,input,textarea{margin:0 32px}button[disabled=disabled],button[disabled],input[disabled=disabled],input[disabled],textarea[disabled=disabled],textarea[disabled]{cursor:not-allowed}label input{margin-left:8px}input{color:#1a1a1a}input[disabled=disabled],input[disabled]{cursor:not-allowed}input:not([type]),input[type=color],input[type=date],input[type=datetime-local],input[type=datetime],input[type=email],input[type=month],input[type=number],input[type=password],input[type=search],input[type=tel],input[type=text],input[type=time],input[type=url],input[type=week]{border:2px solid #fff;padding:4px;background-color:#e6e6e6}input:not([type]):hover,input[type=color]:hover,input[type=date]:hover,input[type=datetime-local]:hover,input[type=datetime]:hover,input[type=email]:hover,input[type=month]:hover,input[type=number]:hover,input[type=password]:hover,input[type=search]:hover,input[type=tel]:hover,input[type=text]:hover,input[type=time]:hover,input[type=url]:hover,input[type=week]:hover{background-color:#fff}input:not([type])[readonly=readonly],input:not([type])[readonly],input[type=color][readonly=readonly],input[type=color][readonly],input[type=date][readonly=readonly],input[type=date][readonly],input[type=datetime-local][readonly=readonly],input[type=datetime-local][readonly],input[type=datetime][readonly=readonly],input[type=datetime][readonly],input[type=email][readonly=readonly],input[type=email][readonly],input[type=month][readonly=readonly],input[type=month][readonly],input[type=number][readonly=readonly],input[type=number][readonly],input[type=password][readonly=readonly],input[type=password][readonly],input[type=search][readonly=readonly],input[type=search][readonly],input[type=tel][readonly=readonly],input[type=tel][readonly],input[type=text][readonly=readonly],input[type=text][readonly],input[type=time][readonly=readonly],input[type=time][readonly],input[type=url][readonly=readonly],input[type=url][readonly],input[type=week][readonly=readonly],input[type=week][readonly]{border-color:#b3b3b3;background-color:#999}input:not([type])[disabled=disabled],input:not([type])[disabled],input[type=color][disabled=disabled],input[type=color][disabled],input[type=date][disabled=disabled],input[type=date][disabled],input[type=datetime-local][disabled=disabled],input[type=datetime-local][disabled],input[type=datetime][disabled=disabled],input[type=datetime][disabled],input[type=email][disabled=disabled],input[type=email][disabled],input[type=month][disabled=disabled],input[type=month][disabled],input[type=number][disabled=disabled],input[type=number][disabled],input[type=password][disabled=disabled],input[type=password][disabled],input[type=search][disabled=disabled],input[type=search][disabled],input[type=tel][disabled=disabled],input[type=tel][disabled],input[type=text][disabled=disabled],input[type=text][disabled],input[type=time][disabled=disabled],input[type=time][disabled],input[type=url][disabled=disabled],input[type=url][disabled],input[type=week][disabled=disabled],input[type=week][disabled]{border-color:transparent}textarea{border:2px solid #fff;padding:4px;background-color:#e6e6e6}textarea:hover{background-color:#fff}textarea[readonly=readonly],textarea[readonly]{border-color:#b3b3b3;background-color:#999}textarea[disabled=disabled],textarea[disabled]{border-color:transparent}input:not([type]),input[type=color],input[type=date],input[type=datetime-local],input[type=datetime],input[type=email],input[type=month],input[type=number],input[type=password],input[type=search],input[type=tel],input[type=text],input[type=time],input[type=url],input[type=week]{line-height:1}button,input[type=button],input[type=reset],input[type=submit]{padding:5px 8px}.input__label_right,label+input{margin:0 8px}.input__default label,.label__table{display:table}.input__default label input,.label__table input{display:table-cell}.input__default label{margin:4px 0}.input__default label input{padding:4px 5px;border-style:solid;border-color:transparent;background-color:#e6e6e6;color:#1a1a1a}.input__default label input:hover{background-color:#000;color:#fff}nav ul{padding-left:0}nav li{margin-bottom:8px;list-style:none}.header__page nav ul ul,.nav__center_old ul ul,.nav__horizontal ul ul{margin:8px 0}.header__page nav ul li,.nav__center_old ul li,.nav__horizontal ul li{margin-right:8px;margin-bottom:0}.header__page nav ul li:last-child,.nav__center_old ul li:last-child,.nav__horizontal ul li:last-child{margin-right:0}.nav__right{float:right;margin-left:8px}.nav__right .align_parent{margin-right:-8px}.nav__separate li{position:relative;padding-left:1px}.nav__separate li:not(:first-child):before{content:"";position:absolute;width:1px;height:100%;left:0;top:0;background-color:#000}.nav__separate_right{float:right}.nav__separate_right li{position:relative}.nav__separate_right li:first-child{padding-left:17px}.nav__separate_right li:first-child:before{content:"";position:absolute;width:1px;height:100%;left:0;top:0;background-color:#fff;margin:0 8px}.nav__center_old{float:right;position:relative;left:-50%}.nav__center_old ul{position:relative;left:50%;text-align:center}.nav__column{position:relative;margin:8px 0}.nav__column ul{margin:0 128px}.nav__column ul li{-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;margin:0;text-align:center}.nav__column ul li a{display:block}.nav__page_meta{position:fixed;right:0;bottom:16px}.nav__page_meta ul{margin:8px 0}.nav__page_meta li{margin-bottom:0}.nav__page_meta .a_button_meta{display:inline-block}.nav__page_meta .a_button_meta:active,.nav__page_meta .a_button_meta:focus{background-color:transparent}.nav__page_meta .a_button_meta:hover{background-color:#0c85ff}.header__page nav a:active,.header__page nav a:focus,.header__page nav a:hover{background-color:rgba(0,0,0,.2);color:#000}.table__link{width:100%;border:0;table-layout:auto}.table__link tbody{border-bottom:1px solid #000}.table__link tbody:hover{background-color:#ccc}.table__link td,.table__link th{border:0}.table__link .cell__icon{width:48px;text-align:center}.table__link .cell__icon img{vertical-align:text-top}.table__link .cell__link{padding-right:8px;padding-left:8px}.table__link .cell__link:hover{background-color:#0c85ff}.table__link .cell__link:hover a:first-child{display:none}.table__link .cell__link:hover a:last-child{display:block;color:#fff}.table__link .cell__link a{display:block}.table__link .cell__link a:last-child{display:none}.table__link .cell__date,.table__link th:last-child{width:16%;text-align:center}.table__link .cell__text{padding-right:8px;padding-left:8px}.table__link .cell__text div{width:100%}.table__link .cell__text .shorten{max-height:44px}.card_body .bkg_box{position:absolute;top:0;left:0;width:100%;height:100%}.card_body{height:100%}.card_body .bkg_box{transition-duration:.8s;overflow:hidden;vertical-align:top;z-index:-1}.card_body .bkg_box>svg{position:relative}.card_body .flex_wrap_center{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;height:100%}.card_body .flex_content{position:relative;padding:64px 64px 24px;border:1px solid #fff;background-color:#f5f5f5;z-index:40}.card_body h1{margin:16px 0;color:#1e1e1e;font-size:24px;line-height:1.4em;font-weight:400}.card_body .block__column_2,.card_body .block__column_3,.card_body caption,.card_body p{margin-top:0;margin-bottom:16px;font-size:12px;line-height:1.4em}.card_body .marked{padding-left:1em;text-indent:-1em;text-align:center}.card_body .marked:before{content:"* "}.card_body .decent{color:#666}.card_body a{color:#000;text-decoration:none}.card_body a:hover{color:#f4f9fa;background-color:#0c85ff;text-decoration:none}.wip,.wip_txt{border-right:8px solid rgba(220,20,60,.8);background-color:rgba(220,20,60,.1)!important}.wip:after,.wip:before{content:"";display:block;height:48px}.exp_expose:after,.exp_expose:before,.exp_expose_post:before,.exp_expose_pre:after{content:"";display:block;height:48px;background-color:rgba(183,224,240,.1)!important}.exp_pop{display:none}.exp_wrap{position:relative}.exp_pop{position:absolute;z-index:100;top:128px;left:128px;padding:4px;border:4px solid gray;border-radius:4px;background-color:gray;pointer-events:none}.exp_marker_pop{position:absolute;top:-12.75px;right:-8.5px;width:17px;height:17px;border:1px solid #fff;border-radius:17px;color:#fff;background-color:#000}.exp_overlay_btn{position:fixed;width:3em;height:2em;cursor:pointer}.exp_help_btn{display:table;right:16px;bottom:16px;background-color:rgba(0,0,0,.4)}.exp_help_btn:hover{background-color:#fff}.exp_help_btn:hover>.span__solo{color:#000}.exp_help_btn .span__solo{display:table-cell;color:hsla(0,0%,100%,.8);font-family:Courier New,monospace;font-size:1.4em;text-align:center;vertical-align:middle}.expose_height{position:absolute;top:0;right:0;bottom:0;left:0;background-color:rgba(183,224,240,.1)!important;transition:height .5s ease}.print_body [class^=din]{background-color:#fff}.print_body{font-size:10pt;margin:10vh 20vw}@page{.print_body{size:A4;margin:1.2cm}}@page :first{.print_body{size:A4;margin:0}}.print_body .dina4{padding:1.2cm 1.2cm 1.2cm 2.4cm}.print_body .dina4 .page_foot,.print_body .dina4 .page_head{right:1.2cm;left:2.4cm}.print_body .dina4 .page_head{top:1.2cm}.print_body .dina4 .page_foot{bottom:1.2cm}.print_body .dina5{padding:0 0 0 1.2cm}.print_body .dina5 .page_foot,.print_body .dina5 .page_head{right:0;left:1.2cm}.print_body .dina5 .page_head{top:0}.print_body .dina5 .page_foot{bottom:0}.print_body .dina6{padding:0 0 0 1.2cm}.print_body .dina6 .page_foot,.print_body .dina6 .page_head{right:0;left:1.2cm}.print_body .dina6 .page_head{top:0}.print_body .dina6 .page_foot{bottom:0}.print_body [class^=din]{position:relative;overflow:auto;margin:32px auto}.print_body [class^=din] .page_foot,.print_body [class^=din] .page_head{position:absolute}.print_body [class^=din] .page_head{page:cover}.print_body [class^=din] .page_foot{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.print_body [class^=din] .page_foot :last-child{margin-bottom:0}.print_body [class^=din] .page_foot .block__column_2,.print_body [class^=din] .page_foot .block__column_3,.print_body [class^=din] .page_foot caption,.print_body [class^=din] .page_foot p{-webkit-box-flex:1;-ms-flex:1 0 auto;flex:1 0 auto;margin:0;font-size:8pt;line-height:10pt;text-align:center}.print_body [class^=din] .page_foot .page_no{-webkit-box-flex:1;-ms-flex:1 0 auto;flex:1 0 auto;font-size:20pt;line-height:1;text-align:right}.print_body [class^=din] .page_foot .block__column_2:first-child,.print_body [class^=din] .page_foot .block__column_3:first-child,.print_body [class^=din] .page_foot caption:first-child,.print_body [class^=din] .page_foot p:first-child{text-align:left}.print_body [class^=din] .page_content{margin-top:10cm;margin-bottom:2cm}.print_body .page_date,.print_body .page_title{font-size:14pt}.print_body .page_title{margin:0}.print_body .page_date,.print_body .page_no{float:right}.print_body .page_author{position:absolute;top:5cm;right:0;text-align:right}.print_body .page_recipient{position:absolute;top:5cm;left:0}.demo__intro{border-top-width:8px;border-top-style:solid;border-color:#000;padding-top:32px}.demo__header{padding:16px}.demo__header nav ul{margin:0}.header__fancy{background-color:rgba(211,10,81,.6)}.header__fancy nav a{background-color:rgba(250,216,3,.6);color:#fad803}.header__fancy nav a:active,.header__fancy nav a:focus,.header__fancy nav a:hover{background-color:hsla(0,0%,100%,.2);color:#fff}.header__fix{position:relative;top:0;left:0;width:100%;background-color:rgba(39,63,139,.6)}.header__fix nav a:active,.header__fix nav a:focus,.header__fix nav a:hover{background-color:hsla(0,0%,100%,.2);color:#fff}.demo__footer{width:100%;padding:16px 0;background-color:#333;color:#ccc}.demo__footer nav a{color:#fff}.demo__avatar img{opacity:1;width:128px;height:auto;min-width:128px;min-height:128px;border-radius:50%;background-color:#b7e0f0}.demo__flag{height:40vh}.demo__credits{margin:32px 0 8px}.demo__button_32{width:32px;height:32px}.demo__queries>.block__column_2,.demo__queries>.block__column_3,.demo__queries>caption,.demo__queries>p{padding:5px 8px}.query__phoneUp{background-color:rgba(0,0,0,.2)}@media (max-width:767px){.query__phoneOnly{background-color:rgba(0,0,0,.2)}}@media (min-width:768px) and (max-width:1023px){.query__tabletPortaitOnly{background-color:rgba(0,0,0,.2)}}@media (min-width:768px){.query__tabletPortraitUp{background-color:rgba(0,0,0,.2)}}@media (min-width:1024px) and (max-width:1279px){.query__tabletLandscapeOnly{background-color:rgba(0,0,0,.2)}}@media (min-width:1024px){.query__tabletLandscapeUp{background-color:rgba(0,0,0,.2)}}@media (min-width:1280px) and (max-width:1679px){.query__desktopOnly{background-color:rgba(0,0,0,.2)}}@media (min-width:1280px){.query__desktopUp{background-color:rgba(0,0,0,.2)}}@media (min-width:1680px){.query__bigDesktopUp{background-color:rgba(0,0,0,.2)}}.demo__query_example{margin-bottom:32px;padding:32px;text-align:center}@media (min-width:48em){.demo__query_example{background-color:#fad803}}@media (min-width:64em){.demo__query_example{background-color:#d30a51}}@media (min-width:80em){.demo__query_example{background-color:#273f8b}}@media (min-width:90em){.demo__query_example{background-color:#b7e0f0}}@media (min-width:105em){.demo__query_example{background-color:#52bed1}}@media (min-width:120em){.demo__query_example{background-color:#0c85ff}}.demo__query_example:after{content:"< 768px";padding:5px 8px;border-radius:2px;background-color:rgba(0,0,0,.2)}@media (min-width:48em){.demo__query_example:after{content:"768px"}}@media (min-width:64em){.demo__query_example:after{content:"1024px"}}@media (min-width:80em){.demo__query_example:after{content:"1280px"}}@media (min-width:105em){.demo__query_example:after{content:"1680px"}}@media (min-width:120em){.demo__query_example:after{content:"1920px"}}.wrap{display:-webkit-box;display:-ms-flexbox;display:flex;height:100%;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.hello{-webkit-box-flex:0;-ms-flex:0 1 auto;flex:0 1 auto;padding:1em 5em;background-color:rgba(0,0,0,.25)}.test li:after{content:"";display:block;height:16px}.front_color_1{color:#fad803}.front_color_1:after{background-color:#fad803}.front_color_2{color:#d30a51}.front_color_2:after{background-color:#d30a51}.front_color_3{color:#273f8b}.front_color_3:after{background-color:#273f8b}.front_color_4{color:#b7e0f0}.front_color_4:after{background-color:#b7e0f0}.front_color_5{color:#52bed1}.front_color_5:after{background-color:#52bed1}.back_color_1,.label_1{background-color:#fad803}.back_color_2,.label_2{background-color:#d30a51}.back_color_3,.label_3{background-color:#273f8b}.back_color_4{background-color:#b7e0f0}.back_color_5{background-color:#52bed1}.label_1,.label_2,.label_3{padding:0 4px} -/*# sourceMappingURL=example.min.css.map */ diff --git a/build/js/all.min.js b/build/js/all.min.js deleted file mode 100644 index b7f3b70..0000000 --- a/build/js/all.min.js +++ /dev/null @@ -1,4 +0,0 @@ -var w=Math.max(document.documentElement.clientWidth,window.innerWidth||0),h=Math.max(document.documentElement.clientHeight,window.innerHeight||0),full_view_hover=!0,doc_pos_y=0,basic_ease=600,scroll_y_margin=h; -function setup(){$("#js_tph").length&&full_view_hover&&$("#js_tph").addClass("hover_full_view_change")}function Utils(){}function scrollNav(){$(".nav a").click(function(){$(".active").removeClass("active"),$(this).closest("li").addClass("active");var t=$(this).attr("class");return $("."+t).parent("li").addClass("active"),$("html, body").stop().animate({scrollTop:$($(this).attr("href")).offset().top-160},400),!1}),$(".scrollTop a").scrollTop()}Utils.prototype={constructor:Utils,isElementInView:function(t,s){var l=$(window).scrollTop(),o=l+$(window).height(),i=$(t).offset().top,e=i+$(t).height();return!0===s?le:i<=o&&e>=l}};var Utils=new Utils; -$(document).ready(function(){setup();var e=!1;$(".js_pop").hover(function(){$(this);$(this).attr("emmet"),$(this).next(".exp_pop").show()},function(){$(this).next(".exp_pop").hide()}).mousemove(function(e){$(this).next(".exp_pop").css({top:e.pageY-$(this).next(".exp_pop").outerHeight()-4,left:e.pageX+8})}),$(".exp_help_btn").click(function(t){var s,o;1!=e?(e=!0,$(".js_pop").each(function(e,t){"static"==$(this).css("position")&&($(this).addClass("js_changed_pos"),$(this).css("position","relative")),o=$(this).next(".exp_pop").detach(),(s=$(this).wrap('').parent().prepend('')).after(o)})):($(".js_pop").each(function(e,t){s=$(this).parent(".exp_wrap"),o=s.next(".exp_pop").detach(),s.find(".exp_marker_pop").remove(),$(this).unwrap(".exp_wrap"),$(this).after(o),$(this).hasClass("js_changed_pos")&&($(this).css("position",""),""==$(this).attr("style")&&$(this).removeAttr("style"),$(this).removeClass("js_changed_pos"))}),e=!1),console.log("Explanation mode: "+e)}),$("#js_scrolltop").click(function(e){console.log("scroll to the top"),e.preventDefault(),$("body").animate({scrollTop:0},basic_ease,function(){console.log("arrived at top")})}),$("#js_scrolldown").click(function(e){console.log("scroll down"),e.preventDefault(),$("body").animate({scrollTop:$(document).height()},2*basic_ease,function(){console.log("arrived at bottom")})}),$("#gameIcon").click(function(e){e.preventDefault(),$(this).clone().appendTo("#gameDetail"),$(this).siblings().clone().appendTo("#gameDetail"),$("#gameDetail").removeClass("magic")});var t=0;$(".pass-def dd").each(function(){$(this).find("li").each(function(e){if(0==$(this).children("ul").length){var s=$(this).html();$(this).html(s+''+t+""),t++}})})}),$(document).scroll(function(){doc_pos_y=$(document).scrollTop();var e=scroll_y_margin;doc_pos_y>e?$("#js_scrolltop").parent().removeClass("magic"):$("#js_scrolltop").parent().addClass("magic")}); -//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["variables.js","functions.js","global.js"],"names":["w","Math","max","document","documentElement","clientWidth","window","innerWidth","h","clientHeight","innerHeight","full_view_hover","doc_pos_y","basic_ease","scroll_y_margin","setup","$","length","addClass","Utils","scrollNav","click","removeClass","this","closest","theClass","attr","parent","stop","animate","scrollTop","offset","top","prototype","constructor","isElementInView","element","fullyInView","pageTop","pageBottom","height","elementTop","elementBottom","ready","exp_mode","hover","next","show","hide","mousemove","ev","css","pageY","outerHeight","left","pageX","e","$wrap","$pop","each","i","detach","wrap","prepend","after","find","remove","unwrap","hasClass","removeAttr","console","log","event","preventDefault","clone","appendTo","siblings","index","children","tempContent","html","scroll"],"mappings":"AAAA,IAAIA,EAAIC,KAAKC,IAAIC,SAASC,gBAAgBC,YAAaC,OAAOC,YAAc,GACxEC,EAAIP,KAAKC,IAAIC,SAASC,gBAAgBK,aAAcH,OAAOI,aAAe,GAE1EC,iBAAkB,EAElBC,UAAY,EACZC,WAAa,IACbC,gBAAkBN;ACPtB,SAASO,QACLC,EAAE,WAAWC,QAAUN,iBAEzBK,EAAE,WAAWE,SAAS,0BAexB,SAASC,SAwBT,SAASC,YACRJ,EAAE,UAAUK,MAAM,WAEjBL,EAAE,WAAWM,YAAY,UACzBN,EAAEO,MAAMC,QAAQ,MAAMN,SAAS,UAC/B,IAAIO,EAAWT,EAAEO,MAAMG,KAAK,SAM5B,OALAV,EAAE,IAAIS,GAAUE,OAAO,MAAMT,SAAS,UAEtCF,EAAE,cAAcY,OAAOC,SACrBC,UAAWd,EAAGA,EAAEO,MAAMG,KAAK,SAAUK,SAASC,IAAM,KACnD,MACI,IAERhB,EAAE,gBAAgBc,YAjCnBX,MAAMc,WACFC,YAAaf,MACbgB,gBAAiB,SAAUC,EAASC,GAChC,IAAIC,EAAUtB,EAAEV,QAAQwB,YACpBS,EAAaD,EAAUtB,EAAEV,QAAQkC,SACjCC,EAAazB,EAAEoB,GAASL,SAASC,IACjCU,EAAgBD,EAAazB,EAAEoB,GAASI,SAE5C,OAAoB,IAAhBH,EACSC,EAAUG,GAAgBF,EAAaG,EAEvCD,GAAcF,GAAgBG,GAAiBJ,IAKpE,IAAInB,MAAQ,IAAIA;ACpChBH,EAAGb,UAAWwC,MAAM,WAKnB5B,QAQA,IAAI6B,GAAW,EAGf5B,EAAE,WAAW6B,MACZ,WACa7B,EAAEO,MAEXP,EAAEO,MAAMG,KAAK,SAIhBV,EAAEO,MAAMuB,KAAK,YAAYC,QACvB,WACF/B,EAAEO,MAAMuB,KAAK,YAAYE,SAEzBC,UACD,SAASC,GACRlC,EAAEO,MAAMuB,KAAK,YAAYK,KACxBnB,IAAOkB,EAAGE,MAAQpC,EAAEO,MAAMuB,KAAK,YAAYO,cAAgB,EAC3DC,KAAQJ,EAAGK,MAAQ,MAOtBvC,EAAE,iBAAiBK,MAAM,SAASmC,GACjC,IAAIC,EAAOC,EAEI,GAAZd,GACFA,GAAW,EAEX5B,EAAE,WAAW2C,KAAK,SAASC,EAAGJ,GACC,UAA3BxC,EAAEO,MAAM4B,IAAI,cACdnC,EAAEO,MAAML,SAAS,kBACjBF,EAAEO,MAAM4B,IAAI,WAAY,aAGzBO,EAAO1C,EAAEO,MAAMuB,KAAK,YAAYe,UAChCJ,EAAQzC,EAAEO,MAAMuC,KAAK,kCAAoCnC,SAASoC,QAAQ,yCACpEC,MAAMN,OAIb1C,EAAE,WAAW2C,KAAK,SAASC,EAAGJ,GAC7BC,EAAQzC,EAAEO,MAAMI,OAAO,aACvB+B,EAAOD,EAAMX,KAAK,YAAYe,SAC9BJ,EAAMQ,KAAK,mBAAmBC,SAC9BlD,EAAEO,MAAM4C,OAAO,aACfnD,EAAEO,MAAMyC,MAAMN,GACX1C,EAAEO,MAAM6C,SAAS,oBACnBpD,EAAEO,MAAM4B,IAAI,WAAY,IACI,IAAzBnC,EAAEO,MAAMG,KAAK,UACfV,EAAEO,MAAM8C,WAAW,SAEpBrD,EAAEO,MAAMD,YAAY,qBAItBsB,GAAW,GAGZ0B,QAAQC,IAAI,qBAAsB3B,KAInC5B,EAAE,iBAAiBK,MAAM,SAASmD,GACjCF,QAAQC,IAAI,qBACZC,EAAMC,iBAENzD,EAAE,QAAQa,SAASC,UAAW,GAAIjB,WAAY,WAC5CyD,QAAQC,IAAI,sBAGfvD,EAAE,kBAAkBK,MAAM,SAASmD,GAClCF,QAAQC,IAAI,eACZC,EAAMC,iBACNzD,EAAE,QAAQa,SAASC,UAAWd,EAAEb,UAAUqC,UAAwB,EAAb3B,WAAgB,WACnEyD,QAAQC,IAAI,yBAMfvD,EAAG,aAAcK,MAAM,SAASmD,GAC/BA,EAAMC,iBACNzD,EAAGO,MAAOmD,QAAQC,SAAU,eAC5B3D,EAAGO,MAAOqD,WAAWF,QAAQC,SAAU,eACvC3D,EAAG,eAAgBM,YAAa,WAGjC,IAAIsC,EAAI,EACR5C,EAAG,gBAAiB2C,KAAK,WACxB3C,EAAGO,MAAO0C,KAAM,MAAON,KAAK,SAAUkB,GACrC,GAAK,GAAK7D,EAAGO,MAAOuD,SAAU,MAAO7D,OAAS,CAE7C,IAAI8D,EAAc/D,EAAGO,MAAOyD,OAE5BhE,EAAGO,MAAOyD,KAAMD,EAAa,4BAA+BnB,EAAG,WAC/DA,WAaJ5C,EAAGb,UAAW8E,OAAO,WAGpBrE,UAAYI,EAAGb,UAAW2B,YAE1B,IAAItB,EAAIM,gBAEJF,UAAYJ,EACfQ,EAAE,iBAAiBW,SAASL,YAAY,SAExCN,EAAE,iBAAiBW,SAAST,SAAS","file":"all.min.js","sourcesContent":["var w = Math.max(document.documentElement.clientWidth, window.innerWidth || 0);\nvar h = Math.max(document.documentElement.clientHeight, window.innerHeight || 0);\n\nvar full_view_hover = true;\n\nvar doc_pos_y = 0;\nvar basic_ease = 600;\nvar scroll_y_margin = h;\n\n\n// TEST\n// var fixed_containers = [];\n","function setup() {\n\tif($('#js_tph').length && full_view_hover) {\n\t\t// $('body').prepend(\"<div id=\\\"js_tph\\\" class=\\\"layer__hover hover_full_view_change\\\"></div>\");\n\t\t$('#js_tph').addClass(\"hover_full_view_change\");\n\t}\n}\n\n// get document coordinates of the element\n// function getCoords(elem) {\n//   let box = elem.getBoundingClientRect();\n//\n//   return {\n//     top: box.top + pageYOffset,\n//     left: box.left + pageXOffset\n//   };\n// }\n\n// https://stackoverflow.com/a/488073/1444149\nfunction Utils() {\n\n}\n\nUtils.prototype = {\n    constructor: Utils,\n    isElementInView: function (element, fullyInView) {\n        var pageTop = $(window).scrollTop();\n        var pageBottom = pageTop + $(window).height();\n        var elementTop = $(element).offset().top;\n        var elementBottom = elementTop + $(element).height();\n\n        if (fullyInView === true) {\n            return ((pageTop < elementTop) && (pageBottom > elementBottom));\n        } else {\n            return ((elementTop <= pageBottom) && (elementBottom >= pageTop));\n        }\n    }\n};\n\nvar Utils = new Utils();\n\n// TEST\n\nfunction scrollNav() {\n\t$('.nav a').click(function(){\n\t\t//Toggle Class\n\t\t$(\".active\").removeClass(\"active\");\n\t\t$(this).closest('li').addClass(\"active\");\n\t\tvar theClass = $(this).attr(\"class\");\n\t\t$('.'+theClass).parent('li').addClass('active');\n\t\t//Animate\n\t\t$('html, body').stop().animate({\n\t\t\t\tscrollTop: $( $(this).attr('href') ).offset().top - 160\n\t\t}, 400);\n\t\treturn false;\n\t});\n\t$('.scrollTop a').scrollTop();\n}\n","// DOM ready\n// ------------------------------------------------------------------------------\n$( document ).ready(function() {\n\n\t// Setup\n\t// ------------------------------------------------------------------------------\n\n\tsetup();\n\n\n\n\t// Modules\n\t// ------------------------------------------------------------------------------\n\n\t// Explanation module scripts\n\tvar exp_mode = false;\n\n\t// Displays explanation popup\n\t$(\".js_pop\").hover(\n\t\tfunction() {\n\t\t\tvar $this = $(this);\n\n\t\t\tif($(this).attr(\"emmet\")){\n\n\t\t\t}\n\n\t\t\t$(this).next(\".exp_pop\").show();\n\t\t}, function() {\n\t\t\t$(this).next(\".exp_pop\").hide();\n\t\t}\n\t).mousemove(\n\t\tfunction(ev) {\n\t\t\t$(this).next(\".exp_pop\").css({\n\t\t\t\t\"top\": ev.pageY - $(this).next(\".exp_pop\").outerHeight() - 4,\n\t\t\t\t\"left\": ev.pageX + 8\n\t\t\t});\n\t\t}\n\t);\n\n\t// WIP Activates layer with explanation elements\n\t// Besser ::after oder ::before benutzen\n\t$(\".exp_help_btn\").click(function(e){\n\t\tvar $wrap, $pop;\n\n\t\tif(exp_mode != true){\n\t\t\texp_mode = true;\n\n\t\t\t$(\".js_pop\").each(function(i, e){\n\t\t\t\tif($(this).css(\"position\") == \"static\") {\n\t\t\t\t\t$(this).addClass(\"js_changed_pos\");\n\t\t\t\t\t$(this).css(\"position\", \"relative\");\n\t\t\t\t}\n\n\t\t\t\t$pop = $(this).next(\".exp_pop\").detach();\n\t\t\t\t$wrap = $(this).wrap(\"<span class=\\\"exp_wrap\\\"></span>\").parent().prepend(\"<span class=\\\"exp_marker_pop\\\"></span>\");\n\t\t\t\t$wrap.after($pop);\n\t\t\t});\n\n\t\t} else {\n\t\t\t$(\".js_pop\").each(function(i, e){\n\t\t\t\t$wrap = $(this).parent(\".exp_wrap\");\n\t\t\t\t$pop = $wrap.next(\".exp_pop\").detach();\n\t\t\t\t$wrap.find(\".exp_marker_pop\").remove();\n\t\t\t\t$(this).unwrap(\".exp_wrap\");\n\t\t\t\t$(this).after($pop);\n\t\t\t\tif($(this).hasClass(\"js_changed_pos\")){\n\t\t\t\t\t$(this).css(\"position\", \"\");\n\t\t\t\t\tif($(this).attr(\"style\") == \"\") {\n\t\t\t\t\t\t$(this).removeAttr(\"style\");\n\t\t\t\t\t}\n\t\t\t\t\t$(this).removeClass(\"js_changed_pos\");\n\t\t\t\t}\n\t\t\t});\n\n\t\t\texp_mode = false;\n\n\t\t}\n\t\tconsole.log(\"Explanation mode: \"+ exp_mode);\n\t});\n\n\t//\tWIP Scroll to top\n\t$('#js_scrolltop').click(function(event) {\n\t\tconsole.log('scroll to the top');\n\t\tevent.preventDefault();\n\t\t// $('body').scrollTop();\n\t\t$('body').animate({scrollTop: 0}, basic_ease, function() {\n\t\t\t console.log('arrived at top');\n\t\t});\n\t});\n\t$('#js_scrolldown').click(function(event) {\n\t\tconsole.log('scroll down');\n\t\tevent.preventDefault();\n\t\t$('body').animate({scrollTop: $(document).height()}, basic_ease * 2, function() {\n\t\t\t console.log('arrived at bottom');\n\t\t});\n\t});\n\n\n\n\t$( \"#gameIcon\" ).click(function(event) {\n\t\tevent.preventDefault();\n\t\t$( this ).clone().appendTo( \"#gameDetail\" );\n\t\t$( this ).siblings().clone().appendTo( \"#gameDetail\" );\n\t\t$( \"#gameDetail\" ).removeClass( \"magic\" );\n\t});\n\n\tvar i = 0;\n\t$( \".pass-def dd\" ).each(function() {\n\t\t$( this ).find( \"li\" ).each(function( index ) {\n\t\t\tif ( 0 == $( this ).children( \"ul\" ).length ) {\n\t\t\t\t//console.log( index + \": \" + $( this ).text() );\n\t\t\t\tvar tempContent = $( this ).html();\n\t\t\t\t//$( this ).html( \"<span class=\\\"list-count\\\"></span>\" );\n\t\t\t\t$( this ).html( tempContent +\"<span class=\\\"list-count\\\">\"+ i +\"</span>\" );\n\t\t\t\ti++;\n\t\t\t}\n\t\t})\n\t});\n\n\n\n});\n\n\n\n// Scroll\n// ------------------------------------------------------------------------------\n$( document ).scroll(function() {\n\n\t// Toggle navigation elements\n\tdoc_pos_y = $( document ).scrollTop();\n\t// console.log(doc_pos_y);\n\tvar h = scroll_y_margin;\n\t// var demo_margin = $('.header__fix');\n\tif (doc_pos_y > h) {\n\t\t$('#js_scrolltop').parent().removeClass('magic');\n\t} else {\n\t\t$('#js_scrolltop').parent().addClass('magic');\n\t}\n\n\n\n});\n"]} From 42e0ccee4edad0fa10ba1f9b46b889a6702f74f6 Mon Sep 17 00:00:00 2001 From: Stephan Hagedorn Date: Wed, 27 Sep 2017 13:28:28 +0200 Subject: [PATCH 060/372] new normalize.css --- source/style/_hippie.scss | 2 +- vendor/{ => normalizecss}/normalize.css | 40 ++++++++----------------- 2 files changed, 14 insertions(+), 28 deletions(-) rename vendor/{ => normalizecss}/normalize.css (90%) diff --git a/source/style/_hippie.scss b/source/style/_hippie.scss index ab0eeee..dfff2ac 100644 --- a/source/style/_hippie.scss +++ b/source/style/_hippie.scss @@ -23,7 +23,7 @@ // Reset // Use a file outside of hippie i.e. vendor/normalize.css // ----------------------------------------------------------------------------- -@import "../../vendor/normalize.css"; +@import "../../vendor/normalizecss/normalize.css"; // @import "vendor/YOUR-FILES.css"; diff --git a/vendor/normalize.css b/vendor/normalizecss/normalize.css similarity index 90% rename from vendor/normalize.css rename to vendor/normalizecss/normalize.css index 9b77e0e..fa4e73d 100644 --- a/vendor/normalize.css +++ b/vendor/normalizecss/normalize.css @@ -1,20 +1,18 @@ -/*! normalize.css v5.0.0 | MIT License | github.com/necolas/normalize.css */ - -/** - * 1. Change the default font family in all browsers (opinionated). - * 2. Correct the line height in all browsers. - * 3. Prevent adjustments of font size after orientation changes in - * IE on Windows Phone and in iOS. - */ +/*! normalize.css v7.0.0 | MIT License | github.com/necolas/normalize.css */ /* Document ========================================================================== */ +/** + * 1. Correct the line height in all browsers. + * 2. Prevent adjustments of font size after orientation changes in + * IE on Windows Phone and in iOS. + */ + html { - font-family: sans-serif; /* 1 */ - line-height: 1.15; /* 2 */ - -ms-text-size-adjust: 100%; /* 3 */ - -webkit-text-size-adjust: 100%; /* 3 */ + line-height: 1.15; /* 1 */ + -ms-text-size-adjust: 100%; /* 2 */ + -webkit-text-size-adjust: 100%; /* 2 */ } /* Sections @@ -108,17 +106,7 @@ a { } /** - * Remove the outline on focused links when they are also active or hovered - * in all browsers (opinionated). - */ - -a:active, -a:hover { - outline-width: 0; -} - -/** - * 1. Remove the bottom border in Firefox 39-. + * 1. Remove the bottom border in Chrome 57- and Firefox 39-. * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. */ @@ -317,13 +305,11 @@ button:-moz-focusring, } /** - * Change the border, margin, and padding in all browsers (opinionated). + * Correct the padding in Firefox. */ fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; + padding: 0.35em 0.75em 0.625em; } /** From 212b41f4a3f873c791881b973e82bd318bd27d06 Mon Sep 17 00:00:00 2001 From: Stephan Hagedorn Date: Thu, 28 Sep 2017 01:12:52 +0200 Subject: [PATCH 061/372] new status sections --- demo-index.html | 45 ++++++++++++++++++++- source/style/elements/_sections.scss | 14 +++++++ source/style/global/_common.scss | 2 +- source/style/modules/demo/_demo_module.scss | 12 +++--- 4 files changed, 65 insertions(+), 8 deletions(-) diff --git a/demo-index.html b/demo-index.html index d536a94..c63f09f 100644 --- a/demo-index.html +++ b/demo-index.html @@ -536,8 +536,8 @@ nav.nav__center_old>ul>(li>a.a__button{Typ $})*4 -
- 
footer.pos_abs.pos_bottom>nav.nav__column>ul>(li>a.a__button_text)*4
+
+ 
footer.pos_abs.pin_bottom>nav.nav__column>ul>(li>a.a__button_text)*4
+
+
+

Autarke Seiten

+

Diese Elemente repräsentieren jeweils eine eigene Seite.

+
+
+
+

404

+

Hier ist nichts.

+
+

Die angeforderte Ressource wurde nicht gefunden. Dieser Statuscode kann ebenfalls verwendet werden, um eine Anfrage ohne näheren Grund abzuweisen. Links, welche auf solche Fehlerseiten verweisen, werden auch als Tote Links bezeichnet.

+

Wikipedia

+
+
+

domain.tld * admin@domain.tld

+
+
+
+

403

+

Nicht erlaubt! Forbidden

+
+

Die Anfrage wurde mangels Berechtigung des Clients nicht durchgeführt, bspw. weil der authentifizierte Benutzer nicht berechtigt ist, oder eine als HTTPS konfigurierte URL nur mit HTTP aufgerufen wurde.

+

Wikipedia

+
+
+

domain.tld * admin@domain.tld

+
+
+
+

400

+

Fehlerhafte Anfrage! Bad Request

+
+

Die Anfrage-Nachricht war fehlerhaft aufgebaut.

+

Wikipedia

+
+
+

domain.tld * admin@domain.tld

+
+
+
+
- - - - diff --git a/gulpfile.js b/gulpfile.js index 907086b..d6f3aa2 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,59 +1,144 @@ // Setup project var source = { - markup: '*.html', - watch: 'source/style/**/*.scss', - styles: 'source/style/example.scss', + watch: ['source/style/**/*.scss', 'source/templates/**/*.+(html|nunjucks)', 'source/pages/**/*.+(html|nunjucks)'], + styles: ['source/style/example.scss', 'source/style/maintenance.scss'], scripts: ['source/code/variables.js', 'source/code/functions.js', 'source/code/global.js', 'source/code/**/*.coffee', '!source/vendor/**/*', ], - images: 'source/art/**/*' + images: 'source/art/**/*', + pages: 'source/pages/**/*.+(html|nunjucks)', + vendor: 'vendor/**/*' }; var build = { styles: 'build/css', scripts: 'build/js', - images: 'build/art' + images: 'build/art', + vendor: 'build/vendor', + root: 'build' } // Load plugins const gulp = require('gulp'), - rename = require('gulp-rename'), - del = require('del'); - concat = require('gulp-concat'), - pump = require('pump'), - sourcemap = require('gulp-sourcemaps'), - prefix = require('gulp-autoprefixer'), - sass = require('gulp-ruby-sass'), - cssnano = require('gulp-cssnano'), - jshint = require('gulp-jshint'), - uglifyjs = require('uglify-es'), - composer = require('gulp-uglify/composer'), - // imagemin = require('gulp-imagemin'), - cache = require('gulp-cached'), - remember = require('gulp-remember'), - changed = require('gulp-changed'), - notify = require('gulp-notify'), - browsersync = require('browser-sync').create(); +rename = require('gulp-rename'), +del = require('del'); +gulpif = require('gulp-if'); +sequencer = require('run-sequence'); +concat = require('gulp-concat'), +pump = require('pump'), +sourcemap = require('gulp-sourcemaps'), +prefix = require('gulp-autoprefixer'), +testsass = require('gulp-sass'), +sass = require('gulp-ruby-sass'), +nunjucks = require('gulp-nunjucks-render'); +cssnano = require('gulp-cssnano'), +jshint = require('gulp-jshint'), +jscs = require('gulp-jscs'), +uglifyjs = require('uglify-es'), +composer = require('gulp-uglify/composer'), +// imagemin = require('gulp-imagemin'), +spritesmith = require('gulp.spritesmith'), +cache = require('gulp-cached'), +remember = require('gulp-remember'), +changed = require('gulp-changed'), +newer = require('gulp-newer'), +plumber = require('gulp-plumber'), +notify = require('gulp-notify'), +browsersync = require('browser-sync').create(); var minify = composer(uglifyjs, console); +// TEST - Tasks +gulp.task('test', function() { + return gulp.src('source/style/**/*.+(scss|sass)') + .pipe(plumbError('Error Running Sass')) + .pipe(sourcemap.init()) + .pipe(testsass({ + includePaths: ['source/bower_components'] + })) + .pipe(prefix(['>= 4%', 'last 2 version'])) + .pipe(sourcemap.write()) + .pipe(gulp.dest('build/css')) + .pipe(browsersync.reload({ + stream: true + })) +}); + +gulp.task('testsync', function() { + browsersync.init({ + open: false, + server: 'build', + // proxy: "http://verser.vrt/virtual/" + }); +}); + +gulp.task('testnunjucks', function() { + return gulp.src('source/pages/**/*.+(html|nunjucks)') + .pipe(plumbError('Error Running Nunjucks')) + .pipe(nunjucks({ + path: ['source/templates'], + envOptions: { + trimBlocks: true + } + })) + .pipe(gulp.dest('build')) + .pipe(browsersync.reload({ + stream: true + })) +}); + +gulp.task('sprites', function() { + gulp.src('source/art/sprites/**/*') + .pipe(spritesmith({ + cssName: '_sprites.scss', + imgName: 'sprites.png' + })) + .pipe(gulpif('*.png', gulp.dest('build/images'))) + .pipe(gulpif('*.scss', gulp.dest('source/style/modules/media'))); +}); + +gulp.task('lint:js', function() { + return gulp.src('source/code/**/*.js') + .pipe(plumbError('JSHint Error')) + .pipe(jshint()) + .pipe(jshint.reporter('jshint-stylish')) + .pipe(jshint.reporter('fail', { + ignoreWarning: true, + ignoreInfo: true + })) + .pipe(jscs({ + fix: false, + configPath: '.jscsrc' + })) + // .pipe(jscs.reporter()); +}); + +gulp.task('clean:dev', function() { + del.sync([ + 'build/css', + 'build/*.html' + ]); +}); + + + // Task - Clean build directory gulp.task('clean', function() { - return del([build.scripts, build.styles, 'build/**']); + return del([build.scripts, build.styles, build.images]); }); // Task - Styles -gulp.task('styles', () => - sass(source.styles, {sourcemap: true}) - .on('error', sass.logError) - .pipe(prefix('last 2 version')) - .pipe(gulp.dest(build.styles)) - .pipe(rename({suffix: '.min'})) - .pipe(cssnano()) - .pipe(sourcemap.write('.', { - includeContent: false, - sourceRoot: 'source' - })) - .pipe(gulp.dest(build.styles)) - .pipe(browsersync.stream({match: '**/*.css'})) - // .pipe(notify({message: 'Style task complete'})) +gulp.task('styles', () => sass(source.styles, {sourcemap: true}) +.on('error', sass.logError) +// .pipe(newer({dest: build.styles, ext: '.css'})) +.pipe(prefix('last 2 version')) +.pipe(gulp.dest(build.styles)) +.pipe(rename({suffix: '.min'})) +.pipe(cssnano()) +.pipe(sourcemap.write('.', { + includeContent: false, + sourceRoot: 'source' +})) +.pipe(gulp.dest(build.styles)) +.pipe(browsersync.stream({match: '**/*.css'})) +// .pipe(notify({message: 'Style task complete'})) ); // Task - Scripts @@ -76,34 +161,108 @@ gulp.task('scripts', function(cb) { // Task - Images gulp.task('images', function() { return gulp.src(source.images) - .pipe(changed(cache(imagemin({ - optimizationLevel: 3, - progressive: true, - interlaced: true }))) - ) + .pipe(changed(build.images)) + // .pipe(cache(imagemin({ + // optimizationLevel: 3, + // progressive: true, + // interlaced: true }))) + // ) .pipe(gulp.dest(build.images)) - .pipe(notify({ message: 'Images task complete' })) + // .pipe(notify({ message: 'Images task complete' })) ; }); +// Task - Vendor +gulp.task('vendor', function() { + return gulp.src(source.vendor) + .pipe(plumbError()) + .pipe(gulp.dest(build.vendor)) + ; +}); + +//Task - Nunjucks +gulp.task('nunjucks', function() { + return gulp.src(source.pages) + // .pipe(changed(build.root)) + .pipe(nunjucks({ + path: ['source/templates'], + envOptions: { + trimBlocks: true + } + })) + .pipe(gulp.dest(build.root)) +}); + +// a task that ensures the other task is complete before reloading browsers +gulp.task('overwatch', ['nunjucks', 'styles'], function(done) { + browsersync.reload(); + done(); +}); + + + +// TEST - Watch +gulp.task('watch-js', ['lint:js'], browsersync.reload); + +gulp.task('testwatch', function() { + gulp.watch('source/code/**/*.js', ['watch-js']) + gulp.watch('source/style/**/*.+(scss|sass)', ['test']); + gulp.watch([ + 'source/templates/**/*', + 'source/pages/**/*.+(html|nunjucks)' + ], ['testnunjucks']); +}); + + + // Watch for file changes -gulp.task('watch', ['clean', 'styles', 'scripts'], function() { - browsersync.init({ - server: "./", - // proxy: "http://verser.vrt/virtual/" +gulp.task('watch', ['styles', 'scripts', 'nunjucks'], function() { + browsersync.init({ + open: false, + server: build.root, + // proxy: "http://verser.vrt/virtual/" }); - gulp.watch(source.watch, ['styles']); gulp.watch(source.scripts, ['scripts']).on('change', function(event) { if (event.type === 'deleted') { delete cache.caches['scripts'][event.path]; remember.forget('scripts', event.path); } }); - gulp.watch(source.markup).on('change', browsersync.reload); - // gulp.watch(['build/**']).on('change', browsersync.reload); + // gulp.watch(source.watch, ['overwatch']); + gulp.watch(source.watch, ['styles', 'nunjucks']).on('change', browsersync.reload); // gulp.watch(source.images, ['images']); }); // The default task (called when you run `gulp` from cli) -gulp.task('default', ['clean', 'styles', 'scripts']); +gulp.task('olddefault', ['clean', 'styles', 'scripts', 'images', 'nunjucks']); + +gulp.task('default', function(callback) { + sequencer( + 'clean:dev', + ['sprites', 'lint:js'], + ['test', 'testnunjucks'], + ['testsync', 'testwatch'], + callback + ) +}); + + + +// function errorHandler(err) { +// // Logs out error in the command line +// console.log(err.toString()); +// // Ends the current pipe, so Gulp watch doesn't break +// this.emit('end'); +// } + +function plumbError(errTitle) { + return plumber({ + errorHandler: notify.onError({ + // Customizing error title + title: errTitle || "Error running Gulp", + message: "Error: <%= error.message %>", + sound: true + }) + }); +} diff --git a/index.html b/index.html deleted file mode 100644 index 92e858a..0000000 --- a/index.html +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - HIPPIE Index - - - - - - - - - - - - - - - - -
- -
- -
- - - - - - - diff --git a/package-lock.json b/package-lock.json index 174e89c..85a3512 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,6 +35,18 @@ "through2": "2.0.3" } }, + "JSV": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz", + "integrity": "sha1-0Hf2glVx+CEy+d/67Vh7QCn+/1c=", + "dev": true + }, + "a-sync-waterfall": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.0.tgz", + "integrity": "sha1-OOgxnXk3niRiiEW1O5ZyKyng5Hw=", + "dev": true + }, "abbrev": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz", @@ -73,6 +85,17 @@ "json-stable-stringify": "1.0.1" } }, + "align-text": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", + "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", + "dev": true, + "requires": { + "kind-of": "3.2.2", + "longest": "1.0.1", + "repeat-string": "1.6.1" + } + }, "alphanum-sort": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz", @@ -107,12 +130,28 @@ "normalize-path": "2.1.1" } }, + "aproba": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", + "dev": true + }, "archy": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=", "dev": true }, + "are-we-there-yet": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz", + "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=", + "dev": true, + "requires": { + "delegates": "1.0.0", + "readable-stream": "2.3.3" + } + }, "argparse": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", @@ -149,6 +188,12 @@ "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=", "dev": true }, + "array-find-index": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", + "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", + "dev": true + }, "array-slice": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.0.0.tgz", @@ -182,6 +227,12 @@ "integrity": "sha1-8zshWfBTKj8xB6JywMz70a0peco=", "dev": true }, + "asap": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", + "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=", + "dev": true + }, "asn1": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", @@ -212,6 +263,12 @@ "integrity": "sha1-dhfBkXQB/Yykooqtzj266Yr+tDI=", "dev": true }, + "async-foreach": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz", + "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=", + "dev": true + }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -250,6 +307,22 @@ "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=", "dev": true }, + "babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", + "dev": true, + "requires": { + "core-js": "2.5.1", + "regenerator-runtime": "0.11.0" + } + }, + "babylon": { + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", + "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", + "dev": true + }, "backo2": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz", @@ -305,6 +378,12 @@ "callsite": "1.0.0" } }, + "bin-pack": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bin-pack/-/bin-pack-1.0.2.tgz", + "integrity": "sha1-wqAU7b8L7XCjKSBi7UZXe5YSBnk=", + "dev": true + }, "binary-extensions": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz", @@ -317,6 +396,15 @@ "integrity": "sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=", "dev": true }, + "block-stream": { + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", + "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", + "dev": true, + "requires": { + "inherits": "2.0.3" + } + }, "boom": { "version": "2.10.1", "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", @@ -439,6 +527,24 @@ "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", "dev": true }, + "camelcase-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", + "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", + "dev": true, + "requires": { + "camelcase": "2.1.1", + "map-obj": "1.0.1" + }, + "dependencies": { + "camelcase": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", + "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=", + "dev": true + } + } + }, "caniuse-api": { "version": "1.6.1", "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz", @@ -481,6 +587,16 @@ "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", "dev": true }, + "center-align": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", + "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", + "dev": true, + "requires": { + "align-text": "0.1.4", + "lazy-cache": "1.0.4" + } + }, "chalk": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", @@ -529,6 +645,23 @@ "glob": "7.1.2" } }, + "cli-table": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz", + "integrity": "sha1-9TsFJmqLGguTSz0IIebi3FkUriM=", + "dev": true, + "requires": { + "colors": "1.0.3" + }, + "dependencies": { + "colors": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz", + "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=", + "dev": true + } + } + }, "cliui": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", @@ -657,6 +790,15 @@ "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==", "dev": true }, + "comment-parser": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-0.3.2.tgz", + "integrity": "sha1-PAPwd2uGo239mgosl8YwfzMggv4=", + "dev": true, + "requires": { + "readable-stream": "2.3.3" + } + }, "component-bind": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz", @@ -681,6 +823,39 @@ "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "dev": true }, + "concat-stream": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz", + "integrity": "sha1-cIl4Yk2FavQaWnQd790mHadSwmY=", + "dev": true, + "requires": { + "inherits": "2.0.3", + "readable-stream": "2.0.6", + "typedarray": "0.0.6" + }, + "dependencies": { + "readable-stream": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", + "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "string_decoder": "0.10.31", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + } + } + }, "concat-with-sourcemaps": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.0.4.tgz", @@ -717,6 +892,47 @@ "date-now": "0.1.4" } }, + "console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", + "dev": true + }, + "contentstream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/contentstream/-/contentstream-1.0.0.tgz", + "integrity": "sha1-C9z6RtowRkqGzo+n7OVlQQ3G+aU=", + "dev": true, + "requires": { + "readable-stream": "1.0.34" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + } + } + }, "convert-source-map": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz", @@ -729,6 +945,12 @@ "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=", "dev": true }, + "core-js": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz", + "integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs=", + "dev": true + }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", @@ -899,6 +1121,119 @@ "source-map": "0.5.7" } }, + "cst": { + "version": "0.4.10", + "resolved": "https://registry.npmjs.org/cst/-/cst-0.4.10.tgz", + "integrity": "sha512-U5ETe1IOjq2h56ZcBE3oe9rT7XryCH6IKgPMv0L7sSk6w29yR3p5egCK0T3BDNHHV95OoUBgXsqiVG+3a900Ag==", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babylon": "6.18.0", + "source-map-support": "0.4.18" + } + }, + "currently-unhandled": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", + "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", + "dev": true, + "requires": { + "array-find-index": "1.0.2" + } + }, + "cwise": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/cwise/-/cwise-1.0.10.tgz", + "integrity": "sha1-JO7mBy69/WuMb12tsXCQtkmxK+8=", + "dev": true, + "requires": { + "cwise-compiler": "1.1.3", + "cwise-parser": "1.0.3", + "static-module": "1.5.0", + "uglify-js": "2.8.29" + }, + "dependencies": { + "cliui": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", + "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", + "dev": true, + "requires": { + "center-align": "0.1.3", + "right-align": "0.1.3", + "wordwrap": "0.0.2" + } + }, + "uglify-js": { + "version": "2.8.29", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", + "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", + "dev": true, + "requires": { + "source-map": "0.5.7", + "uglify-to-browserify": "1.0.2", + "yargs": "3.10.0" + } + }, + "window-size": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", + "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", + "dev": true + }, + "wordwrap": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", + "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", + "dev": true + }, + "yargs": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", + "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", + "dev": true, + "requires": { + "camelcase": "1.2.1", + "cliui": "2.1.0", + "decamelize": "1.2.0", + "window-size": "0.1.0" + } + } + } + }, + "cwise-compiler": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/cwise-compiler/-/cwise-compiler-1.1.3.tgz", + "integrity": "sha1-9NZnQQ6FDToxOn0tt7HlBbsDTMU=", + "dev": true, + "requires": { + "uniq": "1.0.1" + } + }, + "cwise-parser": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/cwise-parser/-/cwise-parser-1.0.3.tgz", + "integrity": "sha1-jkk8F9VPl8sDCp6YVLyGyd+zVP4=", + "dev": true, + "requires": { + "esprima": "1.2.5", + "uniq": "1.0.1" + }, + "dependencies": { + "esprima": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz", + "integrity": "sha1-CZNQL+r2aBODJXVvMPmlH+7sEek=", + "dev": true + } + } + }, + "cycle": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz", + "integrity": "sha1-IegLK+hYD5i0aPN5QwZisEbDStI=", + "dev": true + }, "d": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", @@ -931,6 +1266,12 @@ } } }, + "data-uri-to-buffer": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-0.0.3.tgz", + "integrity": "sha1-GK6XmmoMqZSwYlhTkW0mYruuCxo=", + "dev": true + }, "date-now": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", @@ -992,6 +1333,12 @@ "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", "dev": true }, + "deep-equal": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", + "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=", + "dev": true + }, "defaults": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", @@ -1035,6 +1382,12 @@ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", "dev": true }, + "delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", + "dev": true + }, "depd": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz", @@ -1158,6 +1511,29 @@ } } }, + "duplexify": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz", + "integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==", + "dev": true, + "requires": { + "end-of-stream": "1.4.0", + "inherits": "2.0.3", + "readable-stream": "2.3.3", + "stream-shift": "1.0.0" + }, + "dependencies": { + "end-of-stream": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz", + "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=", + "dev": true, + "requires": { + "once": "1.4.0" + } + } + } + }, "each-async": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz", @@ -1425,12 +1801,54 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", "dev": true }, + "escodegen": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz", + "integrity": "sha1-8CQBb1qI4Eb9EgBQVek5gC5sXyM=", + "dev": true, + "requires": { + "esprima": "1.1.1", + "estraverse": "1.5.1", + "esutils": "1.0.0", + "source-map": "0.1.43" + }, + "dependencies": { + "esprima": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz", + "integrity": "sha1-W28VR/TRAuZw4UDFCb5ncdautUk=", + "dev": true + }, + "source-map": { + "version": "0.1.43", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", + "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", + "dev": true, + "optional": true, + "requires": { + "amdefine": "1.0.1" + } + } + } + }, "esprima": { "version": "2.7.3", "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", "dev": true }, + "estraverse": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz", + "integrity": "sha1-hno+jlip+EYYr7bC3bzZFrfLr3E=", + "dev": true + }, + "esutils": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz", + "integrity": "sha1-gVHTWOIMisx/t0XnRywAJf5JZXA=", + "dev": true + }, "etag": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", @@ -1538,6 +1956,44 @@ "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", "dev": true }, + "eyes": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz", + "integrity": "sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A=", + "dev": true + }, + "falafel": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/falafel/-/falafel-2.1.0.tgz", + "integrity": "sha1-lrsXdh2rqU9G0AFzizzt86Z/4Gw=", + "dev": true, + "requires": { + "acorn": "5.1.2", + "foreach": "2.0.5", + "isarray": "0.0.1", + "object-keys": "1.0.11" + }, + "dependencies": { + "acorn": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.2.tgz", + "integrity": "sha512-o96FZLJBPY1lvTuJylGA9Bk3t/GKPPJG8H0ydQQl01crzwJgspa4AEIq/pVTXigmK0PHVQhiAtn8WMBLL9D2WA==", + "dev": true + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "object-keys": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz", + "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=", + "dev": true + } + } + }, "fancy-log": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz", @@ -1665,12 +2121,24 @@ "for-in": "1.0.2" } }, + "foreach": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", + "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=", + "dev": true + }, "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", "dev": true }, + "fork-stream": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/fork-stream/-/fork-stream-0.0.4.tgz", + "integrity": "sha1-24Sfznf2cIpfjzhq5TOgkHtUrnA=", + "dev": true + }, "form-data": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", @@ -1717,12 +2185,57 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true }, + "fstream": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", + "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "inherits": "2.0.3", + "mkdirp": "0.5.1", + "rimraf": "2.6.2" + }, + "dependencies": { + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + }, + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, + "requires": { + "minimist": "0.0.8" + } + } + } + }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", "dev": true }, + "gauge": { + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "dev": true, + "requires": { + "aproba": "1.2.0", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.2" + } + }, "gaze": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz", @@ -1738,6 +2251,31 @@ "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=", "dev": true }, + "get-pixels": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/get-pixels/-/get-pixels-3.3.0.tgz", + "integrity": "sha1-jZeVvq4YhQuED3SVgbrcBdPjbkE=", + "dev": true, + "requires": { + "data-uri-to-buffer": "0.0.3", + "jpeg-js": "0.1.2", + "mime-types": "2.1.17", + "ndarray": "1.0.18", + "ndarray-pack": "1.2.1", + "node-bitmap": "0.0.1", + "omggif": "1.0.8", + "parse-data-uri": "0.2.0", + "pngjs": "2.3.1", + "request": "2.81.0", + "through": "2.3.8" + } + }, + "get-stdin": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", + "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", + "dev": true + }, "getpass": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", @@ -1755,6 +2293,41 @@ } } }, + "gif-encoder": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/gif-encoder/-/gif-encoder-0.4.3.tgz", + "integrity": "sha1-iitP6MqJWkjjoLbLs0CgpqNXGJk=", + "dev": true, + "requires": { + "readable-stream": "1.1.14" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + } + } + }, "glob": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", @@ -1979,6 +2552,12 @@ "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", "dev": true }, + "graceful-readlink": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", + "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=", + "dev": true + }, "growly": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz", @@ -2105,6 +2684,29 @@ "vinyl-sourcemaps-apply": "0.2.1" } }, + "gulp-if": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/gulp-if/-/gulp-if-2.0.2.tgz", + "integrity": "sha1-pJe351cwBQQcqivIt92jyARE1ik=", + "dev": true, + "requires": { + "gulp-match": "1.0.3", + "ternary-stream": "2.0.1", + "through2": "2.0.3" + } + }, + "gulp-jscs": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/gulp-jscs/-/gulp-jscs-4.0.0.tgz", + "integrity": "sha1-TbLWP5IHzkpUtbJnkOMY40a3aoU=", + "dev": true, + "requires": { + "gulp-util": "3.0.8", + "jscs": "3.0.7", + "through2": "2.0.3", + "tildify": "1.2.0" + } + }, "gulp-jshint": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/gulp-jshint/-/gulp-jshint-2.0.4.tgz", @@ -2126,6 +2728,26 @@ } } }, + "gulp-match": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/gulp-match/-/gulp-match-1.0.3.tgz", + "integrity": "sha1-kcfA1/Kb7NZgbVfYCn+Hdqh6uo4=", + "dev": true, + "requires": { + "minimatch": "3.0.4" + } + }, + "gulp-newer": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/gulp-newer/-/gulp-newer-1.3.0.tgz", + "integrity": "sha1-1Q7Ky7gi7aSStXMkpshaB/2aVcE=", + "dev": true, + "requires": { + "glob": "7.1.2", + "gulp-util": "3.0.8", + "kew": "0.7.0" + } + }, "gulp-notify": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/gulp-notify/-/gulp-notify-3.0.0.tgz", @@ -2160,6 +2782,255 @@ } } }, + "gulp-nunjucks-render": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/gulp-nunjucks-render/-/gulp-nunjucks-render-2.2.1.tgz", + "integrity": "sha1-Nxxqyv6Uup1pzlpfxDwVI4Y7EPA=", + "dev": true, + "requires": { + "gulp-util": "2.2.20", + "lodash": "3.10.1", + "nunjucks": "3.0.1", + "through2": "0.4.2" + }, + "dependencies": { + "ansi-regex": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz", + "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=", + "dev": true + }, + "ansi-styles": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz", + "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=", + "dev": true + }, + "chalk": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz", + "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=", + "dev": true, + "requires": { + "ansi-styles": "1.1.0", + "escape-string-regexp": "1.0.5", + "has-ansi": "0.1.0", + "strip-ansi": "0.3.0", + "supports-color": "0.2.0" + } + }, + "dateformat": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz", + "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=", + "dev": true, + "requires": { + "get-stdin": "4.0.1", + "meow": "3.7.0" + } + }, + "gulp-util": { + "version": "2.2.20", + "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-2.2.20.tgz", + "integrity": "sha1-1xRuVyiRC9jwR6awseVJvCLb1kw=", + "dev": true, + "requires": { + "chalk": "0.5.1", + "dateformat": "1.0.12", + "lodash._reinterpolate": "2.4.1", + "lodash.template": "2.4.1", + "minimist": "0.2.0", + "multipipe": "0.1.2", + "through2": "0.5.1", + "vinyl": "0.2.3" + }, + "dependencies": { + "through2": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz", + "integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=", + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "3.0.0" + } + } + } + }, + "has-ansi": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz", + "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=", + "dev": true, + "requires": { + "ansi-regex": "0.2.1" + } + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "lodash._reinterpolate": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz", + "integrity": "sha1-TxInqlqHEfxjL1sHofRgequLMiI=", + "dev": true + }, + "lodash.defaults": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz", + "integrity": "sha1-p+iIXwXmiFEUS24SqPNngCa8TFQ=", + "dev": true, + "requires": { + "lodash._objecttypes": "2.4.1", + "lodash.keys": "2.4.1" + } + }, + "lodash.escape": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz", + "integrity": "sha1-LOEsXghNsKV92l5dHu659dF1o7Q=", + "dev": true, + "requires": { + "lodash._escapehtmlchar": "2.4.1", + "lodash._reunescapedhtml": "2.4.1", + "lodash.keys": "2.4.1" + } + }, + "lodash.isobject": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz", + "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=", + "dev": true, + "requires": { + "lodash._objecttypes": "2.4.1" + } + }, + "lodash.keys": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", + "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", + "dev": true, + "requires": { + "lodash._isnative": "2.4.1", + "lodash._shimkeys": "2.4.1", + "lodash.isobject": "2.4.1" + } + }, + "lodash.template": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz", + "integrity": "sha1-nmEQB+32KRKal0qzxIuBez4c8g0=", + "dev": true, + "requires": { + "lodash._escapestringchar": "2.4.1", + "lodash._reinterpolate": "2.4.1", + "lodash.defaults": "2.4.1", + "lodash.escape": "2.4.1", + "lodash.keys": "2.4.1", + "lodash.templatesettings": "2.4.1", + "lodash.values": "2.4.1" + } + }, + "lodash.templatesettings": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz", + "integrity": "sha1-6nbHXRHrhtTb6JqDiTu4YZKaxpk=", + "dev": true, + "requires": { + "lodash._reinterpolate": "2.4.1", + "lodash.escape": "2.4.1" + } + }, + "minimist": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz", + "integrity": "sha1-Tf/lJdriuGTGbC4jxicdev3s784=", + "dev": true + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + }, + "strip-ansi": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz", + "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=", + "dev": true, + "requires": { + "ansi-regex": "0.2.1" + } + }, + "supports-color": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz", + "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=", + "dev": true + }, + "through2": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz", + "integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=", + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "2.1.2" + }, + "dependencies": { + "xtend": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz", + "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=", + "dev": true, + "requires": { + "object-keys": "0.4.0" + } + } + } + }, + "vinyl": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz", + "integrity": "sha1-vKk4IJWC7FpJrVOKAPofEl5RMlI=", + "dev": true, + "requires": { + "clone-stats": "0.0.1" + } + }, + "xtend": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz", + "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=", + "dev": true + } + } + }, + "gulp-plumber": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/gulp-plumber/-/gulp-plumber-1.1.0.tgz", + "integrity": "sha1-8SF2wtBCL2AwbCQv/2oBo5T6ugk=", + "dev": true, + "requires": { + "gulp-util": "3.0.8", + "through2": "2.0.3" + } + }, "gulp-remember": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/gulp-remember/-/gulp-remember-0.3.1.tgz", @@ -2239,6 +3110,19 @@ "rimraf": "2.6.2" } }, + "gulp-sass": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-3.1.0.tgz", + "integrity": "sha1-U9xLaKH13f5EJKtMJHZVJpqLdLc=", + "dev": true, + "requires": { + "gulp-util": "3.0.8", + "lodash.clonedeep": "4.5.0", + "node-sass": "4.5.3", + "through2": "2.0.3", + "vinyl-sourcemaps-apply": "0.2.1" + } + }, "gulp-sourcemaps": { "version": "2.6.1", "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.1.tgz", @@ -2329,6 +3213,45 @@ } } }, + "gulp.spritesmith": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/gulp.spritesmith/-/gulp.spritesmith-6.5.1.tgz", + "integrity": "sha1-4An4tdoULtDHyJQ8Pkbp/OLDGYI=", + "dev": true, + "requires": { + "async": "2.1.5", + "gulp-util": "3.0.8", + "minimatch": "3.0.4", + "spritesheet-templates": "10.2.1", + "spritesmith": "3.1.1", + "through2": "2.0.3", + "underscore": "1.8.3", + "url2": "1.0.4" + }, + "dependencies": { + "async": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/async/-/async-2.1.5.tgz", + "integrity": "sha1-5YfGhYCZSsZ/xW/4bTrFa9voELw=", + "dev": true, + "requires": { + "lodash": "4.17.4" + } + }, + "lodash": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", + "dev": true + }, + "underscore": { + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", + "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=", + "dev": true + } + } + }, "gulplog": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", @@ -2338,6 +3261,95 @@ "glogg": "1.0.0" } }, + "handlebars": { + "version": "4.0.10", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz", + "integrity": "sha1-PTDHGLCaPZbyPqTMH0A8TTup/08=", + "dev": true, + "requires": { + "async": "1.5.2", + "optimist": "0.6.1", + "source-map": "0.4.4", + "uglify-js": "2.8.29" + }, + "dependencies": { + "cliui": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", + "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", + "dev": true, + "optional": true, + "requires": { + "center-align": "0.1.3", + "right-align": "0.1.3", + "wordwrap": "0.0.2" + } + }, + "source-map": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "dev": true, + "requires": { + "amdefine": "1.0.1" + } + }, + "uglify-js": { + "version": "2.8.29", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", + "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", + "dev": true, + "optional": true, + "requires": { + "source-map": "0.5.7", + "uglify-to-browserify": "1.0.2", + "yargs": "3.10.0" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true, + "optional": true + } + } + }, + "window-size": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", + "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", + "dev": true, + "optional": true + }, + "wordwrap": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", + "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", + "dev": true, + "optional": true + }, + "yargs": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", + "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", + "dev": true, + "optional": true, + "requires": { + "camelcase": "1.2.1", + "cliui": "2.1.0", + "decamelize": "1.2.0", + "window-size": "0.1.0" + } + } + } + }, + "handlebars-layouts": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/handlebars-layouts/-/handlebars-layouts-1.1.0.tgz", + "integrity": "sha1-JhK+Wu2PICaXN8cxHaFcnC11+7w=", + "dev": true + }, "har-schema": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz", @@ -2389,6 +3401,12 @@ } } }, + "has-color": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz", + "integrity": "sha1-ZxRKUmDDT8PMpnfQQdr1L+e3iy8=", + "dev": true + }, "has-cors": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz", @@ -2410,6 +3428,12 @@ "sparkles": "1.0.0" } }, + "has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", + "dev": true + }, "hawk": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", @@ -2520,12 +3544,33 @@ "sshpk": "1.13.1" } }, + "i": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/i/-/i-0.3.5.tgz", + "integrity": "sha1-HSuFQVjsgWkRPGy39raAHpniEdU=", + "dev": true + }, "immutable": { "version": "3.8.1", "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.1.tgz", "integrity": "sha1-IAgH8Rqw9ycQ6khVQt4IgHX2jNI=", "dev": true }, + "in-publish": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz", + "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=", + "dev": true + }, + "indent-string": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", + "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", + "dev": true, + "requires": { + "repeating": "2.0.1" + } + }, "indexes-of": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz", @@ -2548,6 +3593,12 @@ "wrappy": "1.0.2" } }, + "inherit": { + "version": "2.2.6", + "resolved": "https://registry.npmjs.org/inherit/-/inherit-2.2.6.tgz", + "integrity": "sha1-8WFLBshUToEo5CKchjR9tzrZeI0=", + "dev": true + }, "inherits": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", @@ -2572,6 +3623,18 @@ "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", "dev": true }, + "iota-array": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/iota-array/-/iota-array-1.0.0.tgz", + "integrity": "sha1-ge9X/l0FgUzVjCSDYyqZwwoOgIc=", + "dev": true + }, + "irregular-plurals": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.3.0.tgz", + "integrity": "sha512-njf5A+Mxb3kojuHd1DzISjjIl+XhyzovXEOyPPSzdQozq/Lf2tN27mOrAAsxEPZxpn6I4MGzs1oo9TxXxPFpaA==", + "dev": true + }, "is": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz", @@ -2651,6 +3714,15 @@ "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", "dev": true }, + "is-finite": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", + "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", + "dev": true, + "requires": { + "number-is-nan": "1.0.1" + } + }, "is-fullwidth-code-point": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", @@ -2824,6 +3896,12 @@ "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", "dev": true }, + "jpeg-js": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.1.2.tgz", + "integrity": "sha1-E1uZLAV1yYXPoPSUoyJ+0jhYPs4=", + "dev": true + }, "js-base64": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.3.2.tgz", @@ -2847,6 +3925,106 @@ "dev": true, "optional": true }, + "jscs": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/jscs/-/jscs-3.0.7.tgz", + "integrity": "sha1-cUG03/W4bjLQ6Z12S4NnZ8MNIBo=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "cli-table": "0.3.1", + "commander": "2.9.0", + "cst": "0.4.10", + "estraverse": "4.2.0", + "exit": "0.1.2", + "glob": "5.0.15", + "htmlparser2": "3.8.3", + "js-yaml": "3.4.6", + "jscs-jsdoc": "2.0.0", + "jscs-preset-wikimedia": "1.0.0", + "jsonlint": "1.6.2", + "lodash": "3.10.1", + "minimatch": "3.0.4", + "natural-compare": "1.2.2", + "pathval": "0.1.1", + "prompt": "0.2.14", + "reserved-words": "0.1.2", + "resolve": "1.4.0", + "strip-bom": "2.0.0", + "strip-json-comments": "1.0.4", + "to-double-quotes": "2.0.0", + "to-single-quotes": "2.0.1", + "vow": "0.4.16", + "vow-fs": "0.3.6", + "xmlbuilder": "3.1.0" + }, + "dependencies": { + "commander": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", + "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", + "dev": true, + "requires": { + "graceful-readlink": "1.0.1" + } + }, + "estraverse": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", + "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", + "dev": true + }, + "glob": { + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", + "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", + "dev": true, + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "js-yaml": { + "version": "3.4.6", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.4.6.tgz", + "integrity": "sha1-a+GyP2JJ9T0pM3D9TRqqY84bTrA=", + "dev": true, + "requires": { + "argparse": "1.0.9", + "esprima": "2.7.3", + "inherit": "2.2.6" + } + } + } + }, + "jscs-jsdoc": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/jscs-jsdoc/-/jscs-jsdoc-2.0.0.tgz", + "integrity": "sha1-9T684CmqMSW9iCkLpQ1k1FEKSHE=", + "dev": true, + "requires": { + "comment-parser": "0.3.2", + "jsdoctypeparser": "1.2.0" + } + }, + "jscs-preset-wikimedia": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/jscs-preset-wikimedia/-/jscs-preset-wikimedia-1.0.0.tgz", + "integrity": "sha1-//VjNCA4/C6IJre7cwnDrjQG/H4=", + "dev": true + }, + "jsdoctypeparser": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/jsdoctypeparser/-/jsdoctypeparser-1.2.0.tgz", + "integrity": "sha1-597cFToRhJ/8UUEUSuhqfvDCU5I=", + "dev": true, + "requires": { + "lodash": "3.10.1" + } + }, "jshint": { "version": "2.9.5", "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.9.5.tgz", @@ -2871,6 +4049,26 @@ } } }, + "jshint-stylish": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/jshint-stylish/-/jshint-stylish-2.2.1.tgz", + "integrity": "sha1-JCCCosA1rgP9gQROBXDMQgjPbmE=", + "dev": true, + "requires": { + "beeper": "1.1.1", + "chalk": "1.1.3", + "log-symbols": "1.0.2", + "plur": "2.1.2", + "string-length": "1.0.1", + "text-table": "0.2.0" + } + }, + "json-content-demux": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/json-content-demux/-/json-content-demux-0.1.3.tgz", + "integrity": "sha1-XBJ3v387dRKoa3Mt3UGzLU38scw=", + "dev": true + }, "json-schema": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", @@ -2913,6 +4111,16 @@ "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", "dev": true }, + "jsonlint": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.2.tgz", + "integrity": "sha1-VzcEUIX1XrRVxosf9OvAG9UOiDA=", + "dev": true, + "requires": { + "JSV": "4.0.2", + "nomnom": "1.8.1" + } + }, "jsprim": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", @@ -2933,6 +4141,12 @@ } } }, + "kew": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz", + "integrity": "sha1-edk9LTM2PW/dKXCzNdkUGtWR15s=", + "dev": true + }, "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", @@ -2942,6 +4156,21 @@ "is-buffer": "1.1.5" } }, + "layout": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/layout/-/layout-2.2.0.tgz", + "integrity": "sha1-MeRL/BjdEBmz/7II5AKku/4uavQ=", + "dev": true, + "requires": { + "bin-pack": "1.0.2" + } + }, + "lazy-cache": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", + "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", + "dev": true + }, "lcid": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", @@ -3054,18 +4283,51 @@ "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=", "dev": true }, + "lodash._escapehtmlchar": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz", + "integrity": "sha1-32fDu2t+jh6DGrSL+geVuSr+iZ0=", + "dev": true, + "requires": { + "lodash._htmlescapes": "2.4.1" + } + }, + "lodash._escapestringchar": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz", + "integrity": "sha1-7P4iYYoq3lC/7qQ5N+Ud9m8O23I=", + "dev": true + }, "lodash._getnative": { "version": "3.9.1", "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=", "dev": true }, + "lodash._htmlescapes": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz", + "integrity": "sha1-MtFL8IRLbeb4tioFG09nwii2JMs=", + "dev": true + }, "lodash._isiterateecall": { "version": "3.0.9", "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=", "dev": true }, + "lodash._isnative": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz", + "integrity": "sha1-PqZAS3hKe+g2x7V1gOHN95sUgyw=", + "dev": true + }, + "lodash._objecttypes": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz", + "integrity": "sha1-fAt/admKH3ZSn4kLDNsbTf7BHBE=", + "dev": true + }, "lodash._reescape": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", @@ -3084,12 +4346,53 @@ "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=", "dev": true }, + "lodash._reunescapedhtml": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz", + "integrity": "sha1-dHxPxAED6zu4oJduVx96JlnpO6c=", + "dev": true, + "requires": { + "lodash._htmlescapes": "2.4.1", + "lodash.keys": "2.4.1" + }, + "dependencies": { + "lodash.isobject": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz", + "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=", + "dev": true, + "requires": { + "lodash._objecttypes": "2.4.1" + } + }, + "lodash.keys": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", + "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", + "dev": true, + "requires": { + "lodash._isnative": "2.4.1", + "lodash._shimkeys": "2.4.1", + "lodash.isobject": "2.4.1" + } + } + } + }, "lodash._root": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz", "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=", "dev": true }, + "lodash._shimkeys": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz", + "integrity": "sha1-bpzJZm/wgfC1psl4uD4kLmlJ0gM=", + "dev": true, + "requires": { + "lodash._objecttypes": "2.4.1" + } + }, "lodash.assign": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", @@ -3182,6 +4485,12 @@ "integrity": "sha1-aYhLoUSsM/5plzemCG3v+t0PicU=", "dev": true }, + "lodash.mergewith": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz", + "integrity": "sha1-FQzwoWeR9ZA7iJHqsVRgknS96lU=", + "dev": true + }, "lodash.restparam": { "version": "3.6.1", "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", @@ -3221,6 +4530,62 @@ "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=", "dev": true }, + "lodash.values": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz", + "integrity": "sha1-q/UUQ2s8twUAFieXjLzzCxKA7qQ=", + "dev": true, + "requires": { + "lodash.keys": "2.4.1" + }, + "dependencies": { + "lodash.isobject": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz", + "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=", + "dev": true, + "requires": { + "lodash._objecttypes": "2.4.1" + } + }, + "lodash.keys": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", + "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", + "dev": true, + "requires": { + "lodash._isnative": "2.4.1", + "lodash._shimkeys": "2.4.1", + "lodash.isobject": "2.4.1" + } + } + } + }, + "log-symbols": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz", + "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=", + "dev": true, + "requires": { + "chalk": "1.1.3" + } + }, + "longest": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", + "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", + "dev": true + }, + "loud-rejection": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", + "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", + "dev": true, + "requires": { + "currently-unhandled": "0.4.1", + "signal-exit": "3.0.2" + } + }, "lru-cache": { "version": "2.7.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz", @@ -3263,6 +4628,12 @@ "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", "dev": true }, + "map-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", + "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", + "dev": true + }, "math-expression-evaluator": { "version": "1.2.17", "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz", @@ -3300,6 +4671,33 @@ "timers-ext": "0.1.2" } }, + "meow": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", + "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", + "dev": true, + "requires": { + "camelcase-keys": "2.1.0", + "decamelize": "1.2.0", + "loud-rejection": "1.6.0", + "map-obj": "1.0.1", + "minimist": "1.2.0", + "normalize-package-data": "2.4.0", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "redent": "1.0.0", + "trim-newlines": "1.0.0" + } + }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "2.3.3" + } + }, "micromatch": { "version": "2.3.11", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", @@ -3378,12 +4776,74 @@ "duplexer2": "0.0.2" } }, + "mute-stream": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", + "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", + "dev": true + }, + "nan": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz", + "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY=", + "dev": true + }, "natives": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz", "integrity": "sha1-6f+EFBimsux6SV6TmYT3jxY+bjE=", "dev": true }, + "natural-compare": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.2.2.tgz", + "integrity": "sha1-H5bWDjFBysG20FZTzg2urHY69qo=", + "dev": true + }, + "ncp": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz", + "integrity": "sha1-q8xsvT7C7Spyn/bnwfqPAXhKhXQ=", + "dev": true + }, + "ndarray": { + "version": "1.0.18", + "resolved": "https://registry.npmjs.org/ndarray/-/ndarray-1.0.18.tgz", + "integrity": "sha1-tg06cyJOxVXQ+qeXEeUCRI/T95M=", + "dev": true, + "requires": { + "iota-array": "1.0.0", + "is-buffer": "1.1.5" + } + }, + "ndarray-fill": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/ndarray-fill/-/ndarray-fill-1.0.2.tgz", + "integrity": "sha1-owpg9xiODJWC/N1YiWrNy1IqHtY=", + "dev": true, + "requires": { + "cwise": "1.0.10" + } + }, + "ndarray-ops": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/ndarray-ops/-/ndarray-ops-1.2.2.tgz", + "integrity": "sha1-WeiNLDKn7ryxvGkPrhQVeVV6YU4=", + "dev": true, + "requires": { + "cwise-compiler": "1.1.3" + } + }, + "ndarray-pack": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ndarray-pack/-/ndarray-pack-1.2.1.tgz", + "integrity": "sha1-jK6+qqJNXs9w/4YCBjeXfajuWFo=", + "dev": true, + "requires": { + "cwise-compiler": "1.1.3", + "ndarray": "1.0.18" + } + }, "negotiator": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", @@ -3396,6 +4856,56 @@ "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", "dev": true }, + "node-bitmap": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/node-bitmap/-/node-bitmap-0.0.1.tgz", + "integrity": "sha1-GA6scAPgxwdhjvMTaPYvhLKmkJE=", + "dev": true + }, + "node-gyp": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz", + "integrity": "sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA=", + "dev": true, + "requires": { + "fstream": "1.0.11", + "glob": "7.1.2", + "graceful-fs": "4.1.11", + "minimatch": "3.0.4", + "mkdirp": "0.5.1", + "nopt": "3.0.6", + "npmlog": "4.1.2", + "osenv": "0.1.4", + "request": "2.81.0", + "rimraf": "2.6.2", + "semver": "5.3.0", + "tar": "2.2.1", + "which": "1.3.0" + }, + "dependencies": { + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + }, + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, + "requires": { + "minimist": "0.0.8" + } + }, + "semver": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", + "dev": true + } + } + }, "node-notifier": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.1.2.tgz", @@ -3408,6 +4918,95 @@ "which": "1.3.0" } }, + "node-sass": { + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.5.3.tgz", + "integrity": "sha1-0JydEXlkEjnRuX/8YjH9zsU+FWg=", + "dev": true, + "requires": { + "async-foreach": "0.1.3", + "chalk": "1.1.3", + "cross-spawn": "3.0.1", + "gaze": "1.1.2", + "get-stdin": "4.0.1", + "glob": "7.1.2", + "in-publish": "2.0.0", + "lodash.assign": "4.2.0", + "lodash.clonedeep": "4.5.0", + "lodash.mergewith": "4.6.0", + "meow": "3.7.0", + "mkdirp": "0.5.1", + "nan": "2.7.0", + "node-gyp": "3.6.2", + "npmlog": "4.1.2", + "request": "2.81.0", + "sass-graph": "2.2.4", + "stdout-stream": "1.4.0" + }, + "dependencies": { + "cross-spawn": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz", + "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", + "dev": true, + "requires": { + "lru-cache": "4.1.1", + "which": "1.3.0" + } + }, + "gaze": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz", + "integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=", + "dev": true, + "requires": { + "globule": "1.2.0" + } + }, + "globule": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz", + "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=", + "dev": true, + "requires": { + "glob": "7.1.2", + "lodash": "4.17.4", + "minimatch": "3.0.4" + } + }, + "lodash": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", + "dev": true + }, + "lru-cache": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", + "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", + "dev": true, + "requires": { + "pseudomap": "1.0.2", + "yallist": "2.1.2" + } + }, + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + }, + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, + "requires": { + "minimist": "0.0.8" + } + } + } + }, "node.extend": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/node.extend/-/node.extend-1.1.6.tgz", @@ -3417,6 +5016,47 @@ "is": "3.2.1" } }, + "nomnom": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz", + "integrity": "sha1-IVH3Ikcrp55Qp2/BJbuMjy5Nwqc=", + "dev": true, + "requires": { + "chalk": "0.4.0", + "underscore": "1.6.0" + }, + "dependencies": { + "ansi-styles": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz", + "integrity": "sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=", + "dev": true + }, + "chalk": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz", + "integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=", + "dev": true, + "requires": { + "ansi-styles": "1.0.0", + "has-color": "0.1.7", + "strip-ansi": "0.1.1" + } + }, + "strip-ansi": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz", + "integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=", + "dev": true + }, + "underscore": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz", + "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=", + "dev": true + } + } + }, "nopt": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", @@ -3465,6 +5105,18 @@ "sort-keys": "1.1.2" } }, + "npmlog": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", + "dev": true, + "requires": { + "are-we-there-yet": "1.1.4", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" + } + }, "num2fraction": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", @@ -3477,12 +5129,53 @@ "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", "dev": true }, + "nunjucks": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-3.0.1.tgz", + "integrity": "sha1-TedKPlULr2+jNwMj89HHwqhr3E0=", + "dev": true, + "requires": { + "a-sync-waterfall": "1.0.0", + "asap": "2.0.6", + "chokidar": "1.7.0", + "yargs": "3.32.0" + }, + "dependencies": { + "camelcase": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", + "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=", + "dev": true + }, + "yargs": { + "version": "3.32.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz", + "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=", + "dev": true, + "requires": { + "camelcase": "2.1.1", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "os-locale": "1.4.0", + "string-width": "1.0.2", + "window-size": "0.1.4", + "y18n": "3.2.1" + } + } + } + }, "oauth-sign": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=", "dev": true }, + "obj-extend": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/obj-extend/-/obj-extend-0.1.0.tgz", + "integrity": "sha1-u0SKR3X7les0p4H5CLusLfI9u1s=", + "dev": true + }, "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -3495,6 +5188,18 @@ "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=", "dev": true }, + "object-inspect": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-0.4.0.tgz", + "integrity": "sha1-9RV8EWwUVbJDsG7pdwM5LFrYn+w=", + "dev": true + }, + "object-keys": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz", + "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=", + "dev": true + }, "object-path": { "version": "0.9.2", "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.9.2.tgz", @@ -3557,6 +5262,12 @@ } } }, + "omggif": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/omggif/-/omggif-1.0.8.tgz", + "integrity": "sha1-F483sqsLPXtG7ToORr0HkLWNNTA=", + "dev": true + }, "on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", @@ -3597,6 +5308,24 @@ "pinkie-promise": "2.0.1" } }, + "optimist": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "dev": true, + "requires": { + "minimist": "0.0.10", + "wordwrap": "0.0.3" + }, + "dependencies": { + "minimist": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", + "dev": true + } + } + }, "options": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz", @@ -3641,12 +5370,31 @@ "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true }, + "osenv": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz", + "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=", + "dev": true, + "requires": { + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" + } + }, "p-map": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz", "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==", "dev": true }, + "parse-data-uri": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/parse-data-uri/-/parse-data-uri-0.2.0.tgz", + "integrity": "sha1-vwTYUd1ch7CrI45dAazklLYEtMk=", + "dev": true, + "requires": { + "data-uri-to-buffer": "0.0.3" + } + }, "parse-filepath": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.1.tgz", @@ -3771,6 +5519,12 @@ "pinkie-promise": "2.0.1" } }, + "pathval": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-0.1.1.tgz", + "integrity": "sha1-CPkRzcqczllCiA2ngXvAtyO2bYI=", + "dev": true + }, "performance-now": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", @@ -3798,6 +5552,58 @@ "pinkie": "2.0.4" } }, + "pixelsmith": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/pixelsmith/-/pixelsmith-2.1.2.tgz", + "integrity": "sha1-W+LDBcuv8+AoHAaNtm4SgfHoVhE=", + "dev": true, + "requires": { + "async": "0.9.2", + "concat-stream": "1.5.2", + "get-pixels": "3.3.0", + "mime-types": "2.1.17", + "ndarray": "1.0.18", + "ndarray-fill": "1.0.2", + "obj-extend": "0.1.0", + "save-pixels": "2.3.4", + "vinyl-file": "1.3.0" + }, + "dependencies": { + "async": { + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", + "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=", + "dev": true + } + } + }, + "pkginfo": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.1.tgz", + "integrity": "sha1-tUGO8EOd5UJfxJlQQtztFPsqhP8=", + "dev": true + }, + "plur": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz", + "integrity": "sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo=", + "dev": true, + "requires": { + "irregular-plurals": "1.3.0" + } + }, + "pngjs": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-2.3.1.tgz", + "integrity": "sha1-EdHhK5y2TWPjDBQ6Mw9MH1Z9qF8=", + "dev": true + }, + "pngjs-nozlib": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/pngjs-nozlib/-/pngjs-nozlib-1.0.0.tgz", + "integrity": "sha1-nmTWAs/pzOTZ1Zl9BodCmnPwt9c=", + "dev": true + }, "portscanner": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/portscanner/-/portscanner-2.1.1.tgz", @@ -4893,6 +6699,19 @@ "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", "dev": true }, + "prompt": { + "version": "0.2.14", + "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.14.tgz", + "integrity": "sha1-V3VPZPVD/XsIRXB8gY7OYY8F/9w=", + "dev": true, + "requires": { + "pkginfo": "0.4.1", + "read": "1.0.7", + "revalidator": "0.1.8", + "utile": "0.2.1", + "winston": "0.8.3" + } + }, "pseudomap": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", @@ -4948,6 +6767,67 @@ "strict-uri-encode": "1.1.0" } }, + "quote-stream": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/quote-stream/-/quote-stream-0.0.0.tgz", + "integrity": "sha1-zeKelMQJsW4Z3HCYuJtmWPlyHTs=", + "dev": true, + "requires": { + "minimist": "0.0.8", + "through2": "0.4.2" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + }, + "through2": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz", + "integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=", + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "2.1.2" + } + }, + "xtend": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz", + "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=", + "dev": true, + "requires": { + "object-keys": "0.4.0" + } + } + } + }, "randomatic": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", @@ -5016,6 +6896,15 @@ "rcfinder": "0.1.9" } }, + "read": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz", + "integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=", + "dev": true, + "requires": { + "mute-stream": "0.0.7" + } + }, "read-pkg": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", @@ -5073,6 +6962,16 @@ "resolve": "1.4.0" } }, + "redent": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", + "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", + "dev": true, + "requires": { + "indent-string": "2.1.0", + "strip-indent": "1.0.1" + } + }, "reduce-css-calc": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz", @@ -5109,6 +7008,12 @@ } } }, + "regenerator-runtime": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz", + "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==", + "dev": true + }, "regex-cache": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", @@ -5136,6 +7041,15 @@ "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", "dev": true }, + "repeating": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", + "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", + "dev": true, + "requires": { + "is-finite": "1.0.2" + } + }, "replace-ext": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", @@ -5198,6 +7112,12 @@ "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", "dev": true }, + "reserved-words": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/reserved-words/-/reserved-words-0.1.2.tgz", + "integrity": "sha1-AKCUD5jNUBrqqsMWQR2a3FKzGrE=", + "dev": true + }, "resolve": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz", @@ -5233,6 +7153,21 @@ "minimatch": "3.0.4" } }, + "revalidator": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz", + "integrity": "sha1-/s5hv6DBtSoga9axgZgYS91SOjs=", + "dev": true + }, + "right-align": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", + "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", + "dev": true, + "requires": { + "align-text": "0.1.4" + } + }, "rimraf": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", @@ -5242,6 +7177,16 @@ "glob": "7.1.2" } }, + "run-sequence": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/run-sequence/-/run-sequence-2.2.0.tgz", + "integrity": "sha512-xW5DmUwdvoyYQUMPKN8UW7TZSFs7AxtT59xo1m5y91jHbvwGlGgOmdV1Yw5P68fkjf3aHUZ4G1o1mZCtNe0qtw==", + "dev": true, + "requires": { + "chalk": "1.1.3", + "gulp-util": "3.0.8" + } + }, "rx": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz", @@ -5254,12 +7199,112 @@ "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", "dev": true }, + "sass-graph": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz", + "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=", + "dev": true, + "requires": { + "glob": "7.1.2", + "lodash": "4.17.4", + "scss-tokenizer": "0.2.3", + "yargs": "7.1.0" + }, + "dependencies": { + "camelcase": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", + "dev": true + }, + "lodash": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", + "dev": true + }, + "yargs": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz", + "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", + "dev": true, + "requires": { + "camelcase": "3.0.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "os-locale": "1.4.0", + "read-pkg-up": "1.0.1", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "1.0.2", + "which-module": "1.0.0", + "y18n": "3.2.1", + "yargs-parser": "5.0.0" + } + }, + "yargs-parser": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz", + "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", + "dev": true, + "requires": { + "camelcase": "3.0.0" + } + } + } + }, + "save-pixels": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/save-pixels/-/save-pixels-2.3.4.tgz", + "integrity": "sha1-SdNJwGuNfAEn2/DaJLRKylr7Wf4=", + "dev": true, + "requires": { + "contentstream": "1.0.0", + "gif-encoder": "0.4.3", + "jpeg-js": "0.0.4", + "ndarray": "1.0.18", + "ndarray-ops": "1.2.2", + "pngjs-nozlib": "1.0.0", + "through": "2.3.8" + }, + "dependencies": { + "jpeg-js": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.0.4.tgz", + "integrity": "sha1-Bqr0fv7HrwsZJKWc1pWm0rXthw4=", + "dev": true + } + } + }, "sax": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", "dev": true }, + "scss-tokenizer": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz", + "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", + "dev": true, + "requires": { + "js-base64": "2.3.2", + "source-map": "0.4.4" + }, + "dependencies": { + "source-map": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "dev": true, + "requires": { + "amdefine": "1.0.1" + } + } + } + }, "semver": { "version": "5.4.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", @@ -5399,6 +7444,12 @@ "integrity": "sha1-gaVSFB7BBLiOic44MQOtXGZWTQg=", "dev": true }, + "shallow-copy": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz", + "integrity": "sha1-QV9CcC1z2BAzApLMXuhurhoRoXA=", + "dev": true + }, "shebang-command": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", @@ -5432,6 +7483,12 @@ "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=", "dev": true }, + "signal-exit": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", + "dev": true + }, "sntp": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", @@ -5595,6 +7652,15 @@ "urix": "0.1.0" } }, + "source-map-support": { + "version": "0.4.18", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", + "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", + "dev": true, + "requires": { + "source-map": "0.5.7" + } + }, "source-map-url": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.3.0.tgz", @@ -5634,6 +7700,48 @@ "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", "dev": true }, + "spritesheet-templates": { + "version": "10.2.1", + "resolved": "https://registry.npmjs.org/spritesheet-templates/-/spritesheet-templates-10.2.1.tgz", + "integrity": "sha1-XvVPt47Up28ZMuQQ9yqKuIi3y5o=", + "dev": true, + "requires": { + "handlebars": "4.0.10", + "handlebars-layouts": "1.1.0", + "json-content-demux": "0.1.3", + "underscore": "1.4.4", + "underscore.string": "3.0.3" + }, + "dependencies": { + "underscore": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz", + "integrity": "sha1-YaajIBBiKvoHljvzJSA88SI51gQ=", + "dev": true + } + } + }, + "spritesmith": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/spritesmith/-/spritesmith-3.1.1.tgz", + "integrity": "sha1-TlNk65v9mH2vbBtIpY0r5bag+Nc=", + "dev": true, + "requires": { + "concat-stream": "1.5.2", + "layout": "2.2.0", + "pixelsmith": "2.1.2", + "semver": "5.0.3", + "through2": "2.0.3" + }, + "dependencies": { + "semver": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz", + "integrity": "sha1-d0Zt5YnNXTyV8TiqeLxWmjy10no=", + "dev": true + } + } + }, "sshpk": { "version": "1.13.1", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz", @@ -5658,18 +7766,167 @@ } } }, + "stack-trace": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", + "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=", + "dev": true + }, + "static-eval": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/static-eval/-/static-eval-0.2.4.tgz", + "integrity": "sha1-t9NNg4k3uWn5ZBygfUj47eJj6ns=", + "dev": true, + "requires": { + "escodegen": "0.0.28" + }, + "dependencies": { + "escodegen": { + "version": "0.0.28", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-0.0.28.tgz", + "integrity": "sha1-Dk/xcV8yh3XWyrUaxEpAbNer/9M=", + "dev": true, + "requires": { + "esprima": "1.0.4", + "estraverse": "1.3.2", + "source-map": "0.5.7" + } + }, + "esprima": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz", + "integrity": "sha1-n1V+CPw7TSbs6d00+Pv0drYlha0=", + "dev": true + }, + "estraverse": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.3.2.tgz", + "integrity": "sha1-N8K4k+8T1yPydth41g2FNRUqbEI=", + "dev": true + } + } + }, + "static-module": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/static-module/-/static-module-1.5.0.tgz", + "integrity": "sha1-J9qYg8QajNCSNvhC8MHrxu32PYY=", + "dev": true, + "requires": { + "concat-stream": "1.6.0", + "duplexer2": "0.0.2", + "escodegen": "1.3.3", + "falafel": "2.1.0", + "has": "1.0.1", + "object-inspect": "0.4.0", + "quote-stream": "0.0.0", + "readable-stream": "1.0.34", + "shallow-copy": "0.0.1", + "static-eval": "0.2.4", + "through2": "0.4.2" + }, + "dependencies": { + "concat-stream": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz", + "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=", + "dev": true, + "requires": { + "inherits": "2.0.3", + "readable-stream": "2.3.3", + "typedarray": "0.0.6" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + } + } + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + } + } + }, + "through2": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz", + "integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=", + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "2.1.2" + } + }, + "xtend": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz", + "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=", + "dev": true, + "requires": { + "object-keys": "0.4.0" + } + } + } + }, "statuses": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=", "dev": true }, + "stdout-stream": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.0.tgz", + "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=", + "dev": true, + "requires": { + "readable-stream": "2.3.3" + } + }, "stream-consume": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz", "integrity": "sha1-pB6tGm1ggc63n2WwYZAbbY89HQ8=", "dev": true }, + "stream-shift": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz", + "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=", + "dev": true + }, "stream-throttle": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/stream-throttle/-/stream-throttle-0.1.3.tgz", @@ -5686,6 +7943,15 @@ "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", "dev": true }, + "string-length": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz", + "integrity": "sha1-VpcPscOFWOnnC3KL894mmsRa36w=", + "dev": true, + "requires": { + "strip-ansi": "3.0.1" + } + }, "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", @@ -5730,12 +7996,31 @@ "is-utf8": "0.2.1" } }, + "strip-bom-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz", + "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=", + "dev": true, + "requires": { + "first-chunk-stream": "1.0.0", + "strip-bom": "2.0.0" + } + }, "strip-bom-string": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz", "integrity": "sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI=", "dev": true }, + "strip-indent": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", + "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", + "dev": true, + "requires": { + "get-stdin": "4.0.1" + } + }, "strip-json-comments": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz", @@ -5780,6 +8065,35 @@ } } }, + "tar": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", + "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", + "dev": true, + "requires": { + "block-stream": "0.0.9", + "fstream": "1.0.11", + "inherits": "2.0.3" + } + }, + "ternary-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ternary-stream/-/ternary-stream-2.0.1.tgz", + "integrity": "sha1-Bk5Im0tb9gumpre8fy9cJ07Pgmk=", + "dev": true, + "requires": { + "duplexify": "3.5.1", + "fork-stream": "0.0.4", + "merge-stream": "1.0.1", + "through2": "2.0.3" + } + }, + "text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", + "dev": true + }, "tfunk": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/tfunk/-/tfunk-3.1.0.tgz", @@ -5790,6 +8104,12 @@ "object-path": "0.9.2" } }, + "through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", + "dev": true + }, "through2": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", @@ -5831,6 +8151,18 @@ "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=", "dev": true }, + "to-double-quotes": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-double-quotes/-/to-double-quotes-2.0.0.tgz", + "integrity": "sha1-qvIx1vqUiUn4GTAburRITYWI5Kc=", + "dev": true + }, + "to-single-quotes": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/to-single-quotes/-/to-single-quotes-2.0.1.tgz", + "integrity": "sha1-fMKRUfD18sQZRvEZ9ZMv5VQXASU=", + "dev": true + }, "tough-cookie": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz", @@ -5840,6 +8172,12 @@ "punycode": "1.4.1" } }, + "trim-newlines": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", + "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", + "dev": true + }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -5856,6 +8194,12 @@ "dev": true, "optional": true }, + "typedarray": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", + "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", + "dev": true + }, "ua-parser-js": { "version": "0.7.12", "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.12.tgz", @@ -5882,6 +8226,13 @@ "source-map": "0.5.7" } }, + "uglify-to-browserify": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", + "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", + "dev": true, + "optional": true + }, "ultron": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz", @@ -5900,6 +8251,12 @@ "integrity": "sha1-a7rwh3UA02vjTsqlhODbn+8DUgk=", "dev": true }, + "underscore.string": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.0.3.tgz", + "integrity": "sha1-Rhe4waJQz25QZPu7Nj0PqWzxRVI=", + "dev": true + }, "uniq": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", @@ -5945,6 +8302,32 @@ "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", "dev": true }, + "url": { + "version": "0.10.2", + "resolved": "https://registry.npmjs.org/url/-/url-0.10.2.tgz", + "integrity": "sha1-aGIdaSnqHK00Tr8TXYL89+sadGk=", + "dev": true, + "requires": { + "punycode": "1.3.2" + }, + "dependencies": { + "punycode": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", + "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", + "dev": true + } + } + }, + "url2": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/url2/-/url2-1.0.4.tgz", + "integrity": "sha1-3yKErhXHSbqAl1FRDl4l2p67gNg=", + "dev": true, + "requires": { + "url": "0.10.2" + } + }, "user-home": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz", @@ -5957,6 +8340,28 @@ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true }, + "utile": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz", + "integrity": "sha1-kwyI6ZCY1iIINMNWy9mncFItkNc=", + "dev": true, + "requires": { + "async": "0.2.10", + "deep-equal": "1.0.1", + "i": "0.3.5", + "mkdirp": "0.3.0", + "ncp": "0.4.2", + "rimraf": "2.6.2" + }, + "dependencies": { + "async": { + "version": "0.2.10", + "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz", + "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=", + "dev": true + } + } + }, "utils-merge": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz", @@ -6024,6 +8429,31 @@ "replace-ext": "0.0.1" } }, + "vinyl-file": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/vinyl-file/-/vinyl-file-1.3.0.tgz", + "integrity": "sha1-qgVjTTqGe6kUR77bs0r8sm9E9uc=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "strip-bom": "2.0.0", + "strip-bom-stream": "1.0.0", + "vinyl": "1.2.0" + }, + "dependencies": { + "vinyl": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz", + "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=", + "dev": true, + "requires": { + "clone": "1.0.2", + "clone-stats": "0.0.1", + "replace-ext": "0.0.1" + } + } + } + }, "vinyl-fs": { "version": "0.3.14", "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz", @@ -6135,6 +8565,41 @@ "source-map": "0.5.7" } }, + "vow": { + "version": "0.4.16", + "resolved": "https://registry.npmjs.org/vow/-/vow-0.4.16.tgz", + "integrity": "sha1-u51U2TjV+AUg1linQOeoleMP7us=", + "dev": true + }, + "vow-fs": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/vow-fs/-/vow-fs-0.3.6.tgz", + "integrity": "sha1-LUxZviLivyYY3fWXq0uqkjvnIA0=", + "dev": true, + "requires": { + "glob": "7.1.2", + "uuid": "2.0.3", + "vow": "0.4.16", + "vow-queue": "0.4.2" + }, + "dependencies": { + "uuid": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", + "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=", + "dev": true + } + } + }, + "vow-queue": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/vow-queue/-/vow-queue-0.4.2.tgz", + "integrity": "sha1-5/4XFg4Vx8QYTRtmapvGThjjAYQ=", + "dev": true, + "requires": { + "vow": "0.4.16" + } + }, "weinre": { "version": "2.0.0-pre-I0Z7U9OV", "resolved": "https://registry.npmjs.org/weinre/-/weinre-2.0.0-pre-I0Z7U9OV.tgz", @@ -6167,12 +8632,62 @@ "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=", "dev": true }, + "wide-align": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz", + "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==", + "dev": true, + "requires": { + "string-width": "1.0.2" + } + }, "window-size": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz", "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=", "dev": true }, + "winston": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/winston/-/winston-0.8.3.tgz", + "integrity": "sha1-ZLar9M0Brcrv1QCTk7HY6L7BnbA=", + "dev": true, + "requires": { + "async": "0.2.10", + "colors": "0.6.2", + "cycle": "1.0.3", + "eyes": "0.1.8", + "isstream": "0.1.2", + "pkginfo": "0.3.1", + "stack-trace": "0.0.10" + }, + "dependencies": { + "async": { + "version": "0.2.10", + "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz", + "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=", + "dev": true + }, + "colors": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz", + "integrity": "sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w=", + "dev": true + }, + "pkginfo": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz", + "integrity": "sha1-Wyn2qB9wcXFC4J52W76rl7T4HiE=", + "dev": true + } + } + }, + "wordwrap": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", + "dev": true + }, "wrap-ansi": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", @@ -6205,6 +8720,15 @@ "integrity": "sha1-OS2LotDxw00e4tYw8V0O+2jhBIo=", "dev": true }, + "xmlbuilder": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-3.1.0.tgz", + "integrity": "sha1-LIaIjy1OrehQ+jjKf3Ij9yCVFuE=", + "dev": true, + "requires": { + "lodash": "3.10.1" + } + }, "xmlhttprequest-ssl": { "version": "1.5.3", "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz", diff --git a/package.json b/package.json index 7c022f5..bbed19d 100644 --- a/package.json +++ b/package.json @@ -25,15 +25,24 @@ "gulp-changed": "^3.1.0", "gulp-concat": "^2.6.1", "gulp-cssnano": "^2.1.2", + "gulp-if": "^2.0.2", + "gulp-jscs": "^4.0.0", "gulp-jshint": "^2.0.4", + "gulp-newer": "^1.3.0", "gulp-notify": "^3.0.0", + "gulp-nunjucks-render": "^2.2.1", + "gulp-plumber": "^1.1.0", "gulp-remember": "^0.3.1", "gulp-rename": "^1.2.2", "gulp-ruby-sass": "^2.1.1", + "gulp-sass": "^3.1.0", "gulp-sourcemaps": "^2.6.1", "gulp-uglify": "^3.0.0", + "gulp.spritesmith": "^6.5.1", "jshint": "^2.9.5", + "jshint-stylish": "^2.2.1", "pump": "^1.0.2", + "run-sequence": "^2.2.0", "uglify-es": "^3.1.2" }, "dependencies": {} diff --git a/source/code/functions.js b/source/code/functions.js index b1c0a3d..9cb6821 100644 --- a/source/code/functions.js +++ b/source/code/functions.js @@ -1,3 +1,5 @@ +'use strict'; + function setup() { if($('#js_tph').length && full_view_hover) { // $('body').prepend("
"); diff --git a/source/code/global.js b/source/code/global.js index 440d4a0..a4d1e19 100644 --- a/source/code/global.js +++ b/source/code/global.js @@ -1,3 +1,5 @@ +'use strict'; + // DOM ready // ------------------------------------------------------------------------------ $( document ).ready(function() { diff --git a/source/code/variables.js b/source/code/variables.js index fe6b9d0..5934344 100644 --- a/source/code/variables.js +++ b/source/code/variables.js @@ -1,3 +1,5 @@ +'use strict'; + var w = Math.max(document.documentElement.clientWidth, window.innerWidth || 0); var h = Math.max(document.documentElement.clientHeight, window.innerHeight || 0); diff --git a/source/pages/404.nunjucks b/source/pages/404.nunjucks new file mode 100644 index 0000000..3a70f0c --- /dev/null +++ b/source/pages/404.nunjucks @@ -0,0 +1,22 @@ + +{% set pageId = "404" %} + +{% extends "maintenance.nunjucks" %} + +{% block title %}index{% endblock %} +{% block head %} +{{ super() }} + +{% endblock %} + +{% block body_content %} +
+

404

+

Hier ist nichts.

+
+

Die angeforderte Ressource wurde nicht gefunden. Dieser Statuscode kann ebenfalls verwendet werden, um eine Anfrage ohne näheren Grund abzuweisen. Links, welche auf solche Fehlerseiten verweisen, werden auch als Tote Links bezeichnet.

+

Wikipedia

+
+
+{% include "partials/footer-status.nunjucks" %} +{% endblock %} diff --git a/source/pages/demo-blank.nunjucks b/source/pages/demo-blank.nunjucks new file mode 100644 index 0000000..0b7ad32 --- /dev/null +++ b/source/pages/demo-blank.nunjucks @@ -0,0 +1,6 @@ + +{% extends "index.nunjucks" %} + +{% block body_content %} + +{% endblock %} diff --git a/source/pages/demo-index.nunjucks b/source/pages/demo-index.nunjucks new file mode 100644 index 0000000..9a70251 --- /dev/null +++ b/source/pages/demo-index.nunjucks @@ -0,0 +1,668 @@ + +{% set pageId = "demo" %} + +{% extends "index.nunjucks" %} + +{% block title %}demo{% endblock %} +{% block head %} +{{ super() }} +{% endblock %} + +{% block body_content %} +{% include "partials/page-hover.nunjucks" %} +
+ + +
+ +
+ Dies ist einfach nur Text.
Weniger wäre Nichts, denn dieser Text ist nicht durch ein spezifisches Element umschlossen. +

Es wirken nur die Eigenschaften des <body> Elements. Dieses Element umschließt den gesamten Inhalt des Dokumentes und kommt daher nur einmal vor. Inhalte sind normalerweise durch Elemente definiert. Grundlegende Elemente teilen das Dokument zunächst in Abschnitte.

+

Bereiche

+
+
+

Einen Abschnitt, welcher für sich alleine stehen kann, definiert sich durch <article>. Solch ein Element wird oft detailliert gestaltet, kommt aber auch ohne jegliche Gestaltung aus.

+

Noch allgemeiner ist das <section> Element. Es schafft Bereiche um Inhalte zu strukturieren.

+

Bestimmte Bereiche haben einen vorgegebene Zweck.
Folgende Bereiche sind vorgegeben:

+
+ + +
+
+

Um einleitenden Inhalt festzuhalten, wird das <header> Element eingesetzt. Es beinhaltet häufig auch Navigationselemente. Dabei bezieht es sich auf den nächsten, umgebenden Abschnitt.

+ +
+
+

Auch abschließender Inhalt kann für einen Abschnitt definiert werden. Dazu wird <footer> eingesetzt.

+
+
+ +
+

Zur feineren Strukturierung und Gliederung von Texten sind einige weitere Elemente verfügbar. Diese werden nun der Reihe nach aufgeführt. Zu Beginn die Überschriften, da sie noch zu den Abschnitten gehören. Das kommt vermutlich daher, da Abschnitte häufig eine kennzeichnende Überschrift beinhalten.

+

Überschrift 1

+

Eine Überschrift erster Ordnung <h1> ist sehr groß und steht daher oft außerhalb eines Textflusses. Sie schafft eine deutliche Trennung sowohl inhaltlich wie auch optisch. Sie erzeugt einen Abstand gleich der horizontalen Linie über sich.

+

Überschrift 2

+

Die weiteren Überschriften <h2> bis <h6> gliedern Text und werden auch als Titel für andere Elemente eingesetzt.

+

Überschrift 3 ist in Großbuchstaben gesetzt

+

Überschrift 4 verwendet normale Buchstaben und gleicht ansonsten Überschrift 3

+
Überschrift 5 ist Überschrift 5
+
Überschrift 6
+

Schließlich eine Überschrift in der Größe des Fließtextes. Allerdings in fett.

+

Gruppierung

+

Ein Absatz <p>. Zugegeben ein kurzer.

+

Aus mehreren Absätzen wird ein ganzer Text. Solche Texte haben gelegentlich großen informativen oder unterhaltsamen Charakter.
Einfache Zeilenumbrüche werden darin mit <br> erreicht.

+

Die Unterteilung in Absätze ist eine von vielen Möglichkeiten Texte zu gruppieren und ihnen Struktur zu verleihen. In diesem Dokument flattert Text normalerweise von Links daher. Er ist schwarz und in einer serifenlosen Schrift gesetzt. Zu weiteren Formatierungen, die eher auf einer Ebene der Zeichen einzuordnen ist, wird im Verlauf näher eingegangen. Zunächst die Struktur:

+

Text sitzt gerne auch mal zentriert.

p.txt_center
+

Rechtsbündig ist schon eher eine Ausnahme bzw. Besonderheit.

p.txt_right
+

Texte können auf verschiedene Arten unterteilt werden. Dafür werden unterschiedlich formatierte <hr> Elemente verwendet. Die horizontale Linie ist die Ausgangsformatierung, daher auch der abgekürzte Name des Elements. Eine Linie ist schwarz und durchgezogen.

+
+

Es ist auch eine unsichtbare Unterteilung möglich:

+
hr.hr__hidden
+

Die Linie darf auch gepunkted sein. Zudem sind verschiedene Längen möglich. Diese sind immer ein Prozentwert der verfügbaren Breite. Hier in gleicher Reihenfolge 100%, 50% und 25%:

+
hr.hr__dotted
+
hr.center_50
+
hr.hr__dotted.center_25
+

Zur horizontalen Unterteilung kommt natürlich auch eine vertikale Trennung hinzu. Text kann so zum Beispiel in mehrere Spalten unterteilt werden. Dies ist hilfreich, wenn ein Text durch eine breite Fläche sehr lange Zeilen bekommen würde. Es ist dann schwer den neuen Zeilanfang zu finden. Die vertikale Trennung dient in erster Linie dazu, diesem Umstand zu begegnen. Auch hier kann die Unterteilung viele Formen annehmen.

p.block__column_2
+

Drei Spalten gilt es jetzt also zu Füllen. Dann erst wird die Trennung der Spalten durch eine Linie sichtbar.

p.block__column_3.block__column_line
+

Ist der Text nicht lang genug bleibt eventuell eine Spalte leer. Diesmal wird dies aber nicht passieren, denn das Anschauungsbeispiel ist ja nun durch den vorherigen Absatz schon gegeben.
Oft ist es sinnvoll, Absätze mit mehreren Spalten deutlich von nachfolgenden Absätzen zu trennen. Da der Textfluss spaltenweise verläuft, liest man eventuell an der falschen Stelle weiter. Ach das ziegen diese beiden Absätze ganz gut.

+

Es gibt die Möglichkeit vorformatierten Text darzustellen <pre>.

+ 
Dadurch
	bleiben
		Einrückungen
			durch
				Tabulatoren
					erhalten.
+

Text bekommt durch Listen besondere optische wie auch inhaltliche Struktur. Es gibt ungeordnete <ul> und geordnete Listen <ol> sowie Beschreibungslisten <dl>. Die beiden ersten Varianten beinhalten das Listenelement <li>. Beschreibungslisten beinhalten jeweils das Paar von Ausdruck <dt> und Beschreibung <dd>. Im Folgenden eine Liste der Listen in ihrer Ausgangskonfiguration:

+
    +
  • Ungeordnete
    • +
  • Listen
    • +
+
    +
  • Verschiedener
    • +
  • Art
    • +
+
    +
  1. Geordnete
    2. +
  2. Liste
    3. +
+
+
Beschreibungsliste
+
Auch Definitionslisten genannt
+
Ausdruck
+
Beschreibung
+
+

Wird Bezug auf fremde Inhalte genommen, kommt ein Zitat <blockquote> zur Anwendung. Es besteht aus der Aussage und der Quelle.

+
+

Ein Zitat (das, lateinisch citatum „Angeführtes, Aufgerufenes“ zu lat. citāre „in Bewegung setzen, vorladen“, vgl. „jemanden vor Gericht zitieren“) ist eine wörtlich übernommene Stelle aus einem Text oder ein Hinweis auf eine bestimmte Textstelle.

+

Wikipedia

+
+
blockquote>p+p.quote__source
+

Auch Inhalte, die nicht in Textform sind, können durch einen Bezug integriert werden. Wie diese Fahne werden sie mit <figure> umschlossen und tragen eine Bezeichnung.

+
+
Fahne
+ + + + + + + + + + + +
+
figure>figcaption+{element}
+

Eine von sich aus undefinierte Möglichkeit zur Gruppierung von Text besteht durch <div>. Dieses Element hat, ohne weitere Klassifizierung keine Auswirkungen auf die Erscheinung oder die inhaltliche Aussage. Daher der allgemeine Einsatz.

+

Es wird allerdings häufig eingesetzt und bekommt vielfältige Funktionen zugeordnet wie diese hervorgehobene Information zeigt.

+

Eine sehr klar definierte Gruppierung stellt das Element <main> dar. Es umschließt den hauptsächlichen Inhalt des Dokumentes.

+

Textebene

+

Verweise

+

Ein wesentlicher Bestandteil von Hypertext sind Verweise <a>. Sie dienen als Sprungmarken innerhalb des Netzwerks. Es kann grob zwischen internen und externen Verweisen unterschieden werden. Interne Verweisea.a__line können Verknüpfungen innerhalb des aktuellen Dokumentes sein oder auch Funktionen aktivieren. Externe Verweise verknüpfen Inhalte über das gesamte Netzwerk hinweg. Sie können auch auf E-Mail Adressen oder Dateien zeigen.

+

Nicht nur Text kann als Verweis verwendet werden. Auch andere Elemente wie Bilder können verknüpft werden. Abhängig von ihrer Funktion und ihrem Zweck, werden Verweise unterschiedlich formatiert. Farbige oder unterstrichene Varianten sind möglich.

+

Wird der Verweis innerhalb eines <nav> Elementes notiert, bekommt er die spezielle Bedeutung eines Navigationsverweises innerhalb des Dokumentes oder der Anwendung. Auf diese Verwendung wird im Folgenden genauer eingegangen ...

+

Formatierungen

+

Texte, Wörter oder Zeichen können vielfältig formatiert werden. Sie können fett <b> oder kursiv <i> geschrieben sein. Auch beides ist möglich!?! Sollen sie nicht nur anders aussehen, sondern auch eine besondere inhaltliche Bedeutung bekommen, werden sie mit <strong> und <em> ausgezeichnet.

+

Gerade bei wörtlichen Zitierungen kommt häufig das Anführungszeichen zum Einsatz. Es kann durch die Formatierung automatisch ergänzt werden.

+
+

Das kannst du schon so machen aber dann isses halt Kacke.

+

o. V.

+
+
blockquote.quote__mark>p+p.quote__source
+

Ein besonderer inhaltlicher Bezug ist der Titel eines Werkes. Sowas kann mit <cite> ausgezeichnet werden. Pulp Fiction, super Film - zum Beispiel.

+

Auch die Auszeichnung <code> wurde bis hier hin schon verwendet. Sie markiert Maschinensprache. Für zusammenhängende Blöcke wird die Auszeichnung oft in Kombination mit dem Element <pre> verwendet:

+ 
<html>
  <head>
    <title>Hyper Text Markup Language</title>
  </head>
  <body id="root">
    <!-- Content goes here -->
    <p class="example">Just like this.</p>
  </body>
</html>
+

Dabei bleiben vorhandene Textformatierungen wie Zeilenumbrüche und Einrückung erhalten.

+

Die Zeichen in Absätzen bis hin zu ganzen Texten können, mit einem geeigneten Eingabegerät, markiert werden. Dies stellt sich wie folgt dar:

+

Beispiel zum markieren ^^.

+

Eine Markierung kann, mittels <mark>, auch durch den Autor geschehen. Diese stellt sich ein wenig anders dar: Diese Worte sind markiert.

+ +

Änderungen

+ +

Eingebundene Inhalte

+ + + +

Tabellen

+

Tabellen bieten besonders geordnete Struktur. Häufig werden in ihnen Text und Daten kombiniert dargestellt. Dies erfordert individuelle Formatierungen. Einige grundlegende Eigenschaften werden im folgenden aufgezeigt. Tabellen sind in ihrer Größe entweder vordefiniert oder richten sich nach ihrem Inhalt. Das gilt auch für die einzelnen Zellen....

+
Mit
+ + + + + + + + + +
Eineeinfache
Tabelle
+
table.width_full>tbody>tr>td*2^tr>td[colspan=2]
+
+ + + + + + + + + + +
Einefließende
Tabelle
+
table>tbody>tr>td*2^tr>td[colspan=2]
+ + + + + + + + + + +
Mitohne
Linien
+
table.table__blank>tbody>tr>td*2^tr>td[colspan=2]
+
+

Die nächste Tabelle verwendet alle zur Auszeichnung verfügbaren Elemente und hat eine starre Zellverteilung:

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Beschreibung bzw. Zusammenhang der Tabelle
KopfzeileAB
FußzeileAB
Tabelle
mitTitel
Kopf-und
Fußzeile
+
table.width_full.table__fix>caption+thead>tr>th*3^^tfoot>tr>td*3^^tbody>(tr>td*3)*3
+
+

Viele weitere Formate sind möglich ...

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
KopfzeileAB
VorspalteEine
1erweiterte
2Tabelle
+
table.width_full>thead>tr>th.precol+th[colspan=2]^^tbody>tr>td.precol+td*2^tr>td.precol+td[colspan=2]
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
KopfzeileAB
Tabelle
ohneRahmen
jedochmit
Streifen
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Beschreibung bzw. Zusammenhang der Tabelle
Kopfzeile1>9000
Fußzeile--
Alpha09000
Bravo19001
Charlie09000
+ +

Formulare

+

Spätestens hier werden Betrachter zu Benutzern. Texteingabefelder und verschiedene Bedienelemente geben Möglichkeiten zur Interaktion. Diese Elemente sind in vielerlei Hinsicht besonders. Werden sie nicht explizit gestaltet, ist ihre Erscheinung system- bzw. browserabhängig. (Vielleicht ist das auch scheiße, hier darauf einzugehen) ... Üblicherweise stehen alle Formularelemente innerhalb eines <form> Elementes. Dieses ist notwendig um Angaben zur Kommunikation mit dem Server zu setzen. Es hat normalerweise keine gestalterische Funktion.

+

Grundlegend ist das Element <input>. Es hat viele Attribute um den Typ der Eingabe anzupassen. Ist es undefiniert nimmt es jegliche textbasierte Information auf und erhält eine Standardgröße.

+

+

Ein spezieller Typ des Eingabefeldes verändert seine Funktion zu einer Schaltfläche <input[type="button"]>. Es gibt allerdings auch ein eigenes Element <button> dafür. +

+

Interaktive Elemente können durch das Attribut <readonly> nur lesbar gemacht werden oder mittels <disabled> gänzlich deaktiviert werden.

+

+

Das Element <label> ergänzt interaktive Elemente um eine Beschriftung. Wichtig ist hier, dass die Beziehung beider Elemente zu einander deutlich ist.

+
+
+ +
+
+ +
+
+

Zusätzlich zur Beschriftung einzelner Elemente gibt es auch die Möglichkeit Gruppierungen zu schaffen. Diese werden mit <fieldset> realisiert.

+
+ +
+

Sie können mittels <legend> auch eine eigene Beschriftung erhalten.

+
+ Einfache Eingabefelder + + +
+
+ Weitere Zeicheneingabefelder +

Innerhalb einer Gruppe können nicht nur Ein- und Ausgabefelder platziert werden. Andere Elemente ergänzen Information oder lockern das Erscheinungsbild auf. Hier nun eine Liste aller möglichen Arten von Eingabefeldern.

+ 
ul>(li>label>input[type="text"])
+
+ + + + + + + + + + + + + + +

Interaktive Elemente

+ + + +

Struktur

+
+
+
+ + + + +
+
+
+

Medien

+

Druck

+ +
+
+

Ende der Einführung

+

Dies war eine Übersicht der grundlegenden Elemente. Nun folgen weitere Elemente mit besonderen Formatierungen.

+
+
+
+ +
+
+

HIPPIE Erklärung

+

Aufbau, Standardwerte

+
+
+

…

+
+
+ +
+
+

Medienformat Abfragen

+
+
+
Umbruch bei 
+
+

Telefone und größer

+

Nur Telefone

+

Schreibtafeln hochkant

+

Schreibtafeln und größer

+

Schreibtafeln im Querformat

+

Schreibtafeln quer und größer

+

Nur Arbeitsplatzrechner

+

Arbeitsplatzrechner und größer

+

Richtige Monitore und größer

+
+
+
+
+
+

Sammlung formatierter Elemente

+

Die Elemente werden fortlaufend komplexer

+
+
+ 
h3.txt_light_color+p
+

Helle Überschrift

+

Mit normalem Textabsatz

+ 
a>h4
+ +

Überschrift als Block-Verweis

+ + 
section>div.box__inline_left>img^p+p
+
+
Avatar
+

Vorname Name
Straße 1, 01234 Stadt

+49 (0)123 1337 0000
name@domain.tld

+
+ 
div.box__main_indent
+
+
+

Eingerückter Inhalt

+
+
+ 
nav>ul>(li>a.a__button{Punkt $})*4
+nav>ul>(li>a.a__button_border{Stufe $})*4
+
+ + +
+ 
nav.nav__horizontal>ul>(li>a.a__button{Abschnitt $})*4
+nav.nav__center_old>ul>(li>a.a__button{Typ $})*4
+ +
+ +
+ 
header.header__page>h1+p+nav.nav__separate_right>ul>(li>a.a__button{Nav $})*4^+nav.nav__right>ul>(li>a.a__button{Nav $})*4
+
+

Aufmacher

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis nec consectetur diam. Sed nisl odio, volutpat nec nisi sit amet, commodo faucibus est. Donec lacinia vestibulum sapien. Morbi porttitor nibh quis imperdiet scelerisque. Praesent rutrum quam eu sodales luctus.

+ + +
+ 
header.header__page>nav.nav__right>ul>(li>a.a__button{Nav $})*4
+
+
+ +
+
+ 
footer.pos_abs.pin_bottom>nav.nav__column>ul>(li>a.a__button_text)*4
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +

Gruppierung

+ 
ul.list__link>(li>a>img)*2+li>a
+ + +

Tabellen

+ 
table.table__link>thead>tr>th{&nbsp;}+th{Ab / Zy}+th{Neu / Alt}^^(tbody>tr>td.cell__icon[rowspan="2"]>img[width=16  height=16]^+td.cell__link>a[target=_blank]{Name}+a[target=_blank]{URL}^+td.cell__date[rowspan="2"]{YYY-MM-DD}^tr>td.cell__text>div.shorten{Beschreibung})*2
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 Ab / ZyNeu / Alt
NameURLYYYY-MM-DD
+
Beschreibung
+
NameURLYYYY-MM-DD
+
Beschreibung
+
+

Eingebettet

+
+ + + + + + + + + + + +
+ + +
+
+
+
+

Autarke Seiten

+

Diese Elemente repräsentieren jeweils eine eigene Seite.

+
+
+
+
+

404

+

Hier ist nichts.

+
+

Die angeforderte Ressource wurde nicht gefunden. Dieser Statuscode kann ebenfalls verwendet werden, um eine Anfrage ohne näheren Grund abzuweisen. Links, welche auf solche Fehlerseiten verweisen, werden auch als Tote Links bezeichnet.

+

Wikipedia

+
+
+ {% include "partials/footer-status.nunjucks" %} +
+
+
+

403

+

Nicht erlaubt! Forbidden

+
+

Die Anfrage wurde mangels Berechtigung des Clients nicht durchgeführt, bspw. weil der authentifizierte Benutzer nicht berechtigt ist, oder eine als HTTPS konfigurierte URL nur mit HTTP aufgerufen wurde.

+

Wikipedia

+
+
+ {% include "partials/footer-status.nunjucks" %} +
+
+
+

400

+

Fehlerhafte Anfrage! Bad Request

+
+

Die Anfrage-Nachricht war fehlerhaft aufgebaut.

+

Wikipedia

+
+
+ {% include "partials/footer-status.nunjucks" %} +
+
+
+{% include "partials/footer.nunjucks" %} +{% endblock %} + +{% block script %} + +{% endblock %} diff --git a/source/pages/index.nunjucks b/source/pages/index.nunjucks new file mode 100644 index 0000000..bcdac9d --- /dev/null +++ b/source/pages/index.nunjucks @@ -0,0 +1,32 @@ + +{% set pageId = "index" %} + +{% extends "index.nunjucks" %} + +{% block title %}index{% endblock %} +{% block head %} +{{ super() }} +{% endblock %} + +{% block body_content %} +{% include "partials/page-hover.nunjucks" %} +
+ +
+{% endblock %} + +{% block script %} + +{% endblock %} diff --git a/source/style/elements/_grouping.scss b/source/style/elements/_grouping.scss index d1fb902..512e857 100644 --- a/source/style/elements/_grouping.scss +++ b/source/style/elements/_grouping.scss @@ -4,7 +4,8 @@ // Paragraph p { @extend %basic; - margin: $basic_space 0; + margin-top: $basic_space; + margin-bottom: $basic_space; code { padding: $tiny_space $half_space; font-size: 1em; @@ -14,7 +15,9 @@ p { // Address address { - + @extend %basic; + margin-top: $double_space; + margin-bottom: $double_space; } // Line @@ -124,7 +127,7 @@ ul { color: $basic_font_color; img { margin-right: $basic_space; - padding-bottom: .2em; + padding-bottom: 0.2em; vertical-align: text-bottom; } &:active, @@ -168,8 +171,8 @@ div { .box__info { padding: $double_space $basic_indent; - border-right: $basic_space solid rgba($echo_color, .6); - background-color: rgba($echo_color, .1) !important; + border-right: $basic_space solid rgba($echo_color, 0.6); + background-color: rgba($echo_color, 0.1) !important; } .box__main_indent { diff --git a/source/style/elements/_tables.scss b/source/style/elements/_tables.scss index 47d90ef..f3550b7 100644 --- a/source/style/elements/_tables.scss +++ b/source/style/elements/_tables.scss @@ -59,7 +59,7 @@ tfoot { } tr:nth-child(even) td { - background-color: rgba($brightest_color, .1); + background-color: rgba($brightest_color, 0.1); } } diff --git a/source/style/elements/_textlevel.scss b/source/style/elements/_textlevel.scss index 7ef618b..1713243 100644 --- a/source/style/elements/_textlevel.scss +++ b/source/style/elements/_textlevel.scss @@ -80,10 +80,6 @@ dfn { } -address { - -} - abbr { } diff --git a/source/style/global/_common.scss b/source/style/global/_common.scss index 4af7f6f..c487b0a 100644 --- a/source/style/global/_common.scss +++ b/source/style/global/_common.scss @@ -149,17 +149,17 @@ .pos_full_view { @extend %full_viewport; - background-color: rgba($alpha_color, .5); + background-color: rgba($alpha_color, 0.5); } .pos_full_page { @extend %full_parent; - background-color: rgba($charlie_color, .25); + background-color: rgba($charlie_color, 0.25); } .hover_back_change { background-color: darken($basic_back_color, 10%); - transition: background-color .2s ease-in-out; + transition: background-color 0.2s ease-in-out; &:hover { background-color: $basic_back_color; @@ -169,8 +169,8 @@ .hover_full_view_change { @extend %full_viewport; z-index: $z_heaven; - background-color: transparentize($darkest_color, .5); - transition: background-color .2s ease-in-out; + background-color: transparentize($darkest_color, 0.5); + transition: background-color 0.2s ease-in-out; pointer-events: none; } @@ -216,13 +216,13 @@ %default_button { display: inline-block; padding: $basic_padding; - background-color: transparentize($basic_link_color, .8); + background-color: transparentize($basic_link_color, 0.8); border-radius: $basic_corner; &:active, &:focus, &:hover { - background-color: rgba($basic_highlight_color, .1); + background-color: rgba($basic_highlight_color, 0.1); color: $basic_highlight_color; border-color: transparent; } diff --git a/source/style/global/_config.scss b/source/style/global/_config.scss index 42757db..4442f8a 100644 --- a/source/style/global/_config.scss +++ b/source/style/global/_config.scss @@ -103,13 +103,13 @@ $basic_action_color: $foxtrot_color !default; $basic_border_color: $basic_front_color !default; // default shadow colors -// $shadow_color: fade-out($medium_color, .5); +// $shadow_color: fade-out($medium_color, 0.5); $basic_color_list: (); @each $key, $value in $color_palette { $map: (); - $map: map-merge($map, ($key: createColorMap($value, 15%, .5)) ); + $map: map-merge($map, ($key: createColorMap($value, 15%, 0.5)) ); $basic_color_list: map-merge($basic_color_list, $map); } diff --git a/source/style/maintenance.scss b/source/style/maintenance.scss index b5afad0..dc1d29c 100644 --- a/source/style/maintenance.scss +++ b/source/style/maintenance.scss @@ -23,7 +23,8 @@ // Reset // Use a file outside of hippie i.e. vendor/normalize.css // ----------------------------------------------------------------------------- -@import "../../vendor/normalizecss/normalize.css"; +@import "../bower_components/normalize-css/normalize.css"; +// @import "normalize-css/normalize.css"; // @import "vendor/YOUR-FILES.css"; @@ -91,7 +92,7 @@ // Demonstration -@import "modules/demo/demo_module"; +@import "modules/maintenance/maintenance_module"; diff --git a/source/style/modules/demo/_demo_module.scss b/source/style/modules/demo/_demo_module.scss index 8ec25c1..f018771 100644 --- a/source/style/modules/demo/_demo_module.scss +++ b/source/style/modules/demo/_demo_module.scss @@ -13,6 +13,12 @@ margin-top: 0; font-weight: bold; } + + @media (max-height: 512px) { + .pos_abs { + position: static !important; + } + } } .demo__header { @@ -27,18 +33,18 @@ } .header__fancy { - background-color: transparentize($bravo_color, .4); + background-color: transparentize($bravo_color, 0.4); nav { a { - background-color: transparentize($alpha_color, .4); + background-color: transparentize($alpha_color, 0.4); color: $alpha_color; &:active, &:focus, &:hover { - background-color: rgba($brightest_color, .2); + background-color: rgba($brightest_color, 0.2); color: $brightest_color; } } @@ -50,7 +56,7 @@ top: 0; left: 0; width: 100%; - background-color: transparentize($charlie_color, .4); + background-color: transparentize($charlie_color, 0.4); nav { @@ -59,7 +65,7 @@ &:active, &:focus, &:hover { - background-color: rgba($brightest_color, .2); + background-color: rgba($brightest_color, 0.2); color: $brightest_color; } } @@ -114,39 +120,39 @@ } .query__phoneUp { - background-color: rgba($basic_front_color, .2); + background-color: rgba($basic_front_color, 0.2); } .query__phoneOnly { - @include forPhoneOnly { background-color: rgba($basic_front_color, .2); } + @include forPhoneOnly { background-color: rgba($basic_front_color, 0.2); } } .query__tabletPortaitOnly { - @include forTabletPortraitOnly { background-color: rgba($basic_front_color, .2); } + @include forTabletPortraitOnly { background-color: rgba($basic_front_color, 0.2); } } .query__tabletPortraitUp { - @include forTabletPortraitUp { background-color: rgba($basic_front_color, .2); } + @include forTabletPortraitUp { background-color: rgba($basic_front_color, 0.2); } } .query__tabletLandscapeOnly { - @include forTabletLandscapeOnly { background-color: rgba($basic_front_color, .2); } + @include forTabletLandscapeOnly { background-color: rgba($basic_front_color, 0.2); } } .query__tabletLandscapeUp { - @include forTabletLandscapeUp { background-color: rgba($basic_front_color, .2); } + @include forTabletLandscapeUp { background-color: rgba($basic_front_color, 0.2); } } .query__desktopOnly { - @include forDesktopOnly { background-color: rgba($basic_front_color, .2); } + @include forDesktopOnly { background-color: rgba($basic_front_color, 0.2); } } .query__desktopUp { - @include forDesktopUp { background-color: rgba($basic_front_color, .2); } + @include forDesktopUp { background-color: rgba($basic_front_color, 0.2); } } .query__bigDesktopUp { - @include forBigDesktopUp { background-color: rgba($basic_front_color, .2); } + @include forBigDesktopUp { background-color: rgba($basic_front_color, 0.2); } } .demo__query_example { @@ -180,7 +186,7 @@ content: '< 768px'; padding: $basic_padding; border-radius: $basic_corner_radius; - background-color: rgba($basic_front_color, .2); + background-color: rgba($basic_front_color, 0.2); } } @@ -196,5 +202,5 @@ .hello { flex: 0 1 auto; padding: 1em 5em; - background-color: rgba(black, .25); + background-color: rgba(black, 0.25); } diff --git a/source/style/modules/editor/_editor_module.scss b/source/style/modules/editor/_editor_module.scss index 82d7da9..12fefc3 100644 --- a/source/style/modules/editor/_editor_module.scss +++ b/source/style/modules/editor/_editor_module.scss @@ -7,8 +7,8 @@ // ------------------------------------------------------------------------------ %wip { - border-right: $basic_space solid rgba(crimson, .8); - background-color: rgba(crimson, .1) !important; + border-right: $basic_space solid rgba(crimson, 0.8); + background-color: rgba(crimson, 0.1) !important; } .wip { @extend %wip; diff --git a/source/style/modules/explanation/_explanation_module.scss b/source/style/modules/explanation/_explanation_module.scss index a2a016f..a12aee9 100644 --- a/source/style/modules/explanation/_explanation_module.scss +++ b/source/style/modules/explanation/_explanation_module.scss @@ -11,7 +11,7 @@ content: ""; display: block; height: 48px; - background-color: rgba($delta_color, .1) !important; + background-color: rgba($delta_color, 0.1) !important; } } %expose_before { @@ -19,7 +19,7 @@ content: ""; display: block; height: 48px; - background-color: rgba($delta_color, .1) !important; + background-color: rgba($delta_color, 0.1) !important; } } %expose { @@ -27,7 +27,7 @@ content: ""; display: block; height: 48px; - background-color: rgba($delta_color, .1) !important; + background-color: rgba($delta_color, 0.1) !important; } } %exp { @@ -85,7 +85,7 @@ display: table; right: $double_space; bottom: $double_space; - background-color: rgba($darkest_color, .4); + background-color: rgba($darkest_color, 0.4); &:hover { background-color: $brightest_color; > .span__solo { @@ -94,7 +94,7 @@ } .span__solo { display: table-cell; - color: rgba($brightest_color, .8); + color: rgba($brightest_color, 0.8); font-family: $monospace_font_family; font-size: 1.4em; text-align: center; @@ -110,6 +110,6 @@ right: 0; bottom: 0; left: 0; - background-color: rgba($delta_color, .1) !important; - @include vendor-prefix(transition, height .5s ease); + background-color: rgba($delta_color, 0.1) !important; + @include vendor-prefix(transition, height 0.5s ease); } diff --git a/source/style/modules/maintenance/_maintenance_module.scss b/source/style/modules/maintenance/_maintenance_module.scss new file mode 100644 index 0000000..852e875 --- /dev/null +++ b/source/style/modules/maintenance/_maintenance_module.scss @@ -0,0 +1,11 @@ +#root { + @extend .sec__main_status; + position: relative; + height: 100%; + border-color: $foxtrot_color; + + h1:first-of-type { + margin-top: 0; + font-weight: bold; + } +} diff --git a/source/style/modules/media/_media_module.scss b/source/style/modules/media/_media_module.scss new file mode 100644 index 0000000..62bff9f --- /dev/null +++ b/source/style/modules/media/_media_module.scss @@ -0,0 +1,3 @@ +.up { + @include sprite($up); +} diff --git a/source/style/modules/media/_sprites.scss b/source/style/modules/media/_sprites.scss new file mode 100644 index 0000000..ae0484a --- /dev/null +++ b/source/style/modules/media/_sprites.scss @@ -0,0 +1,101 @@ +// SCSS variables are information about icon's compiled state, stored under its original file name +// +// .icon-home { +// width: $icon-home-width; +// } +// +// The large array-like variables contain all information about a single icon +// $icon-home: x y offset_x offset_y width height total_width total_height image_path; +// +// At the bottom of this section, we provide information about the spritesheet itself +// $spritesheet: width height image $spritesheet-sprites; +$down-name: 'down'; +$down-x: 32px; +$down-y: 0px; +$down-offset-x: -32px; +$down-offset-y: 0px; +$down-width: 32px; +$down-height: 32px; +$down-total-width: 64px; +$down-total-height: 64px; +$down-image: 'sprites.png'; +$down: (32px, 0px, -32px, 0px, 32px, 32px, 64px, 64px, 'sprites.png', 'down', ); +$up-name: 'up'; +$up-x: 0px; +$up-y: 0px; +$up-offset-x: 0px; +$up-offset-y: 0px; +$up-width: 32px; +$up-height: 64px; +$up-total-width: 64px; +$up-total-height: 64px; +$up-image: 'sprites.png'; +$up: (0px, 0px, 0px, 0px, 32px, 64px, 64px, 64px, 'sprites.png', 'up', ); +$spritesheet-width: 64px; +$spritesheet-height: 64px; +$spritesheet-image: 'sprites.png'; +$spritesheet-sprites: ($down, $up, ); +$spritesheet: (64px, 64px, 'sprites.png', $spritesheet-sprites, ); + +// The provided mixins are intended to be used with the array-like variables +// +// .icon-home { +// @include sprite-width($icon-home); +// } +// +// .icon-email { +// @include sprite($icon-email); +// } +// +// Example usage in HTML: +// +// `display: block` sprite: +//
+// +// To change `display` (e.g. `display: inline-block;`), we suggest using a common CSS class: +// +// // CSS +// .icon { +// display: inline-block; +// } +// +// // HTML +// +@mixin sprite-width($sprite) { + width: nth($sprite, 5); +} + +@mixin sprite-height($sprite) { + height: nth($sprite, 6); +} + +@mixin sprite-position($sprite) { + $sprite-offset-x: nth($sprite, 3); + $sprite-offset-y: nth($sprite, 4); + background-position: $sprite-offset-x $sprite-offset-y; +} + +@mixin sprite-image($sprite) { + $sprite-image: nth($sprite, 9); + background-image: url(#{$sprite-image}); +} + +@mixin sprite($sprite) { + @include sprite-image($sprite); + @include sprite-position($sprite); + @include sprite-width($sprite); + @include sprite-height($sprite); +} + +// The `sprites` mixin generates identical output to the CSS template +// but can be overridden inside of SCSS +// +// @include sprites($spritesheet-sprites); +@mixin sprites($sprites) { + @each $sprite in $sprites { + $sprite-name: nth($sprite, 10); + .#{$sprite-name} { + @include sprite($sprite); + } + } +} diff --git a/source/style/modules/navigation/_nav_module.scss b/source/style/modules/navigation/_nav_module.scss index a8c8fa7..79ecd01 100644 --- a/source/style/modules/navigation/_nav_module.scss +++ b/source/style/modules/navigation/_nav_module.scss @@ -154,7 +154,7 @@ nav { &:active, &:focus, &:hover { - background-color: rgba($basic_font_color, .2); + background-color: rgba($basic_font_color, 0.2); color: $basic_font_color; } } diff --git a/source/templates/demo.nunjucks b/source/templates/demo.nunjucks new file mode 100644 index 0000000..e5c6894 --- /dev/null +++ b/source/templates/demo.nunjucks @@ -0,0 +1,55 @@ + + + + + + + {% block head %} + {% block title %}{% endblock %} - HIPPIE + + + + + + + + + + + + + + + + + + + + + {% endblock %} + + + +
+
+ {% block body_header %} + + {% endblock %} +
+
+ {% block body_content %}{% endblock %} +
+
+ + + + {% block script %}{% endblock %} + + diff --git a/source/templates/index.nunjucks b/source/templates/index.nunjucks new file mode 100644 index 0000000..2a827de --- /dev/null +++ b/source/templates/index.nunjucks @@ -0,0 +1,33 @@ + + + + + + + {% block head %} + {% block title %}{% endblock %} - HIPPIE + + + + + + + + + + + + + + + {% endblock %} + + + + {% block body_content %}{% endblock %} + + + + {% block script %}{% endblock %} + + diff --git a/source/templates/macros/nav-macro.nunjucks b/source/templates/macros/nav-macro.nunjucks new file mode 100644 index 0000000..62924cb --- /dev/null +++ b/source/templates/macros/nav-macro.nunjucks @@ -0,0 +1,18 @@ +{% set item = [['mateladen', 'shop'], ['zubereitung', 'preparation'], ['wissen', 'knowledge'], ['blog', 'blog'], ['kontakt', 'contact']] %} +{% macro active(activePage='') %} + +{%- endmacro %} +{% macro top() %} + +{%- endmacro %} diff --git a/source/templates/macros/top-macro.nunjucks b/source/templates/macros/top-macro.nunjucks new file mode 100644 index 0000000..3b681c0 --- /dev/null +++ b/source/templates/macros/top-macro.nunjucks @@ -0,0 +1,5 @@ +{% macro field(name, value='', type='text') %} +
+ +
+{% endmacro %} diff --git a/source/templates/maintenance.nunjucks b/source/templates/maintenance.nunjucks new file mode 100644 index 0000000..1412a77 --- /dev/null +++ b/source/templates/maintenance.nunjucks @@ -0,0 +1,28 @@ + + + + + + + {% block head %} + {% block title %}{% endblock %} + + + + + + + + + + + + {% endblock %} + + + +
+ {% block body_content %}{% endblock %} +
+ + diff --git a/source/templates/partials/footer-status.nunjucks b/source/templates/partials/footer-status.nunjucks new file mode 100644 index 0000000..286ee90 --- /dev/null +++ b/source/templates/partials/footer-status.nunjucks @@ -0,0 +1,4 @@ + +
+
admin@domain.tld * Server Application/ver.s.ion (System Name) serving domain.tld:port
+
diff --git a/source/templates/partials/footer.nunjucks b/source/templates/partials/footer.nunjucks new file mode 100644 index 0000000..ee305b2 --- /dev/null +++ b/source/templates/partials/footer.nunjucks @@ -0,0 +1,2 @@ + +
diff --git a/source/templates/partials/page-hover.nunjucks b/source/templates/partials/page-hover.nunjucks new file mode 100644 index 0000000..0b20403 --- /dev/null +++ b/source/templates/partials/page-hover.nunjucks @@ -0,0 +1,2 @@ + +
From cf8fd24a850d551ae05d3e3f85734d9e19da3910 Mon Sep 17 00:00:00 2001 From: Stephan Date: Tue, 3 Oct 2017 23:27:11 +0200 Subject: [PATCH 066/372] new sass linting --- .sass-lint.yml | 178 +++++++++++ gulpfile.js | 13 +- package-lock.json | 768 ++++++++++++++++++++++++++++++++++++++++++++++ package.json | 1 + test/test.js | 0 5 files changed, 958 insertions(+), 2 deletions(-) create mode 100644 .sass-lint.yml create mode 100644 test/test.js diff --git a/.sass-lint.yml b/.sass-lint.yml new file mode 100644 index 0000000..081dcae --- /dev/null +++ b/.sass-lint.yml @@ -0,0 +1,178 @@ +# sass-lint config generated by make-sass-lint-config v0.1.2 +# +# The following scss-lint Linters are not yet supported by sass-lint: +# DisableLinterReason, ElsePlacement, PropertyCount, SelectorDepth +# SpaceAroundOperator, TrailingWhitespace, UnnecessaryParentReference, Compass::* +# +# The following settings/values are unsupported by sass-lint: +# Linter Indentation, option "allow_non_nested_indentation" +# Linter Indentation, option "character" +# Linter NestingDepth, option "ignore_parent_selectors" +# Linter PropertySortOrder, option "min_properties" +# Linter PropertySortOrder, option "separate_groups" +# Linter SpaceBeforeBrace, option "allow_single_line_padding" +# Linter VendorPrefix, option "identifier_list" + +files: + include: '**/*.scss' +options: + formatter: stylish + merge-default-rules: false +rules: + bem-depth: + - 0 + - max-depth: 1 + border-zero: + - 1 + - convention: zero + brace-style: + - 1 + - allow-single-line: true + class-name-format: + - 1 + - convention: hyphenatedlowercase + clean-import-paths: + - 1 + - filename-extension: false + leading-underscore: false + empty-line-between-blocks: + - 1 + - ignore-single-line-rulesets: true + extends-before-declarations: 1 + extends-before-mixins: 1 + final-newline: + - 1 + - include: true + force-attribute-nesting: 1 + force-element-nesting: 1 + force-pseudo-nesting: 1 + function-name-format: + - 1 + - allow-leading-underscore: true + convention: hyphenatedlowercase + hex-length: + - 1 + - style: short + hex-notation: + - 1 + - style: lowercase + id-name-format: + - 1 + - convention: hyphenatedlowercase + indentation: + - 1 + - size: 2 + leading-zero: + - 1 + - include: false + mixin-name-format: + - 1 + - allow-leading-underscore: true + convention: hyphenatedlowercase + mixins-before-declarations: 1 + nesting-depth: + - 1 + - max-depth: 3 + no-color-keywords: 1 + no-color-literals: 1 + no-css-comments: 1 + no-debug: 1 + no-duplicate-properties: 1 + no-empty-rulesets: 1 + no-extends: 0 + no-ids: 1 + no-important: 1 + no-invalid-hex: 1 + no-mergeable-selectors: 1 + no-misspelled-properties: + - 1 + - extra-properties: [] + no-qualifying-elements: + - 1 + - allow-element-with-attribute: false + allow-element-with-class: false + allow-element-with-id: false + no-trailing-zero: 1 + no-transition-all: 0 + no-url-protocols: 1 + no-vendor-prefixes: + - 1 + - additional-identifiers: [] + excluded-identifiers: [] + placeholder-in-extend: 1 + placeholder-name-format: + - 1 + - convention: hyphenatedlowercase + property-sort-order: + - 1 + - ignore-custom-properties: false + property-units: + - 1 + - global: + - ch + - em + - ex + - rem + - cm + - in + - mm + - pc + - pt + - px + - q + - vh + - vw + - vmin + - vmax + - deg + - grad + - rad + - turn + - ms + - s + - Hz + - kHz + - dpi + - dpcm + - dppx + - '%' + per-property: {} + quotes: + - 1 + - style: single + shorthand-values: + - 1 + - allowed-shorthands: + - 1 + - 2 + - 3 + single-line-per-selector: 1 + space-after-bang: + - 1 + - include: false + space-after-colon: + - 1 + - include: true + space-after-comma: + - 1 + - include: true + space-before-bang: + - 1 + - include: true + space-before-brace: + - 1 + - include: true + space-before-colon: 1 + space-between-parens: + - 1 + - include: false + trailing-semicolon: 1 + url-quotes: 1 + variable-for-property: + - 0 + - properties: [] + variable-name-format: + - 1 + - allow-leading-underscore: true + convention: hyphenatedlowercase + zero-unit: 1 diff --git a/gulpfile.js b/gulpfile.js index d6f3aa2..c08b6bc 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -31,6 +31,7 @@ nunjucks = require('gulp-nunjucks-render'); cssnano = require('gulp-cssnano'), jshint = require('gulp-jshint'), jscs = require('gulp-jscs'), +sasslint = require('gulp-sass-lint'), uglifyjs = require('uglify-es'), composer = require('gulp-uglify/composer'), // imagemin = require('gulp-imagemin'), @@ -110,6 +111,14 @@ gulp.task('lint:js', function() { // .pipe(jscs.reporter()); }); +gulp.task('lint:scss', function() { + return gulp.src('source/style/**/*.scss') + .pipe(plumbError('SASSLint Error')) + .pipe(sasslint({ + configFile: '.sass-lint.yml' + })) +}) + gulp.task('clean:dev', function() { del.sync([ 'build/css', @@ -206,7 +215,7 @@ gulp.task('watch-js', ['lint:js'], browsersync.reload); gulp.task('testwatch', function() { gulp.watch('source/code/**/*.js', ['watch-js']) - gulp.watch('source/style/**/*.+(scss|sass)', ['test']); + gulp.watch('source/style/**/*.+(scss|sass)', ['test', 'lint:scss']); gulp.watch([ 'source/templates/**/*', 'source/pages/**/*.+(html|nunjucks)' @@ -240,7 +249,7 @@ gulp.task('olddefault', ['clean', 'styles', 'scripts', 'images', 'nunjucks']); gulp.task('default', function(callback) { sequencer( 'clean:dev', - ['sprites', 'lint:js'], + ['sprites', 'lint:js', 'lint:scss'], ['test', 'testnunjucks'], ['testsync', 'testwatch'], callback diff --git a/package-lock.json b/package-lock.json index 85a3512..226d7c1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -69,6 +69,23 @@ "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=", "dev": true }, + "acorn-jsx": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz", + "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=", + "dev": true, + "requires": { + "acorn": "3.3.0" + }, + "dependencies": { + "acorn": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", + "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", + "dev": true + } + } + }, "after": { "version": "0.8.1", "resolved": "https://registry.npmjs.org/after/-/after-0.8.1.tgz", @@ -85,6 +102,12 @@ "json-stable-stringify": "1.0.1" } }, + "ajv-keywords": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz", + "integrity": "sha1-MU3QpLM2j609/NxU7eYXG4htrzw=", + "dev": true + }, "align-text": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", @@ -108,6 +131,12 @@ "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", "dev": true }, + "ansi-escapes": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz", + "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=", + "dev": true + }, "ansi-regex": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", @@ -227,6 +256,12 @@ "integrity": "sha1-8zshWfBTKj8xB6JywMz70a0peco=", "dev": true }, + "arrify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", + "dev": true + }, "asap": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", @@ -515,12 +550,27 @@ "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", "dev": true }, + "caller-path": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz", + "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=", + "dev": true, + "requires": { + "callsites": "0.2.0" + } + }, "callsite": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz", "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=", "dev": true }, + "callsites": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz", + "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=", + "dev": true + }, "camelcase": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", @@ -626,6 +676,12 @@ "readdirp": "2.1.0" } }, + "circular-json": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz", + "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==", + "dev": true + }, "clap": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.3.tgz", @@ -645,6 +701,15 @@ "glob": "7.1.2" } }, + "cli-cursor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz", + "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=", + "dev": true, + "requires": { + "restore-cursor": "1.0.1" + } + }, "cli-table": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz", @@ -662,6 +727,12 @@ } } }, + "cli-width": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", + "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", + "dev": true + }, "cliui": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", @@ -1339,6 +1410,12 @@ "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=", "dev": true }, + "deep-is": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", + "dev": true + }, "defaults": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", @@ -1427,6 +1504,24 @@ "integrity": "sha1-p2o+0YVb56ASu4rBbLgPPADcKPA=", "dev": true }, + "doctrine": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz", + "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=", + "dev": true, + "requires": { + "esutils": "2.0.2", + "isarray": "1.0.0" + }, + "dependencies": { + "esutils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", + "dev": true + } + } + }, "dom-serializer": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", @@ -1767,6 +1862,33 @@ "es6-symbol": "3.1.1" } }, + "es6-map": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz", + "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.30", + "es6-iterator": "2.0.1", + "es6-set": "0.1.5", + "es6-symbol": "3.1.1", + "event-emitter": "0.3.5" + } + }, + "es6-set": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz", + "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.30", + "es6-iterator": "2.0.1", + "es6-symbol": "3.1.1", + "event-emitter": "0.3.5" + } + }, "es6-symbol": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz", @@ -1831,12 +1953,159 @@ } } }, + "escope": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz", + "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=", + "dev": true, + "requires": { + "es6-map": "0.1.5", + "es6-weak-map": "2.0.2", + "esrecurse": "4.2.0", + "estraverse": "4.2.0" + }, + "dependencies": { + "estraverse": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", + "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", + "dev": true + } + } + }, + "eslint": { + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-2.13.1.tgz", + "integrity": "sha1-5MyPoPAJ+4KaquI4VaKTYL4fbBE=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "concat-stream": "1.5.2", + "debug": "2.2.0", + "doctrine": "1.5.0", + "es6-map": "0.1.5", + "escope": "3.6.0", + "espree": "3.5.1", + "estraverse": "4.2.0", + "esutils": "2.0.2", + "file-entry-cache": "1.3.1", + "glob": "7.1.2", + "globals": "9.18.0", + "ignore": "3.3.5", + "imurmurhash": "0.1.4", + "inquirer": "0.12.0", + "is-my-json-valid": "2.16.1", + "is-resolvable": "1.0.0", + "js-yaml": "3.7.0", + "json-stable-stringify": "1.0.1", + "levn": "0.3.0", + "lodash": "4.17.4", + "mkdirp": "0.5.1", + "optionator": "0.8.2", + "path-is-absolute": "1.0.1", + "path-is-inside": "1.0.2", + "pluralize": "1.2.1", + "progress": "1.1.8", + "require-uncached": "1.0.3", + "shelljs": "0.6.1", + "strip-json-comments": "1.0.4", + "table": "3.8.3", + "text-table": "0.2.0", + "user-home": "2.0.0" + }, + "dependencies": { + "estraverse": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", + "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", + "dev": true + }, + "esutils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", + "dev": true + }, + "lodash": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", + "dev": true + }, + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + }, + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, + "requires": { + "minimist": "0.0.8" + } + }, + "shelljs": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.6.1.tgz", + "integrity": "sha1-7GIRvtGSBEIIj+D3Cyg3Iy7SyKg=", + "dev": true + }, + "user-home": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz", + "integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8=", + "dev": true, + "requires": { + "os-homedir": "1.0.2" + } + } + } + }, + "espree": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.1.tgz", + "integrity": "sha1-DJiLirRttTEAoZVK5LqZXd0n2H4=", + "dev": true, + "requires": { + "acorn": "5.1.2", + "acorn-jsx": "3.0.1" + }, + "dependencies": { + "acorn": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.2.tgz", + "integrity": "sha512-o96FZLJBPY1lvTuJylGA9Bk3t/GKPPJG8H0ydQQl01crzwJgspa4AEIq/pVTXigmK0PHVQhiAtn8WMBLL9D2WA==", + "dev": true + } + } + }, "esprima": { "version": "2.7.3", "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", "dev": true }, + "esrecurse": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz", + "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=", + "dev": true, + "requires": { + "estraverse": "4.2.0", + "object-assign": "4.1.1" + }, + "dependencies": { + "estraverse": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", + "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", + "dev": true + } + } + }, "estraverse": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz", @@ -1877,6 +2146,12 @@ "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=", "dev": true }, + "exit-hook": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz", + "integrity": "sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=", + "dev": true + }, "expand-brackets": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", @@ -2004,6 +2279,32 @@ "time-stamp": "1.1.0" } }, + "fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", + "dev": true + }, + "figures": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz", + "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", + "dev": true, + "requires": { + "escape-string-regexp": "1.0.5", + "object-assign": "4.1.1" + } + }, + "file-entry-cache": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-1.3.1.tgz", + "integrity": "sha1-RMYepgeuS+nBQC9B9EJwy/4zT/g=", + "dev": true, + "requires": { + "flat-cache": "1.3.0", + "object-assign": "4.1.1" + } + }, "filename-regex": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", @@ -2100,6 +2401,49 @@ "integrity": "sha1-/xke3c1wiKZ1smEP/8l2vpuAdLU=", "dev": true }, + "flat-cache": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz", + "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=", + "dev": true, + "requires": { + "circular-json": "0.3.3", + "del": "2.2.2", + "graceful-fs": "4.1.11", + "write": "0.2.1" + }, + "dependencies": { + "del": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz", + "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", + "dev": true, + "requires": { + "globby": "5.0.0", + "is-path-cwd": "1.0.0", + "is-path-in-cwd": "1.0.0", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "rimraf": "2.6.2" + } + }, + "globby": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", + "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", + "dev": true, + "requires": { + "array-union": "1.0.2", + "arrify": "1.0.1", + "glob": "7.1.2", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + } + } + } + }, "flatten": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz", @@ -2162,6 +2506,15 @@ "integrity": "sha1-ZR+DjiJCTnVm3hYdg1jKoZn4PU8=", "dev": true }, + "front-matter": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/front-matter/-/front-matter-2.1.2.tgz", + "integrity": "sha1-91mDufL0E75ljJPf172M5AePXNs=", + "dev": true, + "requires": { + "js-yaml": "3.7.0" + } + }, "fs-exists-sync": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz", @@ -2245,6 +2598,21 @@ "globule": "0.1.0" } }, + "generate-function": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz", + "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=", + "dev": true + }, + "generate-object-property": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz", + "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=", + "dev": true, + "requires": { + "is-property": "1.0.2" + } + }, "get-caller-file": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", @@ -2472,6 +2840,12 @@ "which": "1.3.0" } }, + "globals": { + "version": "9.18.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", + "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", + "dev": true + }, "globby": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", @@ -2546,6 +2920,23 @@ "sparkles": "1.0.0" } }, + "gonzales-pe": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.2.2.tgz", + "integrity": "sha512-jbQFnd6CD3iEuGtSKVhsh37tQIkkx+/eil3tufyYOHMouG89uqtkWGP03P4vxY+XGeJnCi3ewIY+BnBogyC61Q==", + "dev": true, + "requires": { + "minimist": "1.1.3" + }, + "dependencies": { + "minimist": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz", + "integrity": "sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=", + "dev": true + } + } + }, "graceful-fs": { "version": "4.1.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", @@ -3123,6 +3514,17 @@ "vinyl-sourcemaps-apply": "0.2.1" } }, + "gulp-sass-lint": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/gulp-sass-lint/-/gulp-sass-lint-1.3.3.tgz", + "integrity": "sha1-+HnUI+UXoocqiQJGbA3sgUbceHQ=", + "dev": true, + "requires": { + "gulp-util": "3.0.8", + "sass-lint": "1.11.1", + "through2": "2.0.3" + } + }, "gulp-sourcemaps": { "version": "2.6.1", "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.1.tgz", @@ -3550,12 +3952,24 @@ "integrity": "sha1-HSuFQVjsgWkRPGy39raAHpniEdU=", "dev": true }, + "ignore": { + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.5.tgz", + "integrity": "sha512-JLH93mL8amZQhh/p6mfQgVBH3M6epNq3DfsXsTSuSrInVjwyYlFE1nv2AgfRCC8PoOhM0jwQ5v8s9LgbK7yGDw==", + "dev": true + }, "immutable": { "version": "3.8.1", "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.1.tgz", "integrity": "sha1-IAgH8Rqw9ycQ6khVQt4IgHX2jNI=", "dev": true }, + "imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", + "dev": true + }, "in-publish": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz", @@ -3611,6 +4025,35 @@ "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=", "dev": true }, + "inquirer": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz", + "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=", + "dev": true, + "requires": { + "ansi-escapes": "1.4.0", + "ansi-regex": "2.1.1", + "chalk": "1.1.3", + "cli-cursor": "1.0.2", + "cli-width": "2.2.0", + "figures": "1.7.0", + "lodash": "4.17.4", + "readline2": "1.0.1", + "run-async": "0.1.0", + "rx-lite": "3.1.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "through": "2.3.8" + }, + "dependencies": { + "lodash": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", + "dev": true + } + } + }, "interpret": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.4.tgz", @@ -3741,6 +4184,18 @@ "is-extglob": "1.0.0" } }, + "is-my-json-valid": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz", + "integrity": "sha512-ochPsqWS1WXj8ZnMIV0vnNXooaMhp7cyL4FMSIPKTtnV0Ha/T19G2b9kkhcNsabV9bxYkze7/aLZJb/bYuFduQ==", + "dev": true, + "requires": { + "generate-function": "2.0.0", + "generate-object-property": "1.2.0", + "jsonpointer": "4.0.1", + "xtend": "4.0.1" + } + }, "is-number": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", @@ -3824,6 +4279,12 @@ "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", "dev": true }, + "is-property": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz", + "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=", + "dev": true + }, "is-relative": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz", @@ -3833,6 +4294,15 @@ "is-unc-path": "0.1.2" } }, + "is-resolvable": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz", + "integrity": "sha1-jfV8YeouPFAUCNEA+wE8+NbgzGI=", + "dev": true, + "requires": { + "tryit": "1.0.3" + } + }, "is-svg": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz", @@ -4121,6 +4591,12 @@ "nomnom": "1.8.1" } }, + "jsonpointer": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz", + "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=", + "dev": true + }, "jsprim": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", @@ -4156,6 +4632,12 @@ "is-buffer": "1.1.5" } }, + "known-css-properties": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.3.0.tgz", + "integrity": "sha512-QMQcnKAiQccfQTqtBh/qwquGZ2XK/DXND1jrcN9M8gMMy99Gwla7GQjndVUsEqIaRyP6bsFRuhwRj5poafBGJQ==", + "dev": true + }, "layout": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/layout/-/layout-2.2.0.tgz", @@ -4180,6 +4662,16 @@ "invert-kv": "1.0.0" } }, + "levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "dev": true, + "requires": { + "prelude-ls": "1.1.2", + "type-check": "0.3.2" + } + }, "liftoff": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.3.0.tgz", @@ -4399,6 +4891,12 @@ "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=", "dev": true }, + "lodash.capitalize": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/lodash.capitalize/-/lodash.capitalize-4.2.1.tgz", + "integrity": "sha1-+CbJtOKoUR2E46yinbBeGk87cqk=", + "dev": true + }, "lodash.clonedeep": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", @@ -4456,6 +4954,12 @@ "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=", "dev": true }, + "lodash.kebabcase": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz", + "integrity": "sha1-hImxyw0p/4gZXM7KRI/21swpXDY=", + "dev": true + }, "lodash.keys": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", @@ -4689,6 +5193,12 @@ "trim-newlines": "1.0.0" } }, + "merge": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz", + "integrity": "sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=", + "dev": true + }, "merge-stream": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", @@ -5326,6 +5836,28 @@ } } }, + "optionator": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", + "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", + "dev": true, + "requires": { + "deep-is": "0.1.3", + "fast-levenshtein": "2.0.6", + "levn": "0.3.0", + "prelude-ls": "1.1.2", + "type-check": "0.3.2", + "wordwrap": "1.0.0" + }, + "dependencies": { + "wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", + "dev": true + } + } + }, "options": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz", @@ -5592,6 +6124,12 @@ "irregular-plurals": "1.3.0" } }, + "pluralize": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz", + "integrity": "sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU=", + "dev": true + }, "pngjs": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-2.3.1.tgz", @@ -6675,6 +7213,12 @@ } } }, + "prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", + "dev": true + }, "prepend-http": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", @@ -6699,6 +7243,12 @@ "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", "dev": true }, + "progress": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz", + "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=", + "dev": true + }, "prompt": { "version": "0.2.14", "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.14.tgz", @@ -6953,6 +7503,25 @@ "set-immediate-shim": "1.0.1" } }, + "readline2": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz", + "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=", + "dev": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "mute-stream": "0.0.5" + }, + "dependencies": { + "mute-stream": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz", + "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=", + "dev": true + } + } + }, "rechoir": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", @@ -7106,6 +7675,16 @@ "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", "dev": true }, + "require-uncached": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz", + "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=", + "dev": true, + "requires": { + "caller-path": "0.1.0", + "resolve-from": "1.0.1" + } + }, "requires-port": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", @@ -7137,6 +7716,12 @@ "global-modules": "0.2.3" } }, + "resolve-from": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz", + "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=", + "dev": true + }, "resolve-url": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", @@ -7153,6 +7738,16 @@ "minimatch": "3.0.4" } }, + "restore-cursor": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz", + "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=", + "dev": true, + "requires": { + "exit-hook": "1.1.1", + "onetime": "1.1.0" + } + }, "revalidator": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz", @@ -7177,6 +7772,15 @@ "glob": "7.1.2" } }, + "run-async": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz", + "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=", + "dev": true, + "requires": { + "once": "1.4.0" + } + }, "run-sequence": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/run-sequence/-/run-sequence-2.2.0.tgz", @@ -7193,6 +7797,12 @@ "integrity": "sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=", "dev": true }, + "rx-lite": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz", + "integrity": "sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI=", + "dev": true + }, "safe-buffer": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", @@ -7255,6 +7865,47 @@ } } }, + "sass-lint": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/sass-lint/-/sass-lint-1.11.1.tgz", + "integrity": "sha512-vt29dGRlNDywZUsJOxhh8cGtpRWIqrsGS85U0WnAyMdywnUyiPXV3/HNKtkg7hmm6pRjpYE9806u/GT0oI+lMQ==", + "dev": true, + "requires": { + "commander": "2.11.0", + "eslint": "2.13.1", + "front-matter": "2.1.2", + "fs-extra": "3.0.1", + "glob": "7.1.2", + "globule": "1.2.0", + "gonzales-pe": "4.2.2", + "js-yaml": "3.7.0", + "known-css-properties": "0.3.0", + "lodash.capitalize": "4.2.1", + "lodash.kebabcase": "4.1.1", + "merge": "1.2.0", + "path-is-absolute": "1.0.1", + "util": "0.10.3" + }, + "dependencies": { + "globule": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz", + "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=", + "dev": true, + "requires": { + "glob": "7.1.2", + "lodash": "4.17.4", + "minimatch": "3.0.4" + } + }, + "lodash": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", + "dev": true + } + } + }, "save-pixels": { "version": "2.3.4", "resolved": "https://registry.npmjs.org/save-pixels/-/save-pixels-2.3.4.tgz", @@ -7489,6 +8140,12 @@ "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true }, + "slice-ansi": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz", + "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=", + "dev": true + }, "sntp": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", @@ -8065,6 +8722,59 @@ } } }, + "table": { + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/table/-/table-3.8.3.tgz", + "integrity": "sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=", + "dev": true, + "requires": { + "ajv": "4.11.8", + "ajv-keywords": "1.5.1", + "chalk": "1.1.3", + "lodash": "4.17.4", + "slice-ansi": "0.0.4", + "string-width": "2.1.1" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "lodash": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + } + } + }, "tar": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", @@ -8178,6 +8888,12 @@ "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", "dev": true }, + "tryit": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz", + "integrity": "sha1-OTvnMKlEb9Hq1tpZoBQwjzbCics=", + "dev": true + }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -8194,6 +8910,15 @@ "dev": true, "optional": true }, + "type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "dev": true, + "requires": { + "prelude-ls": "1.1.2" + } + }, "typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", @@ -8334,6 +9059,23 @@ "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=", "dev": true }, + "util": { + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", + "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", + "dev": true, + "requires": { + "inherits": "2.0.1" + }, + "dependencies": { + "inherits": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", + "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=", + "dev": true + } + } + }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -8704,6 +9446,32 @@ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true }, + "write": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz", + "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=", + "dev": true, + "requires": { + "mkdirp": "0.5.1" + }, + "dependencies": { + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + }, + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, + "requires": { + "minimist": "0.0.8" + } + } + } + }, "ws": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz", diff --git a/package.json b/package.json index bbed19d..d8cbb6c 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "gulp-rename": "^1.2.2", "gulp-ruby-sass": "^2.1.1", "gulp-sass": "^3.1.0", + "gulp-sass-lint": "^1.3.3", "gulp-sourcemaps": "^2.6.1", "gulp-uglify": "^3.0.0", "gulp.spritesmith": "^6.5.1", diff --git a/test/test.js b/test/test.js new file mode 100644 index 0000000..e69de29 From c781f5c6c5a18aa0040175bf73457d3c2a9b8976 Mon Sep 17 00:00:00 2001 From: Stephan Date: Mon, 30 Apr 2018 19:09:17 +0200 Subject: [PATCH 067/372] general work - renamed nunjucks extension to njk - removed old demo html files - started to change CRLF to LF - detail work on style definitions - added structure for demo files --- README.md | 9 +- demo-explorer.html | 157 ---- demo-index.html | 708 ----------------- demo-presentation.html | 42 - gulpfile.js | 8 +- source/pages/{404.nunjucks => 404.njk} | 17 +- source/pages/500.njk | 23 + source/pages/blank.njk | 11 + source/pages/demo-blank.nunjucks | 6 - source/pages/demo-index.nunjucks | 668 ---------------- source/pages/elements.njk | 72 ++ source/pages/{index.nunjucks => index.njk} | 17 +- source/pages/intro.njk | 715 ++++++++++++++++++ source/pages/os.njk | 146 ++++ source/pages/tests.njk | 87 +++ source/style/_abovethefold.scss | 2 +- source/style/elements/_grouping.scss | 4 +- source/style/elements/_interactive.scss | 27 +- source/style/elements/_sections.scss | 4 +- source/style/example.scss | 2 +- source/style/global/_common.scss | 18 +- source/style/maintenance.scss | 2 +- .../maintenance/_maintenance_module.scss | 26 +- .../templates/{index.nunjucks => default.njk} | 12 +- source/templates/{demo.nunjucks => demo.njk} | 6 +- .../{nav-macro.nunjucks => nav-macro.njk} | 0 .../{top-macro.nunjucks => top-macro.njk} | 0 .../{maintenance.nunjucks => maintenance.njk} | 7 +- ...oter-status.nunjucks => footer-status.njk} | 0 .../partials/{footer.nunjucks => footer.njk} | 0 .../{page-hover.nunjucks => page-hover.njk} | 0 31 files changed, 1155 insertions(+), 1641 deletions(-) delete mode 100644 demo-explorer.html delete mode 100644 demo-index.html delete mode 100644 demo-presentation.html rename source/pages/{404.nunjucks => 404.njk} (68%) create mode 100644 source/pages/500.njk create mode 100644 source/pages/blank.njk delete mode 100644 source/pages/demo-blank.nunjucks delete mode 100644 source/pages/demo-index.nunjucks create mode 100644 source/pages/elements.njk rename source/pages/{index.nunjucks => index.njk} (55%) create mode 100644 source/pages/intro.njk create mode 100644 source/pages/os.njk create mode 100644 source/pages/tests.njk rename source/templates/{index.nunjucks => default.njk} (74%) rename source/templates/{demo.nunjucks => demo.njk} (91%) rename source/templates/macros/{nav-macro.nunjucks => nav-macro.njk} (100%) rename source/templates/macros/{top-macro.nunjucks => top-macro.njk} (100%) rename source/templates/{maintenance.nunjucks => maintenance.njk} (79%) rename source/templates/partials/{footer-status.nunjucks => footer-status.njk} (100%) rename source/templates/partials/{footer.nunjucks => footer.njk} (100%) rename source/templates/partials/{page-hover.nunjucks => page-hover.njk} (100%) diff --git a/README.md b/README.md index 735778a..62990bb 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,13 @@ # HIPPIE -## USE (work in progress) +## USE (work in progress (it is not ready to be used)) Clone the repo `https://github.com/sthag/hippie.git`. -Copy the source folder to your projects style folder. +Change to the newly created folder. By default this would be *hippie*. -Compile the SCSS files, for example like a so `sass --watch source/:./`. - -Load the screen.css file within the head section of your HTML document. `` +Run the command *gulp*. +This will create a folder *build* with the resulting files. ## LOGIC diff --git a/demo-explorer.html b/demo-explorer.html deleted file mode 100644 index ac11fc7..0000000 --- a/demo-explorer.html +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - HIPPIE Explorer Demo - - - - - - - - - - - - - - - - -
-
- - - - - - -
-
-
- - - -
-
- -
-
-
-
-

Dateiname 1

-

Auszeichnung 1

-
-
-
-
-
-

Dateiname 2

-

Auszeichnung 2

-
-
-
-
-
-

Dateiname 3

-

Auszeichnung 3

-
-
-
-
-
-

Dateiname 4

-

Auszeichnung 4

-
-
-
-
- - - - - - - - - - - -
Objektname 1Objektpfad 1
Objektname 2Objektpfad 2
-
-
-

Status

-
-
-
-
- - - - - - - diff --git a/demo-index.html b/demo-index.html deleted file mode 100644 index 165e351..0000000 --- a/demo-index.html +++ /dev/null @@ -1,708 +0,0 @@ - - - - - - HIPPIE Dummy - - - - - - - - - - - - - - - - -
- -
- - -
- - -
- Dies ist einfach nur Text.
Weniger wäre Nichts, denn dieser Text ist nicht durch ein spezifisches Element umschlossen. -

Es wirken nur die Eigenschaften des <body> Elements. Dieses Element umschließt den gesamten Inhalt des Dokumentes und kommt daher nur einmal vor. Inhalte sind normalerweise durch Elemente definiert. Grundlegende Elemente teilen das Dokument zunächst in Abschnitte.

-

Bereiche

-
-
-

Einen Abschnitt, welcher für sich alleine stehen kann, definiert sich durch <article>. Solch ein Element wird oft detailliert gestaltet, kommt aber auch ohne jegliche Gestaltung aus.

-

Noch allgemeiner ist das <section> Element. Es schafft Bereiche um Inhalte zu strukturieren.

-

Bestimmte Bereiche haben einen vorgegebene Zweck.
Folgende Bereiche sind vorgegeben:

-
- - -
-
-

Um einleitenden Inhalt festzuhalten, wird das <header> Element eingesetzt. Es beinhaltet häufig auch Navigationselemente. Dabei bezieht es sich auf den nächsten, umgebenden Abschnitt.

- -
-
-

Auch abschließender Inhalt kann für einen Abschnitt definiert werden. Dazu wird <footer> eingesetzt.

-
-
- -
-

Zur feineren Strukturierung und Gliederung von Texten sind einige weitere Elemente verfügbar. Diese werden nun der Reihe nach aufgeführt. Zu Beginn die Überschriften, da sie noch zu den Abschnitten gehören. Das kommt vermutlich daher, da Abschnitte häufig eine kennzeichnende Überschrift beinhalten.

-

Überschrift 1

-

Eine Überschrift erster Ordnung <h1> ist sehr groß und steht daher oft außerhalb eines Textflusses. Sie schafft eine deutliche Trennung sowohl inhaltlich wie auch optisch. Sie erzeugt einen Abstand gleich der horizontalen Linie über sich.

-

Überschrift 2

-

Die weiteren Überschriften <h2> bis <h6> gliedern Text und werden auch als Titel für andere Elemente eingesetzt.

-

Überschrift 3 ist in Großbuchstaben gesetzt

-

Überschrift 4 verwendet normale Buchstaben und gleicht ansonsten Überschrift 3

-
Überschrift 5 ist Überschrift 5
-
Überschrift 6
-

Schließlich eine Überschrift in der Größe des Fließtextes. Allerdings in fett.

-

Gruppierung

-

Ein Absatz <p>. Zugegeben ein kurzer.

-

Aus mehreren Absätzen wird ein ganzer Text. Solche Texte haben gelegentlich großen informativen oder unterhaltsamen Charakter.
Einfache Zeilenumbrüche werden darin mit <br> erreicht.

-

Die Unterteilung in Absätze ist eine von vielen Möglichkeiten Texte zu gruppieren und ihnen Struktur zu verleihen. In diesem Dokument flattert Text normalerweise von Links daher. Er ist schwarz und in einer serifenlosen Schrift gesetzt. Zu weiteren Formatierungen, die eher auf einer Ebene der Zeichen einzuordnen ist, wird im Verlauf näher eingegangen. Zunächst die Struktur:

-

Text sitzt gerne auch mal zentriert.

p.txt_center
-

Rechtsbündig ist schon eher eine Ausnahme bzw. Besonderheit.

p.txt_right
-

Texte können auf verschiedene Arten unterteilt werden. Dafür werden unterschiedlich formatierte <hr> Elemente verwendet. Die horizontale Linie ist die Ausgangsformatierung, daher auch der abgekürzte Name des Elements. Eine Linie ist schwarz und durchgezogen.

-
-

Es ist auch eine unsichtbare Unterteilung möglich:

-
hr.hr__hidden
-

Die Linie darf auch gepunkted sein. Zudem sind verschiedene Längen möglich. Diese sind immer ein Prozentwert der verfügbaren Breite. Hier in gleicher Reihenfolge 100%, 50% und 25%:

-
hr.hr__dotted
-
hr.center_50
-
hr.hr__dotted.center_25
-

Zur horizontalen Unterteilung kommt natürlich auch eine vertikale Trennung hinzu. Text kann so zum Beispiel in mehrere Spalten unterteilt werden. Dies ist hilfreich, wenn ein Text durch eine breite Fläche sehr lange Zeilen bekommen würde. Es ist dann schwer den neuen Zeilanfang zu finden. Die vertikale Trennung dient in erster Linie dazu, diesem Umstand zu begegnen. Auch hier kann die Unterteilung viele Formen annehmen.

p.block__column_2
-

Drei Spalten gilt es jetzt also zu Füllen. Dann erst wird die Trennung der Spalten durch eine Linie sichtbar.

p.block__column_3.block__column_line
-

Ist der Text nicht lang genug bleibt eventuell eine Spalte leer. Diesmal wird dies aber nicht passieren, denn das Anschauungsbeispiel ist ja nun durch den vorherigen Absatz schon gegeben.
Oft ist es sinnvoll, Absätze mit mehreren Spalten deutlich von nachfolgenden Absätzen zu trennen. Da der Textfluss spaltenweise verläuft, liest man eventuell an der falschen Stelle weiter. Ach das ziegen diese beiden Absätze ganz gut.

-

Es gibt die Möglichkeit vorformatierten Text darzustellen <pre>.

- 
Dadurch
	bleiben
		Einrückungen
			durch
				Tabulatoren
					erhalten.
-

Text bekommt durch Listen besondere optische wie auch inhaltliche Struktur. Es gibt ungeordnete <ul> und geordnete Listen <ol> sowie Beschreibungslisten <dl>. Die beiden ersten Varianten beinhalten das Listenelement <li>. Beschreibungslisten beinhalten jeweils das Paar von Ausdruck <dt> und Beschreibung <dd>. Im Folgenden eine Liste der Listen in ihrer Ausgangskonfiguration:

-
    -
  • Ungeordnete
    • -
  • Listen
    • -
-
    -
  • Verschiedener
    • -
  • Art
    • -
-
    -
  1. Geordnete
    2. -
  2. Liste
    3. -
-
-
Beschreibungsliste
-
Auch Definitionslisten genannt
-
Ausdruck
-
Beschreibung
-
-

Wird Bezug auf fremde Inhalte genommen, kommt ein Zitat <blockquote> zur Anwendung. Es besteht aus der Aussage und der Quelle.

-
-

Ein Zitat (das, lateinisch citatum „Angeführtes, Aufgerufenes“ zu lat. citāre „in Bewegung setzen, vorladen“, vgl. „jemanden vor Gericht zitieren“) ist eine wörtlich übernommene Stelle aus einem Text oder ein Hinweis auf eine bestimmte Textstelle.

-

Wikipedia

-
-
blockquote>p+p.quote__source
-

Auch Inhalte, die nicht in Textform sind, können durch einen Bezug integriert werden. Wie diese Fahne werden sie mit <figure> umschlossen und tragen eine Bezeichnung.

-
-
Fahne
- - - - - - - - - - - -
-
figure>figcaption+{element}
-

Eine von sich aus undefinierte Möglichkeit zur Gruppierung von Text besteht durch <div>. Dieses Element hat, ohne weitere Klassifizierung keine Auswirkungen auf die Erscheinung oder die inhaltliche Aussage. Daher der allgemeine Einsatz.

-

Es wird allerdings häufig eingesetzt und bekommt vielfältige Funktionen zugeordnet wie diese hervorgehobene Information zeigt.

-

Eine sehr klar definierte Gruppierung stellt das Element <main> dar. Es umschließt den hauptsächlichen Inhalt des Dokumentes.

-

Textebene

-

Verweise

-

Ein wesentlicher Bestandteil von Hypertext sind Verweise <a>. Sie dienen als Sprungmarken innerhalb des Netzwerks. Es kann grob zwischen internen und externen Verweisen unterschieden werden. Interne Verweisea.a__line können Verknüpfungen innerhalb des aktuellen Dokumentes sein oder auch Funktionen aktivieren. Externe Verweise verknüpfen Inhalte über das gesamte Netzwerk hinweg. Sie können auch auf E-Mail Adressen oder Dateien zeigen.

-

Nicht nur Text kann als Verweis verwendet werden. Auch andere Elemente wie Bilder können verknüpft werden. Abhängig von ihrer Funktion und ihrem Zweck, werden Verweise unterschiedlich formatiert. Farbige oder unterstrichene Varianten sind möglich.

-

Wird der Verweis innerhalb eines <nav> Elementes notiert, bekommt er die spezielle Bedeutung eines Navigationsverweises innerhalb des Dokumentes oder der Anwendung. Auf diese Verwendung wird im Folgenden genauer eingegangen ...

-

Formatierungen

-

Texte, Wörter oder Zeichen können vielfältig formatiert werden. Sie können fett <b> oder kursiv <i> geschrieben sein. Auch beides ist möglich!?! Sollen sie nicht nur anders aussehen, sondern auch eine besondere inhaltliche Bedeutung bekommen, werden sie mit <strong> und <em> ausgezeichnet.

-

Gerade bei wörtlichen Zitierungen kommt häufig das Anführungszeichen zum Einsatz. Es kann durch die Formatierung automatisch ergänzt werden.

-
-

Das kannst du schon so machen aber dann isses halt Kacke.

-

o. V.

-
-
blockquote.quote__mark>p+p.quote__source
-

Ein besonderer inhaltlicher Bezug ist der Titel eines Werkes. Sowas kann mit <cite> ausgezeichnet werden. Pulp Fiction, super Film - zum Beispiel.

-

Auch die Auszeichnung <code> wurde bis hier hin schon verwendet. Sie markiert Maschinensprache. Für zusammenhängende Blöcke wird die Auszeichnung oft in Kombination mit dem Element <pre> verwendet:

- 
<html>
  <head>
    <title>Hyper Text Markup Language</title>
  </head>
  <body id="root">
    <!-- Content goes here -->
    <p class="example">Just like this.</p>
  </body>
</html>
-

Dabei bleiben vorhandene Textformatierungen wie Zeilenumbrüche und Einrückung erhalten.

-

Die Zeichen in Absätzen bis hin zu ganzen Texten können, mit einem geeigneten Eingabegerät, markiert werden. Dies stellt sich wie folgt dar:

-

Beispiel zum markieren ^^.

-

Eine Markierung kann, mittels <mark>, auch durch den Autor geschehen. Diese stellt sich ein wenig anders dar: Diese Worte sind markiert.

- -

Änderungen

- -

Eingebundene Inhalte

- - - -

Tabellen

-

Tabellen bieten besonders geordnete Struktur. Häufig werden in ihnen Text und Daten kombiniert dargestellt. Dies erfordert individuelle Formatierungen. Einige grundlegende Eigenschaften werden im folgenden aufgezeigt. Tabellen sind in ihrer Größe entweder vordefiniert oder richten sich nach ihrem Inhalt. Das gilt auch für die einzelnen Zellen....

- - - - - - - - - - -
Eineeinfache
Tabelle
-
table.width_full>tbody>tr>td*2^tr>td[colspan=2]
-
- - - - - - - - - - -
Einefließende
Tabelle
-
table>tbody>tr>td*2^tr>td[colspan=2]
- - - - - - - - - - -
Mitohne
Linien
-
table.table__blank>tbody>tr>td*2^tr>td[colspan=2]
-
-

Die nächste Tabelle verwendet alle zur Auszeichnung verfügbaren Elemente und hat eine starre Zellverteilung:

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Beschreibung bzw. Zusammenhang der Tabelle
KopfzeileAB
FußzeileAB
Tabelle
mitTitel
Kopf-und
Fußzeile
-
table.width_full.table__fix>caption+thead>tr>th*3^^tfoot>tr>td*3^^tbody>(tr>td*3)*3
-
-

Viele weitere Formate sind möglich ...

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
KopfzeileAB
VorspalteEine
1erweiterte
2Tabelle
-
table.width_full>thead>tr>th.precol+th[colspan=2]^^tbody>tr>td.precol+td*2^tr>td.precol+td[colspan=2]
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
KopfzeileAB
Tabelle
ohneRahmen
jedochmit
Streifen
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Beschreibung bzw. Zusammenhang der Tabelle
Kopfzeile1>9000
Fußzeile--
Alpha09000
Bravo19001
Charlie09000
- -

Formulare

-

Spätestens hier werden Betrachter zu Benutzern. Texteingabefelder und verschiedene Bedienelemente geben Möglichkeiten zur Interaktion. Diese Elemente sind in vielerlei Hinsicht besonders. Werden sie nicht explizit gestaltet, ist ihre Erscheinung system- bzw. browserabhängig. (Vielleicht ist das auch scheiße, hier darauf einzugehen) ... Üblicherweise stehen alle Formularelemente innerhalb eines <form> Elementes. Dieses ist notwendig um Angaben zur Kommunikation mit dem Server zu setzen. Es hat normalerweise keine gestalterische Funktion.

-

Grundlegend ist das Element <input>. Es hat viele Attribute um den Typ der Eingabe anzupassen. Ist es undefiniert nimmt es jegliche textbasierte Information auf und erhält eine Standardgröße.

-

-

Ein spezieller Typ des Eingabefeldes verändert seine Funktion zu einer Schaltfläche <input[type="button"]>. Es gibt allerdings auch ein eigenes Element <button> dafür. -

-

Interaktive Elemente können durch das Attribut <readonly> nur lesbar gemacht werden oder mittels <disabled> gänzlich deaktiviert werden.

-

-

Das Element <label> ergänzt interaktive Elemente um eine Beschriftung. Wichtig ist hier, dass die Beziehung beider Elemente zu einander deutlich ist.

-
-
- -
-
- -
-
-

Zusätzlich zur Beschriftung einzelner Elemente gibt es auch die Möglichkeit Gruppierungen zu schaffen. Diese werden mit <fieldset> realisiert.

-
- -
-

Sie können mittels <legend> auch eine eigene Beschriftung erhalten.

-
- Einfache Eingabefelder - - -
-
- Weitere Zeicheneingabefelder -

Innerhalb einer Gruppe können nicht nur Ein- und Ausgabefelder platziert werden. Andere Elemente ergänzen Information oder lockern das Erscheinungsbild auf. Hier nun eine Liste aller möglichen Arten von Eingabefeldern.

- 
ul>(li>label>input[type="text"])
-
- - - - - - - - - - - - - - -

Interaktive Elemente

- - - -

Struktur

-
-
-
- - - - -
-
-
-

Medien

-

Druck

- -
-
-

Ende der Einführung

-

Dies war eine Übersicht der grundlegenden Elemente. Nun folgen weitere Elemente mit besonderen Formatierungen.

-
-
-
- -
-
-

HIPPIE Erklärung

-

Aufbau, Standardwerte

-
-
-

…

-
-
- -
-
-

Medienformat Abfragen

-
-
-
Umbruch bei 
-
-

Telefone und größer

-

Nur Telefone

-

Schreibtafeln hochkant

-

Schreibtafeln und größer

-

Schreibtafeln im Querformat

-

Schreibtafeln quer und größer

-

Nur Arbeitsplatzrechner

-

Arbeitsplatzrechner und größer

-

Richtige Monitore und größer

-
-
-
-
-
-

Sammlung formatierter Elemente

-

Die Elemente werden fortlaufend komplexer

-
-
- 
h3.txt_light_color+p
-

Helle Überschrift

-

Mit normalem Textabsatz

- 
a>h4
- -

Überschrift als Block-Verweis

- - 
section>div.box__inline_left>img^p+p
-
-
Avatar
-

Vorname Name
Straße 1, 01234 Stadt

+49 (0)123 1337 0000
name@domain.tld

-
- 
div.box__main_indent
-
-
-

Eingerückter Inhalt

-
-
- 
nav>ul>(li>a.a__button{Punkt $})*4
-nav>ul>(li>a.a__button_border{Stufe $})*4
-
- - -
- 
nav.nav__horizontal>ul>(li>a.a__button{Abschnitt $})*4
-nav.nav__center_old>ul>(li>a.a__button{Typ $})*4
- -
- -
- 
header.header__page>h1+p+nav.nav__separate_right>ul>(li>a.a__button{Nav $})*4^+nav.nav__right>ul>(li>a.a__button{Nav $})*4
-
-

Aufmacher

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis nec consectetur diam. Sed nisl odio, volutpat nec nisi sit amet, commodo faucibus est. Donec lacinia vestibulum sapien. Morbi porttitor nibh quis imperdiet scelerisque. Praesent rutrum quam eu sodales luctus.

- - -
- 
header.header__page>nav.nav__right>ul>(li>a.a__button{Nav $})*4
-
-
- -
-
- 
footer.pos_abs.pin_bottom>nav.nav__column>ul>(li>a.a__button_text)*4
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -

Gruppierung

- 
ul.list__link>(li>a>img)*2+li>a
- - -

Tabellen

- 
table.table__link>thead>tr>th{&nbsp;}+th{Ab / Zy}+th{Neu / Alt}^^(tbody>tr>td.cell__icon[rowspan="2"]>img[width=16  height=16]^+td.cell__link>a[target=_blank]{Name}+a[target=_blank]{URL}^+td.cell__date[rowspan="2"]{YYY-MM-DD}^tr>td.cell__text>div.shorten{Beschreibung})*2
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Ab / ZyNeu / Alt
NameURLYYYY-MM-DD
-
Beschreibung
-
NameURLYYYY-MM-DD
-
Beschreibung
-
-

Eingebettet

-
- - - - - - - - - - - -
- - -
-
-
-
-

Autarke Seiten

-

Diese Elemente repräsentieren jeweils eine eigene Seite.

-
-
-
-
-

404

-

Hier ist nichts.

-
-

Die angeforderte Ressource wurde nicht gefunden. Dieser Statuscode kann ebenfalls verwendet werden, um eine Anfrage ohne näheren Grund abzuweisen. Links, welche auf solche Fehlerseiten verweisen, werden auch als Tote Links bezeichnet.

-

Wikipedia

-
-
-
-

domain.tld * admin@domain.tld

-
Server Application/ver.s.ion (System Name) serving domain.tld : port
-
-
-
-
-

403

-

Nicht erlaubt! Forbidden

-
-

Die Anfrage wurde mangels Berechtigung des Clients nicht durchgeführt, bspw. weil der authentifizierte Benutzer nicht berechtigt ist, oder eine als HTTPS konfigurierte URL nur mit HTTP aufgerufen wurde.

-

Wikipedia

-
-
-
-

domain.tld * admin@domain.tld

-
Server Application/ver.s.ion (System Name) serving domain.tld : port
-
-
-
-
-

400

-

Fehlerhafte Anfrage! Bad Request

-
-

Die Anfrage-Nachricht war fehlerhaft aufgebaut.

-

Wikipedia

-
-
-
-

domain.tld * admin@domain.tld

-
Server Application/ver.s.ion (System Name) serving domain.tld : port
-
-
-
-
-
- - - - - - - diff --git a/demo-presentation.html b/demo-presentation.html deleted file mode 100644 index 2ace0de..0000000 --- a/demo-presentation.html +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - HIPPIE Presentation Demo - - - - - - - - - - - - - - - - -
-
-
Start
-
Seite 2
-
-
- - - - - - - diff --git a/gulpfile.js b/gulpfile.js index c08b6bc..8a87b58 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,10 +1,10 @@ // Setup project var source = { - watch: ['source/style/**/*.scss', 'source/templates/**/*.+(html|nunjucks)', 'source/pages/**/*.+(html|nunjucks)'], + watch: ['source/style/**/*.scss', 'source/templates/**/*.+(html|njk)', 'source/pages/**/*.+(html|njk)'], styles: ['source/style/example.scss', 'source/style/maintenance.scss'], scripts: ['source/code/variables.js', 'source/code/functions.js', 'source/code/global.js', 'source/code/**/*.coffee', '!source/vendor/**/*', ], images: 'source/art/**/*', - pages: 'source/pages/**/*.+(html|nunjucks)', + pages: 'source/pages/**/*.+(html|njk)', vendor: 'vendor/**/*' }; var build = { @@ -71,7 +71,7 @@ gulp.task('testsync', function() { }); gulp.task('testnunjucks', function() { - return gulp.src('source/pages/**/*.+(html|nunjucks)') + return gulp.src('source/pages/**/*.+(html|njk)') .pipe(plumbError('Error Running Nunjucks')) .pipe(nunjucks({ path: ['source/templates'], @@ -218,7 +218,7 @@ gulp.task('testwatch', function() { gulp.watch('source/style/**/*.+(scss|sass)', ['test', 'lint:scss']); gulp.watch([ 'source/templates/**/*', - 'source/pages/**/*.+(html|nunjucks)' + 'source/pages/**/*.+(html|njk)' ], ['testnunjucks']); }); diff --git a/source/pages/404.nunjucks b/source/pages/404.njk similarity index 68% rename from source/pages/404.nunjucks rename to source/pages/404.njk index 3a70f0c..260fbd5 100644 --- a/source/pages/404.nunjucks +++ b/source/pages/404.njk @@ -1,22 +1,23 @@ - + {% set pageId = "404" %} +{% set pageClass = "body__status" %} -{% extends "maintenance.nunjucks" %} +{% extends "maintenance.njk" %} -{% block title %}index{% endblock %} +{% block title %}404{% endblock %} {% block head %} {{ super() }} - {% endblock %} {% block body_content %} -
+

404

-

Hier ist nichts.

+

Client-Fehler

+

Hier ist nichts. Not Found

Die angeforderte Ressource wurde nicht gefunden. Dieser Statuscode kann ebenfalls verwendet werden, um eine Anfrage ohne näheren Grund abzuweisen. Links, welche auf solche Fehlerseiten verweisen, werden auch als Tote Links bezeichnet.

Wikipedia

-
-{% include "partials/footer-status.nunjucks" %} +
+{% include "partials/footer-status.njk" %} {% endblock %} diff --git a/source/pages/500.njk b/source/pages/500.njk new file mode 100644 index 0000000..974bab4 --- /dev/null +++ b/source/pages/500.njk @@ -0,0 +1,23 @@ + +{% set pageId = "500" %} +{% set pageClass = "body__status" %} + +{% extends "maintenance.njk" %} + +{% block title %}500{% endblock %} +{% block head %} +{{ super() }} +{% endblock %} + +{% block body_content %} +
+

500

+

Server-Fehler

+

Allgemeiner Server Fehler!!! Internal Server Error

+
+

Dies ist ein „Sammel-Statuscode“ für unerwartete Serverfehler.

+

Wikipedia

+
+
+{% include "partials/footer-status.njk" %} +{% endblock %} diff --git a/source/pages/blank.njk b/source/pages/blank.njk new file mode 100644 index 0000000..7cf39c0 --- /dev/null +++ b/source/pages/blank.njk @@ -0,0 +1,11 @@ + +{% set pageId = "blank" %} +{% set pageClass = "height_full" %} + +{% extends "default.njk" %} + +{% block title %}blank{% endblock %} + +{% block body_content %} + +{% endblock %} diff --git a/source/pages/demo-blank.nunjucks b/source/pages/demo-blank.nunjucks deleted file mode 100644 index 0b7ad32..0000000 --- a/source/pages/demo-blank.nunjucks +++ /dev/null @@ -1,6 +0,0 @@ - -{% extends "index.nunjucks" %} - -{% block body_content %} - -{% endblock %} diff --git a/source/pages/demo-index.nunjucks b/source/pages/demo-index.nunjucks deleted file mode 100644 index 9a70251..0000000 --- a/source/pages/demo-index.nunjucks +++ /dev/null @@ -1,668 +0,0 @@ - -{% set pageId = "demo" %} - -{% extends "index.nunjucks" %} - -{% block title %}demo{% endblock %} -{% block head %} -{{ super() }} -{% endblock %} - -{% block body_content %} -{% include "partials/page-hover.nunjucks" %} -
- - -
- -
- Dies ist einfach nur Text.
Weniger wäre Nichts, denn dieser Text ist nicht durch ein spezifisches Element umschlossen. -

Es wirken nur die Eigenschaften des <body> Elements. Dieses Element umschließt den gesamten Inhalt des Dokumentes und kommt daher nur einmal vor. Inhalte sind normalerweise durch Elemente definiert. Grundlegende Elemente teilen das Dokument zunächst in Abschnitte.

-

Bereiche

-
-
-

Einen Abschnitt, welcher für sich alleine stehen kann, definiert sich durch <article>. Solch ein Element wird oft detailliert gestaltet, kommt aber auch ohne jegliche Gestaltung aus.

-

Noch allgemeiner ist das <section> Element. Es schafft Bereiche um Inhalte zu strukturieren.

-

Bestimmte Bereiche haben einen vorgegebene Zweck.
Folgende Bereiche sind vorgegeben:

-
- - -
-
-

Um einleitenden Inhalt festzuhalten, wird das <header> Element eingesetzt. Es beinhaltet häufig auch Navigationselemente. Dabei bezieht es sich auf den nächsten, umgebenden Abschnitt.

- -
-
-

Auch abschließender Inhalt kann für einen Abschnitt definiert werden. Dazu wird <footer> eingesetzt.

-
-
- -
-

Zur feineren Strukturierung und Gliederung von Texten sind einige weitere Elemente verfügbar. Diese werden nun der Reihe nach aufgeführt. Zu Beginn die Überschriften, da sie noch zu den Abschnitten gehören. Das kommt vermutlich daher, da Abschnitte häufig eine kennzeichnende Überschrift beinhalten.

-

Überschrift 1

-

Eine Überschrift erster Ordnung <h1> ist sehr groß und steht daher oft außerhalb eines Textflusses. Sie schafft eine deutliche Trennung sowohl inhaltlich wie auch optisch. Sie erzeugt einen Abstand gleich der horizontalen Linie über sich.

-

Überschrift 2

-

Die weiteren Überschriften <h2> bis <h6> gliedern Text und werden auch als Titel für andere Elemente eingesetzt.

-

Überschrift 3 ist in Großbuchstaben gesetzt

-

Überschrift 4 verwendet normale Buchstaben und gleicht ansonsten Überschrift 3

-
Überschrift 5 ist Überschrift 5
-
Überschrift 6
-

Schließlich eine Überschrift in der Größe des Fließtextes. Allerdings in fett.

-

Gruppierung

-

Ein Absatz <p>. Zugegeben ein kurzer.

-

Aus mehreren Absätzen wird ein ganzer Text. Solche Texte haben gelegentlich großen informativen oder unterhaltsamen Charakter.
Einfache Zeilenumbrüche werden darin mit <br> erreicht.

-

Die Unterteilung in Absätze ist eine von vielen Möglichkeiten Texte zu gruppieren und ihnen Struktur zu verleihen. In diesem Dokument flattert Text normalerweise von Links daher. Er ist schwarz und in einer serifenlosen Schrift gesetzt. Zu weiteren Formatierungen, die eher auf einer Ebene der Zeichen einzuordnen ist, wird im Verlauf näher eingegangen. Zunächst die Struktur:

-

Text sitzt gerne auch mal zentriert.

p.txt_center
-

Rechtsbündig ist schon eher eine Ausnahme bzw. Besonderheit.

p.txt_right
-

Texte können auf verschiedene Arten unterteilt werden. Dafür werden unterschiedlich formatierte <hr> Elemente verwendet. Die horizontale Linie ist die Ausgangsformatierung, daher auch der abgekürzte Name des Elements. Eine Linie ist schwarz und durchgezogen.

-
-

Es ist auch eine unsichtbare Unterteilung möglich:

-
hr.hr__hidden
-

Die Linie darf auch gepunkted sein. Zudem sind verschiedene Längen möglich. Diese sind immer ein Prozentwert der verfügbaren Breite. Hier in gleicher Reihenfolge 100%, 50% und 25%:

-
hr.hr__dotted
-
hr.center_50
-
hr.hr__dotted.center_25
-

Zur horizontalen Unterteilung kommt natürlich auch eine vertikale Trennung hinzu. Text kann so zum Beispiel in mehrere Spalten unterteilt werden. Dies ist hilfreich, wenn ein Text durch eine breite Fläche sehr lange Zeilen bekommen würde. Es ist dann schwer den neuen Zeilanfang zu finden. Die vertikale Trennung dient in erster Linie dazu, diesem Umstand zu begegnen. Auch hier kann die Unterteilung viele Formen annehmen.

p.block__column_2
-

Drei Spalten gilt es jetzt also zu Füllen. Dann erst wird die Trennung der Spalten durch eine Linie sichtbar.

p.block__column_3.block__column_line
-

Ist der Text nicht lang genug bleibt eventuell eine Spalte leer. Diesmal wird dies aber nicht passieren, denn das Anschauungsbeispiel ist ja nun durch den vorherigen Absatz schon gegeben.
Oft ist es sinnvoll, Absätze mit mehreren Spalten deutlich von nachfolgenden Absätzen zu trennen. Da der Textfluss spaltenweise verläuft, liest man eventuell an der falschen Stelle weiter. Ach das ziegen diese beiden Absätze ganz gut.

-

Es gibt die Möglichkeit vorformatierten Text darzustellen <pre>.

- 
Dadurch
	bleiben
		Einrückungen
			durch
				Tabulatoren
					erhalten.
-

Text bekommt durch Listen besondere optische wie auch inhaltliche Struktur. Es gibt ungeordnete <ul> und geordnete Listen <ol> sowie Beschreibungslisten <dl>. Die beiden ersten Varianten beinhalten das Listenelement <li>. Beschreibungslisten beinhalten jeweils das Paar von Ausdruck <dt> und Beschreibung <dd>. Im Folgenden eine Liste der Listen in ihrer Ausgangskonfiguration:

-
    -
  • Ungeordnete
    • -
  • Listen
    • -
-
    -
  • Verschiedener
    • -
  • Art
    • -
-
    -
  1. Geordnete
    2. -
  2. Liste
    3. -
-
-
Beschreibungsliste
-
Auch Definitionslisten genannt
-
Ausdruck
-
Beschreibung
-
-

Wird Bezug auf fremde Inhalte genommen, kommt ein Zitat <blockquote> zur Anwendung. Es besteht aus der Aussage und der Quelle.

-
-

Ein Zitat (das, lateinisch citatum „Angeführtes, Aufgerufenes“ zu lat. citāre „in Bewegung setzen, vorladen“, vgl. „jemanden vor Gericht zitieren“) ist eine wörtlich übernommene Stelle aus einem Text oder ein Hinweis auf eine bestimmte Textstelle.

-

Wikipedia

-
-
blockquote>p+p.quote__source
-

Auch Inhalte, die nicht in Textform sind, können durch einen Bezug integriert werden. Wie diese Fahne werden sie mit <figure> umschlossen und tragen eine Bezeichnung.

-
-
Fahne
- - - - - - - - - - - -
-
figure>figcaption+{element}
-

Eine von sich aus undefinierte Möglichkeit zur Gruppierung von Text besteht durch <div>. Dieses Element hat, ohne weitere Klassifizierung keine Auswirkungen auf die Erscheinung oder die inhaltliche Aussage. Daher der allgemeine Einsatz.

-

Es wird allerdings häufig eingesetzt und bekommt vielfältige Funktionen zugeordnet wie diese hervorgehobene Information zeigt.

-

Eine sehr klar definierte Gruppierung stellt das Element <main> dar. Es umschließt den hauptsächlichen Inhalt des Dokumentes.

-

Textebene

-

Verweise

-

Ein wesentlicher Bestandteil von Hypertext sind Verweise <a>. Sie dienen als Sprungmarken innerhalb des Netzwerks. Es kann grob zwischen internen und externen Verweisen unterschieden werden. Interne Verweisea.a__line können Verknüpfungen innerhalb des aktuellen Dokumentes sein oder auch Funktionen aktivieren. Externe Verweise verknüpfen Inhalte über das gesamte Netzwerk hinweg. Sie können auch auf E-Mail Adressen oder Dateien zeigen.

-

Nicht nur Text kann als Verweis verwendet werden. Auch andere Elemente wie Bilder können verknüpft werden. Abhängig von ihrer Funktion und ihrem Zweck, werden Verweise unterschiedlich formatiert. Farbige oder unterstrichene Varianten sind möglich.

-

Wird der Verweis innerhalb eines <nav> Elementes notiert, bekommt er die spezielle Bedeutung eines Navigationsverweises innerhalb des Dokumentes oder der Anwendung. Auf diese Verwendung wird im Folgenden genauer eingegangen ...

-

Formatierungen

-

Texte, Wörter oder Zeichen können vielfältig formatiert werden. Sie können fett <b> oder kursiv <i> geschrieben sein. Auch beides ist möglich!?! Sollen sie nicht nur anders aussehen, sondern auch eine besondere inhaltliche Bedeutung bekommen, werden sie mit <strong> und <em> ausgezeichnet.

-

Gerade bei wörtlichen Zitierungen kommt häufig das Anführungszeichen zum Einsatz. Es kann durch die Formatierung automatisch ergänzt werden.

-
-

Das kannst du schon so machen aber dann isses halt Kacke.

-

o. V.

-
-
blockquote.quote__mark>p+p.quote__source
-

Ein besonderer inhaltlicher Bezug ist der Titel eines Werkes. Sowas kann mit <cite> ausgezeichnet werden. Pulp Fiction, super Film - zum Beispiel.

-

Auch die Auszeichnung <code> wurde bis hier hin schon verwendet. Sie markiert Maschinensprache. Für zusammenhängende Blöcke wird die Auszeichnung oft in Kombination mit dem Element <pre> verwendet:

- 
<html>
  <head>
    <title>Hyper Text Markup Language</title>
  </head>
  <body id="root">
    <!-- Content goes here -->
    <p class="example">Just like this.</p>
  </body>
</html>
-

Dabei bleiben vorhandene Textformatierungen wie Zeilenumbrüche und Einrückung erhalten.

-

Die Zeichen in Absätzen bis hin zu ganzen Texten können, mit einem geeigneten Eingabegerät, markiert werden. Dies stellt sich wie folgt dar:

-

Beispiel zum markieren ^^.

-

Eine Markierung kann, mittels <mark>, auch durch den Autor geschehen. Diese stellt sich ein wenig anders dar: Diese Worte sind markiert.

- -

Änderungen

- -

Eingebundene Inhalte

- - - -

Tabellen

-

Tabellen bieten besonders geordnete Struktur. Häufig werden in ihnen Text und Daten kombiniert dargestellt. Dies erfordert individuelle Formatierungen. Einige grundlegende Eigenschaften werden im folgenden aufgezeigt. Tabellen sind in ihrer Größe entweder vordefiniert oder richten sich nach ihrem Inhalt. Das gilt auch für die einzelnen Zellen....

- - - - - - - - - - -
Eineeinfache
Tabelle
-
table.width_full>tbody>tr>td*2^tr>td[colspan=2]
-
- - - - - - - - - - -
Einefließende
Tabelle
-
table>tbody>tr>td*2^tr>td[colspan=2]
- - - - - - - - - - -
Mitohne
Linien
-
table.table__blank>tbody>tr>td*2^tr>td[colspan=2]
-
-

Die nächste Tabelle verwendet alle zur Auszeichnung verfügbaren Elemente und hat eine starre Zellverteilung:

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Beschreibung bzw. Zusammenhang der Tabelle
KopfzeileAB
FußzeileAB
Tabelle
mitTitel
Kopf-und
Fußzeile
-
table.width_full.table__fix>caption+thead>tr>th*3^^tfoot>tr>td*3^^tbody>(tr>td*3)*3
-
-

Viele weitere Formate sind möglich ...

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
KopfzeileAB
VorspalteEine
1erweiterte
2Tabelle
-
table.width_full>thead>tr>th.precol+th[colspan=2]^^tbody>tr>td.precol+td*2^tr>td.precol+td[colspan=2]
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
KopfzeileAB
Tabelle
ohneRahmen
jedochmit
Streifen
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Beschreibung bzw. Zusammenhang der Tabelle
Kopfzeile1>9000
Fußzeile--
Alpha09000
Bravo19001
Charlie09000
- -

Formulare

-

Spätestens hier werden Betrachter zu Benutzern. Texteingabefelder und verschiedene Bedienelemente geben Möglichkeiten zur Interaktion. Diese Elemente sind in vielerlei Hinsicht besonders. Werden sie nicht explizit gestaltet, ist ihre Erscheinung system- bzw. browserabhängig. (Vielleicht ist das auch scheiße, hier darauf einzugehen) ... Üblicherweise stehen alle Formularelemente innerhalb eines <form> Elementes. Dieses ist notwendig um Angaben zur Kommunikation mit dem Server zu setzen. Es hat normalerweise keine gestalterische Funktion.

-

Grundlegend ist das Element <input>. Es hat viele Attribute um den Typ der Eingabe anzupassen. Ist es undefiniert nimmt es jegliche textbasierte Information auf und erhält eine Standardgröße.

-

-

Ein spezieller Typ des Eingabefeldes verändert seine Funktion zu einer Schaltfläche <input[type="button"]>. Es gibt allerdings auch ein eigenes Element <button> dafür. -

-

Interaktive Elemente können durch das Attribut <readonly> nur lesbar gemacht werden oder mittels <disabled> gänzlich deaktiviert werden.

-

-

Das Element <label> ergänzt interaktive Elemente um eine Beschriftung. Wichtig ist hier, dass die Beziehung beider Elemente zu einander deutlich ist.

-
-
- -
-
- -
-
-

Zusätzlich zur Beschriftung einzelner Elemente gibt es auch die Möglichkeit Gruppierungen zu schaffen. Diese werden mit <fieldset> realisiert.

-
- -
-

Sie können mittels <legend> auch eine eigene Beschriftung erhalten.

-
- Einfache Eingabefelder - - -
-
- Weitere Zeicheneingabefelder -

Innerhalb einer Gruppe können nicht nur Ein- und Ausgabefelder platziert werden. Andere Elemente ergänzen Information oder lockern das Erscheinungsbild auf. Hier nun eine Liste aller möglichen Arten von Eingabefeldern.

- 
ul>(li>label>input[type="text"])
-
- - - - - - - - - - - - - - -

Interaktive Elemente

- - - -

Struktur

-
-
-
- - - - -
-
-
-

Medien

-

Druck

- -
-
-

Ende der Einführung

-

Dies war eine Übersicht der grundlegenden Elemente. Nun folgen weitere Elemente mit besonderen Formatierungen.

-
-
-
- -
-
-

HIPPIE Erklärung

-

Aufbau, Standardwerte

-
-
-

…

-
-
- -
-
-

Medienformat Abfragen

-
-
-
Umbruch bei 
-
-

Telefone und größer

-

Nur Telefone

-

Schreibtafeln hochkant

-

Schreibtafeln und größer

-

Schreibtafeln im Querformat

-

Schreibtafeln quer und größer

-

Nur Arbeitsplatzrechner

-

Arbeitsplatzrechner und größer

-

Richtige Monitore und größer

-
-
-
-
-
-

Sammlung formatierter Elemente

-

Die Elemente werden fortlaufend komplexer

-
-
- 
h3.txt_light_color+p
-

Helle Überschrift

-

Mit normalem Textabsatz

- 
a>h4
- -

Überschrift als Block-Verweis

- - 
section>div.box__inline_left>img^p+p
-
-
Avatar
-

Vorname Name
Straße 1, 01234 Stadt

+49 (0)123 1337 0000
name@domain.tld

-
- 
div.box__main_indent
-
-
-

Eingerückter Inhalt

-
-
- 
nav>ul>(li>a.a__button{Punkt $})*4
-nav>ul>(li>a.a__button_border{Stufe $})*4
-
- - -
- 
nav.nav__horizontal>ul>(li>a.a__button{Abschnitt $})*4
-nav.nav__center_old>ul>(li>a.a__button{Typ $})*4
- -
- -
- 
header.header__page>h1+p+nav.nav__separate_right>ul>(li>a.a__button{Nav $})*4^+nav.nav__right>ul>(li>a.a__button{Nav $})*4
-
-

Aufmacher

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis nec consectetur diam. Sed nisl odio, volutpat nec nisi sit amet, commodo faucibus est. Donec lacinia vestibulum sapien. Morbi porttitor nibh quis imperdiet scelerisque. Praesent rutrum quam eu sodales luctus.

- - -
- 
header.header__page>nav.nav__right>ul>(li>a.a__button{Nav $})*4
-
-
- -
-
- 
footer.pos_abs.pin_bottom>nav.nav__column>ul>(li>a.a__button_text)*4
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -

Gruppierung

- 
ul.list__link>(li>a>img)*2+li>a
- - -

Tabellen

- 
table.table__link>thead>tr>th{&nbsp;}+th{Ab / Zy}+th{Neu / Alt}^^(tbody>tr>td.cell__icon[rowspan="2"]>img[width=16  height=16]^+td.cell__link>a[target=_blank]{Name}+a[target=_blank]{URL}^+td.cell__date[rowspan="2"]{YYY-MM-DD}^tr>td.cell__text>div.shorten{Beschreibung})*2
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Ab / ZyNeu / Alt
NameURLYYYY-MM-DD
-
Beschreibung
-
NameURLYYYY-MM-DD
-
Beschreibung
-
-

Eingebettet

-
- - - - - - - - - - - -
- - -
-
-
-
-

Autarke Seiten

-

Diese Elemente repräsentieren jeweils eine eigene Seite.

-
-
-
-
-

404

-

Hier ist nichts.

-
-

Die angeforderte Ressource wurde nicht gefunden. Dieser Statuscode kann ebenfalls verwendet werden, um eine Anfrage ohne näheren Grund abzuweisen. Links, welche auf solche Fehlerseiten verweisen, werden auch als Tote Links bezeichnet.

-

Wikipedia

-
-
- {% include "partials/footer-status.nunjucks" %} -
-
-
-

403

-

Nicht erlaubt! Forbidden

-
-

Die Anfrage wurde mangels Berechtigung des Clients nicht durchgeführt, bspw. weil der authentifizierte Benutzer nicht berechtigt ist, oder eine als HTTPS konfigurierte URL nur mit HTTP aufgerufen wurde.

-

Wikipedia

-
-
- {% include "partials/footer-status.nunjucks" %} -
-
-
-

400

-

Fehlerhafte Anfrage! Bad Request

-
-

Die Anfrage-Nachricht war fehlerhaft aufgebaut.

-

Wikipedia

-
-
- {% include "partials/footer-status.nunjucks" %} -
-
-
-{% include "partials/footer.nunjucks" %} -{% endblock %} - -{% block script %} - -{% endblock %} diff --git a/source/pages/elements.njk b/source/pages/elements.njk new file mode 100644 index 0000000..0d34ae7 --- /dev/null +++ b/source/pages/elements.njk @@ -0,0 +1,72 @@ + +{% set pageId = "elements" %} +{% set pageClass = "" %} + +{% extends "demo.njk" %} + +{% block title %}Elements{% endblock %} +{% block head %} +{{ super() }} +{% endblock %} + +{% block body_content %} +
+ + +
+
+
+
+

Bereiche

+

Um einleitenden Inhalt festzuhalten, wird das <header> Element eingesetzt. Es beinhaltet häufig auch Navigationselemente. Dabei bezieht es sich auf den nächsten, umgebenden Abschnitt.

+ +
+
+

Einen Abschnitt, welcher für sich alleine stehen kann, definiert sich durch <article>. Solch ein Element wird oft detailliert gestaltet, kommt aber auch ohne jegliche Gestaltung aus.

+

Noch allgemeiner ist das <section> Element. Es schafft Bereiche um Inhalte zu strukturieren.

+

Bestimmte Bereiche haben einen vorgegebene Zweck.
Folgende Bereiche sind vorgegeben:

+
+
+ +
+
+

Um einleitenden Inhalt festzuhalten, wird das <header> Element eingesetzt. Es beinhaltet häufig auch Navigationselemente. Dabei bezieht es sich auf den nächsten, umgebenden Abschnitt.

+ +
+
+

Auch abschließender Inhalt kann für einen Abschnitt definiert werden. Dazu wird <footer> eingesetzt.

+
+
+
+
+

Auch abschließender Inhalt kann für einen Abschnitt definiert werden. Dazu wird <footer> eingesetzt.

+
+
+
+{% include "partials/footer.njk" %} +{% endblock %} + +{% block script %} + +{% endblock %} diff --git a/source/pages/index.nunjucks b/source/pages/index.njk similarity index 55% rename from source/pages/index.nunjucks rename to source/pages/index.njk index bcdac9d..d3e8883 100644 --- a/source/pages/index.nunjucks +++ b/source/pages/index.njk @@ -1,7 +1,8 @@ - + {% set pageId = "index" %} +{% set pageClass = "height_full" %} -{% extends "index.nunjucks" %} +{% extends "default.njk" %} {% block title %}index{% endblock %} {% block head %} @@ -9,14 +10,14 @@ {% endblock %} {% block body_content %} -{% include "partials/page-hover.nunjucks" %}
{% endblock %} @@ -26,7 +27,7 @@ // Page specific // ------------------------------------------------------------------------------ $( document ).ready(function() { - console.log( 'HIPPIE' ); + console.log('HIPPIE'); }); {% endblock %} diff --git a/source/pages/intro.njk b/source/pages/intro.njk new file mode 100644 index 0000000..97ffbd1 --- /dev/null +++ b/source/pages/intro.njk @@ -0,0 +1,715 @@ + +{% set pageId = "intro" %} +{% set pageClass = "" %} + +{% extends "demo.njk" %} + +{% block title %}Intro{% endblock %} +{% block head %} +{{ super() }} +{% endblock %} + +{% block body_content %} +
+ + +
+ +
+ Dies ist einfach nur Text.
Weniger wäre Nichts, denn dieser Text ist nicht durch ein spezifisches Element umschlossen. +

Es wirken nur die Eigenschaften des <body> Elements. Dieses Element umschließt den gesamten Inhalt des Dokumentes und kommt daher nur einmal vor. Inhalte sind normalerweise durch Elemente definiert. Grundlegende Elemente teilen das Dokument zunächst in Abschnitte.

+

Bereiche

+
+
+

Einen Abschnitt, welcher für sich alleine stehen kann, definiert sich durch <article>. Solch ein Element wird oft detailliert gestaltet, kommt aber auch ohne jegliche Gestaltung aus.

+

Noch allgemeiner ist das <section> Element. Es schafft Bereiche um Inhalte zu strukturieren.

+

Bestimmte Bereiche haben einen vorgegebene Zweck.
Folgende Bereiche sind vorgegeben:

+
+ + +
+
+

Um einleitenden Inhalt festzuhalten, wird das <header> Element eingesetzt. Es beinhaltet häufig auch Navigationselemente. Dabei bezieht es sich auf den nächsten, umgebenden Abschnitt.

+ +
+
+

Auch abschließender Inhalt kann für einen Abschnitt definiert werden. Dazu wird <footer> eingesetzt.

+
+
+ +
+
+

Zur feineren Strukturierung und Gliederung von Texten sind einige weitere Elemente verfügbar. Diese werden nun der Reihe nach aufgeführt. Zu Beginn die Überschriften, da sie noch zu den Abschnitten gehören. Das kommt vermutlich daher, da Abschnitte häufig eine kennzeichnende Überschrift beinhalten.

+

Überschrift 1

+

Eine Überschrift erster Ordnung <h1> ist sehr groß und steht daher oft außerhalb eines Textflusses. Sie schafft eine deutliche Trennung sowohl inhaltlich wie auch optisch. Sie erzeugt einen Abstand gleich der horizontalen Linie über sich.

+

Überschrift 2

+

Die weiteren Überschriften <h2> bis <h6> gliedern Text und werden auch als Titel für andere Elemente eingesetzt.

+

Überschrift 3 ist in Großbuchstaben gesetzt

+

Überschrift 4 verwendet normale Buchstaben und gleicht ansonsten Überschrift 3

+
Überschrift 5 ist Überschrift 5
+
Überschrift 6
+

Schließlich eine Überschrift in der Größe des Fließtextes. Allerdings in fett.

+

Gruppierung

+

Ein Absatz <p>. Zugegeben ein kurzer.

+

Aus mehreren Absätzen wird ein ganzer Text. Solche Texte haben gelegentlich großen informativen oder unterhaltsamen Charakter.
Einfache Zeilenumbrüche werden darin mit <br> erreicht.

+

Die Unterteilung in Absätze ist eine von vielen Möglichkeiten Texte zu gruppieren und ihnen Struktur zu verleihen. In diesem Dokument flattert Text normalerweise von Links daher. Er ist schwarz und in einer serifenlosen Schrift gesetzt. Zu weiteren Formatierungen, die eher auf einer Ebene der Zeichen einzuordnen ist, wird im Verlauf näher eingegangen. Zunächst die Struktur:

+

Text sitzt gerne auch mal zentriert.

p.txt_center
+

Rechtsbündig ist schon eher eine Ausnahme bzw. Besonderheit.

p.txt_right
+

Texte können auf verschiedene Arten unterteilt werden. Dafür werden unterschiedlich formatierte <hr> Elemente verwendet. Die horizontale Linie ist die Ausgangsformatierung, daher auch der abgekürzte Name des Elements. Eine Linie ist schwarz und durchgezogen.

+
+

Es ist auch eine unsichtbare Unterteilung möglich:

+
hr.hr__hidden
+

Die Linie darf auch gepunkted sein. Zudem sind verschiedene Längen möglich. Diese sind immer ein Prozentwert der verfügbaren Breite. Hier in gleicher Reihenfolge 100%, 50% und 25%:

+
hr.hr__dotted
+
hr.center_50
+
hr.hr__dotted.center_25
+

Zur horizontalen Unterteilung kommt natürlich auch eine vertikale Trennung hinzu. Text kann so zum Beispiel in mehrere Spalten unterteilt werden. Dies ist hilfreich, wenn ein Text durch eine breite Fläche sehr lange Zeilen bekommen würde. Es ist dann schwer den neuen Zeilanfang zu finden. Die vertikale Trennung dient in erster Linie dazu, diesem Umstand zu begegnen. Auch hier kann die Unterteilung viele Formen annehmen.

p.block__column_2
+

Drei Spalten gilt es jetzt also zu Füllen. Dann erst wird die Trennung der Spalten durch eine Linie sichtbar.

p.block__column_3.block__column_line
+

Ist der Text nicht lang genug bleibt eventuell eine Spalte leer. Diesmal wird dies aber nicht passieren, denn das Anschauungsbeispiel ist ja nun durch den vorherigen Absatz schon gegeben.
Oft ist es sinnvoll, Absätze mit mehreren Spalten deutlich von nachfolgenden Absätzen zu trennen. Da der Textfluss spaltenweise verläuft, liest man eventuell an der falschen Stelle weiter. Ach das ziegen diese beiden Absätze ganz gut.

+

Es gibt die Möglichkeit vorformatierten Text darzustellen <pre>.

+ 
Dadurch
	bleiben
		Einrückungen
			durch
				Tabulatoren
					erhalten.
+

Text bekommt durch Listen besondere optische wie auch inhaltliche Struktur. Es gibt ungeordnete <ul> und geordnete Listen <ol> sowie Beschreibungslisten <dl>. Die beiden ersten Varianten beinhalten das Listenelement <li>. Beschreibungslisten beinhalten jeweils das Paar von Ausdruck <dt> und Beschreibung <dd>. Im Folgenden eine Liste der Listen in ihrer Ausgangskonfiguration:

+
    +
  • Ungeordnete
    • +
  • Listen
    • +
+
    +
  • Verschiedener
    • +
  • Art
    • +
+
    +
  1. Geordnete
    2. +
  2. Liste
    3. +
+
+
Beschreibungsliste
+
Auch Definitionslisten genannt
+
Ausdruck
+
Beschreibung
+
+

Wird Bezug auf fremde Inhalte genommen, kommt ein Zitat <blockquote> zur Anwendung. Es besteht aus der Aussage und der Quelle.

+
+

Ein Zitat (das, lateinisch citatum „Angeführtes, Aufgerufenes“ zu lat. citāre „in Bewegung setzen, vorladen“, vgl. „jemanden vor Gericht zitieren“) ist eine wörtlich übernommene Stelle aus einem Text oder ein Hinweis auf eine bestimmte Textstelle.

+

Wikipedia

+
+
blockquote>p+p.quote__source
+

Auch Inhalte, die nicht in Textform sind, können durch einen Bezug integriert werden. Wie diese Fahne werden sie mit <figure> umschlossen und tragen eine Bezeichnung.

+
+
Fahne
+ + + + + + + + + + + +
+
figure>figcaption+{element}
+

Eine von sich aus undefinierte Möglichkeit zur Gruppierung von Text besteht durch <div>. Dieses Element hat, ohne weitere Klassifizierung keine Auswirkungen auf die Erscheinung oder die inhaltliche Aussage. Daher der allgemeine Einsatz.

+

Es wird allerdings häufig eingesetzt und bekommt vielfältige Funktionen zugeordnet wie diese hervorgehobene Information zeigt.

+

Eine sehr klar definierte Gruppierung stellt das Element <main> dar. Es umschließt den hauptsächlichen Inhalt des Dokumentes.

+
+
+

Textebene

+

Verweise

+

Ein wesentlicher Bestandteil von Hypertext sind Verweise <a>. Sie dienen als Sprungmarken innerhalb des Netzwerks. Es kann grob zwischen internen und externen Verweisen unterschieden werden. Interne Verweisea.a__line können Verknüpfungen innerhalb des aktuellen Dokumentes sein oder auch Funktionen aktivieren. Externe Verweise verknüpfen Inhalte über das gesamte Netzwerk hinweg. Sie können auch auf E-Mail Adressen oder Dateien zeigen.

+

Nicht nur Text kann als Verweis verwendet werden. Auch andere Elemente wie Bilder können verknüpft werden. Abhängig von ihrer Funktion und ihrem Zweck, werden Verweise unterschiedlich formatiert. Farbige oder unterstrichene Varianten sind möglich.

+

Wird der Verweis innerhalb eines <nav> Elementes notiert, bekommt er die spezielle Bedeutung eines Navigationsverweises innerhalb des Dokumentes oder der Anwendung. Auf diese Verwendung wird im Folgenden genauer eingegangen ...

+

Formatierungen

+

Texte, Wörter oder Zeichen können vielfältig formatiert werden. Sie können fett <b> oder kursiv <i> geschrieben sein. Auch beides ist möglich!?! Sollen sie nicht nur anders aussehen, sondern auch eine besondere inhaltliche Bedeutung bekommen, werden sie mit <strong> und <em> ausgezeichnet.

+

Gerade bei wörtlichen Zitierungen kommt häufig das Anführungszeichen zum Einsatz. Es kann durch die Formatierung automatisch ergänzt werden.

+
+

Das kannst du schon so machen aber dann isses halt Kacke.

+

o. V.

+
+
blockquote.quote__mark>p+p.quote__source
+

Ein besonderer inhaltlicher Bezug ist der Titel eines Werkes. Sowas kann mit <cite> ausgezeichnet werden. Pulp Fiction, super Film - zum Beispiel.

+

Auch die Auszeichnung <code> wurde bis hier hin schon verwendet. Sie markiert Maschinensprache. Für zusammenhängende Blöcke wird die Auszeichnung oft in Kombination mit dem Element <pre> verwendet:

+ 
<html>
  <head>
    <title>Hyper Text Markup Language</title>
  </head>
  <body id="root">
    <!-- Content goes here -->
    <p class="example">Just like this.</p>
  </body>
</html>
+

Dabei bleiben vorhandene Textformatierungen wie Zeilenumbrüche und Einrückung erhalten.

+

Die Zeichen in Absätzen bis hin zu ganzen Texten können, mit einem geeigneten Eingabegerät, markiert werden. Dies stellt sich wie folgt dar:

+

Beispiel zum markieren ^^.

+

Eine Markierung kann, mittels <mark>, auch durch den Autor geschehen. Diese stellt sich ein wenig anders dar: Diese Worte sind markiert.

+ +

Änderungen

+ +
+
+

Eingebundene Inhalte

+ +
+
+

Tabellen

+

Tabellen bieten besonders geordnete Struktur. Häufig werden in ihnen Text und Daten kombiniert dargestellt. Dies erfordert individuelle Formatierungen. Einige grundlegende Eigenschaften werden im folgenden aufgezeigt. Tabellen sind in ihrer Größe entweder vordefiniert oder richten sich nach ihrem Inhalt. Das gilt auch für die einzelnen Zellen....

+ + + + + + + + + + +
Eineeinfache
Tabelle
+
table.width_full>tbody>tr>td*2^tr>td[colspan=2]
+
+ + + + + + + + + + +
Einefließende
Tabelle
+
table>tbody>tr>td*2^tr>td[colspan=2]
+ + + + + + + + + + +
Mitohne
Linien
+
table.table__blank>tbody>tr>td*2^tr>td[colspan=2]
+
+

Die nächste Tabelle verwendet alle zur Auszeichnung verfügbaren Elemente und hat eine starre Zellverteilung:

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Beschreibung bzw. Zusammenhang der Tabelle
KopfzeileAB
FußzeileAB
Tabelle
mitTitel
Kopf-und
Fußzeile
+
table.width_full.table__fix>caption+thead>tr>th*3^^tfoot>tr>td*3^^tbody>(tr>td*3)*3
+
+

Viele weitere Formate sind möglich ...

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
KopfzeileAB
VorspalteEine
1erweiterte
2Tabelle
+
table.width_full>thead>tr>th.precol+th[colspan=2]^^tbody>tr>td.precol+td*2^tr>td.precol+td[colspan=2]
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
KopfzeileAB
Tabelle
ohneRahmen
jedochmit
Streifen
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Beschreibung bzw. Zusammenhang der Tabelle
Kopfzeile1>9000
Fußzeile--
Alpha09000
Bravo19001
Charlie09000
+
+
+

Formulare

+

Spätestens hier werden Betrachter zu Benutzern. Texteingabefelder und verschiedene Bedienelemente geben Möglichkeiten zur Interaktion. Diese Elemente sind in vielerlei Hinsicht besonders. Werden sie nicht explizit gestaltet, ist ihre Erscheinung system- bzw. browserabhängig. (Vielleicht ist das auch scheiße, hier darauf einzugehen) ... Üblicherweise stehen alle Formularelemente innerhalb eines <form> Elementes. Dieses ist notwendig um Angaben zur Kommunikation mit dem Server zu setzen. Es hat normalerweise keine gestalterische Funktion.

+

Grundlegend ist das Element <input>. Es hat viele Attribute um den Typ der Eingabe anzupassen. Ist es undefiniert nimmt es jegliche textbasierte Information auf und erhält eine Standardgröße.

+

+

Ein spezieller Typ des Eingabefeldes verändert seine Funktion zu einer Schaltfläche <input[type="button"]>. Es gibt allerdings auch ein eigenes Element <button> dafür. +

+

Interaktive Elemente können durch das Attribut <readonly> nur lesbar gemacht werden oder mittels <disabled> gänzlich deaktiviert werden.

+

+

Das Element <label> ergänzt interaktive Elemente um eine Beschriftung. Wichtig ist hier, dass die Beziehung beider Elemente zu einander deutlich ist.

+
+
+ +
+
+ +
+
+

Zusätzlich zur Beschriftung einzelner Elemente gibt es auch die Möglichkeit Gruppierungen zu schaffen. Diese werden mit <fieldset> realisiert.

+
+ +
+

Sie können mittels <legend> auch eine eigene Beschriftung erhalten.

+
+ Einfache Eingabefelder + + +
+
+ Weitere Eingabemöglichkeiten +

Innerhalb einer Gruppe können nicht nur Ein- und Ausgabefelder platziert werden. Andere Elemente ergänzen Information oder lockern das Erscheinungsbild auf. Hier nun eine Liste möglicher Arten von Eingabefeldern.

+ 
ul>(li>label>input[type="text"])
+
    +
    • +
    • +
    • +
    • +
    • +
+
+ +
+ + +
+
+
+ + + + +
+

+ Show me a + Sorted by + + + Matching + +

+
+ +

Interaktive Elemente

+
+
+

Struktur

+
+
+
+ + + + +
+
+
+
+
+

Medien

+
+
+

Druck

+
+ +
+
+

Ende der Einführung

+

Dies war eine Übersicht der grundlegenden Elemente. Nun folgen weitere Elemente mit besonderen Formatierungen.

+
+
+
+ +
+
+

HIPPIE Erklärung

+

Aufbau, Standardwerte

+
+
+

…

+
+
+ +
+
+

Medienformat Abfragen

+
+
+
Umbruch bei 
+
+

Telefone und größer

+

Nur Telefone

+

Schreibtafeln hochkant

+

Schreibtafeln und größer

+

Schreibtafeln im Querformat

+

Schreibtafeln quer und größer

+

Nur Arbeitsplatzrechner

+

Arbeitsplatzrechner und größer

+

Richtige Monitore und größer

+
+
+
+
+
+

Sammlung formatierter Elemente

+

Die Elemente werden fortlaufend komplexer

+
+
+ 
h3.txt_light_color+p
+

Helle Überschrift

+

Mit normalem Textabsatz

+ 
a>h4
+ +

Überschrift als Block-Verweis

+ + 
section>div.box__inline_left>img^p+p
+
+
Avatar
+

Vorname Name
Straße 1, 01234 Stadt

+49 (0)123 1337 0000
name@domain.tld

+
+ 
div.box__main_indent
+
+
+

Eingerückter Inhalt

+
+
+ 
nav>ul>(li>a.a__button{Punkt $})*4
+        nav>ul>(li>a.a__button_border{Stufe $})*4
+
+ + +
+ 
nav.nav__horizontal>ul>(li>a.a__button{Abschnitt $})*4
+          nav.nav__center_old>ul>(li>a.a__button{Typ $})*4
+ +
+ +
+ 
header.header__page>h1+p+nav.nav__separate_right>ul>(li>a.a__button{Nav $})*4^+nav.nav__right>ul>(li>a.a__button{Nav $})*4
+
+

Aufmacher

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis nec consectetur diam. Sed nisl odio, volutpat nec nisi sit amet, commodo faucibus est. Donec lacinia vestibulum sapien. Morbi porttitor nibh quis imperdiet scelerisque. Praesent rutrum quam eu sodales luctus.

+ + +
+ 
header.header__page>nav.nav__right>ul>(li>a.a__button{Nav $})*4
+
+
+ +
+
+ 
footer.pos_abs.pin_bottom>nav.nav__column>ul>(li>a.a__button_text)*4
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +

Gruppierung

+ 
ul.list__link>(li>a>img)*2+li>a
+ + +

Tabellen

+ 
table.table__link>thead>tr>th{&nbsp;}+th{Ab / Zy}+th{Neu / Alt}^^(tbody>tr>td.cell__icon[rowspan="2"]>img[width=16  height=16]^+td.cell__link>a[target=_blank]{Name}+a[target=_blank]{URL}^+td.cell__date[rowspan="2"]{YYY-MM-DD}^tr>td.cell__text>div.shorten{Beschreibung})*2
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 Ab / ZyNeu / Alt
NameURLYYYY-MM-DD
+
Beschreibung
+
NameURLYYYY-MM-DD
+
Beschreibung
+
+

Eingebettet

+
+ + + + + + + + + + + +
+ + +
+
+
+
+

Autarke Seiten

+

Diese Elemente repräsentieren jeweils eine eigene Seite.

+
+
+
+
+

404

+

Hier ist nichts.

+
+

Die angeforderte Ressource wurde nicht gefunden. Dieser Statuscode kann ebenfalls verwendet werden, um eine Anfrage ohne näheren Grund abzuweisen. Links, welche auf solche Fehlerseiten verweisen, werden auch als Tote Links bezeichnet.

+

Wikipedia

+
+
+ {% include "partials/footer-status.njk" %} +
+
+
+

403

+

Nicht erlaubt! Forbidden

+
+

Die Anfrage wurde mangels Berechtigung des Clients nicht durchgeführt, bspw. weil der authentifizierte Benutzer nicht berechtigt ist, oder eine als HTTPS konfigurierte URL nur mit HTTP aufgerufen wurde.

+

Wikipedia

+
+
+ {% include "partials/footer-status.njk" %} +
+
+
+

400

+

Fehlerhafte Anfrage! Bad Request

+
+

Die Anfrage-Nachricht war fehlerhaft aufgebaut.

+

Wikipedia

+
+
+ {% include "partials/footer-status.njk" %} +
+
+
+ {% include "partials/footer.njk" %} + {% endblock %} + + {% block script %} + + {% endblock %} diff --git a/source/pages/os.njk b/source/pages/os.njk new file mode 100644 index 0000000..c360ddf --- /dev/null +++ b/source/pages/os.njk @@ -0,0 +1,146 @@ + +{% set pageId = "os" %} +{% set pageClass = "" %} + +{% extends "default.njk" %} + +{% block title %}demo{% endblock %} +{% block head %} +{{ super() }} +{% endblock %} + +{% block body_content %} +{# {% include "partials/page-hover.njk" %} #} +
+
+ + + + + + +
+
+
+ + + +
+
+ +
+
+
+
+

Dateiname 1

+

Auszeichnung 1

+
+
+
+
+
+

Dateiname 2

+

Auszeichnung 2

+
+
+
+
+
+

Dateiname 3

+

Auszeichnung 3

+
+
+
+
+
+

Dateiname 4

+

Auszeichnung 4

+
+
+
+
+ + + + + + + + + + + +
Objektname 1Objektpfad 1
Objektname 2Objektpfad 2
+
+
+

Status

+
+
+
+
+{% include "partials/footer.njk" %} +{% endblock %} + +{% block script %} + +{% endblock %} diff --git a/source/pages/tests.njk b/source/pages/tests.njk new file mode 100644 index 0000000..1e07e96 --- /dev/null +++ b/source/pages/tests.njk @@ -0,0 +1,87 @@ + +{% set pageId = "blank" %} +{% set pageClass = "height_full" %} + +{% extends "default.njk" %} + +{% block title %}blank{% endblock %} +{% block head %} +{{ super() }} + +{% endblock %} + +{% block body_content %} + + +
+ Caps Lock is ON. +
+{% endblock %} + +{% block script %} + +{% endblock %} diff --git a/source/style/_abovethefold.scss b/source/style/_abovethefold.scss index 4b91d99..f0f0136 100644 --- a/source/style/_abovethefold.scss +++ b/source/style/_abovethefold.scss @@ -17,7 +17,7 @@ /* * # NOTE * - * CSS rules for content which is presented immediately + * CSS rules for content which is presented immediately * to the screen and needs priority loading * */ diff --git a/source/style/elements/_grouping.scss b/source/style/elements/_grouping.scss index 512e857..940302f 100644 --- a/source/style/elements/_grouping.scss +++ b/source/style/elements/_grouping.scss @@ -90,8 +90,8 @@ li, dt, dd { @extend %basic; } -li, dd { - // margin-bottom: $basic_space; +.list__basic li, dd { + margin-bottom: $basic_space; } dd { diff --git a/source/style/elements/_interactive.scss b/source/style/elements/_interactive.scss index 0a26f75..d5745ac 100644 --- a/source/style/elements/_interactive.scss +++ b/source/style/elements/_interactive.scss @@ -32,11 +32,16 @@ input, button, textarea { label { @extend %basic; - input { + input, textarea { margin-left: $basic_space; } } +label + textarea { + @extend %solo; + display: block; +} + input { color: $basic_io_font_color; @@ -46,10 +51,9 @@ input { } } -@each $input in $basic_input_list, textarea { +@each $input in $basic_input_list, textarea, select { #{$input} { @extend %basic_mono; - border: $basic_io_border; padding: $half_space; background-color: $basic_io_back_color; @@ -70,8 +74,13 @@ input { } } -@each $input in $basic_input_list { +@each $input in $basic_input_list, textarea { + #{$input} { + border: $basic_io_border; + } +} +@each $input in $basic_input_list { #{$input} { line-height: 1; } @@ -84,10 +93,16 @@ input { } label + input, -.input__label_right { +.input__label_right, +.label > input, +.label > select { margin: 0 $basic_space; } +.label { + line-height: 2.5; +} + .label__table { display: table; @@ -133,7 +148,7 @@ button { } select { - + border: none; } datalist { diff --git a/source/style/elements/_sections.scss b/source/style/elements/_sections.scss index 8bd7b53..871d4e1 100644 --- a/source/style/elements/_sections.scss +++ b/source/style/elements/_sections.scss @@ -67,11 +67,11 @@ section { aside { - &.right + section { + &.right + .bside { margin-right: calc(#{$basic_aside_width} + #{$basic_space}); } - &.left + section { + &.left + .bside { margin-left: calc(#{$basic_aside_width} + #{$basic_space}); } } diff --git a/source/style/example.scss b/source/style/example.scss index eabc71e..b6635d9 100644 --- a/source/style/example.scss +++ b/source/style/example.scss @@ -2,4 +2,4 @@ // ------------------------------------------------------------------------------ @import "hippie"; -// NOTE // No css rules allowed in here \ No newline at end of file +// NOTE // No css rules allowed in here diff --git a/source/style/global/_common.scss b/source/style/global/_common.scss index c487b0a..9c282f9 100644 --- a/source/style/global/_common.scss +++ b/source/style/global/_common.scss @@ -37,6 +37,18 @@ margin-left: 0; } +.width_half { + width: 50%; + margin-right: 0; + margin-left: 0; +} + +.width_third { + width: 33.3%; + margin-right: 0; + margin-left: 0; +} + .height_basic { height: 1024px; } @@ -59,7 +71,7 @@ margin-right: $space_3; } -.main_center { +.wrap_center { & > * { margin-right: (100% - $basic_width) / 2; margin-left: (100% - $basic_width) / 2; @@ -69,8 +81,8 @@ margin-left: (100% - $width_small) / 2; } @include forTabletLandscapeUp { - margin-right: 1(00% - $width_medium) / 2; - margin-left: 1(00% - $width_medium) / 2; + margin-right: (100% - $width_medium) / 2; + margin-left: (100% - $width_medium) / 2; } @include forBigDesktopUp { margin-right: (100% - $width_large) / 2; diff --git a/source/style/maintenance.scss b/source/style/maintenance.scss index dc1d29c..0f4de74 100644 --- a/source/style/maintenance.scss +++ b/source/style/maintenance.scss @@ -23,7 +23,7 @@ // Reset // Use a file outside of hippie i.e. vendor/normalize.css // ----------------------------------------------------------------------------- -@import "../bower_components/normalize-css/normalize.css"; +@import "../vendor/normalizecss/normalize.css"; // @import "normalize-css/normalize.css"; // @import "vendor/YOUR-FILES.css"; diff --git a/source/style/modules/maintenance/_maintenance_module.scss b/source/style/modules/maintenance/_maintenance_module.scss index 852e875..96660a7 100644 --- a/source/style/modules/maintenance/_maintenance_module.scss +++ b/source/style/modules/maintenance/_maintenance_module.scss @@ -1,11 +1,19 @@ -#root { - @extend .sec__main_status; - position: relative; - height: 100%; - border-color: $foxtrot_color; +.body__status { + @extend .sec__main_status; + height: 100vh; + border-color: $foxtrot_color; - h1:first-of-type { - margin-top: 0; - font-weight: bold; - } + .main__site { + @extend .wrap_center; + & > h1:first-of-type { + margin-top: 0; + margin-bottom: 0; + font-weight: bold; + line-height: 1; + } + & > h1 + h3 { + margin-top: 0; + margin-bottom: $space_3; + } + } } diff --git a/source/templates/index.nunjucks b/source/templates/default.njk similarity index 74% rename from source/templates/index.nunjucks rename to source/templates/default.njk index 2a827de..5df467e 100644 --- a/source/templates/index.nunjucks +++ b/source/templates/default.njk @@ -1,4 +1,3 @@ - @@ -8,7 +7,7 @@ {% block title %}{% endblock %} - HIPPIE - + @@ -23,10 +22,13 @@ {% endblock %} - + {% block body_content %}{% endblock %} - - + + {# #} {% block script %}{% endblock %} diff --git a/source/templates/demo.nunjucks b/source/templates/demo.njk similarity index 91% rename from source/templates/demo.nunjucks rename to source/templates/demo.njk index e5c6894..33a1c63 100644 --- a/source/templates/demo.nunjucks +++ b/source/templates/demo.njk @@ -1,4 +1,4 @@ - + @@ -33,7 +33,8 @@ {% endblock %} - + + {% include "partials/page-hover.njk" %}
{% block body_header %} @@ -48,6 +49,7 @@ src="https://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"> + {# #} {% block script %}{% endblock %} diff --git a/source/templates/macros/nav-macro.nunjucks b/source/templates/macros/nav-macro.njk similarity index 100% rename from source/templates/macros/nav-macro.nunjucks rename to source/templates/macros/nav-macro.njk diff --git a/source/templates/macros/top-macro.nunjucks b/source/templates/macros/top-macro.njk similarity index 100% rename from source/templates/macros/top-macro.nunjucks rename to source/templates/macros/top-macro.njk diff --git a/source/templates/maintenance.nunjucks b/source/templates/maintenance.njk similarity index 79% rename from source/templates/maintenance.nunjucks rename to source/templates/maintenance.njk index 1412a77..54fea55 100644 --- a/source/templates/maintenance.nunjucks +++ b/source/templates/maintenance.njk @@ -1,4 +1,3 @@ - @@ -8,7 +7,7 @@ {% block title %}{% endblock %} - + @@ -17,10 +16,12 @@ + + {% endblock %} - +
{% block body_content %}{% endblock %}
diff --git a/source/templates/partials/footer-status.nunjucks b/source/templates/partials/footer-status.njk similarity index 100% rename from source/templates/partials/footer-status.nunjucks rename to source/templates/partials/footer-status.njk diff --git a/source/templates/partials/footer.nunjucks b/source/templates/partials/footer.njk similarity index 100% rename from source/templates/partials/footer.nunjucks rename to source/templates/partials/footer.njk diff --git a/source/templates/partials/page-hover.nunjucks b/source/templates/partials/page-hover.njk similarity index 100% rename from source/templates/partials/page-hover.nunjucks rename to source/templates/partials/page-hover.njk From 1bb57b109b8df5b166093de35f32f514d9c57147 Mon Sep 17 00:00:00 2001 From: Stephan Date: Mon, 30 Apr 2018 20:20:13 +0200 Subject: [PATCH 068/372] focus on demo - sorted files to demo folder - try to focus more on the creation of demo example files --- source/pages/{ => demo}/blank.njk | 0 source/pages/{ => demo/error}/404.njk | 0 source/pages/{ => demo/error}/500.njk | 0 source/pages/{ => demo}/intro.njk | 0 source/pages/{ => demo}/os.njk | 0 source/pages/index.njk | 23 ++++++++++++++------- source/style/modules/demo/_demo_module.scss | 6 ++++-- 7 files changed, 19 insertions(+), 10 deletions(-) rename source/pages/{ => demo}/blank.njk (100%) rename source/pages/{ => demo/error}/404.njk (100%) rename source/pages/{ => demo/error}/500.njk (100%) rename source/pages/{ => demo}/intro.njk (100%) rename source/pages/{ => demo}/os.njk (100%) diff --git a/source/pages/blank.njk b/source/pages/demo/blank.njk similarity index 100% rename from source/pages/blank.njk rename to source/pages/demo/blank.njk diff --git a/source/pages/404.njk b/source/pages/demo/error/404.njk similarity index 100% rename from source/pages/404.njk rename to source/pages/demo/error/404.njk diff --git a/source/pages/500.njk b/source/pages/demo/error/500.njk similarity index 100% rename from source/pages/500.njk rename to source/pages/demo/error/500.njk diff --git a/source/pages/intro.njk b/source/pages/demo/intro.njk similarity index 100% rename from source/pages/intro.njk rename to source/pages/demo/intro.njk diff --git a/source/pages/os.njk b/source/pages/demo/os.njk similarity index 100% rename from source/pages/os.njk rename to source/pages/demo/os.njk diff --git a/source/pages/index.njk b/source/pages/index.njk index d3e8883..d3aaca7 100644 --- a/source/pages/index.njk +++ b/source/pages/index.njk @@ -11,14 +11,21 @@ {% block body_content %}
- +
+

Demo Pages

+ +

Overview about all the styles

+ +
{% endblock %} diff --git a/source/style/modules/demo/_demo_module.scss b/source/style/modules/demo/_demo_module.scss index f018771..0499278 100644 --- a/source/style/modules/demo/_demo_module.scss +++ b/source/style/modules/demo/_demo_module.scss @@ -201,6 +201,8 @@ .hello { flex: 0 1 auto; - padding: 1em 5em; - background-color: rgba(black, 0.25); + ul { + padding: 1em 5em; + background-color: rgba(black, 0.25); + } } From 8bc8da74db6f1f14bc21c5d55f1e3c6c4c0c990e Mon Sep 17 00:00:00 2001 From: Stephan Date: Tue, 8 May 2018 23:00:46 +0200 Subject: [PATCH 069/372] demo.1 - added possibility to add data into tempaltes via json - restructured output files - some work on styles --- README.md | 5 +- gulpfile.js | 232 +++++---- package-lock.json | 693 +++++++++++++++++++++++++ package.json | 2 + source/data.json | 34 ++ source/pages/{demo => }/blank.njk | 0 source/pages/demo/intro.njk | 4 +- source/pages/demo/os.njk | 2 +- source/pages/index.njk | 27 +- source/pages/tests.njk | 99 ++-- source/style/elements/_grouping.scss | 6 - source/style/elements/_textlevel.scss | 38 ++ source/style/elements/_typography.scss | 13 +- source/style/global/_common.scss | 29 +- source/style/global/_config.scss | 11 +- source/templates/demo.njk | 4 +- source/templates/maintenance.njk | 4 +- test/test.js | 0 18 files changed, 1004 insertions(+), 199 deletions(-) create mode 100644 source/data.json rename source/pages/{demo => }/blank.njk (100%) delete mode 100644 test/test.js diff --git a/README.md b/README.md index 62990bb..88e0669 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,10 @@ Clone the repo `https://github.com/sthag/hippie.git`. Change to the newly created folder. By default this would be *hippie*. -Run the command *gulp*. +Run the command `npm install`. +This will install all nodejs dependencies into the filder *node_modules*. + +Run the command `gulp`. This will create a folder *build* with the resulting files. ## LOGIC diff --git a/gulpfile.js b/gulpfile.js index 8a87b58..bcc8bd9 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -15,6 +15,8 @@ var build = { root: 'build' } + +var fs = require('fs'); // Load plugins const gulp = require('gulp'), rename = require('gulp-rename'), @@ -25,12 +27,13 @@ concat = require('gulp-concat'), pump = require('pump'), sourcemap = require('gulp-sourcemaps'), prefix = require('gulp-autoprefixer'), -testsass = require('gulp-sass'), -sass = require('gulp-ruby-sass'), +sass = require('gulp-sass'), +rubysass = require('gulp-ruby-sass'), nunjucks = require('gulp-nunjucks-render'); cssnano = require('gulp-cssnano'), jshint = require('gulp-jshint'), jscs = require('gulp-jscs'), +useref = require('gulp-useref'), sasslint = require('gulp-sass-lint'), uglifyjs = require('uglify-es'), composer = require('gulp-uglify/composer'), @@ -42,16 +45,19 @@ changed = require('gulp-changed'), newer = require('gulp-newer'), plumber = require('gulp-plumber'), notify = require('gulp-notify'), +data = require('gulp-data'), browsersync = require('browser-sync').create(); var minify = composer(uglifyjs, console); -// TEST - Tasks -gulp.task('test', function() { + + +// Task for the looks +gulp.task('sass', function() { return gulp.src('source/style/**/*.+(scss|sass)') .pipe(plumbError('Error Running Sass')) .pipe(sourcemap.init()) - .pipe(testsass({ + .pipe(sass({ includePaths: ['source/bower_components'] })) .pipe(prefix(['>= 4%', 'last 2 version'])) @@ -62,7 +68,9 @@ gulp.task('test', function() { })) }); -gulp.task('testsync', function() { + +// Task for automagically reload browsers +gulp.task('syncreload', function() { browsersync.init({ open: false, server: 'build', @@ -70,9 +78,13 @@ gulp.task('testsync', function() { }); }); -gulp.task('testnunjucks', function() { +// templating engine +gulp.task('nunjucks', function() { return gulp.src('source/pages/**/*.+(html|njk)') .pipe(plumbError('Error Running Nunjucks')) + .pipe(data(function() { + return JSON.parse(fs.readFileSync('./source/data.json')) + })) .pipe(nunjucks({ path: ['source/templates'], envOptions: { @@ -128,14 +140,17 @@ gulp.task('clean:dev', function() { + + + // Task - Clean build directory gulp.task('clean', function() { return del([build.scripts, build.styles, build.images]); }); // Task - Styles -gulp.task('styles', () => sass(source.styles, {sourcemap: true}) -.on('error', sass.logError) +gulp.task('styles', () => rubysass(source.styles, {sourcemap: true}) +.on('error', rubysass.logError) // .pipe(newer({dest: build.styles, ext: '.css'})) .pipe(prefix('last 2 version')) .pipe(gulp.dest(build.styles)) @@ -172,106 +187,115 @@ gulp.task('images', function() { return gulp.src(source.images) .pipe(changed(build.images)) // .pipe(cache(imagemin({ - // optimizationLevel: 3, - // progressive: true, - // interlaced: true }))) - // ) - .pipe(gulp.dest(build.images)) - // .pipe(notify({ message: 'Images task complete' })) - ; -}); + // optimizationLevel: 3, + // progressive: true, + // interlaced: true }))) + // ) + .pipe(gulp.dest(build.images)) + // .pipe(notify({ message: 'Images task complete' })) + ; + }); -// Task - Vendor -gulp.task('vendor', function() { - return gulp.src(source.vendor) - .pipe(plumbError()) - .pipe(gulp.dest(build.vendor)) - ; -}); + // Task - Vendor + gulp.task('vendor', function() { + return gulp.src(source.vendor) + .pipe(plumbError()) + .pipe(gulp.dest(build.vendor)) + ; + }); -//Task - Nunjucks -gulp.task('nunjucks', function() { - return gulp.src(source.pages) - // .pipe(changed(build.root)) - .pipe(nunjucks({ - path: ['source/templates'], - envOptions: { - trimBlocks: true - } - })) - .pipe(gulp.dest(build.root)) -}); + //Task - Nunjucks + gulp.task('oldnunjucks', function() { + return gulp.src(source.pages) + // .pipe(changed(build.root)) + .pipe(nunjucks({ + path: ['source/templates'], + envOptions: { + trimBlocks: true + } + })) + .pipe(gulp.dest(build.root)) + }); -// a task that ensures the other task is complete before reloading browsers -gulp.task('overwatch', ['nunjucks', 'styles'], function(done) { + // a task that ensures the other task is complete before reloading browsers + gulp.task('overwatch', ['oldnunjucks', 'styles'], function(done) { browsersync.reload(); done(); -}); - - - -// TEST - Watch -gulp.task('watch-js', ['lint:js'], browsersync.reload); - -gulp.task('testwatch', function() { - gulp.watch('source/code/**/*.js', ['watch-js']) - gulp.watch('source/style/**/*.+(scss|sass)', ['test', 'lint:scss']); - gulp.watch([ - 'source/templates/**/*', - 'source/pages/**/*.+(html|njk)' - ], ['testnunjucks']); -}); - - - -// Watch for file changes -gulp.task('watch', ['styles', 'scripts', 'nunjucks'], function() { - browsersync.init({ - open: false, - server: build.root, - // proxy: "http://verser.vrt/virtual/" }); - gulp.watch(source.scripts, ['scripts']).on('change', function(event) { - if (event.type === 'deleted') { - delete cache.caches['scripts'][event.path]; - remember.forget('scripts', event.path); + + + // TEST - Watch + gulp.task('watch-js', ['lint:js'], browsersync.reload); + + gulp.task('testwatch', function() { + gulp.watch('source/code/**/*.js', ['watch-js']) + gulp.watch('source/style/**/*.+(scss|sass)', ['sass', 'lint:scss']); + gulp.watch([ + 'source/templates/**/*', + 'source/pages/**/*.+(html|njk)', + 'source/data.json' + ], ['nunjucks']); + }); + + + + // Old watch for file changes + gulp.task('watch', ['styles', 'scripts', 'oldnunjucks'], function() { + browsersync.init({ + open: false, + server: build.root, + // proxy: "http://verser.vrt/virtual/" + }); + + gulp.watch(source.scripts, ['scripts']).on('change', function(event) { + if (event.type === 'deleted') { + delete cache.caches['scripts'][event.path]; + remember.forget('scripts', event.path); + } + }); + // gulp.watch(source.watch, ['overwatch']); + gulp.watch(source.watch, ['styles', 'oldnunjucks']).on('change', browsersync.reload); + // gulp.watch(source.images, ['images']); + }); + + gulp.task('olddefault', ['clean', 'styles', 'scripts', 'images', 'nunjucks']); + + + + + + + // The default task (called when you run `gulp` from cli) + gulp.task('default', function(callback) { + sequencer( + 'clean:dev', + ['sprites', 'lint:js', 'lint:scss'], + ['sass', 'nunjucks'], + ['syncreload', 'testwatch'], + callback + ) + }); + + + + + + + // function errorHandler(err) { + // // Logs out error in the command line + // console.log(err.toString()); + // // Ends the current pipe, so Gulp watch doesn't break + // this.emit('end'); + // } + + function plumbError(errTitle) { + return plumber({ + errorHandler: notify.onError({ + // Customizing error title + title: errTitle || "Error running Gulp", + message: "Error: <%= error.message %>", + sound: true + }) + }); } - }); - // gulp.watch(source.watch, ['overwatch']); - gulp.watch(source.watch, ['styles', 'nunjucks']).on('change', browsersync.reload); - // gulp.watch(source.images, ['images']); -}); - -// The default task (called when you run `gulp` from cli) -gulp.task('olddefault', ['clean', 'styles', 'scripts', 'images', 'nunjucks']); - -gulp.task('default', function(callback) { - sequencer( - 'clean:dev', - ['sprites', 'lint:js', 'lint:scss'], - ['test', 'testnunjucks'], - ['testsync', 'testwatch'], - callback - ) -}); - - - -// function errorHandler(err) { -// // Logs out error in the command line -// console.log(err.toString()); -// // Ends the current pipe, so Gulp watch doesn't break -// this.emit('end'); -// } - -function plumbError(errTitle) { - return plumber({ - errorHandler: notify.onError({ - // Customizing error title - title: errTitle || "Error running Gulp", - message: "Error: <%= error.message %>", - sound: true - }) - }); -} diff --git a/package-lock.json b/package-lock.json index 226d7c1..268dd6b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -131,12 +131,39 @@ "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", "dev": true }, + "ansi-colors": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz", + "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==", + "dev": true, + "requires": { + "ansi-wrap": "0.1.0" + } + }, + "ansi-cyan": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz", + "integrity": "sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=", + "dev": true, + "requires": { + "ansi-wrap": "0.1.0" + } + }, "ansi-escapes": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz", "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=", "dev": true }, + "ansi-red": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz", + "integrity": "sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=", + "dev": true, + "requires": { + "ansi-wrap": "0.1.0" + } + }, "ansi-regex": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", @@ -149,6 +176,12 @@ "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", "dev": true }, + "ansi-wrap": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz", + "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=", + "dev": true + }, "anymatch": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", @@ -159,6 +192,15 @@ "normalize-path": "2.1.1" } }, + "append-buffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz", + "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=", + "dev": true, + "requires": { + "buffer-equal": "1.0.0" + } + }, "aproba": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", @@ -205,6 +247,12 @@ "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", "dev": true }, + "arr-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz", + "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=", + "dev": true + }, "array-differ": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", @@ -280,6 +328,12 @@ "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=", "dev": true }, + "assign-symbols": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", + "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", + "dev": true + }, "async": { "version": "1.5.2", "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", @@ -544,6 +598,12 @@ "integrity": "sha1-DS1NSKcYyMBEdp/cT4lZLci2lYU=", "dev": true }, + "buffer-equal": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz", + "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=", + "dev": true + }, "builtin-modules": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", @@ -1425,6 +1485,24 @@ "clone": "1.0.2" } }, + "define-properties": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz", + "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=", + "dev": true, + "requires": { + "foreach": "2.0.5", + "object-keys": "1.0.11" + }, + "dependencies": { + "object-keys": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz", + "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=", + "dev": true + } + } + }, "defined": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz", @@ -1571,6 +1649,12 @@ "domelementtype": "1.3.0" } }, + "duplexer": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", + "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=", + "dev": true + }, "duplexer2": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", @@ -2134,6 +2218,21 @@ "es5-ext": "0.10.30" } }, + "event-stream": { + "version": "3.3.4", + "resolved": "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", + "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=", + "dev": true, + "requires": { + "duplexer": "0.1.1", + "from": "0.1.7", + "map-stream": "0.1.0", + "pause-stream": "0.0.11", + "split": "0.3.3", + "stream-combiner": "0.0.4", + "through": "2.3.8" + } + }, "eventemitter3": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz", @@ -2216,6 +2315,23 @@ "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=", "dev": true }, + "extend-shallow": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz", + "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=", + "dev": true, + "requires": { + "kind-of": "1.1.0" + }, + "dependencies": { + "kind-of": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz", + "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=", + "dev": true + } + } + }, "extglob": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", @@ -2450,6 +2566,16 @@ "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=", "dev": true }, + "flush-write-stream": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz", + "integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==", + "dev": true, + "requires": { + "inherits": "2.0.3", + "readable-stream": "2.3.3" + } + }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", @@ -2506,6 +2632,12 @@ "integrity": "sha1-ZR+DjiJCTnVm3hYdg1jKoZn4PU8=", "dev": true }, + "from": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz", + "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=", + "dev": true + }, "front-matter": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/front-matter/-/front-matter-2.1.2.tgz", @@ -2532,6 +2664,16 @@ "universalify": "0.1.1" } }, + "fs-mkdirp-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz", + "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "through2": "2.0.3" + } + }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -3075,6 +3217,17 @@ "vinyl-sourcemaps-apply": "0.2.1" } }, + "gulp-data": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/gulp-data/-/gulp-data-1.3.1.tgz", + "integrity": "sha512-fvpQJvgVyhkwRcFP3Y9QUS9sWvIFsAlJDinQjhLuknmHZz52jH0gHmTujYBFjr9aTlTHlrAayY5m1d0tA1HzGQ==", + "dev": true, + "requires": { + "plugin-error": "0.1.2", + "through2": "2.0.3", + "util-extend": "1.0.3" + } + }, "gulp-if": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/gulp-if/-/gulp-if-2.0.2.tgz", @@ -3581,6 +3734,188 @@ } } }, + "gulp-useref": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/gulp-useref/-/gulp-useref-3.1.5.tgz", + "integrity": "sha1-vrjgCcGfgZ9gTejRkdsSi9JEqnA=", + "dev": true, + "requires": { + "event-stream": "3.3.4", + "extend": "3.0.1", + "glob": "7.1.2", + "gulp-concat": "2.6.1", + "gulp-if": "2.0.2", + "is-relative-url": "1.0.0", + "plugin-error": "1.0.1", + "through2": "2.0.3", + "useref": "1.4.1", + "vinyl-fs": "3.0.2" + }, + "dependencies": { + "arr-diff": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", + "dev": true + }, + "arr-union": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", + "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", + "dev": true + }, + "clone": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz", + "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=", + "dev": true + }, + "clone-stats": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz", + "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=", + "dev": true + }, + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "dev": true, + "requires": { + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" + } + }, + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "dev": true, + "requires": { + "is-glob": "3.1.0", + "path-dirname": "1.0.2" + } + }, + "glob-stream": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz", + "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=", + "dev": true, + "requires": { + "extend": "3.0.1", + "glob": "7.1.2", + "glob-parent": "3.1.0", + "is-negated-glob": "1.0.0", + "ordered-read-streams": "1.0.1", + "pumpify": "1.4.0", + "readable-stream": "2.3.3", + "remove-trailing-separator": "1.1.0", + "to-absolute-glob": "2.0.2", + "unique-stream": "2.2.1" + } + }, + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, + "requires": { + "is-plain-object": "2.0.4" + } + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "dev": true + }, + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "dev": true, + "requires": { + "is-extglob": "2.1.1" + } + }, + "ordered-read-streams": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz", + "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=", + "dev": true, + "requires": { + "readable-stream": "2.3.3" + } + }, + "plugin-error": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz", + "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==", + "dev": true, + "requires": { + "ansi-colors": "1.1.0", + "arr-diff": "4.0.0", + "arr-union": "3.1.0", + "extend-shallow": "3.0.2" + } + }, + "replace-ext": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz", + "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=", + "dev": true + }, + "unique-stream": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz", + "integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=", + "dev": true, + "requires": { + "json-stable-stringify": "1.0.1", + "through2-filter": "2.0.0" + } + }, + "vinyl": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.1.0.tgz", + "integrity": "sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw=", + "dev": true, + "requires": { + "clone": "2.1.1", + "clone-buffer": "1.0.0", + "clone-stats": "1.0.0", + "cloneable-readable": "1.0.0", + "remove-trailing-separator": "1.1.0", + "replace-ext": "1.0.0" + } + }, + "vinyl-fs": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.2.tgz", + "integrity": "sha512-AUSFda1OukBwuLPBTbyuO4IRWgfXmqC4UTW0f8xrCa8Hkv9oyIU+NSqBlgfOLZRoUt7cHdo75hKQghCywpIyIw==", + "dev": true, + "requires": { + "fs-mkdirp-stream": "1.0.0", + "glob-stream": "6.1.0", + "graceful-fs": "4.1.11", + "is-valid-glob": "1.0.0", + "lazystream": "1.0.0", + "lead": "1.0.0", + "object.assign": "4.1.0", + "pumpify": "1.4.0", + "readable-stream": "2.3.3", + "remove-bom-buffer": "3.0.0", + "remove-bom-stream": "1.2.0", + "resolve-options": "1.1.0", + "through2": "2.0.3", + "to-through": "2.0.0", + "value-or-function": "3.0.0", + "vinyl": "2.1.0", + "vinyl-sourcemap": "1.1.0" + } + } + } + }, "gulp-util": { "version": "3.0.8", "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz", @@ -3830,6 +4165,12 @@ "sparkles": "1.0.0" } }, + "has-symbols": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz", + "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=", + "dev": true + }, "has-unicode": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", @@ -4196,6 +4537,12 @@ "xtend": "4.0.1" } }, + "is-negated-glob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz", + "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=", + "dev": true + }, "is-number": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", @@ -4294,6 +4641,23 @@ "is-unc-path": "0.1.2" } }, + "is-relative-url": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-relative-url/-/is-relative-url-1.0.0.tgz", + "integrity": "sha1-h6nTXop4m0ngebTX1p1kYS6ODh8=", + "dev": true, + "requires": { + "is-absolute-url": "1.0.0" + }, + "dependencies": { + "is-absolute-url": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-1.0.0.tgz", + "integrity": "sha1-LX7w/QuyqI2sfpIlPGgIoKziS/s=", + "dev": true + } + } + }, "is-resolvable": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz", @@ -4333,6 +4697,12 @@ "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", "dev": true }, + "is-valid-glob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz", + "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=", + "dev": true + }, "is-windows": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz", @@ -4653,6 +5023,15 @@ "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", "dev": true }, + "lazystream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz", + "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=", + "dev": true, + "requires": { + "readable-stream": "2.3.3" + } + }, "lcid": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", @@ -4662,6 +5041,15 @@ "invert-kv": "1.0.0" } }, + "lead": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz", + "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=", + "dev": true, + "requires": { + "flush-write-stream": "1.0.3" + } + }, "levn": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", @@ -5138,6 +5526,12 @@ "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", "dev": true }, + "map-stream": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz", + "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=", + "dev": true + }, "math-expression-evaluator": { "version": "1.2.17", "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz", @@ -5615,6 +6009,15 @@ "sort-keys": "1.1.2" } }, + "now-and-later": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.0.tgz", + "integrity": "sha1-vGHLtFbXnLMiB85HygUTb/Ln1u4=", + "dev": true, + "requires": { + "once": "1.4.0" + } + }, "npmlog": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", @@ -5716,6 +6119,26 @@ "integrity": "sha1-D9mnT8X60a45aLWGvaXGMr1sBaU=", "dev": true }, + "object.assign": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", + "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", + "dev": true, + "requires": { + "define-properties": "1.1.2", + "function-bind": "1.1.1", + "has-symbols": "1.0.0", + "object-keys": "1.0.11" + }, + "dependencies": { + "object-keys": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz", + "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=", + "dev": true + } + } + }, "object.defaults": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz", @@ -5998,6 +6421,12 @@ "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=", "dev": true }, + "path-dirname": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", + "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=", + "dev": true + }, "path-exists": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", @@ -6057,6 +6486,15 @@ "integrity": "sha1-CPkRzcqczllCiA2ngXvAtyO2bYI=", "dev": true }, + "pause-stream": { + "version": "0.0.11", + "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", + "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=", + "dev": true, + "requires": { + "through": "2.3.8" + } + }, "performance-now": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", @@ -6115,6 +6553,37 @@ "integrity": "sha1-tUGO8EOd5UJfxJlQQtztFPsqhP8=", "dev": true }, + "plugin-error": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz", + "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=", + "dev": true, + "requires": { + "ansi-cyan": "0.1.1", + "ansi-red": "0.1.1", + "arr-diff": "1.1.0", + "arr-union": "2.1.0", + "extend-shallow": "1.1.4" + }, + "dependencies": { + "arr-diff": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz", + "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=", + "dev": true, + "requires": { + "arr-flatten": "1.1.0", + "array-slice": "0.2.3" + } + }, + "array-slice": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz", + "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=", + "dev": true + } + } + }, "plur": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz", @@ -7289,6 +7758,50 @@ } } }, + "pumpify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.4.0.tgz", + "integrity": "sha512-2kmNR9ry+Pf45opRVirpNuIFotsxUGLaYqxIwuR77AYrYRMuFCz9eryHBS52L360O+NcR383CL4QYlMKPq4zYA==", + "dev": true, + "requires": { + "duplexify": "3.5.4", + "inherits": "2.0.3", + "pump": "2.0.1" + }, + "dependencies": { + "duplexify": { + "version": "3.5.4", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.4.tgz", + "integrity": "sha512-JzYSLYMhoVVBe8+mbHQ4KgpvHpm0DZpJuL8PY93Vyv1fW7jYJ90LoXa1di/CVbJM+TgMs91rbDapE/RNIfnJsA==", + "dev": true, + "requires": { + "end-of-stream": "1.4.1", + "inherits": "2.0.3", + "readable-stream": "2.3.3", + "stream-shift": "1.0.0" + } + }, + "end-of-stream": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", + "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", + "dev": true, + "requires": { + "once": "1.4.0" + } + }, + "pump": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", + "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", + "dev": true, + "requires": { + "end-of-stream": "1.4.1", + "once": "1.4.0" + } + } + } + }, "punycode": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", @@ -7592,6 +8105,27 @@ "is-equal-shallow": "0.1.3" } }, + "remove-bom-buffer": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz", + "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==", + "dev": true, + "requires": { + "is-buffer": "1.1.5", + "is-utf8": "0.2.1" + } + }, + "remove-bom-stream": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz", + "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=", + "dev": true, + "requires": { + "remove-bom-buffer": "3.0.0", + "safe-buffer": "5.1.1", + "through2": "2.0.3" + } + }, "remove-trailing-separator": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", @@ -7722,6 +8256,15 @@ "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=", "dev": true }, + "resolve-options": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz", + "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=", + "dev": true, + "requires": { + "value-or-function": "3.0.0" + } + }, "resolve-url": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", @@ -8351,6 +8894,15 @@ "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=", "dev": true }, + "split": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz", + "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=", + "dev": true, + "requires": { + "through": "2.3.8" + } + }, "sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", @@ -8572,6 +9124,15 @@ "readable-stream": "2.3.3" } }, + "stream-combiner": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz", + "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=", + "dev": true, + "requires": { + "duplexer": "0.1.1" + } + }, "stream-consume": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz", @@ -8830,6 +9391,16 @@ "xtend": "4.0.1" } }, + "through2-filter": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz", + "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=", + "dev": true, + "requires": { + "through2": "2.0.3", + "xtend": "4.0.1" + } + }, "tildify": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz", @@ -8855,6 +9426,52 @@ "next-tick": "1.0.0" } }, + "to-absolute-glob": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz", + "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=", + "dev": true, + "requires": { + "is-absolute": "1.0.0", + "is-negated-glob": "1.0.0" + }, + "dependencies": { + "is-absolute": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz", + "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==", + "dev": true, + "requires": { + "is-relative": "1.0.0", + "is-windows": "1.0.2" + } + }, + "is-relative": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz", + "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==", + "dev": true, + "requires": { + "is-unc-path": "1.0.0" + } + }, + "is-unc-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz", + "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==", + "dev": true, + "requires": { + "unc-path-regex": "0.1.2" + } + }, + "is-windows": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", + "dev": true + } + } + }, "to-array": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz", @@ -8873,6 +9490,15 @@ "integrity": "sha1-fMKRUfD18sQZRvEZ9ZMv5VQXASU=", "dev": true }, + "to-through": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz", + "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=", + "dev": true, + "requires": { + "through2": "2.0.3" + } + }, "tough-cookie": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz", @@ -9059,6 +9685,12 @@ "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=", "dev": true }, + "useref": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/useref/-/useref-1.4.1.tgz", + "integrity": "sha1-Atq60QsahQJdlkJS/KMbgFkxrX0=", + "dev": true + }, "util": { "version": "0.10.3", "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", @@ -9082,6 +9714,12 @@ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true }, + "util-extend": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz", + "integrity": "sha1-p8IW0mdUUWljeztu3GypEZ4v+T8=", + "dev": true + }, "utile": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz", @@ -9135,6 +9773,12 @@ "spdx-expression-parse": "1.0.4" } }, + "value-or-function": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz", + "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=", + "dev": true + }, "vendors": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.1.tgz", @@ -9298,6 +9942,55 @@ } } }, + "vinyl-sourcemap": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz", + "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=", + "dev": true, + "requires": { + "append-buffer": "1.0.2", + "convert-source-map": "1.5.0", + "graceful-fs": "4.1.11", + "normalize-path": "2.1.1", + "now-and-later": "2.0.0", + "remove-bom-buffer": "3.0.0", + "vinyl": "2.1.0" + }, + "dependencies": { + "clone": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz", + "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=", + "dev": true + }, + "clone-stats": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz", + "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=", + "dev": true + }, + "replace-ext": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz", + "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=", + "dev": true + }, + "vinyl": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.1.0.tgz", + "integrity": "sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw=", + "dev": true, + "requires": { + "clone": "2.1.1", + "clone-buffer": "1.0.0", + "clone-stats": "1.0.0", + "cloneable-readable": "1.0.0", + "remove-trailing-separator": "1.1.0", + "replace-ext": "1.0.0" + } + } + } + }, "vinyl-sourcemaps-apply": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz", diff --git a/package.json b/package.json index d8cbb6c..8d5dead 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "gulp-changed": "^3.1.0", "gulp-concat": "^2.6.1", "gulp-cssnano": "^2.1.2", + "gulp-data": "^1.3.1", "gulp-if": "^2.0.2", "gulp-jscs": "^4.0.0", "gulp-jshint": "^2.0.4", @@ -39,6 +40,7 @@ "gulp-sass-lint": "^1.3.3", "gulp-sourcemaps": "^2.6.1", "gulp-uglify": "^3.0.0", + "gulp-useref": "^3.1.5", "gulp.spritesmith": "^6.5.1", "jshint": "^2.9.5", "jshint-stylish": "^2.2.1", diff --git a/source/data.json b/source/data.json new file mode 100644 index 0000000..0086589 --- /dev/null +++ b/source/data.json @@ -0,0 +1,34 @@ +{ + "demolinks": [ + { + "href": "demo/intro.html", + "text": "Intro" + }, + { + "href": "demo/os.html", + "text": "OS" + }, + { + "href": "demo/error/404.html", + "text": "404" + }, + { + "href": "demo/error/500.html", + "text": "500" + } + ], + "links": [ + { + "href": "elements.html", + "text": "Elements" + }, + { + "href": "blank.html", + "text": "Blank" + }, + { + "href": "tests.html", + "text": "Tests" + } + ] +} diff --git a/source/pages/demo/blank.njk b/source/pages/blank.njk similarity index 100% rename from source/pages/demo/blank.njk rename to source/pages/blank.njk diff --git a/source/pages/demo/intro.njk b/source/pages/demo/intro.njk index 97ffbd1..85ea3b1 100644 --- a/source/pages/demo/intro.njk +++ b/source/pages/demo/intro.njk @@ -486,9 +486,9 @@

Überschrift als Block-Verweis

 - 
section>div.box__inline_left>img^p+p
+ 
section>div.float_space_left>img^p+p
-
Avatar
+
Avatar

Vorname Name
Straße 1, 01234 Stadt

+49 (0)123 1337 0000
name@domain.tld

div.box__main_indent
diff --git a/source/pages/demo/os.njk b/source/pages/demo/os.njk index c360ddf..ba29c44 100644 --- a/source/pages/demo/os.njk +++ b/source/pages/demo/os.njk @@ -2,7 +2,7 @@ {% set pageId = "os" %} {% set pageClass = "" %} -{% extends "default.njk" %} +{% extends "demo.njk" %} {% block title %}demo{% endblock %} {% block head %} diff --git a/source/pages/index.njk b/source/pages/index.njk index d3aaca7..c6cd661 100644 --- a/source/pages/index.njk +++ b/source/pages/index.njk @@ -12,18 +12,27 @@ {% block body_content %}
-

Demo Pages

+

This is HIPPIE

+

You can start using it by replacing this file with your own index page.

+

The folder demo contains examples and also an overview of definitions made.
Follow the white rabbit.

+ +

Demo Pages

-

Overview about all the styles

+ 
+  ()()
+  (..)
+C(")(")
+

Overview about all the styles

diff --git a/source/pages/tests.njk b/source/pages/tests.njk index 1e07e96..39c8021 100644 --- a/source/pages/tests.njk +++ b/source/pages/tests.njk @@ -9,17 +9,18 @@ {{ super() }} {% endblock %} {% block body_content %} +
@@ -32,55 +33,55 @@ // Page specific // ------------------------------------------------------------------------------ $( document ).ready(function() { - console.log('HIPPIE Tests'); + console.log('HIPPIE Tests'); }); function capLock(e){ - kc = e.keyCode?e.keyCode:e.which; - sk = e.shiftKey?e.shiftKey:((kc == 16)?true:false); - if(((kc >= 65 && kc <= 90) && !sk)||((kc >= 97 && kc <= 122) && sk)) - document.getElementById('divMayus').style.visibility = 'visible'; - else - document.getElementById('divMayus').style.visibility = 'hidden'; + kc = e.keyCode?e.keyCode:e.which; + sk = e.shiftKey?e.shiftKey:((kc == 16)?true:false); + if(((kc >= 65 && kc <= 90) && !sk)||((kc >= 97 && kc <= 122) && sk)) + document.getElementById('divMayus').style.visibility = 'visible'; + else + document.getElementById('divMayus').style.visibility = 'hidden'; } function capsDetect() { - var body = document.getElementsByTagName('body')[0]; - var isShiftPressed = false; - var isCapsOn = false; - var capsWarning = document.getElementById('error'); - body.addEventListener('keydown', function(e) { - var keyCode = e.keyCode ? e.keyCode : e.which; - if (keyCode === 16) { - isShiftPressed = true; - } - }); - body.addEventListener('keyup', function(e) { - var keyCode = e.keyCode ? e.keyCode : e.which; - if (keyCode === 16) { - isShiftPressed = false; - } - if (keyCode === 20) { - if (isCapsOn) { - isCapsOn = false; - capsWarning.style.display = 'none'; - } else { - isCapsOn = true; - capsWarning.style.display = 'inline-block'; - } - } - }); - body.addEventListener('keypress', function(e) { - var keyCode = e.keyCode ? e.keyCode : e.which; - if (keyCode <= 40) - return; - if (keyCode >= 65 && keyCode <= 90 && !isShiftPressed) { - isCapsOn = true; - capsWarning.style.display = 'inline-block'; - } else { - capsWarning.style.display = 'none'; - } - }); + var body = document.getElementsByTagName('body')[0]; + var isShiftPressed = false; + var isCapsOn = false; + var capsWarning = document.getElementById('error'); + body.addEventListener('keydown', function(e) { + var keyCode = e.keyCode ? e.keyCode : e.which; + if (keyCode === 16) { + isShiftPressed = true; + } + }); + body.addEventListener('keyup', function(e) { + var keyCode = e.keyCode ? e.keyCode : e.which; + if (keyCode === 16) { + isShiftPressed = false; + } + if (keyCode === 20) { + if (isCapsOn) { + isCapsOn = false; + capsWarning.style.display = 'none'; + } else { + isCapsOn = true; + capsWarning.style.display = 'inline-block'; + } + } + }); + body.addEventListener('keypress', function(e) { + var keyCode = e.keyCode ? e.keyCode : e.which; + if (keyCode <= 40) + return; + if (keyCode >= 65 && keyCode <= 90 && !isShiftPressed) { + isCapsOn = true; + capsWarning.style.display = 'inline-block'; + } else { + capsWarning.style.display = 'none'; + } + }); } capsDetect(); diff --git a/source/style/elements/_grouping.scss b/source/style/elements/_grouping.scss index 940302f..ff9153f 100644 --- a/source/style/elements/_grouping.scss +++ b/source/style/elements/_grouping.scss @@ -186,12 +186,6 @@ div { } -// Inline -.box__inline_left { - @extend .float_space_left; - // padding: $basic_space / 2; -} - // Columns .block__column_line { diff --git a/source/style/elements/_textlevel.scss b/source/style/elements/_textlevel.scss index 1713243..6a3e1c2 100644 --- a/source/style/elements/_textlevel.scss +++ b/source/style/elements/_textlevel.scss @@ -164,3 +164,41 @@ ins { del { } + + + +// General Classes +// ------------------------------------------------------------------------------ +.txt-tiny { + font-size: .5em !important; +} + +.txt-smaller { + font-size: .75em !important; +} + +.txt-larger { + font-size: 1.2em !important; +} + +.txt-huge { + font-size: 3em !important; +} + +.txt_center { + text-align: center !important; +} +.txt_right { + text-align: right !important; +} +.txt_left { + text-align: left !important; +} + +.txt_white { + color: white; +} + +.txt_black { + color: black; +} diff --git a/source/style/elements/_typography.scss b/source/style/elements/_typography.scss index 68718b0..2986a6d 100644 --- a/source/style/elements/_typography.scss +++ b/source/style/elements/_typography.scss @@ -4,19 +4,19 @@ %basic { font-family: $primary_font_family; font-size: $text_size_1; - line-height: $text_line_1; + line-height: $text_line_basic; } %basic_mono { - font-family: $third_font_family; + font-family: $monospace_font_family; font-size: $text_size_1; - line-height: $text_line_1; + line-height: $text_line_mono; } %basic_print { - font-family: $third_font_family; + font-family: $print_font_family; font-size: $text_size_1; - line-height: $text_line_1; + line-height: $text_line_basic; } %head_all { @@ -27,7 +27,7 @@ font-family: $secondary_font_family; font-size: $head_size_1; font-weight: 300; - line-height: $head_line_1; + line-height: $head_line_basic; } %head_2 { @@ -53,7 +53,6 @@ %solo { @extend %basic; - color: $basic_font_color; } %short { diff --git a/source/style/global/_common.scss b/source/style/global/_common.scss index 9c282f9..8799da2 100644 --- a/source/style/global/_common.scss +++ b/source/style/global/_common.scss @@ -57,16 +57,6 @@ height: 100vh; } -.txt_center { - text-align: center !important; -} -.txt_right { - text-align: right !important; -} -.txt_left { - text-align: left !important; -} - .space_right { margin-right: $space_3; } @@ -108,8 +98,16 @@ overflow: auto; } -.float_space_left { +.float_left { float: left; +} + +.float_right { + float: right; +} + +.float_space_left { + @extend .float_left; margin-right: $space_3; } @@ -123,6 +121,15 @@ } +// Inlining +// ------------------------------------------------------------------------------ + +.inline { + display: inline-block; +} + + + // Positioned elements // ------------------------------------------------------------------------------ %full_viewport { diff --git a/source/style/global/_config.scss b/source/style/global/_config.scss index 4442f8a..2215a9d 100644 --- a/source/style/global/_config.scss +++ b/source/style/global/_config.scss @@ -52,11 +52,12 @@ $head_size_4: 1.35em !default; $text_size_1: 1em; $text_size_2: 20; -$text_line_1: 1.5 !default; -$head_line_1: $text_line_1; -$head_line_2: $text_line_1; -$head_line_3: $text_line_1; -$head_line_4: $text_line_1; +$text_line_basic: 1.3 !default; +$text_line_mono: 1.1 !default; +$head_line_basic: $text_line_basic !default; +$head_line_2: $head_line_basic; +$head_line_3: $head_line_basic; +$head_line_4: $head_line_basic; $print_font_family: #{'Times New Roman', times} !default; $monospace_font_family: #{'Courier New', monospace} !default; diff --git a/source/templates/demo.njk b/source/templates/demo.njk index 33a1c63..c87b98a 100644 --- a/source/templates/demo.njk +++ b/source/templates/demo.njk @@ -28,7 +28,7 @@ - + {% endblock %} @@ -51,7 +51,7 @@ crossorigin="anonymous"> {# #} - + {% block script %}{% endblock %} diff --git a/source/templates/maintenance.njk b/source/templates/maintenance.njk index 54fea55..1604c81 100644 --- a/source/templates/maintenance.njk +++ b/source/templates/maintenance.njk @@ -16,8 +16,8 @@ - - + + {% endblock %} diff --git a/test/test.js b/test/test.js deleted file mode 100644 index e69de29..0000000 From ce6597b6d10a97fe1927e37515a0e9f079ac70f1 Mon Sep 17 00:00:00 2001 From: Stephan Date: Sat, 26 May 2018 14:29:50 +0200 Subject: [PATCH 070/372] demo.2 - restructured input files - sorted gulpfile and separated old stuff - next up are node module updates --- gulpfile.js | 241 ++++++++++-------- source/code/{ => hippie}/functions.js | 2 +- source/code/{ => hippie}/global.js | 18 +- source/code/{ => hippie}/variables.js | 2 +- source/data.json | 8 +- source/pages/{ => demo}/elements.njk | 0 .../{_settings.scss => _demo_config.scss} | 2 + source/style/{elements => }/_new.scss | 0 source/style/demo.scss | 16 ++ source/style/example.scss | 5 - source/style/{ => hippie}/_abovethefold.scss | 0 .../{_hippie.scss => hippie/_basic.scss} | 54 +--- source/style/hippie/_hippie.scss | 33 +++ .../{ => hippie}/elements/_embedded.scss | 0 .../{ => hippie}/elements/_grouping.scss | 0 .../{ => hippie}/elements/_interactive.scss | 0 .../{ => hippie}/elements/_sections.scss | 0 .../style/{ => hippie}/elements/_tables.scss | 0 .../{ => hippie}/elements/_textlevel.scss | 0 .../{ => hippie}/elements/_typography.scss | 0 source/style/{ => hippie}/functions/_all.scss | 0 .../style/{ => hippie}/functions/_color.scss | 0 .../style/{ => hippie}/functions/_shade.scss | 0 .../style/{ => hippie}/functions/_tint.scss | 0 source/style/{ => hippie}/global/_common.scss | 0 source/style/{ => hippie}/global/_config.scss | 0 source/style/{ => hippie}/mixins/_all.scss | 0 source/style/{ => hippie}/mixins/_color.scss | 0 source/style/{ => hippie}/mixins/_flow.scss | 0 .../{ => hippie}/mixins/_media_query.scss | 0 .../{ => hippie}/mixins/_user_agent.scss | 0 .../style/{ => hippie}/modules/_vendor.scss | 0 .../breakpoint/_breakpoint_module.scss | 0 .../modules/card/_card_module.scss | 0 .../{ => hippie}/modules/card/_extends.scss | 0 .../{ => hippie}/modules/card/_mixins.scss | 0 .../modules/editor/_editor_module.scss | 0 .../{ => hippie}/modules/editor/_extends.scss | 0 .../{ => hippie}/modules/editor/_mixins.scss | 0 .../explanation/_explanation_module.scss | 0 .../modules/explanation/_extends.scss | 0 .../modules/explanation/_mixins.scss | 0 .../maintenance/_maintenance_module.scss | 0 .../modules/media/_media_module.scss | 0 .../{ => hippie}/modules/media/_sprites.scss | 0 .../modules/navigation/_nav_module.scss | 0 .../{ => hippie}/modules/print/_extends.scss | 0 .../{ => hippie}/modules/print/_mixins.scss | 0 .../modules/print/_print_module.scss | 0 .../modules/tables/_tables_module.scss | 0 source/style/maintenance.scss | 116 ++------- source/templates/default.njk | 2 +- source/templates/demo.njk | 2 +- 53 files changed, 216 insertions(+), 285 deletions(-) rename source/code/{ => hippie}/functions.js (99%) rename source/code/{ => hippie}/global.js (93%) rename source/code/{ => hippie}/variables.js (95%) rename source/pages/{ => demo}/elements.njk (100%) rename source/style/{_settings.scss => _demo_config.scss} (59%) rename source/style/{elements => }/_new.scss (100%) create mode 100644 source/style/demo.scss delete mode 100644 source/style/example.scss rename source/style/{ => hippie}/_abovethefold.scss (100%) rename source/style/{_hippie.scss => hippie/_basic.scss} (58%) create mode 100644 source/style/hippie/_hippie.scss rename source/style/{ => hippie}/elements/_embedded.scss (100%) rename source/style/{ => hippie}/elements/_grouping.scss (100%) rename source/style/{ => hippie}/elements/_interactive.scss (100%) rename source/style/{ => hippie}/elements/_sections.scss (100%) rename source/style/{ => hippie}/elements/_tables.scss (100%) rename source/style/{ => hippie}/elements/_textlevel.scss (100%) rename source/style/{ => hippie}/elements/_typography.scss (100%) rename source/style/{ => hippie}/functions/_all.scss (100%) rename source/style/{ => hippie}/functions/_color.scss (100%) rename source/style/{ => hippie}/functions/_shade.scss (100%) rename source/style/{ => hippie}/functions/_tint.scss (100%) rename source/style/{ => hippie}/global/_common.scss (100%) rename source/style/{ => hippie}/global/_config.scss (100%) rename source/style/{ => hippie}/mixins/_all.scss (100%) rename source/style/{ => hippie}/mixins/_color.scss (100%) rename source/style/{ => hippie}/mixins/_flow.scss (100%) rename source/style/{ => hippie}/mixins/_media_query.scss (100%) rename source/style/{ => hippie}/mixins/_user_agent.scss (100%) rename source/style/{ => hippie}/modules/_vendor.scss (100%) rename source/style/{ => hippie}/modules/breakpoint/_breakpoint_module.scss (100%) rename source/style/{ => hippie}/modules/card/_card_module.scss (100%) rename source/style/{ => hippie}/modules/card/_extends.scss (100%) rename source/style/{ => hippie}/modules/card/_mixins.scss (100%) rename source/style/{ => hippie}/modules/editor/_editor_module.scss (100%) rename source/style/{ => hippie}/modules/editor/_extends.scss (100%) rename source/style/{ => hippie}/modules/editor/_mixins.scss (100%) rename source/style/{ => hippie}/modules/explanation/_explanation_module.scss (100%) rename source/style/{ => hippie}/modules/explanation/_extends.scss (100%) rename source/style/{ => hippie}/modules/explanation/_mixins.scss (100%) rename source/style/{ => hippie}/modules/maintenance/_maintenance_module.scss (100%) rename source/style/{ => hippie}/modules/media/_media_module.scss (100%) rename source/style/{ => hippie}/modules/media/_sprites.scss (100%) rename source/style/{ => hippie}/modules/navigation/_nav_module.scss (100%) rename source/style/{ => hippie}/modules/print/_extends.scss (100%) rename source/style/{ => hippie}/modules/print/_mixins.scss (100%) rename source/style/{ => hippie}/modules/print/_print_module.scss (100%) rename source/style/{ => hippie}/modules/tables/_tables_module.scss (100%) diff --git a/gulpfile.js b/gulpfile.js index bcc8bd9..c7ed93f 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,13 +1,14 @@ // Setup project -var source = { - watch: ['source/style/**/*.scss', 'source/templates/**/*.+(html|njk)', 'source/pages/**/*.+(html|njk)'], - styles: ['source/style/example.scss', 'source/style/maintenance.scss'], - scripts: ['source/code/variables.js', 'source/code/functions.js', 'source/code/global.js', 'source/code/**/*.coffee', '!source/vendor/**/*', ], +var source_folder = { + watch: ['source/style/hippie/**/*.scss', 'source/style/**/*.scss', 'source/templates/**/*.+(html|njk)', 'source/pages/**/*.+(html|njk)'], + styles: ['source/style/hippie/*.+(scss|sass)', 'source/style/**/*.+(scss|sass)'], + scripts: ['source/code/hippie/variables.js', 'source/code/hippie/functions.js', 'source/code/hippie/global.js', 'source/code/**/*.coffee', '!source/vendor/**/*', ], images: 'source/art/**/*', pages: 'source/pages/**/*.+(html|njk)', - vendor: 'vendor/**/*' + vendor: 'vendor/**/*', + root: 'source' }; -var build = { +var build_folder = { styles: 'build/css', scripts: 'build/js', images: 'build/art', @@ -15,69 +16,60 @@ var build = { root: 'build' } - -var fs = require('fs'); // Load plugins +var fs = require('fs'); const gulp = require('gulp'), -rename = require('gulp-rename'), +// rename = require('gulp-rename'), del = require('del'); gulpif = require('gulp-if'); sequencer = require('run-sequence'); -concat = require('gulp-concat'), -pump = require('pump'), +// concat = require('gulp-concat'), +// pump = require('pump'), sourcemap = require('gulp-sourcemaps'), prefix = require('gulp-autoprefixer'), sass = require('gulp-sass'), -rubysass = require('gulp-ruby-sass'), +// rubysass = require('gulp-ruby-sass'), nunjucks = require('gulp-nunjucks-render'); -cssnano = require('gulp-cssnano'), +// cssnano = require('gulp-cssnano'), jshint = require('gulp-jshint'), jscs = require('gulp-jscs'), -useref = require('gulp-useref'), +// useref = require('gulp-useref'), sasslint = require('gulp-sass-lint'), -uglifyjs = require('uglify-es'), -composer = require('gulp-uglify/composer'), +// uglifyjs = require('uglify-es'), +// composer = require('gulp-uglify/composer'), // imagemin = require('gulp-imagemin'), spritesmith = require('gulp.spritesmith'), -cache = require('gulp-cached'), -remember = require('gulp-remember'), -changed = require('gulp-changed'), -newer = require('gulp-newer'), +// cache = require('gulp-cached'), +// remember = require('gulp-remember'), +// changed = require('gulp-changed'), +// newer = require('gulp-newer'), plumber = require('gulp-plumber'), notify = require('gulp-notify'), data = require('gulp-data'), browsersync = require('browser-sync').create(); -var minify = composer(uglifyjs, console); +// var minify = composer(uglifyjs, console); -// Task for the looks + +// this is for the looks gulp.task('sass', function() { - return gulp.src('source/style/**/*.+(scss|sass)') + return gulp.src(source_folder.styles) .pipe(plumbError('Error Running Sass')) .pipe(sourcemap.init()) .pipe(sass({ - includePaths: ['source/bower_components'] + includePaths: [source_folder.root+'/bower_components'] })) .pipe(prefix(['>= 4%', 'last 2 version'])) .pipe(sourcemap.write()) - .pipe(gulp.dest('build/css')) + .pipe(gulp.dest(build_folder.styles)) .pipe(browsersync.reload({ stream: true })) }); -// Task for automagically reload browsers -gulp.task('syncreload', function() { - browsersync.init({ - open: false, - server: 'build', - // proxy: "http://verser.vrt/virtual/" - }); -}); - // templating engine gulp.task('nunjucks', function() { return gulp.src('source/pages/**/*.+(html|njk)') @@ -91,22 +83,36 @@ gulp.task('nunjucks', function() { trimBlocks: true } })) - .pipe(gulp.dest('build')) + .pipe(gulp.dest(build_folder.root)) .pipe(browsersync.reload({ stream: true })) }); + +// automagically reload browsers +gulp.task('syncreload', function() { + browsersync.init({ + open: false, + server: 'build', + // proxy: "http://verser.vrt/virtual/" + }); +}); + + +// creates sprites from files in art/sprites folder gulp.task('sprites', function() { gulp.src('source/art/sprites/**/*') .pipe(spritesmith({ cssName: '_sprites.scss', imgName: 'sprites.png' })) - .pipe(gulpif('*.png', gulp.dest('build/images'))) - .pipe(gulpif('*.scss', gulp.dest('source/style/modules/media'))); + .pipe(gulpif('*.png', gulp.dest(build_folder.images))) + .pipe(gulpif('*.scss', gulp.dest('source/style/hippie/modules/media'))); }); + +// linting ... gulp.task('lint:js', function() { return gulp.src('source/code/**/*.js') .pipe(plumbError('JSHint Error')) @@ -122,7 +128,6 @@ gulp.task('lint:js', function() { })) // .pipe(jscs.reporter()); }); - gulp.task('lint:scss', function() { return gulp.src('source/style/**/*.scss') .pipe(plumbError('SASSLint Error')) @@ -131,36 +136,99 @@ gulp.task('lint:scss', function() { })) }) + +// cleans the build folder gulp.task('clean:dev', function() { del.sync([ - 'build/css', - 'build/*.html' + build_folder.styles, + build_folder.root+'/*.html' ]); }); +// watch over changes and react +// split up into sub tasks +gulp.task('watch-js', ['lint:js'], browsersync.reload); +gulp.task('overwatch', function() { + gulp.watch('source/code/**/*.js', ['watch-js']) + gulp.watch('source/style/**/*.+(scss|sass)', ['sass', 'lint:scss']); + gulp.watch([ + 'source/templates/**/*', + 'source/pages/**/*.+(html|njk)', + 'source/data.json' + ], ['nunjucks']); +}); + + +// The default task (called when you run `gulp` from cli) +gulp.task('default', function(callback) { + sequencer( + 'clean:dev', + ['sprites', 'lint:js', 'lint:scss'], + ['sass', 'nunjucks'], + ['syncreload', 'overwatch'], + callback + ) +}); + + +function plumbError(errTitle) { + return plumber({ + errorHandler: notify.onError({ + // Customizing error title + title: errTitle || "Error running Gulp", + message: "Error: <%= error.message %>", + sound: true + }) + }); +} + + + + + + + + +// NOTE // to be deleted + +var oldsource = { + watch: ['source/style/hippie/**/*.scss', 'source/style/**/*.scss', 'source/templates/**/*.+(html|njk)', 'source/pages/**/*.+(html|njk)'], + styles: ['source/style/demo.scss', 'source/style/maintenance.scss'], + scripts: ['source/code/hippie/variables.js', 'source/code/hippie/functions.js', 'source/code/hippie/global.js', 'source/code/**/*.coffee', '!source/vendor/**/*', ], + images: 'source/art/**/*', + pages: 'source/pages/**/*.+(html|njk)', + vendor: 'vendor/**/*' +}; +var oldbuild = { + styles: 'build/css', + scripts: 'build/js', + images: 'build/art', + vendor: 'build/vendor', + root: 'build' +} // Task - Clean build directory gulp.task('clean', function() { - return del([build.scripts, build.styles, build.images]); + return del([oldbuild.scripts, oldbuild.styles, oldbuild.images]); }); // Task - Styles -gulp.task('styles', () => rubysass(source.styles, {sourcemap: true}) +gulp.task('styles', () => rubysass(oldsource.styles, {sourcemap: true}) .on('error', rubysass.logError) -// .pipe(newer({dest: build.styles, ext: '.css'})) +// .pipe(newer({dest: oldbuild.styles, ext: '.css'})) .pipe(prefix('last 2 version')) -.pipe(gulp.dest(build.styles)) +.pipe(gulp.dest(oldbuild.styles)) .pipe(rename({suffix: '.min'})) .pipe(cssnano()) .pipe(sourcemap.write('.', { includeContent: false, sourceRoot: 'source' })) -.pipe(gulp.dest(build.styles)) +.pipe(gulp.dest(oldbuild.styles)) .pipe(browsersync.stream({match: '**/*.css'})) // .pipe(notify({message: 'Style task complete'})) ); @@ -168,7 +236,7 @@ gulp.task('styles', () => rubysass(source.styles, {sourcemap: true}) // Task - Scripts gulp.task('scripts', function(cb) { pump([ - gulp.src(source.scripts), + gulp.src(oldsource.scripts), cache('scripts'), jshint('.jshintrc'), jshint.reporter('default'), @@ -177,125 +245,76 @@ gulp.task('scripts', function(cb) { remember('scripts'), concat('all.min.js'), sourcemap.write(), - gulp.dest(build.scripts), + gulp.dest(oldbuild.scripts), browsersync.stream() ], cb); }); // Task - Images gulp.task('images', function() { - return gulp.src(source.images) - .pipe(changed(build.images)) + return gulp.src(oldsource.images) + .pipe(changed(oldbuild.images)) // .pipe(cache(imagemin({ // optimizationLevel: 3, // progressive: true, // interlaced: true }))) // ) - .pipe(gulp.dest(build.images)) + .pipe(gulp.dest(oldbuild.images)) // .pipe(notify({ message: 'Images task complete' })) ; }); // Task - Vendor gulp.task('vendor', function() { - return gulp.src(source.vendor) + return gulp.src(oldsource.vendor) .pipe(plumbError()) - .pipe(gulp.dest(build.vendor)) + .pipe(gulp.dest(oldbuild.vendor)) ; }); //Task - Nunjucks gulp.task('oldnunjucks', function() { - return gulp.src(source.pages) - // .pipe(changed(build.root)) + return gulp.src(oldsource.pages) + // .pipe(changed(oldbuild.root)) .pipe(nunjucks({ path: ['source/templates'], envOptions: { trimBlocks: true } })) - .pipe(gulp.dest(build.root)) + .pipe(gulp.dest(oldbuild.root)) }); // a task that ensures the other task is complete before reloading browsers - gulp.task('overwatch', ['oldnunjucks', 'styles'], function(done) { + gulp.task('prewatch', ['oldnunjucks', 'styles'], function(done) { browsersync.reload(); done(); }); - - - // TEST - Watch - gulp.task('watch-js', ['lint:js'], browsersync.reload); - - gulp.task('testwatch', function() { - gulp.watch('source/code/**/*.js', ['watch-js']) - gulp.watch('source/style/**/*.+(scss|sass)', ['sass', 'lint:scss']); - gulp.watch([ - 'source/templates/**/*', - 'source/pages/**/*.+(html|njk)', - 'source/data.json' - ], ['nunjucks']); - }); - - - // Old watch for file changes - gulp.task('watch', ['styles', 'scripts', 'oldnunjucks'], function() { + gulp.task('oldwatch', ['styles', 'scripts', 'oldnunjucks'], function() { browsersync.init({ open: false, - server: build.root, + server: oldbuild.root, // proxy: "http://verser.vrt/virtual/" }); - gulp.watch(source.scripts, ['scripts']).on('change', function(event) { + gulp.watch(oldsource.scripts, ['scripts']).on('change', function(event) { if (event.type === 'deleted') { delete cache.caches['scripts'][event.path]; remember.forget('scripts', event.path); } }); - // gulp.watch(source.watch, ['overwatch']); - gulp.watch(source.watch, ['styles', 'oldnunjucks']).on('change', browsersync.reload); - // gulp.watch(source.images, ['images']); + // gulp.watch(oldsource.watch, ['prewatch']); + gulp.watch(oldsource.watch, ['styles', 'oldnunjucks']).on('change', browsersync.reload); + // gulp.watch(oldsource.images, ['images']); }); gulp.task('olddefault', ['clean', 'styles', 'scripts', 'images', 'nunjucks']); - - - - - - // The default task (called when you run `gulp` from cli) - gulp.task('default', function(callback) { - sequencer( - 'clean:dev', - ['sprites', 'lint:js', 'lint:scss'], - ['sass', 'nunjucks'], - ['syncreload', 'testwatch'], - callback - ) - }); - - - - - - // function errorHandler(err) { // // Logs out error in the command line // console.log(err.toString()); // // Ends the current pipe, so Gulp watch doesn't break // this.emit('end'); // } - - function plumbError(errTitle) { - return plumber({ - errorHandler: notify.onError({ - // Customizing error title - title: errTitle || "Error running Gulp", - message: "Error: <%= error.message %>", - sound: true - }) - }); - } diff --git a/source/code/functions.js b/source/code/hippie/functions.js similarity index 99% rename from source/code/functions.js rename to source/code/hippie/functions.js index 9cb6821..d120d16 100644 --- a/source/code/functions.js +++ b/source/code/hippie/functions.js @@ -1,4 +1,4 @@ -'use strict'; +"use strict"; function setup() { if($('#js_tph').length && full_view_hover) { diff --git a/source/code/global.js b/source/code/hippie/global.js similarity index 93% rename from source/code/global.js rename to source/code/hippie/global.js index a4d1e19..1b8e7de 100644 --- a/source/code/global.js +++ b/source/code/hippie/global.js @@ -1,4 +1,4 @@ -'use strict'; +"use strict"; // DOM ready // ------------------------------------------------------------------------------ @@ -22,9 +22,9 @@ $( document ).ready(function() { function() { var $this = $(this); - if($(this).attr("emmet")){ - - } + // if($(this).attr("emmet")){ + // + // } $(this).next(".exp_pop").show(); }, function() { @@ -47,11 +47,11 @@ $( document ).ready(function() { $(".exp_help_btn").click(function(e){ var $wrap, $pop; - if(exp_mode != true){ + if(exp_mode !== true){ exp_mode = true; $(".js_pop").each(function(i, e){ - if($(this).css("position") == "static") { + if($(this).css("position") === "static") { $(this).addClass("js_changed_pos"); $(this).css("position", "relative"); } @@ -70,7 +70,7 @@ $( document ).ready(function() { $(this).after($pop); if($(this).hasClass("js_changed_pos")){ $(this).css("position", ""); - if($(this).attr("style") == "") { + if($(this).attr("style") === "") { $(this).removeAttr("style"); } $(this).removeClass("js_changed_pos"); @@ -112,14 +112,14 @@ $( document ).ready(function() { var i = 0; $( ".pass-def dd" ).each(function() { $( this ).find( "li" ).each(function( index ) { - if ( 0 == $( this ).children( "ul" ).length ) { + if ( 0 === $( this ).children( "ul" ).length ) { //console.log( index + ": " + $( this ).text() ); var tempContent = $( this ).html(); //$( this ).html( "" ); $( this ).html( tempContent +""+ i +"" ); i++; } - }) + }); }); diff --git a/source/code/variables.js b/source/code/hippie/variables.js similarity index 95% rename from source/code/variables.js rename to source/code/hippie/variables.js index 5934344..3aa9cd6 100644 --- a/source/code/variables.js +++ b/source/code/hippie/variables.js @@ -1,4 +1,4 @@ -'use strict'; +"use strict"; var w = Math.max(document.documentElement.clientWidth, window.innerWidth || 0); var h = Math.max(document.documentElement.clientHeight, window.innerHeight || 0); diff --git a/source/data.json b/source/data.json index 0086589..5c43ee8 100644 --- a/source/data.json +++ b/source/data.json @@ -4,6 +4,10 @@ "href": "demo/intro.html", "text": "Intro" }, + { + "href": "demo/elements.html", + "text": "Elements" + }, { "href": "demo/os.html", "text": "OS" @@ -18,10 +22,6 @@ } ], "links": [ - { - "href": "elements.html", - "text": "Elements" - }, { "href": "blank.html", "text": "Blank" diff --git a/source/pages/elements.njk b/source/pages/demo/elements.njk similarity index 100% rename from source/pages/elements.njk rename to source/pages/demo/elements.njk diff --git a/source/style/_settings.scss b/source/style/_demo_config.scss similarity index 59% rename from source/style/_settings.scss rename to source/style/_demo_config.scss index 6239a8e..ed30d63 100644 --- a/source/style/_settings.scss +++ b/source/style/_demo_config.scss @@ -1,4 +1,6 @@ // Override for configuration file +// All variables setup with !default in gloabl/_config.scss can be used // ------------------------------------------------------------------------------ +// $basic_back_color: yellow; // $basic_link_color: magenta; diff --git a/source/style/elements/_new.scss b/source/style/_new.scss similarity index 100% rename from source/style/elements/_new.scss rename to source/style/_new.scss diff --git a/source/style/demo.scss b/source/style/demo.scss new file mode 100644 index 0000000..5da0ada --- /dev/null +++ b/source/style/demo.scss @@ -0,0 +1,16 @@ +// Start a new project by creating YOUR-PROJECT.scss and _YOUR-CONFIG.scss +// Then import your config and hippie +// NOTE // No css rules allowed in here +// ------------------------------------------------------------------------------ +@import "demo_config"; +@import "hippie/hippie"; + + +// Additional Modules and variables +// in dependency to other basic styles +// could be defined here +// ----------------------------------------------------------------------------- +@import "modules/demo/demo_module"; +// @import "modules/YOUR-MODULE/YOUR-FILES"; +// New +@import "new"; diff --git a/source/style/example.scss b/source/style/example.scss deleted file mode 100644 index b6635d9..0000000 --- a/source/style/example.scss +++ /dev/null @@ -1,5 +0,0 @@ -// Add hippie -// ------------------------------------------------------------------------------ -@import "hippie"; - -// NOTE // No css rules allowed in here diff --git a/source/style/_abovethefold.scss b/source/style/hippie/_abovethefold.scss similarity index 100% rename from source/style/_abovethefold.scss rename to source/style/hippie/_abovethefold.scss diff --git a/source/style/_hippie.scss b/source/style/hippie/_basic.scss similarity index 58% rename from source/style/_hippie.scss rename to source/style/hippie/_basic.scss index 578d2bb..6837a65 100644 --- a/source/style/_hippie.scss +++ b/source/style/hippie/_basic.scss @@ -1,30 +1,7 @@ -/* - * # TABLE OF CONTENTS - * - * - Reset - * - Global functions and mixins - * - Configuration - * - Special modules - * - Basic styles - * - Common - * - Typography - * - * - Sections - * - Grouping - * - Textlevel - * - Embedded - * - Tables - * - Interactive - * - Modules - * - */ - - // Reset // Use a file outside of hippie i.e. vendor/normalize.css // ----------------------------------------------------------------------------- @import "../../vendor/normalizecss/normalize.css"; -// @import "vendor/YOUR-FILES.css"; @@ -39,26 +16,20 @@ // Fonts // Use a central file outside of hippie for font definitions with @font-face // ----------------------------------------------------------------------------- -// @import "vendor/fonts.css"; +// @import "../../vendor/fonts.css"; // Global configuration with default values -// Adjustments can be made by copying values from _config.scss to _override.scss -// Be careful though changes will get lost if hippie gets updated // ----------------------------------------------------------------------------- -// @import "global/default"; // DO NOT EDIT -@import "settings"; // EDIT -@import "global/config"; // DO NOT EDIT +@import "global/config"; // Modules and variables -// Additional modules can be defined here // ----------------------------------------------------------------------------- @import "modules/vendor"; // @import modules/all deprecated because of the new vendor mixin -// @import "modules/YOUR-MODULE/YOUR-FILES"; // Basic styles - this is the core of definitions // Individual styles can be added her @@ -73,29 +44,10 @@ @import "elements/embedded"; @import "elements/tables"; @import "elements/interactive"; -// @import "YOU-NAME-IT"; // Individual Modules and variables // in dependency to other styles -// Additional modules can be defined here // ----------------------------------------------------------------------------- @import "modules/breakpoint/breakpoint_module"; -@import "modules/navigation/nav_module"; @import "modules/tables/tables_module"; -@import "modules/card/card_module"; -@import "modules/editor/editor_module"; -@import "modules/explanation/explanation_module"; -@import "modules/print/print_module"; -// @import "modules/YOUR-MODULE/YOUR-FILES"; - - - -// Demonstration -@import "modules/demo/demo_module"; - - - -// Not yet sorted -@import "elements/new"; - -// NOTE // No css rules allowed in here +@import "modules/maintenance/maintenance_module"; diff --git a/source/style/hippie/_hippie.scss b/source/style/hippie/_hippie.scss new file mode 100644 index 0000000..ad96e38 --- /dev/null +++ b/source/style/hippie/_hippie.scss @@ -0,0 +1,33 @@ +/* + * # TABLE OF CONTENTS + * + * - Reset + * - Global functions and mixins + * - Configuration + * - Special modules + * - Basic styles + * - Common + * - Typography + * + * - Sections + * - Grouping + * - Textlevel + * - Embedded + * - Tables + * - Interactive + * - Modules + - Breakpoint + - Tables + - Maintenance +* + */ +@import "basic"; + +// Additional Modules and variables +// in dependency to other basic styles +// ----------------------------------------------------------------------------- +@import "modules/navigation/nav_module"; +@import "modules/card/card_module"; +@import "modules/editor/editor_module"; +@import "modules/explanation/explanation_module"; +@import "modules/print/print_module"; diff --git a/source/style/elements/_embedded.scss b/source/style/hippie/elements/_embedded.scss similarity index 100% rename from source/style/elements/_embedded.scss rename to source/style/hippie/elements/_embedded.scss diff --git a/source/style/elements/_grouping.scss b/source/style/hippie/elements/_grouping.scss similarity index 100% rename from source/style/elements/_grouping.scss rename to source/style/hippie/elements/_grouping.scss diff --git a/source/style/elements/_interactive.scss b/source/style/hippie/elements/_interactive.scss similarity index 100% rename from source/style/elements/_interactive.scss rename to source/style/hippie/elements/_interactive.scss diff --git a/source/style/elements/_sections.scss b/source/style/hippie/elements/_sections.scss similarity index 100% rename from source/style/elements/_sections.scss rename to source/style/hippie/elements/_sections.scss diff --git a/source/style/elements/_tables.scss b/source/style/hippie/elements/_tables.scss similarity index 100% rename from source/style/elements/_tables.scss rename to source/style/hippie/elements/_tables.scss diff --git a/source/style/elements/_textlevel.scss b/source/style/hippie/elements/_textlevel.scss similarity index 100% rename from source/style/elements/_textlevel.scss rename to source/style/hippie/elements/_textlevel.scss diff --git a/source/style/elements/_typography.scss b/source/style/hippie/elements/_typography.scss similarity index 100% rename from source/style/elements/_typography.scss rename to source/style/hippie/elements/_typography.scss diff --git a/source/style/functions/_all.scss b/source/style/hippie/functions/_all.scss similarity index 100% rename from source/style/functions/_all.scss rename to source/style/hippie/functions/_all.scss diff --git a/source/style/functions/_color.scss b/source/style/hippie/functions/_color.scss similarity index 100% rename from source/style/functions/_color.scss rename to source/style/hippie/functions/_color.scss diff --git a/source/style/functions/_shade.scss b/source/style/hippie/functions/_shade.scss similarity index 100% rename from source/style/functions/_shade.scss rename to source/style/hippie/functions/_shade.scss diff --git a/source/style/functions/_tint.scss b/source/style/hippie/functions/_tint.scss similarity index 100% rename from source/style/functions/_tint.scss rename to source/style/hippie/functions/_tint.scss diff --git a/source/style/global/_common.scss b/source/style/hippie/global/_common.scss similarity index 100% rename from source/style/global/_common.scss rename to source/style/hippie/global/_common.scss diff --git a/source/style/global/_config.scss b/source/style/hippie/global/_config.scss similarity index 100% rename from source/style/global/_config.scss rename to source/style/hippie/global/_config.scss diff --git a/source/style/mixins/_all.scss b/source/style/hippie/mixins/_all.scss similarity index 100% rename from source/style/mixins/_all.scss rename to source/style/hippie/mixins/_all.scss diff --git a/source/style/mixins/_color.scss b/source/style/hippie/mixins/_color.scss similarity index 100% rename from source/style/mixins/_color.scss rename to source/style/hippie/mixins/_color.scss diff --git a/source/style/mixins/_flow.scss b/source/style/hippie/mixins/_flow.scss similarity index 100% rename from source/style/mixins/_flow.scss rename to source/style/hippie/mixins/_flow.scss diff --git a/source/style/mixins/_media_query.scss b/source/style/hippie/mixins/_media_query.scss similarity index 100% rename from source/style/mixins/_media_query.scss rename to source/style/hippie/mixins/_media_query.scss diff --git a/source/style/mixins/_user_agent.scss b/source/style/hippie/mixins/_user_agent.scss similarity index 100% rename from source/style/mixins/_user_agent.scss rename to source/style/hippie/mixins/_user_agent.scss diff --git a/source/style/modules/_vendor.scss b/source/style/hippie/modules/_vendor.scss similarity index 100% rename from source/style/modules/_vendor.scss rename to source/style/hippie/modules/_vendor.scss diff --git a/source/style/modules/breakpoint/_breakpoint_module.scss b/source/style/hippie/modules/breakpoint/_breakpoint_module.scss similarity index 100% rename from source/style/modules/breakpoint/_breakpoint_module.scss rename to source/style/hippie/modules/breakpoint/_breakpoint_module.scss diff --git a/source/style/modules/card/_card_module.scss b/source/style/hippie/modules/card/_card_module.scss similarity index 100% rename from source/style/modules/card/_card_module.scss rename to source/style/hippie/modules/card/_card_module.scss diff --git a/source/style/modules/card/_extends.scss b/source/style/hippie/modules/card/_extends.scss similarity index 100% rename from source/style/modules/card/_extends.scss rename to source/style/hippie/modules/card/_extends.scss diff --git a/source/style/modules/card/_mixins.scss b/source/style/hippie/modules/card/_mixins.scss similarity index 100% rename from source/style/modules/card/_mixins.scss rename to source/style/hippie/modules/card/_mixins.scss diff --git a/source/style/modules/editor/_editor_module.scss b/source/style/hippie/modules/editor/_editor_module.scss similarity index 100% rename from source/style/modules/editor/_editor_module.scss rename to source/style/hippie/modules/editor/_editor_module.scss diff --git a/source/style/modules/editor/_extends.scss b/source/style/hippie/modules/editor/_extends.scss similarity index 100% rename from source/style/modules/editor/_extends.scss rename to source/style/hippie/modules/editor/_extends.scss diff --git a/source/style/modules/editor/_mixins.scss b/source/style/hippie/modules/editor/_mixins.scss similarity index 100% rename from source/style/modules/editor/_mixins.scss rename to source/style/hippie/modules/editor/_mixins.scss diff --git a/source/style/modules/explanation/_explanation_module.scss b/source/style/hippie/modules/explanation/_explanation_module.scss similarity index 100% rename from source/style/modules/explanation/_explanation_module.scss rename to source/style/hippie/modules/explanation/_explanation_module.scss diff --git a/source/style/modules/explanation/_extends.scss b/source/style/hippie/modules/explanation/_extends.scss similarity index 100% rename from source/style/modules/explanation/_extends.scss rename to source/style/hippie/modules/explanation/_extends.scss diff --git a/source/style/modules/explanation/_mixins.scss b/source/style/hippie/modules/explanation/_mixins.scss similarity index 100% rename from source/style/modules/explanation/_mixins.scss rename to source/style/hippie/modules/explanation/_mixins.scss diff --git a/source/style/modules/maintenance/_maintenance_module.scss b/source/style/hippie/modules/maintenance/_maintenance_module.scss similarity index 100% rename from source/style/modules/maintenance/_maintenance_module.scss rename to source/style/hippie/modules/maintenance/_maintenance_module.scss diff --git a/source/style/modules/media/_media_module.scss b/source/style/hippie/modules/media/_media_module.scss similarity index 100% rename from source/style/modules/media/_media_module.scss rename to source/style/hippie/modules/media/_media_module.scss diff --git a/source/style/modules/media/_sprites.scss b/source/style/hippie/modules/media/_sprites.scss similarity index 100% rename from source/style/modules/media/_sprites.scss rename to source/style/hippie/modules/media/_sprites.scss diff --git a/source/style/modules/navigation/_nav_module.scss b/source/style/hippie/modules/navigation/_nav_module.scss similarity index 100% rename from source/style/modules/navigation/_nav_module.scss rename to source/style/hippie/modules/navigation/_nav_module.scss diff --git a/source/style/modules/print/_extends.scss b/source/style/hippie/modules/print/_extends.scss similarity index 100% rename from source/style/modules/print/_extends.scss rename to source/style/hippie/modules/print/_extends.scss diff --git a/source/style/modules/print/_mixins.scss b/source/style/hippie/modules/print/_mixins.scss similarity index 100% rename from source/style/modules/print/_mixins.scss rename to source/style/hippie/modules/print/_mixins.scss diff --git a/source/style/modules/print/_print_module.scss b/source/style/hippie/modules/print/_print_module.scss similarity index 100% rename from source/style/modules/print/_print_module.scss rename to source/style/hippie/modules/print/_print_module.scss diff --git a/source/style/modules/tables/_tables_module.scss b/source/style/hippie/modules/tables/_tables_module.scss similarity index 100% rename from source/style/modules/tables/_tables_module.scss rename to source/style/hippie/modules/tables/_tables_module.scss diff --git a/source/style/maintenance.scss b/source/style/maintenance.scss index 0f4de74..320218f 100644 --- a/source/style/maintenance.scss +++ b/source/style/maintenance.scss @@ -1,102 +1,16 @@ -/* - * # TABLE OF CONTENTS - * - * - Reset - * - Global functions and mixins - * - Configuration - * - Special modules - * - Basic styles - * - Common - * - Typography - * - * - Sections - * - Grouping - * - Textlevel - * - Embedded - * - Tables - * - Interactive - * - Modules - * - */ - - -// Reset -// Use a file outside of hippie i.e. vendor/normalize.css -// ----------------------------------------------------------------------------- -@import "../vendor/normalizecss/normalize.css"; -// @import "normalize-css/normalize.css"; -// @import "vendor/YOUR-FILES.css"; - - - -// Functions and Mixins -// Important code constructions -// ----------------------------------------------------------------------------- -@import "functions/all"; -@import "mixins/all"; - - - -// Fonts -// Use a central file outside of hippie for font definitions with @font-face -// ----------------------------------------------------------------------------- -// @import "vendor/fonts.css"; - - - -// Global configuration with default values -// Adjustments can be made by copying values from _config.scss to _override.scss -// Be careful though changes will get lost if hippie gets updated -// ----------------------------------------------------------------------------- -// @import "global/default"; // DO NOT EDIT -@import "settings"; // EDIT -@import "global/config"; // DO NOT EDIT - - - -// Modules and variables -// Additional modules can be defined here -// ----------------------------------------------------------------------------- -// @import "modules/vendor"; -// @import modules/all deprecated because of the new vendor mixin -// @import "modules/YOUR-MODULE/YOUR-FILES"; - -// Basic styles - this is the core of definitions -// Individual styles can be added her -// ----------------------------------------------------------------------------- -@import "global/common"; -@import "elements/typography"; -// Following the w3c document element structure -// https://w3c.github.io/html/index.html#contents -@import "elements/sections"; -@import "elements/grouping"; -@import "elements/textlevel"; -@import "elements/embedded"; -@import "elements/tables"; -@import "elements/interactive"; -// @import "YOU-NAME-IT"; - -// Individual Modules and variables -// in dependency to other styles -// Additional modules can be defined here -// ----------------------------------------------------------------------------- -@import "modules/breakpoint/breakpoint_module"; -// @import "modules/navigation/nav_module"; -@import "modules/tables/tables_module"; -// @import "modules/card/card_module"; -// @import "modules/editor/editor_module"; -// @import "modules/explanation/explanation_module"; -// @import "modules/print/print_module"; -// @import "modules/YOUR-MODULE/YOUR-FILES"; - - - -// Demonstration -@import "modules/maintenance/maintenance_module"; - - - -// Not yet sorted -// @import "elements/new"; - +// Start a new project by creating YOUR-PROJECT.scss and _YOUR-CONFIG.scss +// Then import your config and hippie // NOTE // No css rules allowed in here +// ------------------------------------------------------------------------------ +@import "demo_config"; +@import "hippie/basic"; + + +// Additional Modules and variables +// in dependency to other basic styles +// could be defined here +// ----------------------------------------------------------------------------- +@import "modules/demo/demo_module"; +// @import "modules/YOUR-MODULE/YOUR-FILES"; +// New +@import "new"; diff --git a/source/templates/default.njk b/source/templates/default.njk index 5df467e..076ff87 100644 --- a/source/templates/default.njk +++ b/source/templates/default.njk @@ -17,7 +17,7 @@ - + {% endblock %} diff --git a/source/templates/demo.njk b/source/templates/demo.njk index c87b98a..a7a15d9 100644 --- a/source/templates/demo.njk +++ b/source/templates/demo.njk @@ -28,7 +28,7 @@ - + {% endblock %} From 273cef92349da1f9f02bc03629a3e31e9b84a1b9 Mon Sep 17 00:00:00 2001 From: Stephan Date: Sat, 2 Jun 2018 17:23:21 +0200 Subject: [PATCH 071/372] updated dependencies --- package-lock.json | 4406 +++++++++++++++++++++++++++------------------ package.json | 36 +- 2 files changed, 2712 insertions(+), 1730 deletions(-) diff --git a/package-lock.json b/package-lock.json index 268dd6b..33d44ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,19 +10,11 @@ "integrity": "sha1-z6I7xYQPkQTOMqZedNt+epdLvuE=", "dev": true, "requires": { - "acorn": "5.1.2", - "css": "2.2.1", + "acorn": "5.5.3", + "css": "2.2.3", "normalize-path": "2.1.1", "source-map": "0.5.7", "through2": "2.0.3" - }, - "dependencies": { - "acorn": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.2.tgz", - "integrity": "sha512-o96FZLJBPY1lvTuJylGA9Bk3t/GKPPJG8H0ydQQl01crzwJgspa4AEIq/pVTXigmK0PHVQhiAtn8WMBLL9D2WA==", - "dev": true - } } }, "@gulp-sourcemaps/map-sources": { @@ -48,25 +40,25 @@ "dev": true }, "abbrev": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz", - "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", "dev": true }, "accepts": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz", - "integrity": "sha1-hiRnWMfdbSGmR0/whKR0DsBesh8=", + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz", + "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=", "dev": true, "requires": { - "mime-types": "2.1.17", + "mime-types": "2.1.18", "negotiator": "0.6.1" } }, "acorn": { - "version": "4.0.13", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz", - "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=", + "version": "5.5.3", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz", + "integrity": "sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ==", "dev": true }, "acorn-jsx": { @@ -87,9 +79,9 @@ } }, "after": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/after/-/after-0.8.1.tgz", - "integrity": "sha1-q11PuIP1loFtNRX495HAr0ht1ic=", + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz", + "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=", "dev": true }, "ajv": { @@ -155,6 +147,15 @@ "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=", "dev": true }, + "ansi-gray": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz", + "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=", + "dev": true, + "requires": { + "ansi-wrap": "0.1.0" + } + }, "ansi-red": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz", @@ -214,9 +215,9 @@ "dev": true }, "are-we-there-yet": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz", - "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", + "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "dev": true, "requires": { "delegates": "1.0.0", @@ -224,9 +225,9 @@ } }, "argparse": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", - "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=", + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, "requires": { "sprintf-js": "1.0.3" @@ -299,9 +300,9 @@ "dev": true }, "arraybuffer.slice": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz", - "integrity": "sha1-8zshWfBTKj8xB6JywMz70a0peco=", + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz", + "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==", "dev": true }, "arrify": { @@ -358,6 +359,12 @@ "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=", "dev": true }, + "async-limiter": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz", + "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==", + "dev": true + }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -365,22 +372,22 @@ "dev": true }, "atob": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/atob/-/atob-1.1.3.tgz", - "integrity": "sha1-lfE2KbEsOlGl0hWr3OKqnzL4B3M=", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz", + "integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio=", "dev": true }, "autoprefixer": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.1.4.tgz", - "integrity": "sha512-MB1XybOJqu1uAwpfSilAa1wSURNc4W310CFKvMj1fNaJBFxr1PGgz72vZaPr9ryKGqs2vYZ6jDyJ0aiGELjsoA==", + "version": "7.2.6", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.6.tgz", + "integrity": "sha512-Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==", "dev": true, "requires": { - "browserslist": "2.4.0", - "caniuse-lite": "1.0.30000738", + "browserslist": "2.11.3", + "caniuse-lite": "1.0.30000846", "normalize-range": "0.1.2", "num2fraction": "1.2.2", - "postcss": "6.0.12", + "postcss": "6.0.22", "postcss-value-parser": "3.3.0" } }, @@ -391,19 +398,29 @@ "dev": true }, "aws4": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", - "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz", + "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==", "dev": true }, + "axios": { + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.17.1.tgz", + "integrity": "sha1-LY4+XQvb1zJ/kbyBT1xXZg+Bgk0=", + "dev": true, + "requires": { + "follow-redirects": "1.5.0", + "is-buffer": "1.1.5" + } + }, "babel-runtime": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "dev": true, "requires": { - "core-js": "2.5.1", - "regenerator-runtime": "0.11.0" + "core-js": "2.5.7", + "regenerator-runtime": "0.11.1" } }, "babylon": { @@ -424,6 +441,73 @@ "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", "dev": true }, + "base": { + "version": "0.11.2", + "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", + "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", + "dev": true, + "requires": { + "cache-base": "1.0.1", + "class-utils": "0.3.6", + "component-emitter": "1.2.1", + "define-property": "1.0.0", + "isobject": "3.0.1", + "mixin-deep": "1.3.1", + "pascalcase": "0.1.1" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, + "requires": { + "is-descriptor": "1.0.2" + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "dev": true, + "requires": { + "kind-of": "6.0.2" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "dev": true, + "requires": { + "kind-of": "6.0.2" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" + } + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true + }, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "dev": true + } + } + }, "base64-arraybuffer": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz", @@ -431,9 +515,9 @@ "dev": true }, "base64id": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz", - "integrity": "sha1-As4P3u4M709ACA4ec+g08LG/zj8=", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz", + "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=", "dev": true }, "batch": { @@ -474,9 +558,9 @@ "dev": true }, "binary-extensions": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz", - "integrity": "sha1-muuabF6IY4qtFx4Wf1kAq+JINdA=", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz", + "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=", "dev": true }, "blob": { @@ -525,71 +609,62 @@ } }, "browser-sync": { - "version": "2.18.13", - "resolved": "https://registry.npmjs.org/browser-sync/-/browser-sync-2.18.13.tgz", - "integrity": "sha512-qhdrmgshVGwweogT/bdOKkZDxVxqiF4+9mibaDeAxvDBeoUtdgABk5x7YQ1KCcLRchAfv8AVtp9NuITl5CTNqg==", + "version": "2.24.4", + "resolved": "https://registry.npmjs.org/browser-sync/-/browser-sync-2.24.4.tgz", + "integrity": "sha512-qfXv8vQA/Dctub2v44v/vPuvfC4XNd6bn+W5vWZVuhuy6w91lPsdY6qhalT2s2PjnJ3FR6kWq5wkTQgN26eKzA==", "dev": true, "requires": { - "browser-sync-client": "2.5.1", - "browser-sync-ui": "0.6.3", + "browser-sync-ui": "1.0.1", "bs-recipes": "1.3.4", "chokidar": "1.7.0", "connect": "3.5.0", + "connect-history-api-fallback": "1.5.0", "dev-ip": "1.0.1", "easy-extender": "2.3.2", "eazy-logger": "3.0.2", - "emitter-steward": "1.0.0", + "etag": "1.8.1", + "fresh": "0.5.2", "fs-extra": "3.0.1", "http-proxy": "1.15.2", - "immutable": "3.8.1", - "localtunnel": "1.8.3", + "immutable": "3.8.2", + "localtunnel": "1.9.0", "micromatch": "2.3.11", "opn": "4.0.2", "portscanner": "2.1.1", - "qs": "6.2.1", + "qs": "6.2.3", + "raw-body": "2.3.3", "resp-modifier": "6.0.2", "rx": "4.1.0", "serve-index": "1.8.0", - "serve-static": "1.12.2", + "serve-static": "1.13.2", "server-destroy": "1.0.1", - "socket.io": "1.6.0", - "socket.io-client": "1.6.0", - "ua-parser-js": "0.7.12", + "socket.io": "2.0.4", + "ua-parser-js": "0.7.17", "yargs": "6.4.0" } }, - "browser-sync-client": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.5.1.tgz", - "integrity": "sha1-7BrWmknC4tS2RbGLHAbCmz2a+Os=", - "dev": true, - "requires": { - "etag": "1.8.1", - "fresh": "0.3.0" - } - }, "browser-sync-ui": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-0.6.3.tgz", - "integrity": "sha1-ZApTfBgGiTA9W+krxHa568RBwLw=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-1.0.1.tgz", + "integrity": "sha512-RIxmwVVcUFhRd1zxp7m2FfLnXHf59x4Gtj8HFwTA//3VgYI3AKkaQAuDL8KDJnE59XqCshxZa13JYuIWtZlKQg==", "dev": true, "requires": { "async-each-series": "0.1.1", - "connect-history-api-fallback": "1.3.0", - "immutable": "3.8.1", + "connect-history-api-fallback": "1.5.0", + "immutable": "3.8.2", "server-destroy": "1.0.1", - "stream-throttle": "0.1.3", - "weinre": "2.0.0-pre-I0Z7U9OV" + "socket.io-client": "2.0.4", + "stream-throttle": "0.1.3" } }, "browserslist": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.4.0.tgz", - "integrity": "sha512-aM2Gt4x9bVlCUteADBS6JP0F+2tMWKM1jQzUulVROtdFWFIcIVvY76AJbr7GDqy0eDhn+PcnpzzivGxY4qiaKQ==", + "version": "2.11.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz", + "integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==", "dev": true, "requires": { - "caniuse-lite": "1.0.30000738", - "electron-to-chromium": "1.3.22" + "caniuse-lite": "1.0.30000846", + "electron-to-chromium": "1.3.48" } }, "bs-recipes": { @@ -604,12 +679,49 @@ "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=", "dev": true }, + "buffer-from": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz", + "integrity": "sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA==", + "dev": true + }, "builtin-modules": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", "dev": true }, + "bytes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", + "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=", + "dev": true + }, + "cache-base": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", + "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", + "dev": true, + "requires": { + "collection-visit": "1.0.0", + "component-emitter": "1.2.1", + "get-value": "2.0.6", + "has-value": "1.0.0", + "isobject": "3.0.1", + "set-value": "2.0.0", + "to-object-path": "0.3.0", + "union-value": "1.0.0", + "unset-value": "1.0.0" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true + } + } + }, "caller-path": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz", @@ -632,9 +744,9 @@ "dev": true }, "camelcase": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", - "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", "dev": true }, "camelcase-keys": { @@ -662,7 +774,7 @@ "dev": true, "requires": { "browserslist": "1.7.7", - "caniuse-db": "1.0.30000738", + "caniuse-db": "1.0.30000846", "lodash.memoize": "4.1.2", "lodash.uniq": "4.5.0" }, @@ -673,28 +785,28 @@ "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "dev": true, "requires": { - "caniuse-db": "1.0.30000738", - "electron-to-chromium": "1.3.22" + "caniuse-db": "1.0.30000846", + "electron-to-chromium": "1.3.48" } } } }, "caniuse-db": { - "version": "1.0.30000738", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000738.tgz", - "integrity": "sha1-hICavEmjkOWowiSrk2nT+NAaogI=", + "version": "1.0.30000846", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000846.tgz", + "integrity": "sha1-2chvkUc4202gmO7e2ZdBPERWG9I=", "dev": true }, "caniuse-lite": { - "version": "1.0.30000738", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000738.tgz", - "integrity": "sha1-GCDDya25oRfjEaW9yh0lvDQojro=", + "version": "1.0.30000846", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000846.tgz", + "integrity": "sha512-qxUOHr5mTaadWH1ap0ueivHd8x42Bnemcn+JutVr7GWmm2bU4zoBhjuv5QdXgALQnnT626lOQros7cCDf8PwCg==", "dev": true }, "caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz", + "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=", "dev": true }, "center-align": { @@ -751,6 +863,41 @@ "chalk": "1.1.3" } }, + "class-utils": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", + "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", + "dev": true, + "requires": { + "arr-union": "3.1.0", + "define-property": "0.2.5", + "isobject": "3.0.1", + "static-extend": "0.1.2" + }, + "dependencies": { + "arr-union": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", + "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", + "dev": true + }, + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, + "requires": { + "is-descriptor": "0.1.6" + } + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true + } + } + }, "cli": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz", @@ -845,7 +992,7 @@ "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=", "dev": true, "requires": { - "q": "1.5.0" + "q": "1.5.1" } }, "code-point-at": { @@ -854,6 +1001,16 @@ "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", "dev": true }, + "collection-visit": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", + "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", + "dev": true, + "requires": { + "map-visit": "1.0.0", + "object-visit": "1.0.1" + } + }, "color": { "version": "0.11.4", "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz", @@ -861,14 +1018,14 @@ "dev": true, "requires": { "clone": "1.0.2", - "color-convert": "1.9.0", + "color-convert": "1.9.1", "color-string": "0.3.0" } }, "color-convert": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz", - "integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=", + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", + "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", "dev": true, "requires": { "color-name": "1.1.3" @@ -889,6 +1046,12 @@ "color-name": "1.1.3" } }, + "color-support": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", + "dev": true + }, "colormin": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz", @@ -907,9 +1070,9 @@ "dev": true }, "combined-stream": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", - "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", + "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", "dev": true, "requires": { "delayed-stream": "1.0.0" @@ -937,9 +1100,9 @@ "dev": true }, "component-emitter": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz", - "integrity": "sha1-KWWU8nU9qmOZbSrwjRWpURbJrsM=", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", + "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", "dev": true }, "component-inherit": { @@ -955,36 +1118,15 @@ "dev": true }, "concat-stream": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz", - "integrity": "sha1-cIl4Yk2FavQaWnQd790mHadSwmY=", + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", + "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", "dev": true, "requires": { + "buffer-from": "1.0.0", "inherits": "2.0.3", - "readable-stream": "2.0.6", + "readable-stream": "2.3.3", "typedarray": "0.0.6" - }, - "dependencies": { - "readable-stream": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", - "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=", - "dev": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "string_decoder": "0.10.31", - "util-deprecate": "1.0.2" - } - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true - } } }, "concat-with-sourcemaps": { @@ -1006,12 +1148,29 @@ "finalhandler": "0.5.0", "parseurl": "1.3.2", "utils-merge": "1.0.0" + }, + "dependencies": { + "debug": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", + "dev": true, + "requires": { + "ms": "0.7.1" + } + }, + "ms": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", + "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=", + "dev": true + } } }, "connect-history-api-fallback": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.3.0.tgz", - "integrity": "sha1-5R0X+PDvDbkKZP20feMFFVbp8Wk=", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz", + "integrity": "sha1-sGhzk0vF40T+9hGhlqb6rgruAVo=", "dev": true }, "console-browserify": { @@ -1076,10 +1235,16 @@ "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=", "dev": true }, + "copy-descriptor": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", + "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", + "dev": true + }, "core-js": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz", - "integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs=", + "version": "2.5.7", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz", + "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==", "dev": true }, "core-util-is": { @@ -1121,14 +1286,14 @@ } }, "css": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/css/-/css-2.2.1.tgz", - "integrity": "sha1-c6TIHehdtmTU7mdPfUcIXjstVdw=", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/css/-/css-2.2.3.tgz", + "integrity": "sha512-0W171WccAjQGGTKLhw4m2nnl0zPHUlTO/I8td4XzJgIB8Hg3ZZx71qT4G4eX8OVsSiaAKiUMy73E3nsbPlg2DQ==", "dev": true, "requires": { "inherits": "2.0.3", "source-map": "0.1.43", - "source-map-resolve": "0.3.1", + "source-map-resolve": "0.5.2", "urix": "0.1.0" }, "dependencies": { @@ -1160,7 +1325,7 @@ "defined": "1.0.0", "has": "1.0.1", "object-assign": "4.1.1", - "postcss": "5.2.17", + "postcss": "5.2.18", "postcss-calc": "5.3.1", "postcss-colormin": "2.2.2", "postcss-convert-values": "2.6.1", @@ -1169,7 +1334,7 @@ "postcss-discard-empty": "2.1.0", "postcss-discard-overridden": "0.1.1", "postcss-discard-unused": "2.2.3", - "postcss-filter-plugins": "2.0.2", + "postcss-filter-plugins": "2.0.3", "postcss-merge-idents": "2.1.7", "postcss-merge-longhand": "2.0.2", "postcss-merge-rules": "2.1.2", @@ -1196,10 +1361,10 @@ "dev": true, "requires": { "browserslist": "1.7.7", - "caniuse-db": "1.0.30000738", + "caniuse-db": "1.0.30000846", "normalize-range": "0.1.2", "num2fraction": "1.2.2", - "postcss": "5.2.17", + "postcss": "5.2.18", "postcss-value-parser": "3.3.0" } }, @@ -1209,8 +1374,8 @@ "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "dev": true, "requires": { - "caniuse-db": "1.0.30000738", - "electron-to-chromium": "1.3.22" + "caniuse-db": "1.0.30000846", + "electron-to-chromium": "1.3.48" } }, "has-flag": { @@ -1220,13 +1385,13 @@ "dev": true }, "postcss": { - "version": "5.2.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", - "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.3.2", + "js-base64": "2.4.5", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -1284,6 +1449,12 @@ "uglify-js": "2.8.29" }, "dependencies": { + "camelcase": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", + "dev": true + }, "cliui": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", @@ -1371,7 +1542,7 @@ "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", "dev": true, "requires": { - "es5-ext": "0.10.30" + "es5-ext": "0.10.42" } }, "dargs": { @@ -1416,45 +1587,33 @@ "dev": true }, "debug": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, "requires": { - "ms": "0.7.1" + "ms": "2.0.0" } }, "debug-fabulous": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-0.1.1.tgz", - "integrity": "sha512-UhD+fzBYnlHjOpUrSeKT+sbZAqxDsqoXAsESKQPAoBm2j/0F9l9IeOEYDST8Lkz1L2zA9KvIxp58h923wCWjDQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-1.1.0.tgz", + "integrity": "sha512-GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg==", "dev": true, "requires": { - "debug": "2.3.0", - "memoizee": "0.4.11", - "object-assign": "4.1.0" + "debug": "3.1.0", + "memoizee": "0.4.12", + "object-assign": "4.1.1" }, "dependencies": { "debug": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.0.tgz", - "integrity": "sha1-ORLcVdcWf8OvF9K4XBP5PertqkM=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", "dev": true, "requires": { - "ms": "0.7.2" + "ms": "2.0.0" } - }, - "ms": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", - "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", - "dev": true - }, - "object-assign": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz", - "integrity": "sha1-ejs9DpgGPUP0wD8uiubNUahog6A=", - "dev": true } } }, @@ -1464,6 +1623,12 @@ "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", "dev": true }, + "decode-uri-component": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", + "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", + "dev": true + }, "deep-equal": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", @@ -1503,6 +1668,59 @@ } } }, + "define-property": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", + "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", + "dev": true, + "requires": { + "is-descriptor": "1.0.2", + "isobject": "3.0.1" + }, + "dependencies": { + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "dev": true, + "requires": { + "kind-of": "6.0.2" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "dev": true, + "requires": { + "kind-of": "6.0.2" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" + } + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true + }, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "dev": true + } + } + }, "defined": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz", @@ -1544,9 +1762,9 @@ "dev": true }, "depd": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz", - "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", "dev": true }, "deprecated": { @@ -1590,14 +1808,6 @@ "requires": { "esutils": "2.0.2", "isarray": "1.0.0" - }, - "dependencies": { - "esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", - "dev": true - } } }, "dom-serializer": { @@ -1758,21 +1968,15 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.22", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.22.tgz", - "integrity": "sha1-QyLVLBUUBuPq73StAmdog+hBZBg=", - "dev": true - }, - "emitter-steward": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/emitter-steward/-/emitter-steward-1.0.0.tgz", - "integrity": "sha1-80Ea3pdYp1Zd+Eiy2gy70bRsvWQ=", + "version": "1.3.48", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.48.tgz", + "integrity": "sha1-07DYWTgUBE4JLs4hCPw6ya6kuQA=", "dev": true }, "encodeurl": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz", - "integrity": "sha1-eePVhlU0aQn+bw9Fpd5oEDspTSA=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", "dev": true }, "end-of-stream": { @@ -1796,118 +2000,72 @@ } }, "engine.io": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-1.8.0.tgz", - "integrity": "sha1-PutfJky3XbvsG6rqJtYfWk6s4qo=", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.1.5.tgz", + "integrity": "sha512-D06ivJkYxyRrcEe0bTpNnBQNgP9d3xog+qZlLbui8EsMr/DouQpf5o9FzJnWYHEYE0YsFHllUv2R1dkgYZXHcA==", "dev": true, "requires": { - "accepts": "1.3.3", - "base64id": "0.1.0", + "accepts": "1.3.5", + "base64id": "1.0.0", "cookie": "0.3.1", - "debug": "2.3.3", - "engine.io-parser": "1.3.1", - "ws": "1.1.1" + "debug": "3.1.0", + "engine.io-parser": "2.1.2", + "uws": "9.14.0", + "ws": "3.3.3" }, "dependencies": { - "accepts": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz", - "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=", - "dev": true, - "requires": { - "mime-types": "2.1.17", - "negotiator": "0.6.1" - } - }, "debug": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", - "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", "dev": true, "requires": { - "ms": "0.7.2" + "ms": "2.0.0" } - }, - "ms": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", - "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", - "dev": true } } }, "engine.io-client": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.0.tgz", - "integrity": "sha1-e3MOQSdBQIdZbZvjyI0rxf22z1w=", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.6.tgz", + "integrity": "sha512-hnuHsFluXnsKOndS4Hv6SvUrgdYx1pk2NqfaDMW+GWdgfU3+/V25Cj7I8a0x92idSpa5PIhJRKxPvp9mnoLsfg==", "dev": true, "requires": { "component-emitter": "1.2.1", "component-inherit": "0.0.3", - "debug": "2.3.3", - "engine.io-parser": "1.3.1", + "debug": "3.1.0", + "engine.io-parser": "2.1.2", "has-cors": "1.1.0", "indexof": "0.0.1", - "parsejson": "0.0.3", "parseqs": "0.0.5", "parseuri": "0.0.5", - "ws": "1.1.1", - "xmlhttprequest-ssl": "1.5.3", + "ws": "3.3.3", + "xmlhttprequest-ssl": "1.5.5", "yeast": "0.1.2" }, "dependencies": { - "component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", - "dev": true - }, "debug": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", - "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", "dev": true, "requires": { - "ms": "0.7.2" + "ms": "2.0.0" } - }, - "ms": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", - "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", - "dev": true } } }, "engine.io-parser": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.1.tgz", - "integrity": "sha1-lVTxrjMQfW+9FwylRm0vgz9qB88=", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.2.tgz", + "integrity": "sha512-dInLFzr80RijZ1rGpx1+56/uFoH7/7InhH3kZt+Ms6hT8tNx3NGW/WNSA/f8As1WkOfkuyb3tnRyuXGxusclMw==", "dev": true, "requires": { - "after": "0.8.1", - "arraybuffer.slice": "0.0.6", + "after": "0.8.2", + "arraybuffer.slice": "0.0.7", "base64-arraybuffer": "0.1.5", "blob": "0.0.4", - "has-binary": "0.1.6", - "wtf-8": "1.0.0" - }, - "dependencies": { - "has-binary": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.6.tgz", - "integrity": "sha1-JTJvOc+k9hath4eJTjryz7x7bhA=", - "dev": true, - "requires": { - "isarray": "0.0.1" - } - }, - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - } + "has-binary2": "1.0.3" } }, "entities": { @@ -1926,23 +2084,24 @@ } }, "es5-ext": { - "version": "0.10.30", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.30.tgz", - "integrity": "sha1-cUGhaDZpfbq/qq7uQUlc4p9SyTk=", + "version": "0.10.42", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.42.tgz", + "integrity": "sha512-AJxO1rmPe1bDEfSR6TJ/FgMFYuTBhR5R57KW58iCkYACMyFbrkqVyzXSurYoScDGvgyMpk7uRF/lPUPPTmsRSA==", "dev": true, "requires": { - "es6-iterator": "2.0.1", - "es6-symbol": "3.1.1" + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1", + "next-tick": "1.0.0" } }, "es6-iterator": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz", - "integrity": "sha1-jjGcnwRTv1ddN0lAplWSDlnKVRI=", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", + "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.30", + "es5-ext": "0.10.42", "es6-symbol": "3.1.1" } }, @@ -1953,8 +2112,8 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.30", - "es6-iterator": "2.0.1", + "es5-ext": "0.10.42", + "es6-iterator": "2.0.3", "es6-set": "0.1.5", "es6-symbol": "3.1.1", "event-emitter": "0.3.5" @@ -1967,8 +2126,8 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.30", - "es6-iterator": "2.0.1", + "es5-ext": "0.10.42", + "es6-iterator": "2.0.3", "es6-symbol": "3.1.1", "event-emitter": "0.3.5" } @@ -1980,7 +2139,7 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.30" + "es5-ext": "0.10.42" } }, "es6-weak-map": { @@ -1990,8 +2149,8 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.30", - "es6-iterator": "2.0.1", + "es5-ext": "0.10.42", + "es6-iterator": "2.0.3", "es6-symbol": "3.1.1" } }, @@ -2025,6 +2184,18 @@ "integrity": "sha1-W28VR/TRAuZw4UDFCb5ncdautUk=", "dev": true }, + "estraverse": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz", + "integrity": "sha1-hno+jlip+EYYr7bC3bzZFrfLr3E=", + "dev": true + }, + "esutils": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz", + "integrity": "sha1-gVHTWOIMisx/t0XnRywAJf5JZXA=", + "dev": true + }, "source-map": { "version": "0.1.43", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", @@ -2045,16 +2216,8 @@ "requires": { "es6-map": "0.1.5", "es6-weak-map": "2.0.2", - "esrecurse": "4.2.0", + "esrecurse": "4.2.1", "estraverse": "4.2.0" - }, - "dependencies": { - "estraverse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", - "dev": true - } } }, "eslint": { @@ -2064,26 +2227,26 @@ "dev": true, "requires": { "chalk": "1.1.3", - "concat-stream": "1.5.2", - "debug": "2.2.0", + "concat-stream": "1.6.2", + "debug": "2.6.9", "doctrine": "1.5.0", "es6-map": "0.1.5", "escope": "3.6.0", - "espree": "3.5.1", + "espree": "3.5.4", "estraverse": "4.2.0", "esutils": "2.0.2", "file-entry-cache": "1.3.1", "glob": "7.1.2", "globals": "9.18.0", - "ignore": "3.3.5", + "ignore": "3.3.8", "imurmurhash": "0.1.4", "inquirer": "0.12.0", - "is-my-json-valid": "2.16.1", - "is-resolvable": "1.0.0", + "is-my-json-valid": "2.17.2", + "is-resolvable": "1.1.0", "js-yaml": "3.7.0", "json-stable-stringify": "1.0.1", "levn": "0.3.0", - "lodash": "4.17.4", + "lodash": "4.17.10", "mkdirp": "0.5.1", "optionator": "0.8.2", "path-is-absolute": "1.0.1", @@ -2098,39 +2261,12 @@ "user-home": "2.0.0" }, "dependencies": { - "estraverse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", - "dev": true - }, - "esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", - "dev": true - }, "lodash": { - "version": "4.17.4", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", + "version": "4.17.10", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", + "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==", "dev": true }, - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, - "requires": { - "minimist": "0.0.8" - } - }, "shelljs": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.6.1.tgz", @@ -2149,21 +2285,13 @@ } }, "espree": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.1.tgz", - "integrity": "sha1-DJiLirRttTEAoZVK5LqZXd0n2H4=", + "version": "3.5.4", + "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz", + "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==", "dev": true, "requires": { - "acorn": "5.1.2", + "acorn": "5.5.3", "acorn-jsx": "3.0.1" - }, - "dependencies": { - "acorn": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.2.tgz", - "integrity": "sha512-o96FZLJBPY1lvTuJylGA9Bk3t/GKPPJG8H0ydQQl01crzwJgspa4AEIq/pVTXigmK0PHVQhiAtn8WMBLL9D2WA==", - "dev": true - } } }, "esprima": { @@ -2173,33 +2301,24 @@ "dev": true }, "esrecurse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz", - "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz", + "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", "dev": true, "requires": { - "estraverse": "4.2.0", - "object-assign": "4.1.1" - }, - "dependencies": { - "estraverse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", - "dev": true - } + "estraverse": "4.2.0" } }, "estraverse": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz", - "integrity": "sha1-hno+jlip+EYYr7bC3bzZFrfLr3E=", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", + "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", "dev": true }, "esutils": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz", - "integrity": "sha1-gVHTWOIMisx/t0XnRywAJf5JZXA=", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", "dev": true }, "etag": { @@ -2215,7 +2334,7 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.30" + "es5-ext": "0.10.42" } }, "event-stream": { @@ -2278,37 +2397,6 @@ "os-homedir": "1.0.2" } }, - "express": { - "version": "2.5.11", - "resolved": "https://registry.npmjs.org/express/-/express-2.5.11.tgz", - "integrity": "sha1-TOjqHzY15p5J8Ou0l7aksKUc5vA=", - "dev": true, - "requires": { - "connect": "1.9.2", - "mime": "1.2.4", - "mkdirp": "0.3.0", - "qs": "0.4.2" - }, - "dependencies": { - "connect": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/connect/-/connect-1.9.2.tgz", - "integrity": "sha1-QogKIulDiuWait105Df1iujlKAc=", - "dev": true, - "requires": { - "formidable": "1.0.17", - "mime": "1.2.4", - "qs": "0.4.2" - } - }, - "qs": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-0.4.2.tgz", - "integrity": "sha1-PKxMhh43GoycR3CsI82o3mObjl8=", - "dev": true - } - } - }, "extend": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", @@ -2359,18 +2447,12 @@ "integrity": "sha1-lrsXdh2rqU9G0AFzizzt86Z/4Gw=", "dev": true, "requires": { - "acorn": "5.1.2", + "acorn": "5.5.3", "foreach": "2.0.5", "isarray": "0.0.1", "object-keys": "1.0.11" }, "dependencies": { - "acorn": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.2.tgz", - "integrity": "sha512-o96FZLJBPY1lvTuJylGA9Bk3t/GKPPJG8H0ydQQl01crzwJgspa4AEIq/pVTXigmK0PHVQhiAtn8WMBLL9D2WA==", - "dev": true - }, "isarray": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", @@ -2451,6 +2533,23 @@ "on-finished": "2.3.0", "statuses": "1.3.1", "unpipe": "1.0.0" + }, + "dependencies": { + "debug": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", + "dev": true, + "requires": { + "ms": "0.7.1" + } + }, + "ms": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", + "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=", + "dev": true + } } }, "find-index": { @@ -2576,6 +2675,26 @@ "readable-stream": "2.3.3" } }, + "follow-redirects": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.0.tgz", + "integrity": "sha512-fdrt472/9qQ6Kgjvb935ig6vJCuofpBUD14f9Vb+SLlm7xIe4Qva5gey8EKtv8lp7ahE1wilg3xL1znpVGtZIA==", + "dev": true, + "requires": { + "debug": "3.1.0" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + } + } + }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", @@ -2616,20 +2735,23 @@ "dev": true, "requires": { "asynckit": "0.4.0", - "combined-stream": "1.0.5", - "mime-types": "2.1.17" + "combined-stream": "1.0.6", + "mime-types": "2.1.18" } }, - "formidable": { - "version": "1.0.17", - "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz", - "integrity": "sha1-71SRSQ+UM7cF+qdyScmQKa40hVk=", - "dev": true + "fragment-cache": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", + "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", + "dev": true, + "requires": { + "map-cache": "0.2.2" + } }, "fresh": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz", - "integrity": "sha1-ZR+DjiJCTnVm3hYdg1jKoZn4PU8=", + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", "dev": true }, "from": { @@ -2690,23 +2812,6 @@ "inherits": "2.0.3", "mkdirp": "0.5.1", "rimraf": "2.6.2" - }, - "dependencies": { - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, - "requires": { - "minimist": "0.0.8" - } - } } }, "function-bind": { @@ -2728,7 +2833,7 @@ "signal-exit": "3.0.2", "string-width": "1.0.2", "strip-ansi": "3.0.1", - "wide-align": "1.1.2" + "wide-align": "1.1.3" } }, "gaze": { @@ -2769,14 +2874,14 @@ "requires": { "data-uri-to-buffer": "0.0.3", "jpeg-js": "0.1.2", - "mime-types": "2.1.17", + "mime-types": "2.1.18", "ndarray": "1.0.18", "ndarray-pack": "1.2.1", "node-bitmap": "0.0.1", - "omggif": "1.0.8", + "omggif": "1.0.9", "parse-data-uri": "0.2.0", "pngjs": "2.3.1", - "request": "2.81.0", + "request": "2.79.0", "through": "2.3.8" } }, @@ -2786,6 +2891,12 @@ "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", "dev": true }, + "get-value": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", + "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", + "dev": true + }, "getpass": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", @@ -3062,10 +3173,10 @@ "sparkles": "1.0.0" } }, - "gonzales-pe": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.2.2.tgz", - "integrity": "sha512-jbQFnd6CD3iEuGtSKVhsh37tQIkkx+/eil3tufyYOHMouG89uqtkWGP03P4vxY+XGeJnCi3ewIY+BnBogyC61Q==", + "gonzales-pe-sl": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/gonzales-pe-sl/-/gonzales-pe-sl-4.2.3.tgz", + "integrity": "sha1-aoaLw4BkXxQf7rBCxvl/zHG1n+Y=", "dev": true, "requires": { "minimist": "1.1.3" @@ -3127,16 +3238,30 @@ } }, "gulp-autoprefixer": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/gulp-autoprefixer/-/gulp-autoprefixer-4.0.0.tgz", - "integrity": "sha1-4AqMVxuF0GUWrCY0G+kN/Z/B6rA=", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/gulp-autoprefixer/-/gulp-autoprefixer-4.1.0.tgz", + "integrity": "sha1-Bkr3PMAsrayP800L+T/9+5TqEqo=", "dev": true, "requires": { - "autoprefixer": "7.1.4", - "gulp-util": "3.0.8", - "postcss": "6.0.12", + "autoprefixer": "7.2.6", + "fancy-log": "1.3.2", + "plugin-error": "0.1.2", + "postcss": "6.0.22", "through2": "2.0.3", "vinyl-sourcemaps-apply": "0.2.1" + }, + "dependencies": { + "fancy-log": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz", + "integrity": "sha1-9BEl49hPLn2JpD0G2VjI94vha+E=", + "dev": true, + "requires": { + "ansi-gray": "0.1.1", + "color-support": "1.1.3", + "time-stamp": "1.1.0" + } + } } }, "gulp-cached": { @@ -3150,14 +3275,31 @@ } }, "gulp-changed": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/gulp-changed/-/gulp-changed-3.1.0.tgz", - "integrity": "sha1-h80Vk6C7SlEp3C8im+zm2UiMJyo=", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/gulp-changed/-/gulp-changed-3.2.0.tgz", + "integrity": "sha1-zumGbZSeCRh1IlI9bGVWX24yvXw=", "dev": true, "requires": { - "gulp-util": "3.0.8", - "pify": "2.3.0", - "through2": "2.0.3" + "make-dir": "1.3.0", + "pify": "3.0.0", + "plugin-error": "0.1.2", + "replace-ext": "1.0.0", + "through2": "2.0.3", + "touch": "3.1.0" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + }, + "replace-ext": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz", + "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=", + "dev": true + } } }, "gulp-concat": { @@ -3206,15 +3348,61 @@ } }, "gulp-cssnano": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/gulp-cssnano/-/gulp-cssnano-2.1.2.tgz", - "integrity": "sha1-4IoJdx7FRUpUnxoAW90lbLjl4KM=", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/gulp-cssnano/-/gulp-cssnano-2.1.3.tgz", + "integrity": "sha512-r8qdX5pTXsBb/IRm9loE8Ijz8UiPW/URMC/bKJe4FPNHRaz4aEx8Bev03L0FYHd/7BSGu/ebmfumAkpGuTdenA==", "dev": true, "requires": { + "buffer-from": "1.0.0", "cssnano": "3.10.0", - "gulp-util": "3.0.8", "object-assign": "4.1.1", + "plugin-error": "1.0.1", "vinyl-sourcemaps-apply": "0.2.1" + }, + "dependencies": { + "arr-diff": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", + "dev": true + }, + "arr-union": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", + "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", + "dev": true + }, + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "dev": true, + "requires": { + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" + } + }, + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, + "requires": { + "is-plain-object": "2.0.4" + } + }, + "plugin-error": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz", + "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==", + "dev": true, + "requires": { + "ansi-colors": "1.1.0", + "arr-diff": "4.0.0", + "arr-union": "3.1.0", + "extend-shallow": "3.0.2" + } + } } }, "gulp-data": { @@ -3240,34 +3428,34 @@ } }, "gulp-jscs": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/gulp-jscs/-/gulp-jscs-4.0.0.tgz", - "integrity": "sha1-TbLWP5IHzkpUtbJnkOMY40a3aoU=", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/gulp-jscs/-/gulp-jscs-4.1.0.tgz", + "integrity": "sha512-GV+EAmJgyXgttd4BewkqzoyThuR50wErlRNPbHBL0c4wHGiNoElknV08egQkIgOBmeq7dcOidicpgdtxte/e9g==", "dev": true, "requires": { - "gulp-util": "3.0.8", "jscs": "3.0.7", + "plugin-error": "0.1.2", "through2": "2.0.3", "tildify": "1.2.0" } }, "gulp-jshint": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/gulp-jshint/-/gulp-jshint-2.0.4.tgz", - "integrity": "sha1-84KxhWSxBy3vDJqvdTwUba208Og=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/gulp-jshint/-/gulp-jshint-2.1.0.tgz", + "integrity": "sha512-sP3NK8Y/1e58O0PH9t6s7DAr/lKDSUbIY207oWSeufM6/VclB7jJrIBcPCsyhrFTCDUl9DauePbt6VqP2vPM5w==", "dev": true, "requires": { - "gulp-util": "3.0.8", - "lodash": "4.17.4", + "lodash": "4.17.10", "minimatch": "3.0.4", + "plugin-error": "0.1.2", "rcloader": "0.2.2", "through2": "2.0.3" }, "dependencies": { "lodash": { - "version": "4.17.4", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", + "version": "4.17.10", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", + "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==", "dev": true } } @@ -3282,29 +3470,42 @@ } }, "gulp-newer": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/gulp-newer/-/gulp-newer-1.3.0.tgz", - "integrity": "sha1-1Q7Ky7gi7aSStXMkpshaB/2aVcE=", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/gulp-newer/-/gulp-newer-1.4.0.tgz", + "integrity": "sha512-h79fGO55S/P9eAADbLAP9aTtVYpLSR1ONj08VPaSdVVNVYhTS8p1CO1TW7kEMu+hC+sytmCqcUr5LesvZEtDoQ==", "dev": true, "requires": { "glob": "7.1.2", - "gulp-util": "3.0.8", - "kew": "0.7.0" + "kew": "0.7.0", + "plugin-error": "0.1.2" } }, "gulp-notify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/gulp-notify/-/gulp-notify-3.0.0.tgz", - "integrity": "sha1-oEuK+azb5OY8hFZ4zgw9MGlMWaM=", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/gulp-notify/-/gulp-notify-3.2.0.tgz", + "integrity": "sha512-qEocs1UVoDKKUjfsxJNMNwkRla0PbsyJwsqNNXpzYWsLQ29LhxRMY3wnTGZcc4hMHtalnvah/Dwlwb4NijH/0A==", "dev": true, "requires": { - "gulp-util": "3.0.8", + "ansi-colors": "1.1.0", + "fancy-log": "1.3.2", "lodash.template": "4.4.0", - "node-notifier": "5.1.2", - "node.extend": "1.1.6", + "node-notifier": "5.2.1", + "node.extend": "2.0.0", + "plugin-error": "0.1.2", "through2": "2.0.3" }, "dependencies": { + "fancy-log": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz", + "integrity": "sha1-9BEl49hPLn2JpD0G2VjI94vha+E=", + "dev": true, + "requires": { + "ansi-gray": "0.1.1", + "color-support": "1.1.3", + "time-stamp": "1.1.0" + } + }, "lodash.template": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz", @@ -3327,173 +3528,24 @@ } }, "gulp-nunjucks-render": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/gulp-nunjucks-render/-/gulp-nunjucks-render-2.2.1.tgz", - "integrity": "sha1-Nxxqyv6Uup1pzlpfxDwVI4Y7EPA=", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/gulp-nunjucks-render/-/gulp-nunjucks-render-2.2.2.tgz", + "integrity": "sha512-L4BiPLm5MSDhBmG+qJ13aNBcyqdI9Ligz9tFqh7R+ZyYK0Gi7pCUYoiWXxY2yFCFHUkQE4UbxYFdzR5A6MKPRQ==", "dev": true, "requires": { - "gulp-util": "2.2.20", "lodash": "3.10.1", - "nunjucks": "3.0.1", + "nunjucks": "3.1.3", + "plugin-error": "0.1.2", + "replace-ext": "1.0.0", "through2": "0.4.2" }, "dependencies": { - "ansi-regex": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz", - "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=", - "dev": true - }, - "ansi-styles": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz", - "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=", - "dev": true - }, - "chalk": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz", - "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=", - "dev": true, - "requires": { - "ansi-styles": "1.1.0", - "escape-string-regexp": "1.0.5", - "has-ansi": "0.1.0", - "strip-ansi": "0.3.0", - "supports-color": "0.2.0" - } - }, - "dateformat": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz", - "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=", - "dev": true, - "requires": { - "get-stdin": "4.0.1", - "meow": "3.7.0" - } - }, - "gulp-util": { - "version": "2.2.20", - "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-2.2.20.tgz", - "integrity": "sha1-1xRuVyiRC9jwR6awseVJvCLb1kw=", - "dev": true, - "requires": { - "chalk": "0.5.1", - "dateformat": "1.0.12", - "lodash._reinterpolate": "2.4.1", - "lodash.template": "2.4.1", - "minimist": "0.2.0", - "multipipe": "0.1.2", - "through2": "0.5.1", - "vinyl": "0.2.3" - }, - "dependencies": { - "through2": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz", - "integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=", - "dev": true, - "requires": { - "readable-stream": "1.0.34", - "xtend": "3.0.0" - } - } - } - }, - "has-ansi": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz", - "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=", - "dev": true, - "requires": { - "ansi-regex": "0.2.1" - } - }, "isarray": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", "dev": true }, - "lodash._reinterpolate": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz", - "integrity": "sha1-TxInqlqHEfxjL1sHofRgequLMiI=", - "dev": true - }, - "lodash.defaults": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz", - "integrity": "sha1-p+iIXwXmiFEUS24SqPNngCa8TFQ=", - "dev": true, - "requires": { - "lodash._objecttypes": "2.4.1", - "lodash.keys": "2.4.1" - } - }, - "lodash.escape": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz", - "integrity": "sha1-LOEsXghNsKV92l5dHu659dF1o7Q=", - "dev": true, - "requires": { - "lodash._escapehtmlchar": "2.4.1", - "lodash._reunescapedhtml": "2.4.1", - "lodash.keys": "2.4.1" - } - }, - "lodash.isobject": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz", - "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=", - "dev": true, - "requires": { - "lodash._objecttypes": "2.4.1" - } - }, - "lodash.keys": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", - "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", - "dev": true, - "requires": { - "lodash._isnative": "2.4.1", - "lodash._shimkeys": "2.4.1", - "lodash.isobject": "2.4.1" - } - }, - "lodash.template": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz", - "integrity": "sha1-nmEQB+32KRKal0qzxIuBez4c8g0=", - "dev": true, - "requires": { - "lodash._escapestringchar": "2.4.1", - "lodash._reinterpolate": "2.4.1", - "lodash.defaults": "2.4.1", - "lodash.escape": "2.4.1", - "lodash.keys": "2.4.1", - "lodash.templatesettings": "2.4.1", - "lodash.values": "2.4.1" - } - }, - "lodash.templatesettings": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz", - "integrity": "sha1-6nbHXRHrhtTb6JqDiTu4YZKaxpk=", - "dev": true, - "requires": { - "lodash._reinterpolate": "2.4.1", - "lodash.escape": "2.4.1" - } - }, - "minimist": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz", - "integrity": "sha1-Tf/lJdriuGTGbC4jxicdev3s784=", - "dev": true - }, "readable-stream": { "version": "1.0.34", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", @@ -3506,27 +3558,18 @@ "string_decoder": "0.10.31" } }, + "replace-ext": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz", + "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=", + "dev": true + }, "string_decoder": { "version": "0.10.31", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", "dev": true }, - "strip-ansi": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz", - "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=", - "dev": true, - "requires": { - "ansi-regex": "0.2.1" - } - }, - "supports-color": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz", - "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=", - "dev": true - }, "through2": { "version": "0.4.2", "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz", @@ -3535,44 +3578,42 @@ "requires": { "readable-stream": "1.0.34", "xtend": "2.1.2" - }, - "dependencies": { - "xtend": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz", - "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=", - "dev": true, - "requires": { - "object-keys": "0.4.0" - } - } - } - }, - "vinyl": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz", - "integrity": "sha1-vKk4IJWC7FpJrVOKAPofEl5RMlI=", - "dev": true, - "requires": { - "clone-stats": "0.0.1" } }, "xtend": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz", - "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=", - "dev": true + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz", + "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=", + "dev": true, + "requires": { + "object-keys": "0.4.0" + } } } }, "gulp-plumber": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/gulp-plumber/-/gulp-plumber-1.1.0.tgz", - "integrity": "sha1-8SF2wtBCL2AwbCQv/2oBo5T6ugk=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gulp-plumber/-/gulp-plumber-1.2.0.tgz", + "integrity": "sha512-L/LJftsbKoHbVj6dN5pvMsyJn9jYI0wT0nMg3G6VZhDac4NesezecYTi8/48rHi+yEic3sUpw6jlSc7qNWh32A==", "dev": true, "requires": { - "gulp-util": "3.0.8", + "chalk": "1.1.3", + "fancy-log": "1.3.2", + "plugin-error": "0.1.2", "through2": "2.0.3" + }, + "dependencies": { + "fancy-log": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz", + "integrity": "sha1-9BEl49hPLn2JpD0G2VjI94vha+E=", + "dev": true, + "requires": { + "ansi-gray": "0.1.1", + "color-support": "1.1.3", + "time-stamp": "1.1.0" + } + } } }, "gulp-remember": { @@ -3628,9 +3669,9 @@ } }, "gulp-rename": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.2.2.tgz", - "integrity": "sha1-OtRCh2PwXidk3sHGfYaNsnVoeBc=", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.2.3.tgz", + "integrity": "sha512-CmdPM0BjJ105QCX1fk+j7NGhiN/1rCl9HLGss+KllBS/tdYadpjTxqdKyh/5fNV+M3yjT1MFz5z93bXdrTyzAw==", "dev": true }, "gulp-ruby-sass": { @@ -3655,59 +3696,53 @@ } }, "gulp-sass": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-3.1.0.tgz", - "integrity": "sha1-U9xLaKH13f5EJKtMJHZVJpqLdLc=", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-3.2.1.tgz", + "integrity": "sha512-UATbRpSDsyXCnpYSPBUEvdvtSEzksJs7/oQ0CujIpzKqKrO6vlnYwhX2UTsGrf4rNLwqlSSaM271It0uHYvJ3Q==", "dev": true, "requires": { "gulp-util": "3.0.8", "lodash.clonedeep": "4.5.0", - "node-sass": "4.5.3", + "node-sass": "4.9.0", "through2": "2.0.3", "vinyl-sourcemaps-apply": "0.2.1" } }, "gulp-sass-lint": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/gulp-sass-lint/-/gulp-sass-lint-1.3.3.tgz", - "integrity": "sha1-+HnUI+UXoocqiQJGbA3sgUbceHQ=", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/gulp-sass-lint/-/gulp-sass-lint-1.4.0.tgz", + "integrity": "sha512-XerYvHx7rznInkedMw5Ayif+p8EhysOVHUBvlgUa0FSl88H2cjNjaRZ3NGn5Efmp+2HxpXp4NHqMIbOSdwef3A==", "dev": true, "requires": { - "gulp-util": "3.0.8", - "sass-lint": "1.11.1", + "plugin-error": "0.1.2", + "sass-lint": "1.12.1", "through2": "2.0.3" } }, "gulp-sourcemaps": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.1.tgz", - "integrity": "sha512-1qHCI3hdmsMdq/SUotxwUh/L8YzlI6J9zQ5ifNOtx4Y6KV5y5sGuORv1KZzWhuKtz/mXNh5xLESUtwC4EndCjA==", + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.4.tgz", + "integrity": "sha1-y7IAhFCxvM5s0jv5gze+dRv24wo=", "dev": true, "requires": { "@gulp-sourcemaps/identity-map": "1.0.1", "@gulp-sourcemaps/map-sources": "1.0.0", - "acorn": "4.0.13", + "acorn": "5.5.3", "convert-source-map": "1.5.0", - "css": "2.2.1", - "debug-fabulous": "0.1.1", + "css": "2.2.3", + "debug-fabulous": "1.1.0", "detect-newline": "2.1.0", "graceful-fs": "4.1.11", - "source-map": "0.5.7", + "source-map": "0.6.1", "strip-bom-string": "1.0.0", - "through2": "2.0.3", - "vinyl": "1.2.0" + "through2": "2.0.3" }, "dependencies": { - "vinyl": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz", - "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=", - "dev": true, - "requires": { - "clone": "1.0.2", - "clone-stats": "0.0.1", - "replace-ext": "0.0.1" - } + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true } } }, @@ -3951,19 +3986,19 @@ } }, "gulp.spritesmith": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/gulp.spritesmith/-/gulp.spritesmith-6.5.1.tgz", - "integrity": "sha1-4An4tdoULtDHyJQ8Pkbp/OLDGYI=", + "version": "6.9.0", + "resolved": "https://registry.npmjs.org/gulp.spritesmith/-/gulp.spritesmith-6.9.0.tgz", + "integrity": "sha1-KPge46Qlx/iMbd5WupINmV+dBBk=", "dev": true, "requires": { "async": "2.1.5", - "gulp-util": "3.0.8", "minimatch": "3.0.4", - "spritesheet-templates": "10.2.1", - "spritesmith": "3.1.1", + "spritesheet-templates": "10.2.2", + "spritesmith": "3.3.0", "through2": "2.0.3", "underscore": "1.8.3", - "url2": "1.0.4" + "url2": "1.0.4", + "vinyl": "2.1.0" }, "dependencies": { "async": { @@ -3972,13 +4007,31 @@ "integrity": "sha1-5YfGhYCZSsZ/xW/4bTrFa9voELw=", "dev": true, "requires": { - "lodash": "4.17.4" + "lodash": "4.17.10" } }, + "clone": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz", + "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=", + "dev": true + }, + "clone-stats": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz", + "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=", + "dev": true + }, "lodash": { - "version": "4.17.4", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", + "version": "4.17.10", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", + "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==", + "dev": true + }, + "replace-ext": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz", + "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=", "dev": true }, "underscore": { @@ -3986,6 +4039,20 @@ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=", "dev": true + }, + "vinyl": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.1.0.tgz", + "integrity": "sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw=", + "dev": true, + "requires": { + "clone": "2.1.1", + "clone-buffer": "1.0.0", + "clone-stats": "1.0.0", + "cloneable-readable": "1.0.0", + "remove-trailing-separator": "1.1.0", + "replace-ext": "1.0.0" + } } } }, @@ -3999,9 +4066,9 @@ } }, "handlebars": { - "version": "4.0.10", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz", - "integrity": "sha1-PTDHGLCaPZbyPqTMH0A8TTup/08=", + "version": "4.0.11", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz", + "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", "dev": true, "requires": { "async": "1.5.2", @@ -4010,6 +4077,13 @@ "uglify-js": "2.8.29" }, "dependencies": { + "camelcase": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", + "dev": true, + "optional": true + }, "cliui": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", @@ -4087,20 +4161,16 @@ "integrity": "sha1-JhK+Wu2PICaXN8cxHaFcnC11+7w=", "dev": true }, - "har-schema": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz", - "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=", - "dev": true - }, "har-validator": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz", - "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz", + "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=", "dev": true, "requires": { - "ajv": "4.11.8", - "har-schema": "1.0.5" + "chalk": "1.1.3", + "commander": "2.11.0", + "is-my-json-valid": "2.17.2", + "pinkie-promise": "2.0.1" } }, "has": { @@ -4121,19 +4191,19 @@ "ansi-regex": "2.1.1" } }, - "has-binary": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz", - "integrity": "sha1-aOYesWIQyVRaClzOBqhzkS/h5ow=", + "has-binary2": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz", + "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==", "dev": true, "requires": { - "isarray": "0.0.1" + "isarray": "2.0.1" }, "dependencies": { "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz", + "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=", "dev": true } } @@ -4151,9 +4221,9 @@ "dev": true }, "has-flag": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", "dev": true }, "has-gulplog": { @@ -4177,6 +4247,66 @@ "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", "dev": true }, + "has-value": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", + "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", + "dev": true, + "requires": { + "get-value": "2.0.6", + "has-values": "1.0.0", + "isobject": "3.0.1" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true + } + } + }, + "has-values": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", + "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", + "dev": true, + "requires": { + "is-number": "3.0.0", + "kind-of": "4.0.0" + }, + "dependencies": { + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.5" + } + } + } + }, + "kind-of": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", + "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", + "dev": true, + "requires": { + "is-buffer": "1.1.5" + } + } + } + }, "hawk": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", @@ -4205,9 +4335,9 @@ } }, "hosted-git-info": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", - "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz", + "integrity": "sha512-lIbgIIQA3lz5XaB6vxakj6sDHADJiZadYEJB+FgA+C4nubM1NwcuvUr9EJPmnH1skZqpqUzWborWo8EIUi0Sdw==", "dev": true }, "html-comment-regex": { @@ -4256,14 +4386,23 @@ } }, "http-errors": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz", - "integrity": "sha1-eIwNLB3iyBuebowBhDtrl+uSB1A=", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", + "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", "dev": true, "requires": { + "depd": "1.1.2", "inherits": "2.0.3", - "setprototypeof": "1.0.2", - "statuses": "1.3.1" + "setprototypeof": "1.1.0", + "statuses": "1.5.0" + }, + "dependencies": { + "statuses": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", + "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", + "dev": true + } } }, "http-proxy": { @@ -4284,25 +4423,34 @@ "requires": { "assert-plus": "0.2.0", "jsprim": "1.4.1", - "sshpk": "1.13.1" + "sshpk": "1.14.1" } }, "i": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/i/-/i-0.3.5.tgz", - "integrity": "sha1-HSuFQVjsgWkRPGy39raAHpniEdU=", + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/i/-/i-0.3.6.tgz", + "integrity": "sha1-2WyScyB28HJxG2sQ/X1PZa2O4j0=", "dev": true }, + "iconv-lite": { + "version": "0.4.23", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz", + "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", + "dev": true, + "requires": { + "safer-buffer": "2.1.2" + } + }, "ignore": { - "version": "3.3.5", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.5.tgz", - "integrity": "sha512-JLH93mL8amZQhh/p6mfQgVBH3M6epNq3DfsXsTSuSrInVjwyYlFE1nv2AgfRCC8PoOhM0jwQ5v8s9LgbK7yGDw==", + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.8.tgz", + "integrity": "sha512-pUh+xUQQhQzevjRHHFqqcTy0/dP/kS9I8HSrUydhihjuD09W6ldVWFtIrwhXdUJHis3i2rZNqEHpZH/cbinFbg==", "dev": true }, "immutable": { - "version": "3.8.1", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.1.tgz", - "integrity": "sha1-IAgH8Rqw9ycQ6khVQt4IgHX2jNI=", + "version": "3.8.2", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.2.tgz", + "integrity": "sha1-wkOZUUVbs5kT2vKBN28VMOEErfM=", "dev": true }, "imurmurhash": { @@ -4378,7 +4526,7 @@ "cli-cursor": "1.0.2", "cli-width": "2.2.0", "figures": "1.7.0", - "lodash": "4.17.4", + "lodash": "4.17.10", "readline2": "1.0.1", "run-async": "0.1.0", "rx-lite": "3.1.2", @@ -4388,9 +4536,9 @@ }, "dependencies": { "lodash": { - "version": "4.17.4", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", + "version": "4.17.10", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", + "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==", "dev": true } } @@ -4441,6 +4589,15 @@ "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=", "dev": true }, + "is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + } + }, "is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", @@ -4453,7 +4610,7 @@ "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "dev": true, "requires": { - "binary-extensions": "1.10.0" + "binary-extensions": "1.11.0" } }, "is-buffer": { @@ -4471,6 +4628,34 @@ "builtin-modules": "1.1.1" } }, + "is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + } + }, + "is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" + }, + "dependencies": { + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true + } + } + }, "is-dotfile": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", @@ -4525,14 +4710,21 @@ "is-extglob": "1.0.0" } }, + "is-my-ip-valid": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz", + "integrity": "sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==", + "dev": true + }, "is-my-json-valid": { - "version": "2.16.1", - "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz", - "integrity": "sha512-ochPsqWS1WXj8ZnMIV0vnNXooaMhp7cyL4FMSIPKTtnV0Ha/T19G2b9kkhcNsabV9bxYkze7/aLZJb/bYuFduQ==", + "version": "2.17.2", + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz", + "integrity": "sha512-IBhBslgngMQN8DDSppmgDv7RNrlFotuuDsKcrCP3+HbFaVivIBU7u9oiiErw8sH4ynx3+gOGQ3q2otkgiSi6kg==", "dev": true, "requires": { "generate-function": "2.0.0", "generate-object-property": "1.2.0", + "is-my-ip-valid": "1.0.0", "jsonpointer": "4.0.1", "xtend": "4.0.1" } @@ -4561,6 +4753,25 @@ "lodash.isfinite": "3.3.2" } }, + "is-odd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz", + "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==", + "dev": true, + "optional": true, + "requires": { + "is-number": "4.0.0" + }, + "dependencies": { + "is-number": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", + "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==", + "dev": true, + "optional": true + } + } + }, "is-path-cwd": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", @@ -4659,13 +4870,10 @@ } }, "is-resolvable": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz", - "integrity": "sha1-jfV8YeouPFAUCNEA+wE8+NbgzGI=", - "dev": true, - "requires": { - "tryit": "1.0.3" - } + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz", + "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", + "dev": true }, "is-svg": { "version": "2.1.0", @@ -4743,9 +4951,9 @@ "dev": true }, "js-base64": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.3.2.tgz", - "integrity": "sha512-Y2/+DnfJJXT1/FCwUebUhLWb3QihxiSC42+ctHLGogmW2jPY6LCapMdFZXRvVP2z6qyKW7s6qncE/9gSqZiArw==", + "version": "2.4.5", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.5.tgz", + "integrity": "sha512-aUnNwqMOXw3yvErjMPSQu6qIIzUmT1e5KcU1OZxRDU1g/am6mzBvcrmLAYwzmB59BHPrh5/tKaiF4OPhqRWESQ==", "dev": true }, "js-yaml": { @@ -4754,7 +4962,7 @@ "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=", "dev": true, "requires": { - "argparse": "1.0.9", + "argparse": "1.0.10", "esprima": "2.7.3" } }, @@ -4781,8 +4989,8 @@ "htmlparser2": "3.8.3", "js-yaml": "3.4.6", "jscs-jsdoc": "2.0.0", - "jscs-preset-wikimedia": "1.0.0", - "jsonlint": "1.6.2", + "jscs-preset-wikimedia": "1.0.1", + "jsonlint": "1.6.3", "lodash": "3.10.1", "minimatch": "3.0.4", "natural-compare": "1.2.2", @@ -4794,7 +5002,7 @@ "strip-json-comments": "1.0.4", "to-double-quotes": "2.0.0", "to-single-quotes": "2.0.1", - "vow": "0.4.16", + "vow": "0.4.17", "vow-fs": "0.3.6", "xmlbuilder": "3.1.0" }, @@ -4808,12 +5016,6 @@ "graceful-readlink": "1.0.1" } }, - "estraverse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", - "dev": true - }, "glob": { "version": "5.0.15", "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", @@ -4833,7 +5035,7 @@ "integrity": "sha1-a+GyP2JJ9T0pM3D9TRqqY84bTrA=", "dev": true, "requires": { - "argparse": "1.0.9", + "argparse": "1.0.10", "esprima": "2.7.3", "inherit": "2.2.6" } @@ -4851,9 +5053,9 @@ } }, "jscs-preset-wikimedia": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/jscs-preset-wikimedia/-/jscs-preset-wikimedia-1.0.0.tgz", - "integrity": "sha1-//VjNCA4/C6IJre7cwnDrjQG/H4=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/jscs-preset-wikimedia/-/jscs-preset-wikimedia-1.0.1.tgz", + "integrity": "sha512-RWqu6IYSUlnYuCRCF0obCOHjJV0vhpLcvKbauwxmLQoZ0PiXDTWBYlfpsEfdhg7pmREAEwrARfDRz5qWD6qknA==", "dev": true }, "jsdoctypeparser": { @@ -4930,12 +5132,6 @@ "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", "dev": true }, - "json3": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz", - "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=", - "dev": true - }, "jsonfile": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz", @@ -4952,9 +5148,9 @@ "dev": true }, "jsonlint": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.2.tgz", - "integrity": "sha1-VzcEUIX1XrRVxosf9OvAG9UOiDA=", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.3.tgz", + "integrity": "sha512-jMVTMzP+7gU/IyC6hvKyWpUU8tmTkK5b3BPNuMI9U8Sit+YAWLlZwB6Y6YrdCxfg2kNz05p3XY3Bmm4m26Nv3A==", "dev": true, "requires": { "JSV": "4.0.2", @@ -5078,9 +5274,9 @@ } }, "limiter": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.2.tgz", - "integrity": "sha512-JIKZ0xb6fZZYa3deZ0BgXCgX6HgV8Nx3mFGeFHmFWW8Fb2c08e0CyE+G3nalpD0xGvGssjGb1UdFr+PprxZEbw==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.3.tgz", + "integrity": "sha512-zrycnIMsLw/3ZxTbW7HCez56rcFGecWTx5OZNplzcXUUmJLmoYArC6qdJzmAN5BWiNXGcpjhF9RQ1HSv5zebEw==", "dev": true }, "load-json-file": { @@ -5097,15 +5293,15 @@ } }, "localtunnel": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/localtunnel/-/localtunnel-1.8.3.tgz", - "integrity": "sha1-3MWSL9hWUQN9S94k/ZMkjQsk6wU=", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/localtunnel/-/localtunnel-1.9.0.tgz", + "integrity": "sha512-wCIiIHJ8kKIcWkTQE3m1VRABvsH2ZuOkiOpZUofUCf6Q42v3VIZ+Q0YfX1Z4sYDRj0muiKL1bLvz1FeoxsPO0w==", "dev": true, "requires": { + "axios": "0.17.1", "debug": "2.6.8", "openurl": "1.1.1", - "request": "2.81.0", - "yargs": "3.29.0" + "yargs": "6.6.0" }, "dependencies": { "debug": { @@ -5117,24 +5313,25 @@ "ms": "2.0.0" } }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, "yargs": { - "version": "3.29.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.29.0.tgz", - "integrity": "sha1-GquWYOrnnYuPZ1vK7qtu40ws9pw=", + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz", + "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=", "dev": true, "requires": { - "camelcase": "1.2.1", + "camelcase": "3.0.0", "cliui": "3.2.0", "decamelize": "1.2.0", + "get-caller-file": "1.0.2", "os-locale": "1.4.0", - "window-size": "0.1.4", - "y18n": "3.2.1" + "read-pkg-up": "1.0.1", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "1.0.2", + "which-module": "1.0.0", + "y18n": "3.2.1", + "yargs-parser": "4.2.1" } } } @@ -5163,51 +5360,18 @@ "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=", "dev": true }, - "lodash._escapehtmlchar": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz", - "integrity": "sha1-32fDu2t+jh6DGrSL+geVuSr+iZ0=", - "dev": true, - "requires": { - "lodash._htmlescapes": "2.4.1" - } - }, - "lodash._escapestringchar": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz", - "integrity": "sha1-7P4iYYoq3lC/7qQ5N+Ud9m8O23I=", - "dev": true - }, "lodash._getnative": { "version": "3.9.1", "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=", "dev": true }, - "lodash._htmlescapes": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz", - "integrity": "sha1-MtFL8IRLbeb4tioFG09nwii2JMs=", - "dev": true - }, "lodash._isiterateecall": { "version": "3.0.9", "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=", "dev": true }, - "lodash._isnative": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz", - "integrity": "sha1-PqZAS3hKe+g2x7V1gOHN95sUgyw=", - "dev": true - }, - "lodash._objecttypes": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz", - "integrity": "sha1-fAt/admKH3ZSn4kLDNsbTf7BHBE=", - "dev": true - }, "lodash._reescape": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", @@ -5226,53 +5390,12 @@ "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=", "dev": true }, - "lodash._reunescapedhtml": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz", - "integrity": "sha1-dHxPxAED6zu4oJduVx96JlnpO6c=", - "dev": true, - "requires": { - "lodash._htmlescapes": "2.4.1", - "lodash.keys": "2.4.1" - }, - "dependencies": { - "lodash.isobject": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz", - "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=", - "dev": true, - "requires": { - "lodash._objecttypes": "2.4.1" - } - }, - "lodash.keys": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", - "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", - "dev": true, - "requires": { - "lodash._isnative": "2.4.1", - "lodash._shimkeys": "2.4.1", - "lodash.isobject": "2.4.1" - } - } - } - }, "lodash._root": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz", "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=", "dev": true }, - "lodash._shimkeys": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz", - "integrity": "sha1-bpzJZm/wgfC1psl4uD4kLmlJ0gM=", - "dev": true, - "requires": { - "lodash._objecttypes": "2.4.1" - } - }, "lodash.assign": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", @@ -5372,15 +5495,15 @@ "dev": true }, "lodash.merge": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.0.tgz", - "integrity": "sha1-aYhLoUSsM/5plzemCG3v+t0PicU=", + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz", + "integrity": "sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==", "dev": true }, "lodash.mergewith": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz", - "integrity": "sha1-FQzwoWeR9ZA7iJHqsVRgknS96lU=", + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz", + "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==", "dev": true }, "lodash.restparam": { @@ -5422,37 +5545,6 @@ "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=", "dev": true }, - "lodash.values": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz", - "integrity": "sha1-q/UUQ2s8twUAFieXjLzzCxKA7qQ=", - "dev": true, - "requires": { - "lodash.keys": "2.4.1" - }, - "dependencies": { - "lodash.isobject": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz", - "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=", - "dev": true, - "requires": { - "lodash._objecttypes": "2.4.1" - } - }, - "lodash.keys": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz", - "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=", - "dev": true, - "requires": { - "lodash._isnative": "2.4.1", - "lodash._shimkeys": "2.4.1", - "lodash.isobject": "2.4.1" - } - } - } - }, "log-symbols": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz", @@ -5490,14 +5582,25 @@ "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=", "dev": true, "requires": { - "es5-ext": "0.10.30" + "es5-ext": "0.10.42" } }, - "macaddress": { - "version": "0.2.8", - "resolved": "https://registry.npmjs.org/macaddress/-/macaddress-0.2.8.tgz", - "integrity": "sha1-WQTcU3w57G2+/q6QIycTX6hRHxI=", - "dev": true + "make-dir": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", + "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", + "dev": true, + "requires": { + "pify": "3.0.0" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + } + } }, "make-error": { "version": "1.3.0", @@ -5532,6 +5635,15 @@ "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=", "dev": true }, + "map-visit": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", + "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", + "dev": true, + "requires": { + "object-visit": "1.0.1" + } + }, "math-expression-evaluator": { "version": "1.2.17", "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz", @@ -5554,19 +5666,19 @@ "dev": true }, "memoizee": { - "version": "0.4.11", - "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.11.tgz", - "integrity": "sha1-vemBdmPJ5A/bKk6hw2cpYIeujI8=", + "version": "0.4.12", + "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.12.tgz", + "integrity": "sha512-sprBu6nwxBWBvBOh5v2jcsGqiGLlL2xr2dLub3vR8dnE8YB17omwtm/0NSHl8jjNbcsJd5GMWJAnTSVe/O0Wfg==", "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.30", + "es5-ext": "0.10.42", "es6-weak-map": "2.0.2", "event-emitter": "0.3.5", "is-promise": "2.1.0", "lru-queue": "0.1.0", "next-tick": "1.0.0", - "timers-ext": "0.1.2" + "timers-ext": "0.1.5" } }, "meow": { @@ -5624,24 +5736,24 @@ } }, "mime": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.4.tgz", - "integrity": "sha1-EbX9rynCUJJVF2uArVIClPXekrc=", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", + "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==", "dev": true }, "mime-db": { - "version": "1.30.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz", - "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz", + "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==", "dev": true }, "mime-types": { - "version": "2.1.17", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz", - "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=", + "version": "2.1.18", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", + "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", "dev": true, "requires": { - "mime-db": "1.30.0" + "mime-db": "1.33.0" } }, "minimatch": { @@ -5659,16 +5771,48 @@ "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, + "mixin-deep": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", + "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", + "dev": true, + "requires": { + "for-in": "1.0.2", + "is-extendable": "1.0.1" + }, + "dependencies": { + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, + "requires": { + "is-plain-object": "2.0.4" + } + } + } + }, "mkdirp": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz", - "integrity": "sha1-G79asbqCevI1dRQ0kEJkVfSB/h4=", - "dev": true + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, + "requires": { + "minimist": "0.0.8" + }, + "dependencies": { + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + } + } }, "ms": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true }, "multipipe": { @@ -5687,11 +5831,83 @@ "dev": true }, "nan": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz", - "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY=", + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz", + "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==", "dev": true }, + "nanomatch": { + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz", + "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==", + "dev": true, + "optional": true, + "requires": { + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "fragment-cache": "0.2.1", + "is-odd": "2.0.0", + "is-windows": "1.0.2", + "kind-of": "6.0.2", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "arr-diff": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", + "dev": true, + "optional": true + }, + "array-unique": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", + "dev": true, + "optional": true + }, + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "dev": true, + "optional": true, + "requires": { + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" + } + }, + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, + "optional": true, + "requires": { + "is-plain-object": "2.0.4" + } + }, + "is-windows": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", + "dev": true, + "optional": true + }, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "dev": true, + "optional": true + } + } + }, "natives": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz", @@ -5779,27 +5995,21 @@ "mkdirp": "0.5.1", "nopt": "3.0.6", "npmlog": "4.1.2", - "osenv": "0.1.4", - "request": "2.81.0", + "osenv": "0.1.5", + "request": "2.79.0", "rimraf": "2.6.2", "semver": "5.3.0", "tar": "2.2.1", "which": "1.3.0" }, "dependencies": { - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "nopt": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", + "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", "dev": true, "requires": { - "minimist": "0.0.8" + "abbrev": "1.1.1" } }, "semver": { @@ -5811,41 +6021,42 @@ } }, "node-notifier": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.1.2.tgz", - "integrity": "sha1-L6nhJgX6EACdRFSdb82KY93g5P8=", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.2.1.tgz", + "integrity": "sha512-MIBs+AAd6dJ2SklbbE8RUDRlIVhU8MaNLh1A9SUZDUHPiZkWLFde6UNwG41yQHZEToHgJMXqyVZ9UcS/ReOVTg==", "dev": true, "requires": { "growly": "1.3.0", - "semver": "5.4.1", + "semver": "5.5.0", "shellwords": "0.1.1", "which": "1.3.0" } }, "node-sass": { - "version": "4.5.3", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.5.3.tgz", - "integrity": "sha1-0JydEXlkEjnRuX/8YjH9zsU+FWg=", + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.9.0.tgz", + "integrity": "sha512-QFHfrZl6lqRU3csypwviz2XLgGNOoWQbo2GOvtsfQqOfL4cy1BtWnhx/XUeAO9LT3ahBzSRXcEO6DdvAH9DzSg==", "dev": true, "requires": { "async-foreach": "0.1.3", "chalk": "1.1.3", "cross-spawn": "3.0.1", - "gaze": "1.1.2", + "gaze": "1.1.3", "get-stdin": "4.0.1", "glob": "7.1.2", "in-publish": "2.0.0", "lodash.assign": "4.2.0", "lodash.clonedeep": "4.5.0", - "lodash.mergewith": "4.6.0", + "lodash.mergewith": "4.6.1", "meow": "3.7.0", "mkdirp": "0.5.1", - "nan": "2.7.0", + "nan": "2.10.0", "node-gyp": "3.6.2", "npmlog": "4.1.2", - "request": "2.81.0", + "request": "2.79.0", "sass-graph": "2.2.4", - "stdout-stream": "1.4.0" + "stdout-stream": "1.4.0", + "true-case-path": "1.0.2" }, "dependencies": { "cross-spawn": { @@ -5854,14 +6065,14 @@ "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", "dev": true, "requires": { - "lru-cache": "4.1.1", + "lru-cache": "4.1.3", "which": "1.3.0" } }, "gaze": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz", - "integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz", + "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", "dev": true, "requires": { "globule": "1.2.0" @@ -5874,47 +6085,32 @@ "dev": true, "requires": { "glob": "7.1.2", - "lodash": "4.17.4", + "lodash": "4.17.10", "minimatch": "3.0.4" } }, "lodash": { - "version": "4.17.4", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", + "version": "4.17.10", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", + "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==", "dev": true }, "lru-cache": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", - "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz", + "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==", "dev": true, "requires": { "pseudomap": "1.0.2", "yallist": "2.1.2" } - }, - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, - "requires": { - "minimist": "0.0.8" - } } } }, "node.extend": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/node.extend/-/node.extend-1.1.6.tgz", - "integrity": "sha1-p7iCyC1sk6SGOlUEvV3o7IYli5Y=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/node.extend/-/node.extend-2.0.0.tgz", + "integrity": "sha1-dSWih1Z36lNHhKXhCseJVhOWFN8=", "dev": true, "requires": { "is": "3.2.1" @@ -5952,22 +6148,16 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz", "integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=", "dev": true - }, - "underscore": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz", - "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=", - "dev": true } } }, "nopt": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", - "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", + "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=", "dev": true, "requires": { - "abbrev": "1.1.0" + "abbrev": "1.1.1" } }, "normalize-package-data": { @@ -5976,10 +6166,10 @@ "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", "dev": true, "requires": { - "hosted-git-info": "2.5.0", + "hosted-git-info": "2.6.0", "is-builtin-module": "1.0.0", - "semver": "5.4.1", - "validate-npm-package-license": "3.0.1" + "semver": "5.5.0", + "validate-npm-package-license": "3.0.3" } }, "normalize-path": { @@ -6024,7 +6214,7 @@ "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "dev": true, "requires": { - "are-we-there-yet": "1.1.4", + "are-we-there-yet": "1.1.5", "console-control-strings": "1.1.0", "gauge": "2.7.4", "set-blocking": "2.0.0" @@ -6043,23 +6233,414 @@ "dev": true }, "nunjucks": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-3.0.1.tgz", - "integrity": "sha1-TedKPlULr2+jNwMj89HHwqhr3E0=", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-3.1.3.tgz", + "integrity": "sha512-UtlKKAzg9vdtvURdNy9DjGhiB7qYf2R7Ez+hsucOQG5gYJexSggXSSZ+9IpSDyKOlWu/4rMVPH2oVoANOSqNKA==", "dev": true, "requires": { "a-sync-waterfall": "1.0.0", "asap": "2.0.6", - "chokidar": "1.7.0", + "chokidar": "2.0.3", + "postinstall-build": "5.0.1", "yargs": "3.32.0" }, "dependencies": { + "anymatch": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", + "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", + "dev": true, + "optional": true, + "requires": { + "micromatch": "3.1.10", + "normalize-path": "2.1.1" + } + }, + "arr-diff": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", + "dev": true, + "optional": true + }, + "array-unique": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", + "dev": true + }, + "braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "dev": true, + "requires": { + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "repeat-element": "1.1.2", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, "camelcase": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=", "dev": true }, + "chokidar": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.3.tgz", + "integrity": "sha512-zW8iXYZtXMx4kux/nuZVXjkLP+CyIK5Al5FHnj1OgTKGZfp4Oy6/ymtMSKFv3GD8DviEmUPmJg9eFdJ/JzudMg==", + "dev": true, + "optional": true, + "requires": { + "anymatch": "2.0.0", + "async-each": "1.0.1", + "braces": "2.3.2", + "glob-parent": "3.1.0", + "inherits": "2.0.3", + "is-binary-path": "1.0.1", + "is-glob": "4.0.0", + "normalize-path": "2.1.1", + "path-is-absolute": "1.0.1", + "readdirp": "2.1.0", + "upath": "1.1.0" + } + }, + "expand-brackets": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", + "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "dev": true, + "optional": true, + "requires": { + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "posix-character-classes": "0.1.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, + "optional": true, + "requires": { + "is-descriptor": "0.1.6" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "optional": true, + "requires": { + "is-extendable": "0.1.1" + } + }, + "is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dev": true, + "optional": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "optional": true, + "requires": { + "is-buffer": "1.1.5" + } + } + } + }, + "is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dev": true, + "optional": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "optional": true, + "requires": { + "is-buffer": "1.1.5" + } + } + } + }, + "is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, + "optional": true, + "requires": { + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" + } + }, + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true, + "optional": true + } + } + }, + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "dev": true, + "optional": true, + "requires": { + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" + }, + "dependencies": { + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, + "optional": true, + "requires": { + "is-plain-object": "2.0.4" + } + } + } + }, + "extglob": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", + "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", + "dev": true, + "optional": true, + "requires": { + "array-unique": "0.3.2", + "define-property": "1.0.0", + "expand-brackets": "2.1.4", + "extend-shallow": "2.0.1", + "fragment-cache": "0.2.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, + "optional": true, + "requires": { + "is-descriptor": "1.0.2" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "optional": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "dev": true, + "requires": { + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "dev": true, + "optional": true, + "requires": { + "is-glob": "3.1.0", + "path-dirname": "1.0.2" + }, + "dependencies": { + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "dev": true, + "optional": true, + "requires": { + "is-extglob": "2.1.1" + } + } + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "dev": true, + "optional": true, + "requires": { + "kind-of": "6.0.2" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "dev": true, + "optional": true, + "requires": { + "kind-of": "6.0.2" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "dev": true, + "optional": true, + "requires": { + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" + } + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "dev": true + }, + "is-glob": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", + "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", + "dev": true, + "optional": true, + "requires": { + "is-extglob": "2.1.1" + } + }, + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.5" + } + } + } + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true + }, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "dev": true + }, + "micromatch": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", + "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "dev": true, + "optional": true, + "requires": { + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.2", + "nanomatch": "1.2.9", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + } + }, + "window-size": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz", + "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=", + "dev": true + }, "yargs": { "version": "3.32.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz", @@ -6101,6 +6682,28 @@ "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=", "dev": true }, + "object-copy": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", + "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", + "dev": true, + "requires": { + "copy-descriptor": "0.1.1", + "define-property": "0.2.5", + "kind-of": "3.2.2" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, + "requires": { + "is-descriptor": "0.1.6" + } + } + } + }, "object-inspect": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-0.4.0.tgz", @@ -6119,6 +6722,23 @@ "integrity": "sha1-D9mnT8X60a45aLWGvaXGMr1sBaU=", "dev": true }, + "object-visit": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", + "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", + "dev": true, + "requires": { + "isobject": "3.0.1" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true + } + } + }, "object.assign": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", @@ -6196,9 +6816,9 @@ } }, "omggif": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/omggif/-/omggif-1.0.8.tgz", - "integrity": "sha1-F483sqsLPXtG7ToORr0HkLWNNTA=", + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/omggif/-/omggif-1.0.9.tgz", + "integrity": "sha1-3LcCTazVDFK00wPwSALJHAV8dl8=", "dev": true }, "on-finished": { @@ -6256,6 +6876,12 @@ "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", "dev": true + }, + "wordwrap": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", + "dev": true } } }, @@ -6271,22 +6897,8 @@ "prelude-ls": "1.1.2", "type-check": "0.3.2", "wordwrap": "1.0.0" - }, - "dependencies": { - "wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", - "dev": true - } } }, - "options": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz", - "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=", - "dev": true - }, "orchestrator": { "version": "0.3.8", "resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz", @@ -6326,9 +6938,9 @@ "dev": true }, "osenv": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz", - "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=", + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "dev": true, "requires": { "os-homedir": "1.0.2", @@ -6388,15 +7000,6 @@ "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=", "dev": true }, - "parsejson": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz", - "integrity": "sha1-q343WfIJ7OmUN5c/fQ8fZK4OZKs=", - "dev": true, - "requires": { - "better-assert": "1.0.2" - } - }, "parseqs": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz", @@ -6421,6 +7024,12 @@ "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=", "dev": true }, + "pascalcase": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", + "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", + "dev": true + }, "path-dirname": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", @@ -6495,12 +7104,6 @@ "through": "2.3.8" } }, - "performance-now": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", - "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=", - "dev": true - }, "pify": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", @@ -6523,15 +7126,15 @@ } }, "pixelsmith": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/pixelsmith/-/pixelsmith-2.1.2.tgz", - "integrity": "sha1-W+LDBcuv8+AoHAaNtm4SgfHoVhE=", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/pixelsmith/-/pixelsmith-2.2.1.tgz", + "integrity": "sha1-MT95MAKcZdCyj+HOKcBrjiy7OAc=", "dev": true, "requires": { "async": "0.9.2", "concat-stream": "1.5.2", "get-pixels": "3.3.0", - "mime-types": "2.1.17", + "mime-types": "2.1.18", "ndarray": "1.0.18", "ndarray-fill": "1.0.2", "obj-extend": "0.1.0", @@ -6544,6 +7147,37 @@ "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=", "dev": true + }, + "concat-stream": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz", + "integrity": "sha1-cIl4Yk2FavQaWnQd790mHadSwmY=", + "dev": true, + "requires": { + "inherits": "2.0.3", + "readable-stream": "2.0.6", + "typedarray": "0.0.6" + } + }, + "readable-stream": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", + "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "string_decoder": "0.10.31", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true } } }, @@ -6621,44 +7255,57 @@ "is-number-like": "1.0.8" } }, + "posix-character-classes": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", + "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=", + "dev": true, + "optional": true + }, "postcss": { - "version": "6.0.12", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.12.tgz", - "integrity": "sha512-K6SLofXEK43FBSyZ6/ExQV7ji24OEw4tEY6x1CAf7+tcoMWJoO24Rf3rVFVpk+5IQL1e1Cy3sTKfg7hXuLzafg==", + "version": "6.0.22", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.22.tgz", + "integrity": "sha512-Toc9lLoUASwGqxBSJGTVcOQiDqjK+Z2XlWBg+IgYwQMY9vA2f7iMpXVc1GpPcfTSyM5lkxNo0oDwDRO+wm7XHA==", "dev": true, "requires": { - "chalk": "2.1.0", - "source-map": "0.5.7", - "supports-color": "4.4.0" + "chalk": "2.4.1", + "source-map": "0.6.1", + "supports-color": "5.4.0" }, "dependencies": { "ansi-styles": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", - "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.0" + "color-convert": "1.9.1" } }, "chalk": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz", - "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", "dev": true, "requires": { - "ansi-styles": "3.2.0", + "ansi-styles": "3.2.1", "escape-string-regexp": "1.0.5", - "supports-color": "4.4.0" + "supports-color": "5.4.0" } }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, "supports-color": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", - "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", "dev": true, "requires": { - "has-flag": "2.0.0" + "has-flag": "3.0.0" } } } @@ -6669,7 +7316,7 @@ "integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=", "dev": true, "requires": { - "postcss": "5.2.17", + "postcss": "5.2.18", "postcss-message-helpers": "2.0.0", "reduce-css-calc": "1.3.0" }, @@ -6681,13 +7328,13 @@ "dev": true }, "postcss": { - "version": "5.2.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", - "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.3.2", + "js-base64": "2.4.5", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -6710,7 +7357,7 @@ "dev": true, "requires": { "colormin": "1.1.2", - "postcss": "5.2.17", + "postcss": "5.2.18", "postcss-value-parser": "3.3.0" }, "dependencies": { @@ -6721,13 +7368,13 @@ "dev": true }, "postcss": { - "version": "5.2.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", - "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.3.2", + "js-base64": "2.4.5", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -6749,7 +7396,7 @@ "integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=", "dev": true, "requires": { - "postcss": "5.2.17", + "postcss": "5.2.18", "postcss-value-parser": "3.3.0" }, "dependencies": { @@ -6760,13 +7407,13 @@ "dev": true }, "postcss": { - "version": "5.2.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", - "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.3.2", + "js-base64": "2.4.5", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -6788,7 +7435,7 @@ "integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=", "dev": true, "requires": { - "postcss": "5.2.17" + "postcss": "5.2.18" }, "dependencies": { "has-flag": { @@ -6798,13 +7445,13 @@ "dev": true }, "postcss": { - "version": "5.2.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", - "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.3.2", + "js-base64": "2.4.5", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -6826,7 +7473,7 @@ "integrity": "sha1-uavye4isGIFYpesSq8riAmO5GTI=", "dev": true, "requires": { - "postcss": "5.2.17" + "postcss": "5.2.18" }, "dependencies": { "has-flag": { @@ -6836,13 +7483,13 @@ "dev": true }, "postcss": { - "version": "5.2.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", - "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.3.2", + "js-base64": "2.4.5", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -6864,7 +7511,7 @@ "integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=", "dev": true, "requires": { - "postcss": "5.2.17" + "postcss": "5.2.18" }, "dependencies": { "has-flag": { @@ -6874,13 +7521,13 @@ "dev": true }, "postcss": { - "version": "5.2.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", - "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.3.2", + "js-base64": "2.4.5", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -6902,7 +7549,7 @@ "integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=", "dev": true, "requires": { - "postcss": "5.2.17" + "postcss": "5.2.18" }, "dependencies": { "has-flag": { @@ -6912,13 +7559,13 @@ "dev": true }, "postcss": { - "version": "5.2.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", - "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.3.2", + "js-base64": "2.4.5", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -6940,7 +7587,7 @@ "integrity": "sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=", "dev": true, "requires": { - "postcss": "5.2.17", + "postcss": "5.2.18", "uniqs": "2.0.0" }, "dependencies": { @@ -6951,13 +7598,13 @@ "dev": true }, "postcss": { - "version": "5.2.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", - "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.3.2", + "js-base64": "2.4.5", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -6974,13 +7621,12 @@ } }, "postcss-filter-plugins": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz", - "integrity": "sha1-bYWGJTTXNaxCDkqFgG4fXUKG2Ew=", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.3.tgz", + "integrity": "sha512-T53GVFsdinJhgwm7rg1BzbeBRomOg9y5MBVhGcsV0CxurUdVj1UlPdKtn7aqYA/c/QVkzKMjq2bSV5dKG5+AwQ==", "dev": true, "requires": { - "postcss": "5.2.17", - "uniqid": "4.1.1" + "postcss": "5.2.18" }, "dependencies": { "has-flag": { @@ -6990,13 +7636,13 @@ "dev": true }, "postcss": { - "version": "5.2.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", - "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.3.2", + "js-base64": "2.4.5", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -7019,7 +7665,7 @@ "dev": true, "requires": { "has": "1.0.1", - "postcss": "5.2.17", + "postcss": "5.2.18", "postcss-value-parser": "3.3.0" }, "dependencies": { @@ -7030,13 +7676,13 @@ "dev": true }, "postcss": { - "version": "5.2.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", - "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.3.2", + "js-base64": "2.4.5", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -7058,7 +7704,7 @@ "integrity": "sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=", "dev": true, "requires": { - "postcss": "5.2.17" + "postcss": "5.2.18" }, "dependencies": { "has-flag": { @@ -7068,13 +7714,13 @@ "dev": true }, "postcss": { - "version": "5.2.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", - "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.3.2", + "js-base64": "2.4.5", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -7098,9 +7744,9 @@ "requires": { "browserslist": "1.7.7", "caniuse-api": "1.6.1", - "postcss": "5.2.17", + "postcss": "5.2.18", "postcss-selector-parser": "2.2.3", - "vendors": "1.0.1" + "vendors": "1.0.2" }, "dependencies": { "browserslist": { @@ -7109,8 +7755,8 @@ "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "dev": true, "requires": { - "caniuse-db": "1.0.30000738", - "electron-to-chromium": "1.3.22" + "caniuse-db": "1.0.30000846", + "electron-to-chromium": "1.3.48" } }, "has-flag": { @@ -7120,13 +7766,13 @@ "dev": true }, "postcss": { - "version": "5.2.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", - "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.3.2", + "js-base64": "2.4.5", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -7155,7 +7801,7 @@ "dev": true, "requires": { "object-assign": "4.1.1", - "postcss": "5.2.17", + "postcss": "5.2.18", "postcss-value-parser": "3.3.0" }, "dependencies": { @@ -7166,13 +7812,13 @@ "dev": true }, "postcss": { - "version": "5.2.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", - "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.3.2", + "js-base64": "2.4.5", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -7194,7 +7840,7 @@ "integrity": "sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=", "dev": true, "requires": { - "postcss": "5.2.17", + "postcss": "5.2.18", "postcss-value-parser": "3.3.0" }, "dependencies": { @@ -7205,13 +7851,13 @@ "dev": true }, "postcss": { - "version": "5.2.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", - "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.3.2", + "js-base64": "2.4.5", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -7234,7 +7880,7 @@ "dev": true, "requires": { "alphanum-sort": "1.0.2", - "postcss": "5.2.17", + "postcss": "5.2.18", "postcss-value-parser": "3.3.0", "uniqs": "2.0.0" }, @@ -7246,13 +7892,13 @@ "dev": true }, "postcss": { - "version": "5.2.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", - "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.3.2", + "js-base64": "2.4.5", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -7276,7 +7922,7 @@ "requires": { "alphanum-sort": "1.0.2", "has": "1.0.1", - "postcss": "5.2.17", + "postcss": "5.2.18", "postcss-selector-parser": "2.2.3" }, "dependencies": { @@ -7287,13 +7933,13 @@ "dev": true }, "postcss": { - "version": "5.2.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", - "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.3.2", + "js-base64": "2.4.5", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -7315,7 +7961,7 @@ "integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=", "dev": true, "requires": { - "postcss": "5.2.17" + "postcss": "5.2.18" }, "dependencies": { "has-flag": { @@ -7325,13 +7971,13 @@ "dev": true }, "postcss": { - "version": "5.2.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", - "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.3.2", + "js-base64": "2.4.5", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -7355,7 +8001,7 @@ "requires": { "is-absolute-url": "2.1.0", "normalize-url": "1.9.1", - "postcss": "5.2.17", + "postcss": "5.2.18", "postcss-value-parser": "3.3.0" }, "dependencies": { @@ -7366,13 +8012,13 @@ "dev": true }, "postcss": { - "version": "5.2.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", - "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.3.2", + "js-base64": "2.4.5", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -7394,7 +8040,7 @@ "integrity": "sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=", "dev": true, "requires": { - "postcss": "5.2.17", + "postcss": "5.2.18", "postcss-value-parser": "3.3.0" }, "dependencies": { @@ -7405,13 +8051,13 @@ "dev": true }, "postcss": { - "version": "5.2.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", - "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.3.2", + "js-base64": "2.4.5", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -7433,7 +8079,7 @@ "integrity": "sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=", "dev": true, "requires": { - "postcss": "5.2.17", + "postcss": "5.2.18", "postcss-value-parser": "3.3.0" }, "dependencies": { @@ -7444,13 +8090,13 @@ "dev": true }, "postcss": { - "version": "5.2.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", - "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.3.2", + "js-base64": "2.4.5", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -7472,7 +8118,7 @@ "integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=", "dev": true, "requires": { - "postcss": "5.2.17" + "postcss": "5.2.18" }, "dependencies": { "has-flag": { @@ -7482,13 +8128,13 @@ "dev": true }, "postcss": { - "version": "5.2.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", - "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.3.2", + "js-base64": "2.4.5", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -7511,7 +8157,7 @@ "dev": true, "requires": { "has": "1.0.1", - "postcss": "5.2.17", + "postcss": "5.2.18", "postcss-value-parser": "3.3.0" }, "dependencies": { @@ -7522,13 +8168,13 @@ "dev": true }, "postcss": { - "version": "5.2.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", - "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.3.2", + "js-base64": "2.4.5", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -7562,7 +8208,7 @@ "dev": true, "requires": { "is-svg": "2.1.0", - "postcss": "5.2.17", + "postcss": "5.2.18", "postcss-value-parser": "3.3.0", "svgo": "0.7.2" }, @@ -7574,13 +8220,13 @@ "dev": true }, "postcss": { - "version": "5.2.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", - "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.3.2", + "js-base64": "2.4.5", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -7603,7 +8249,7 @@ "dev": true, "requires": { "alphanum-sort": "1.0.2", - "postcss": "5.2.17", + "postcss": "5.2.18", "uniqs": "2.0.0" }, "dependencies": { @@ -7614,13 +8260,13 @@ "dev": true }, "postcss": { - "version": "5.2.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", - "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.3.2", + "js-base64": "2.4.5", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -7649,7 +8295,7 @@ "dev": true, "requires": { "has": "1.0.1", - "postcss": "5.2.17", + "postcss": "5.2.18", "uniqs": "2.0.0" }, "dependencies": { @@ -7660,13 +8306,13 @@ "dev": true }, "postcss": { - "version": "5.2.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", - "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.3.2", + "js-base64": "2.4.5", "source-map": "0.5.7", "supports-color": "3.2.3" } @@ -7682,6 +8328,12 @@ } } }, + "postinstall-build": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postinstall-build/-/postinstall-build-5.0.1.tgz", + "integrity": "sha1-uRepB5smF42aJK9aXNjLSpkdEbk=", + "dev": true + }, "prelude-ls": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", @@ -7738,19 +8390,19 @@ "dev": true }, "pump": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz", - "integrity": "sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE=", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz", + "integrity": "sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==", "dev": true, "requires": { - "end-of-stream": "1.4.0", + "end-of-stream": "1.4.1", "once": "1.4.0" }, "dependencies": { "end-of-stream": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz", - "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", + "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", "dev": true, "requires": { "once": "1.4.0" @@ -7809,15 +8461,15 @@ "dev": true }, "q": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz", - "integrity": "sha1-3QG6ydBtMObyGa7LglPunr3DCPE=", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", + "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=", "dev": true }, "qs": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz", - "integrity": "sha1-zgPF/wk1vB2daanxTL0Y5WjWdiU=", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz", + "integrity": "sha1-HPyyXBCpsrSDBT/zn138kjOQjP4=", "dev": true }, "query-string": { @@ -7938,6 +8590,18 @@ "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=", "dev": true }, + "raw-body": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz", + "integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==", + "dev": true, + "requires": { + "bytes": "3.0.0", + "http-errors": "1.6.3", + "iconv-lite": "0.4.23", + "unpipe": "1.0.0" + } + }, "rcfinder": { "version": "0.1.9", "resolved": "https://registry.npmjs.org/rcfinder/-/rcfinder-0.1.9.tgz", @@ -7955,7 +8619,7 @@ "requires": { "lodash.assign": "4.2.0", "lodash.isobject": "3.0.2", - "lodash.merge": "4.6.0", + "lodash.merge": "4.6.1", "rcfinder": "0.1.9" } }, @@ -8091,9 +8755,9 @@ } }, "regenerator-runtime": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz", - "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==", + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", "dev": true }, "regex-cache": { @@ -8105,6 +8769,37 @@ "is-equal-shallow": "0.1.3" } }, + "regex-not": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", + "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", + "dev": true, + "requires": { + "extend-shallow": "3.0.2", + "safe-regex": "1.1.0" + }, + "dependencies": { + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "dev": true, + "requires": { + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" + } + }, + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, + "requires": { + "is-plain-object": "2.0.4" + } + } + } + }, "remove-bom-buffer": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz", @@ -8160,39 +8855,43 @@ "dev": true }, "request": { - "version": "2.81.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", - "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", + "version": "2.79.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz", + "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=", "dev": true, "requires": { "aws-sign2": "0.6.0", - "aws4": "1.6.0", - "caseless": "0.12.0", - "combined-stream": "1.0.5", + "aws4": "1.7.0", + "caseless": "0.11.0", + "combined-stream": "1.0.6", "extend": "3.0.1", "forever-agent": "0.6.1", "form-data": "2.1.4", - "har-validator": "4.2.1", + "har-validator": "2.0.6", "hawk": "3.1.3", "http-signature": "1.1.1", "is-typedarray": "1.0.0", "isstream": "0.1.2", "json-stringify-safe": "5.0.1", - "mime-types": "2.1.17", + "mime-types": "2.1.18", "oauth-sign": "0.8.2", - "performance-now": "0.2.0", - "qs": "6.4.0", - "safe-buffer": "5.1.1", - "stringstream": "0.0.5", - "tough-cookie": "2.3.3", - "tunnel-agent": "0.6.0", - "uuid": "3.1.0" + "qs": "6.3.2", + "stringstream": "0.0.6", + "tough-cookie": "2.3.4", + "tunnel-agent": "0.4.3", + "uuid": "3.2.1" }, "dependencies": { "qs": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", - "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=", + "version": "6.3.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz", + "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=", + "dev": true + }, + "uuid": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", + "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==", "dev": true } } @@ -8277,7 +8976,7 @@ "integrity": "sha1-sSTeXE+6/LpUH0j/pzlw9KpFa08=", "dev": true, "requires": { - "debug": "2.2.0", + "debug": "2.6.9", "minimatch": "3.0.4" } }, @@ -8291,6 +8990,12 @@ "onetime": "1.1.0" } }, + "ret": { + "version": "0.1.15", + "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", + "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", + "dev": true + }, "revalidator": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz", @@ -8325,13 +9030,27 @@ } }, "run-sequence": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/run-sequence/-/run-sequence-2.2.0.tgz", - "integrity": "sha512-xW5DmUwdvoyYQUMPKN8UW7TZSFs7AxtT59xo1m5y91jHbvwGlGgOmdV1Yw5P68fkjf3aHUZ4G1o1mZCtNe0qtw==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/run-sequence/-/run-sequence-2.2.1.tgz", + "integrity": "sha512-qkzZnQWMZjcKbh3CNly2srtrkaO/2H/SI5f2eliMCapdRD3UhMrwjfOAZJAnZ2H8Ju4aBzFZkBGXUqFs9V0yxw==", "dev": true, "requires": { "chalk": "1.1.3", - "gulp-util": "3.0.8" + "fancy-log": "1.3.2", + "plugin-error": "0.1.2" + }, + "dependencies": { + "fancy-log": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz", + "integrity": "sha1-9BEl49hPLn2JpD0G2VjI94vha+E=", + "dev": true, + "requires": { + "ansi-gray": "0.1.1", + "color-support": "1.1.3", + "time-stamp": "1.1.0" + } + } } }, "rx": { @@ -8352,6 +9071,21 @@ "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", "dev": true }, + "safe-regex": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", + "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", + "dev": true, + "requires": { + "ret": "0.1.15" + } + }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true + }, "sass-graph": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz", @@ -8359,21 +9093,15 @@ "dev": true, "requires": { "glob": "7.1.2", - "lodash": "4.17.4", + "lodash": "4.17.10", "scss-tokenizer": "0.2.3", "yargs": "7.1.0" }, "dependencies": { - "camelcase": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", - "dev": true - }, "lodash": { - "version": "4.17.4", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", + "version": "4.17.10", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", + "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==", "dev": true }, "yargs": { @@ -8409,9 +9137,9 @@ } }, "sass-lint": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/sass-lint/-/sass-lint-1.11.1.tgz", - "integrity": "sha512-vt29dGRlNDywZUsJOxhh8cGtpRWIqrsGS85U0WnAyMdywnUyiPXV3/HNKtkg7hmm6pRjpYE9806u/GT0oI+lMQ==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/sass-lint/-/sass-lint-1.12.1.tgz", + "integrity": "sha1-Yw9pwhaqIGuCMvsqqQe98zNrbYM=", "dev": true, "requires": { "commander": "2.11.0", @@ -8420,7 +9148,7 @@ "fs-extra": "3.0.1", "glob": "7.1.2", "globule": "1.2.0", - "gonzales-pe": "4.2.2", + "gonzales-pe-sl": "4.2.3", "js-yaml": "3.7.0", "known-css-properties": "0.3.0", "lodash.capitalize": "4.2.1", @@ -8437,14 +9165,14 @@ "dev": true, "requires": { "glob": "7.1.2", - "lodash": "4.17.4", + "lodash": "4.17.10", "minimatch": "3.0.4" } }, "lodash": { - "version": "4.17.4", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", + "version": "4.17.10", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", + "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==", "dev": true } } @@ -8484,7 +9212,7 @@ "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", "dev": true, "requires": { - "js-base64": "2.3.2", + "js-base64": "2.4.5", "source-map": "0.4.4" }, "dependencies": { @@ -8500,83 +9228,36 @@ } }, "semver": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", - "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, "send": { - "version": "0.15.2", - "resolved": "https://registry.npmjs.org/send/-/send-0.15.2.tgz", - "integrity": "sha1-+R+rRAO8+H5xb3DOtdsvV4vcF9Y=", + "version": "0.16.2", + "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz", + "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==", "dev": true, "requires": { - "debug": "2.6.4", - "depd": "1.1.1", + "debug": "2.6.9", + "depd": "1.1.2", "destroy": "1.0.4", - "encodeurl": "1.0.1", + "encodeurl": "1.0.2", "escape-html": "1.0.3", "etag": "1.8.1", - "fresh": "0.5.0", - "http-errors": "1.6.2", - "mime": "1.3.4", - "ms": "1.0.0", + "fresh": "0.5.2", + "http-errors": "1.6.3", + "mime": "1.4.1", + "ms": "2.0.0", "on-finished": "2.3.0", "range-parser": "1.2.0", - "statuses": "1.3.1" + "statuses": "1.4.0" }, "dependencies": { - "debug": { - "version": "2.6.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.4.tgz", - "integrity": "sha1-dYaps8OXQcAoKuM0RcTorHRzT+A=", - "dev": true, - "requires": { - "ms": "0.7.3" - }, - "dependencies": { - "ms": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz", - "integrity": "sha1-cIFVpeROM/X9D8U+gdDUCpG+H/8=", - "dev": true - } - } - }, - "fresh": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz", - "integrity": "sha1-9HTKXmqSRtb9jglTz6m5yAWvp44=", - "dev": true - }, - "http-errors": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz", - "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=", - "dev": true, - "requires": { - "depd": "1.1.1", - "inherits": "2.0.3", - "setprototypeof": "1.0.3", - "statuses": "1.3.1" - } - }, - "mime": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz", - "integrity": "sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM=", - "dev": true - }, - "ms": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-1.0.0.tgz", - "integrity": "sha1-Wa3NIu3FQ/e1OBhi0xOHsfS8lHM=", - "dev": true - }, - "setprototypeof": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz", - "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=", + "statuses": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", + "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==", "dev": true } } @@ -8593,25 +9274,59 @@ "integrity": "sha1-fF2WwT+xMRAfk8HFd0+FFqHnjTs=", "dev": true, "requires": { - "accepts": "1.3.4", + "accepts": "1.3.5", "batch": "0.5.3", "debug": "2.2.0", "escape-html": "1.0.3", "http-errors": "1.5.1", - "mime-types": "2.1.17", + "mime-types": "2.1.18", "parseurl": "1.3.2" + }, + "dependencies": { + "debug": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", + "dev": true, + "requires": { + "ms": "0.7.1" + } + }, + "http-errors": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz", + "integrity": "sha1-eIwNLB3iyBuebowBhDtrl+uSB1A=", + "dev": true, + "requires": { + "inherits": "2.0.3", + "setprototypeof": "1.0.2", + "statuses": "1.3.1" + } + }, + "ms": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", + "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=", + "dev": true + }, + "setprototypeof": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz", + "integrity": "sha1-gaVSFB7BBLiOic44MQOtXGZWTQg=", + "dev": true + } } }, "serve-static": { - "version": "1.12.2", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.12.2.tgz", - "integrity": "sha1-5UbicmCBuBtLzsjpCAjrzdMjr7o=", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz", + "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==", "dev": true, "requires": { - "encodeurl": "1.0.1", + "encodeurl": "1.0.2", "escape-html": "1.0.3", "parseurl": "1.3.2", - "send": "0.15.2" + "send": "0.16.2" } }, "server-destroy": { @@ -8632,10 +9347,33 @@ "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", "dev": true }, + "set-value": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", + "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", + "dev": true, + "requires": { + "extend-shallow": "2.0.1", + "is-extendable": "0.1.1", + "is-plain-object": "2.0.4", + "split-string": "3.1.0" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, "setprototypeof": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz", - "integrity": "sha1-gaVSFB7BBLiOic44MQOtXGZWTQg=", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", + "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", "dev": true }, "shallow-copy": { @@ -8689,6 +9427,114 @@ "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=", "dev": true }, + "snapdragon": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", + "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", + "dev": true, + "requires": { + "base": "0.11.2", + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "map-cache": "0.2.2", + "source-map": "0.5.7", + "source-map-resolve": "0.5.2", + "use": "3.1.0" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, + "requires": { + "is-descriptor": "0.1.6" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "snapdragon-node": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", + "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", + "dev": true, + "requires": { + "define-property": "1.0.0", + "isobject": "3.0.1", + "snapdragon-util": "3.0.1" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, + "requires": { + "is-descriptor": "1.0.2" + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "dev": true, + "requires": { + "kind-of": "6.0.2" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "dev": true, + "requires": { + "kind-of": "6.0.2" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" + } + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true + }, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "dev": true + } + } + }, + "snapdragon-util": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", + "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", + "dev": true, + "requires": { + "kind-of": "3.2.2" + } + }, "sntp": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", @@ -8699,128 +9545,70 @@ } }, "socket.io": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-1.6.0.tgz", - "integrity": "sha1-PkDZMmN+a9kjmBslyvfFPoO24uE=", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.0.4.tgz", + "integrity": "sha1-waRZDO/4fs8TxyZS8Eb3FrKeYBQ=", "dev": true, "requires": { - "debug": "2.3.3", - "engine.io": "1.8.0", - "has-binary": "0.1.7", - "object-assign": "4.1.0", - "socket.io-adapter": "0.5.0", - "socket.io-client": "1.6.0", - "socket.io-parser": "2.3.1" - }, - "dependencies": { - "debug": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", - "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", - "dev": true, - "requires": { - "ms": "0.7.2" - } - }, - "ms": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", - "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", - "dev": true - }, - "object-assign": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz", - "integrity": "sha1-ejs9DpgGPUP0wD8uiubNUahog6A=", - "dev": true - } + "debug": "2.6.9", + "engine.io": "3.1.5", + "socket.io-adapter": "1.1.1", + "socket.io-client": "2.0.4", + "socket.io-parser": "3.1.3" } }, "socket.io-adapter": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz", - "integrity": "sha1-y21LuL7IHhB4uZZ3+c7QBGBmu4s=", - "dev": true, - "requires": { - "debug": "2.3.3", - "socket.io-parser": "2.3.1" - }, - "dependencies": { - "debug": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", - "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", - "dev": true, - "requires": { - "ms": "0.7.2" - } - }, - "ms": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", - "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", - "dev": true - } - } + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz", + "integrity": "sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=", + "dev": true }, "socket.io-client": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.6.0.tgz", - "integrity": "sha1-W2aPT3cTBN/u0XkGRwg4b6ZxeFM=", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.0.4.tgz", + "integrity": "sha1-CRilUkBtxeVAs4Dc2Xr8SmQzL44=", "dev": true, "requires": { "backo2": "1.0.2", + "base64-arraybuffer": "0.1.5", "component-bind": "1.0.0", "component-emitter": "1.2.1", - "debug": "2.3.3", - "engine.io-client": "1.8.0", - "has-binary": "0.1.7", + "debug": "2.6.9", + "engine.io-client": "3.1.6", + "has-cors": "1.1.0", "indexof": "0.0.1", "object-component": "0.0.3", + "parseqs": "0.0.5", "parseuri": "0.0.5", - "socket.io-parser": "2.3.1", + "socket.io-parser": "3.1.3", "to-array": "0.1.4" - }, - "dependencies": { - "component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", - "dev": true - }, - "debug": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", - "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", - "dev": true, - "requires": { - "ms": "0.7.2" - } - }, - "ms": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", - "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", - "dev": true - } } }, "socket.io-parser": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz", - "integrity": "sha1-3VMgJRA85Clpcya+/WQAX8/ltKA=", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.1.3.tgz", + "integrity": "sha512-g0a2HPqLguqAczs3dMECuA1RgoGFPyvDqcbaDEdCWY9g59kdUAz3YRmaJBNKXflrHNwB7Q12Gkf/0CZXfdHR7g==", "dev": true, "requires": { - "component-emitter": "1.1.2", - "debug": "2.2.0", - "isarray": "0.0.1", - "json3": "3.3.2" + "component-emitter": "1.2.1", + "debug": "3.1.0", + "has-binary2": "1.0.3", + "isarray": "2.0.1" }, "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz", + "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=", "dev": true } } @@ -8841,14 +9629,15 @@ "dev": true }, "source-map-resolve": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.3.1.tgz", - "integrity": "sha1-YQ9hIqRFuN1RU1oqcbeD38Ekh2E=", + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz", + "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==", "dev": true, "requires": { - "atob": "1.1.3", + "atob": "2.1.1", + "decode-uri-component": "0.2.0", "resolve-url": "0.2.1", - "source-map-url": "0.3.0", + "source-map-url": "0.4.0", "urix": "0.1.0" } }, @@ -8862,9 +9651,9 @@ } }, "source-map-url": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.3.0.tgz", - "integrity": "sha1-fsrxO1e80J2opAxdJp2zN5nUqvk=", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", + "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=", "dev": true }, "sparkles": { @@ -8874,24 +9663,35 @@ "dev": true }, "spdx-correct": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", - "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz", + "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==", "dev": true, "requires": { - "spdx-license-ids": "1.2.2" + "spdx-expression-parse": "3.0.0", + "spdx-license-ids": "3.0.0" } }, - "spdx-expression-parse": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", - "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=", + "spdx-exceptions": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz", + "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==", "dev": true }, + "spdx-expression-parse": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", + "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", + "dev": true, + "requires": { + "spdx-exceptions": "2.1.0", + "spdx-license-ids": "3.0.0" + } + }, "spdx-license-ids": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", - "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz", + "integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==", "dev": true }, "split": { @@ -8903,6 +9703,36 @@ "through": "2.3.8" } }, + "split-string": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", + "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", + "dev": true, + "requires": { + "extend-shallow": "3.0.2" + }, + "dependencies": { + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "dev": true, + "requires": { + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" + } + }, + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, + "requires": { + "is-plain-object": "2.0.4" + } + } + } + }, "sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", @@ -8910,12 +9740,12 @@ "dev": true }, "spritesheet-templates": { - "version": "10.2.1", - "resolved": "https://registry.npmjs.org/spritesheet-templates/-/spritesheet-templates-10.2.1.tgz", - "integrity": "sha1-XvVPt47Up28ZMuQQ9yqKuIi3y5o=", + "version": "10.2.2", + "resolved": "https://registry.npmjs.org/spritesheet-templates/-/spritesheet-templates-10.2.2.tgz", + "integrity": "sha1-6J2ihbvM20HFm1eYFnTikGeJrWY=", "dev": true, "requires": { - "handlebars": "4.0.10", + "handlebars": "4.0.11", "handlebars-layouts": "1.1.0", "json-content-demux": "0.1.3", "underscore": "1.4.4", @@ -8931,30 +9761,61 @@ } }, "spritesmith": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/spritesmith/-/spritesmith-3.1.1.tgz", - "integrity": "sha1-TlNk65v9mH2vbBtIpY0r5bag+Nc=", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/spritesmith/-/spritesmith-3.3.0.tgz", + "integrity": "sha1-M40taGKV9QQJMWWBHys4NqTVc0Q=", "dev": true, "requires": { "concat-stream": "1.5.2", "layout": "2.2.0", - "pixelsmith": "2.1.2", + "pixelsmith": "2.2.1", "semver": "5.0.3", "through2": "2.0.3" }, "dependencies": { + "concat-stream": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz", + "integrity": "sha1-cIl4Yk2FavQaWnQd790mHadSwmY=", + "dev": true, + "requires": { + "inherits": "2.0.3", + "readable-stream": "2.0.6", + "typedarray": "0.0.6" + } + }, + "readable-stream": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", + "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "string_decoder": "0.10.31", + "util-deprecate": "1.0.2" + } + }, "semver": { "version": "5.0.3", "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz", "integrity": "sha1-d0Zt5YnNXTyV8TiqeLxWmjy10no=", "dev": true + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true } } }, "sshpk": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz", - "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz", + "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=", "dev": true, "requires": { "asn1": "0.2.3", @@ -9015,13 +9876,34 @@ } } }, + "static-extend": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", + "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", + "dev": true, + "requires": { + "define-property": "0.2.5", + "object-copy": "0.1.0" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, + "requires": { + "is-descriptor": "0.1.6" + } + } + } + }, "static-module": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/static-module/-/static-module-1.5.0.tgz", "integrity": "sha1-J9qYg8QajNCSNvhC8MHrxu32PYY=", "dev": true, "requires": { - "concat-stream": "1.6.0", + "concat-stream": "1.6.2", "duplexer2": "0.0.2", "escodegen": "1.3.3", "falafel": "2.1.0", @@ -9034,33 +9916,11 @@ "through2": "0.4.2" }, "dependencies": { - "concat-stream": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz", - "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=", - "dev": true, - "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.3", - "typedarray": "0.0.6" - }, - "dependencies": { - "readable-stream": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", - "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", - "dev": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "safe-buffer": "5.1.1", - "string_decoder": "1.0.3", - "util-deprecate": "1.0.2" - } - } - } + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true }, "readable-stream": { "version": "1.0.34", @@ -9072,22 +9932,14 @@ "inherits": "2.0.3", "isarray": "0.0.1", "string_decoder": "0.10.31" - }, - "dependencies": { - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true - } } }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + }, "through2": { "version": "0.4.2", "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz", @@ -9152,7 +10004,7 @@ "dev": true, "requires": { "commander": "2.11.0", - "limiter": "1.1.2" + "limiter": "1.1.3" } }, "strict-uri-encode": { @@ -9191,9 +10043,9 @@ } }, "stringstream": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", - "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=", + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz", + "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==", "dev": true }, "strip-ansi": { @@ -9264,23 +10116,6 @@ "mkdirp": "0.5.1", "sax": "1.2.4", "whet.extend": "0.9.9" - }, - "dependencies": { - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, - "requires": { - "minimist": "0.0.8" - } - } } }, "table": { @@ -9292,7 +10127,7 @@ "ajv": "4.11.8", "ajv-keywords": "1.5.1", "chalk": "1.1.3", - "lodash": "4.17.4", + "lodash": "4.17.10", "slice-ansi": "0.0.4", "string-width": "2.1.1" }, @@ -9310,9 +10145,9 @@ "dev": true }, "lodash": { - "version": "4.17.4", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", + "version": "4.17.10", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", + "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==", "dev": true }, "string-width": { @@ -9417,12 +10252,12 @@ "dev": true }, "timers-ext": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.2.tgz", - "integrity": "sha1-YcxHp2wavTGV8UUn+XjViulMUgQ=", + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.5.tgz", + "integrity": "sha512-tsEStd7kmACHENhsUPaxb8Jf8/+GZZxyNFQbZD07HQOyooOa6At1rQqjffgvg7n+dxscQa9cjjMdWhJtsP2sxg==", "dev": true, "requires": { - "es5-ext": "0.10.30", + "es5-ext": "0.10.42", "next-tick": "1.0.0" } }, @@ -9484,6 +10319,69 @@ "integrity": "sha1-qvIx1vqUiUn4GTAburRITYWI5Kc=", "dev": true }, + "to-object-path": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", + "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + } + }, + "to-regex": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", + "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", + "dev": true, + "requires": { + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "regex-not": "1.0.2", + "safe-regex": "1.1.0" + }, + "dependencies": { + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "dev": true, + "requires": { + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" + } + }, + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, + "requires": { + "is-plain-object": "2.0.4" + } + } + } + }, + "to-regex-range": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", + "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "dev": true, + "requires": { + "is-number": "3.0.0", + "repeat-string": "1.6.1" + }, + "dependencies": { + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + } + } + } + }, "to-single-quotes": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/to-single-quotes/-/to-single-quotes-2.0.1.tgz", @@ -9499,10 +10397,19 @@ "through2": "2.0.3" } }, + "touch": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz", + "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==", + "dev": true, + "requires": { + "nopt": "1.0.10" + } + }, "tough-cookie": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz", - "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=", + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", + "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", "dev": true, "requires": { "punycode": "1.4.1" @@ -9514,21 +10421,36 @@ "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", "dev": true }, - "tryit": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz", - "integrity": "sha1-OTvnMKlEb9Hq1tpZoBQwjzbCics=", - "dev": true - }, - "tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "true-case-path": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.2.tgz", + "integrity": "sha1-fskRMJJHZsf1c74wIMNPj9/QDWI=", "dev": true, "requires": { - "safe-buffer": "5.1.1" + "glob": "6.0.4" + }, + "dependencies": { + "glob": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", + "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", + "dev": true, + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + } } }, + "tunnel-agent": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz", + "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=", + "dev": true + }, "tweetnacl": { "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", @@ -9552,19 +10474,33 @@ "dev": true }, "ua-parser-js": { - "version": "0.7.12", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.12.tgz", - "integrity": "sha1-BMgamb3V3FImPqKdJMa/jUgYpLs=", + "version": "0.7.17", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.17.tgz", + "integrity": "sha512-uRdSdu1oA1rncCQL7sCj8vSyZkgtL7faaw9Tc9rZ3mGgraQ7+Pdx7w5mnOSF3gw9ZNG6oc+KXfkon3bKuROm0g==", "dev": true }, "uglify-es": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.1.2.tgz", - "integrity": "sha512-ULYW1xj/yW0IAkLW1XzIXB3O888275E2/r4tFy83D9wPRKGlUjKWeQAZoyHXujr/fsHeh6QMlc1ayCE8kqnoaw==", + "version": "3.3.10", + "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.10.tgz", + "integrity": "sha512-rPzPisCzW68Okj1zNrfa2dR9uEm43SevDmpR6FChoZABFk9dANGnzzBMgHYUXI3609//63fnVkyQ1SQmAMyjww==", "dev": true, "requires": { - "commander": "2.11.0", - "source-map": "0.5.7" + "commander": "2.14.1", + "source-map": "0.6.1" + }, + "dependencies": { + "commander": { + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz", + "integrity": "sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw==", + "dev": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } } }, "uglify-js": { @@ -9585,9 +10521,9 @@ "optional": true }, "ultron": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz", - "integrity": "sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po=", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", + "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==", "dev": true }, "unc-path-regex": { @@ -9597,9 +10533,9 @@ "dev": true }, "underscore": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz", - "integrity": "sha1-a7rwh3UA02vjTsqlhODbn+8DUgk=", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz", + "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=", "dev": true }, "underscore.string": { @@ -9608,21 +10544,53 @@ "integrity": "sha1-Rhe4waJQz25QZPu7Nj0PqWzxRVI=", "dev": true }, + "union-value": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", + "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", + "dev": true, + "requires": { + "arr-union": "3.1.0", + "get-value": "2.0.6", + "is-extendable": "0.1.1", + "set-value": "0.4.3" + }, + "dependencies": { + "arr-union": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", + "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", + "dev": true + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + }, + "set-value": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", + "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", + "dev": true, + "requires": { + "extend-shallow": "2.0.1", + "is-extendable": "0.1.1", + "is-plain-object": "2.0.4", + "to-object-path": "0.3.0" + } + } + } + }, "uniq": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=", "dev": true }, - "uniqid": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-4.1.1.tgz", - "integrity": "sha1-iSIN32t1GuUrX3JISGNShZa7hME=", - "dev": true, - "requires": { - "macaddress": "0.2.8" - } - }, "uniqs": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz", @@ -9647,6 +10615,59 @@ "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", "dev": true }, + "unset-value": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", + "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", + "dev": true, + "requires": { + "has-value": "0.3.1", + "isobject": "3.0.1" + }, + "dependencies": { + "has-value": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", + "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", + "dev": true, + "requires": { + "get-value": "2.0.6", + "has-values": "0.1.4", + "isobject": "2.1.0" + }, + "dependencies": { + "isobject": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", + "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", + "dev": true, + "requires": { + "isarray": "1.0.0" + } + } + } + }, + "has-values": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", + "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=", + "dev": true + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true + } + } + }, + "upath": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz", + "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==", + "dev": true, + "optional": true + }, "urix": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", @@ -9679,6 +10700,23 @@ "url": "0.10.2" } }, + "use": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/use/-/use-3.1.0.tgz", + "integrity": "sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==", + "dev": true, + "requires": { + "kind-of": "6.0.2" + }, + "dependencies": { + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "dev": true + } + } + }, "user-home": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz", @@ -9728,8 +10766,8 @@ "requires": { "async": "0.2.10", "deep-equal": "1.0.1", - "i": "0.3.5", - "mkdirp": "0.3.0", + "i": "0.3.6", + "mkdirp": "0.5.1", "ncp": "0.4.2", "rimraf": "2.6.2" }, @@ -9749,11 +10787,18 @@ "dev": true }, "uuid": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", - "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", + "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=", "dev": true }, + "uws": { + "version": "9.14.0", + "resolved": "https://registry.npmjs.org/uws/-/uws-9.14.0.tgz", + "integrity": "sha512-HNMztPP5A1sKuVFmdZ6BPVpBQd5bUjNC8EFMFiICK+oho/OQsAJy5hnIx4btMHiOk8j04f/DbIlqnEZ9d72dqg==", + "dev": true, + "optional": true + }, "v8flags": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz", @@ -9764,13 +10809,13 @@ } }, "validate-npm-package-license": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", - "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz", + "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==", "dev": true, "requires": { - "spdx-correct": "1.0.2", - "spdx-expression-parse": "1.0.4" + "spdx-correct": "3.0.0", + "spdx-expression-parse": "3.0.0" } }, "value-or-function": { @@ -9780,9 +10825,9 @@ "dev": true }, "vendors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.1.tgz", - "integrity": "sha1-N61zyO5Bf7PVgOeFMSMH0nSEfyI=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.2.tgz", + "integrity": "sha512-w/hry/368nO21AN9QljsaIhb9ZiZtZARoVH5f3CsFbawdLdayCgKRPup7CggujvySMxx0I91NOyxdVENohprLQ==", "dev": true }, "verror": { @@ -10001,9 +11046,9 @@ } }, "vow": { - "version": "0.4.16", - "resolved": "https://registry.npmjs.org/vow/-/vow-0.4.16.tgz", - "integrity": "sha1-u51U2TjV+AUg1linQOeoleMP7us=", + "version": "0.4.17", + "resolved": "https://registry.npmjs.org/vow/-/vow-0.4.17.tgz", + "integrity": "sha512-A3/9bWFqf6gT0jLR4/+bT+IPTe1mQf+tdsW6+WI5geP9smAp8Kbbu4R6QQCDKZN/8TSCqTlXVQm12QliB4rHfg==", "dev": true }, "vow-fs": { @@ -10014,36 +11059,17 @@ "requires": { "glob": "7.1.2", "uuid": "2.0.3", - "vow": "0.4.16", - "vow-queue": "0.4.2" - }, - "dependencies": { - "uuid": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", - "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=", - "dev": true - } + "vow": "0.4.17", + "vow-queue": "0.4.3" } }, "vow-queue": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/vow-queue/-/vow-queue-0.4.2.tgz", - "integrity": "sha1-5/4XFg4Vx8QYTRtmapvGThjjAYQ=", + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/vow-queue/-/vow-queue-0.4.3.tgz", + "integrity": "sha512-/poAKDTFL3zYbeQg7cl4BGcfP4sGgXKrHnRFSKj97dteUFu8oyXMwIcdwu8NSx/RmPGIuYx1Bik/y5vU4H/VKw==", "dev": true, "requires": { - "vow": "0.4.16" - } - }, - "weinre": { - "version": "2.0.0-pre-I0Z7U9OV", - "resolved": "https://registry.npmjs.org/weinre/-/weinre-2.0.0-pre-I0Z7U9OV.tgz", - "integrity": "sha1-/viqIjkh97QLu71MPtQwL2/QqBM=", - "dev": true, - "requires": { - "express": "2.5.11", - "nopt": "3.0.6", - "underscore": "1.7.0" + "vow": "0.4.17" } }, "whet.extend": { @@ -10068,18 +11094,18 @@ "dev": true }, "wide-align": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz", - "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "dev": true, "requires": { "string-width": "1.0.2" } }, "window-size": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz", - "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz", + "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=", "dev": true }, "winston": { @@ -10118,9 +11144,9 @@ } }, "wordwrap": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", "dev": true }, "wrap-ansi": { @@ -10146,41 +11172,19 @@ "dev": true, "requires": { "mkdirp": "0.5.1" - }, - "dependencies": { - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, - "requires": { - "minimist": "0.0.8" - } - } } }, "ws": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz", - "integrity": "sha1-CC3bbGQehdS7RR8D1S8G6r2x8Bg=", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz", + "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==", "dev": true, "requires": { - "options": "0.0.6", - "ultron": "1.0.2" + "async-limiter": "1.0.0", + "safe-buffer": "5.1.1", + "ultron": "1.1.1" } }, - "wtf-8": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz", - "integrity": "sha1-OS2LotDxw00e4tYw8V0O+2jhBIo=", - "dev": true - }, "xmlbuilder": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-3.1.0.tgz", @@ -10191,9 +11195,9 @@ } }, "xmlhttprequest-ssl": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz", - "integrity": "sha1-GFqIjATspGw+QHDZn3tJ3jUomS0=", + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz", + "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=", "dev": true }, "xtend": { @@ -10234,20 +11238,6 @@ "window-size": "0.2.0", "y18n": "3.2.1", "yargs-parser": "4.2.1" - }, - "dependencies": { - "camelcase": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", - "dev": true - }, - "window-size": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz", - "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=", - "dev": true - } } }, "yargs-parser": { @@ -10257,14 +11247,6 @@ "dev": true, "requires": { "camelcase": "3.0.0" - }, - "dependencies": { - "camelcase": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", - "dev": true - } } }, "yeast": { diff --git a/package.json b/package.json index 8d5dead..612a412 100644 --- a/package.json +++ b/package.json @@ -17,36 +17,36 @@ }, "homepage": "https://github.com/sthag/hippie#readme", "devDependencies": { - "browser-sync": "^2.18.13", + "browser-sync": "^2.24.4", "del": "^3.0.0", "gulp": "^3.9.1", - "gulp-autoprefixer": "^4.0.0", + "gulp-autoprefixer": "^4.1.0", "gulp-cached": "^1.1.1", - "gulp-changed": "^3.1.0", + "gulp-changed": "^3.2.0", "gulp-concat": "^2.6.1", - "gulp-cssnano": "^2.1.2", + "gulp-cssnano": "^2.1.3", "gulp-data": "^1.3.1", "gulp-if": "^2.0.2", - "gulp-jscs": "^4.0.0", - "gulp-jshint": "^2.0.4", - "gulp-newer": "^1.3.0", - "gulp-notify": "^3.0.0", - "gulp-nunjucks-render": "^2.2.1", - "gulp-plumber": "^1.1.0", + "gulp-jscs": "^4.1.0", + "gulp-jshint": "^2.1.0", + "gulp-newer": "^1.4.0", + "gulp-notify": "^3.2.0", + "gulp-nunjucks-render": "^2.2.2", + "gulp-plumber": "^1.2.0", "gulp-remember": "^0.3.1", - "gulp-rename": "^1.2.2", + "gulp-rename": "^1.2.3", "gulp-ruby-sass": "^2.1.1", - "gulp-sass": "^3.1.0", - "gulp-sass-lint": "^1.3.3", - "gulp-sourcemaps": "^2.6.1", + "gulp-sass": "^3.2.1", + "gulp-sass-lint": "^1.4.0", + "gulp-sourcemaps": "^2.6.4", "gulp-uglify": "^3.0.0", "gulp-useref": "^3.1.5", - "gulp.spritesmith": "^6.5.1", + "gulp.spritesmith": "^6.9.0", "jshint": "^2.9.5", "jshint-stylish": "^2.2.1", - "pump": "^1.0.2", - "run-sequence": "^2.2.0", - "uglify-es": "^3.1.2" + "pump": "^1.0.3", + "run-sequence": "^2.2.1", + "uglify-es": "^3.3.10" }, "dependencies": {} } From 4708896f794533f4710c3d7b5f69794ca55bcfff Mon Sep 17 00:00:00 2001 From: Stephan Hagedorn Date: Thu, 16 Aug 2018 10:33:04 +0200 Subject: [PATCH 072/372] reactivated js gulp task --- gulpfile.js | 86 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 53 insertions(+), 33 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index c7ed93f..bc842ad 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -17,38 +17,39 @@ var build_folder = { } // Load plugins -var fs = require('fs'); -const gulp = require('gulp'), -// rename = require('gulp-rename'), -del = require('del'); -gulpif = require('gulp-if'); -sequencer = require('run-sequence'); -// concat = require('gulp-concat'), -// pump = require('pump'), -sourcemap = require('gulp-sourcemaps'), -prefix = require('gulp-autoprefixer'), -sass = require('gulp-sass'), -// rubysass = require('gulp-ruby-sass'), -nunjucks = require('gulp-nunjucks-render'); -// cssnano = require('gulp-cssnano'), -jshint = require('gulp-jshint'), -jscs = require('gulp-jscs'), -// useref = require('gulp-useref'), -sasslint = require('gulp-sass-lint'), -// uglifyjs = require('uglify-es'), -// composer = require('gulp-uglify/composer'), -// imagemin = require('gulp-imagemin'), -spritesmith = require('gulp.spritesmith'), -// cache = require('gulp-cached'), -// remember = require('gulp-remember'), -// changed = require('gulp-changed'), -// newer = require('gulp-newer'), -plumber = require('gulp-plumber'), -notify = require('gulp-notify'), -data = require('gulp-data'), -browsersync = require('browser-sync').create(); +const fs = require('fs'); +const gulp = require('gulp'); +// const rename = require('gulp-rename'); +const del = require('del'); +const gulpif = require('gulp-if'); +const sequencer = require('run-sequence'); +const sourcemap = require('gulp-sourcemaps'); +const prefix = require('gulp-autoprefixer'); +const sass = require('gulp-sass'); +// const rubysass = require('gulp-ruby-sass'); +const nunjucks = require('gulp-nunjucks-render'); +// const cssnano = require('gulp-cssnano'); +const jshint = require('gulp-jshint'); +const jscs = require('gulp-jscs'); +// const useref = require('gulp-useref'); +const sasslint = require('gulp-sass-lint'); +// const imagemin = require('gulp-imagemin'); +const spritesmith = require('gulp.spritesmith'); +// const changed = require('gulp-changed'); +// const newer = require('gulp-newer'); +const plumber = require('gulp-plumber'); +const notify = require('gulp-notify'); +const data = require('gulp-data'); +const browsersync = require('browser-sync').create(); -// var minify = composer(uglifyjs, console); +// only used for js task +const concat = require('gulp-concat'); +const pump = require('pump'); +const composer = require('gulp-uglify/composer'); +const uglifyjs = require('uglify-es'); +const minify = composer(uglifyjs, console); +const cache = require('gulp-cached'); +const remember = require('gulp-remember'); @@ -62,6 +63,7 @@ gulp.task('sass', function() { includePaths: [source_folder.root+'/bower_components'] })) .pipe(prefix(['>= 4%', 'last 2 version'])) + // .pipe(cssnano()) .pipe(sourcemap.write()) .pipe(gulp.dest(build_folder.styles)) .pipe(browsersync.reload({ @@ -70,6 +72,24 @@ gulp.task('sass', function() { }); +// and this is functionality +gulp.task('js', function(cb) { + pump([ + gulp.src(source_folder.scripts), + cache('scripts'), + jshint('.jshintrc'), + jshint.reporter('default'), + sourcemap.init(), + minify(), + remember('scripts'), + concat('all.min.js'), + sourcemap.write(), + gulp.dest(build_folder.scripts), + browsersync.stream() + ], cb); +}); + + // templating engine gulp.task('nunjucks', function() { return gulp.src('source/pages/**/*.+(html|njk)') @@ -150,7 +170,7 @@ gulp.task('clean:dev', function() { // watch over changes and react // split up into sub tasks -gulp.task('watch-js', ['lint:js'], browsersync.reload); +gulp.task('watch-js', ['lint:js', 'js'], browsersync.reload); gulp.task('overwatch', function() { gulp.watch('source/code/**/*.js', ['watch-js']) @@ -168,7 +188,7 @@ gulp.task('default', function(callback) { sequencer( 'clean:dev', ['sprites', 'lint:js', 'lint:scss'], - ['sass', 'nunjucks'], + ['sass', 'js', 'nunjucks'], ['syncreload', 'overwatch'], callback ) From a810ec2770d12091ce372d2ac353c56e9cbc0dad Mon Sep 17 00:00:00 2001 From: Stephan Date: Mon, 20 Aug 2018 22:42:46 +0200 Subject: [PATCH 073/372] demo.3 * moved templates to demo structure * new sass version * restructure of some styles for demo --- gulpfile.js | 4 + package-lock.json | 114 ++++++++++++++++-- package.json | 2 +- source/data.json | 6 +- source/pages/{index.njk => demo.njk} | 4 +- source/pages/maintenance.njk | 13 ++ source/pages/tests.njk | 3 + source/style/{_new.scss => _demo_new.scss} | 0 source/style/demo.scss | 2 +- .../{maintenance.scss => demo_basic.scss} | 2 +- source/style/hippie/elements/_textlevel.scss | 11 ++ source/style/hippie/global/_config.scss | 2 + source/templates/default.njk | 70 +++++------ source/templates/demo.njk | 2 +- source/templates/maintenance.njk | 6 +- 15 files changed, 187 insertions(+), 54 deletions(-) rename source/pages/{index.njk => demo.njk} (92%) create mode 100644 source/pages/maintenance.njk rename source/style/{_new.scss => _demo_new.scss} (100%) rename source/style/{maintenance.scss => demo_basic.scss} (96%) diff --git a/gulpfile.js b/gulpfile.js index bc842ad..ee6ad8f 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -113,8 +113,12 @@ gulp.task('nunjucks', function() { // automagically reload browsers gulp.task('syncreload', function() { browsersync.init({ + // online: false, + // watch: true, + // logLevel: "info", open: false, server: 'build', + // index: "demo.html", // proxy: "http://verser.vrt/virtual/" }); }); diff --git a/package-lock.json b/package-lock.json index 33d44ff..0392fb9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3696,16 +3696,114 @@ } }, "gulp-sass": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-3.2.1.tgz", - "integrity": "sha512-UATbRpSDsyXCnpYSPBUEvdvtSEzksJs7/oQ0CujIpzKqKrO6vlnYwhX2UTsGrf4rNLwqlSSaM271It0uHYvJ3Q==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-4.0.1.tgz", + "integrity": "sha512-OMQEgWNggpog8Tc5v1MuI6eo+5iiPkVeLL76iBhDoEEScLUPfZlpvzmgTnLkpcqdrNodZxpz5qcv6mS2rulk3g==", "dev": true, "requires": { - "gulp-util": "3.0.8", + "chalk": "2.4.1", "lodash.clonedeep": "4.5.0", "node-sass": "4.9.0", + "plugin-error": "1.0.1", + "replace-ext": "1.0.0", + "strip-ansi": "4.0.0", "through2": "2.0.3", "vinyl-sourcemaps-apply": "0.2.1" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "arr-diff": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", + "dev": true + }, + "arr-union": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", + "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", + "dev": true + }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.4.0" + } + }, + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "dev": true, + "requires": { + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" + } + }, + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, + "requires": { + "is-plain-object": "2.0.4" + } + }, + "plugin-error": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz", + "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==", + "dev": true, + "requires": { + "ansi-colors": "1.1.0", + "arr-diff": "4.0.0", + "arr-union": "3.1.0", + "extend-shallow": "3.0.2" + } + }, + "replace-ext": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz", + "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=", + "dev": true + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + }, + "supports-color": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + } } }, "gulp-sass-lint": { @@ -6075,13 +6173,13 @@ "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", "dev": true, "requires": { - "globule": "1.2.0" + "globule": "1.2.1" } }, "globule": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz", - "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz", + "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==", "dev": true, "requires": { "glob": "7.1.2", diff --git a/package.json b/package.json index 612a412..0bd8e8c 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "gulp-remember": "^0.3.1", "gulp-rename": "^1.2.3", "gulp-ruby-sass": "^2.1.1", - "gulp-sass": "^3.2.1", + "gulp-sass": "^4.0.1", "gulp-sass-lint": "^1.4.0", "gulp-sourcemaps": "^2.6.4", "gulp-uglify": "^3.0.0", diff --git a/source/data.json b/source/data.json index 5c43ee8..5b6c22d 100644 --- a/source/data.json +++ b/source/data.json @@ -21,11 +21,15 @@ "text": "500" } ], - "links": [ + "demoadditionallinks": [ { "href": "blank.html", "text": "Blank" }, + { + "href": "maintenance.html", + "text": "Maintenance" + }, { "href": "tests.html", "text": "Tests" diff --git a/source/pages/index.njk b/source/pages/demo.njk similarity index 92% rename from source/pages/index.njk rename to source/pages/demo.njk index c6cd661..4e96715 100644 --- a/source/pages/index.njk +++ b/source/pages/demo.njk @@ -29,8 +29,8 @@ C(")(")

Overview about all the styles

    - - {% for link in links %} + + {% for link in demoadditionallinks %}
  • {{link.text}}
    • {% endfor %}
diff --git a/source/pages/maintenance.njk b/source/pages/maintenance.njk new file mode 100644 index 0000000..f7cd759 --- /dev/null +++ b/source/pages/maintenance.njk @@ -0,0 +1,13 @@ + +{% set pageId = "blank" %} +{% set pageClass = "height_full" %} + +{% extends "maintenance.njk" %} + +{% block title %}Wartung{% endblock %} + +{% block body_content %} +
+

HIPPIE

+
+{% endblock %} diff --git a/source/pages/tests.njk b/source/pages/tests.njk index 39c8021..61ffe44 100644 --- a/source/pages/tests.njk +++ b/source/pages/tests.njk @@ -26,6 +26,9 @@ Caps Lock is ON. + +{% import "macros/nav-macro.njk" as forms %} +{{ forms.active('zubereitung') }} {% endblock %} {% block script %} diff --git a/source/style/_new.scss b/source/style/_demo_new.scss similarity index 100% rename from source/style/_new.scss rename to source/style/_demo_new.scss diff --git a/source/style/demo.scss b/source/style/demo.scss index 5da0ada..fa1ab3c 100644 --- a/source/style/demo.scss +++ b/source/style/demo.scss @@ -13,4 +13,4 @@ @import "modules/demo/demo_module"; // @import "modules/YOUR-MODULE/YOUR-FILES"; // New -@import "new"; +@import "demo_new"; diff --git a/source/style/maintenance.scss b/source/style/demo_basic.scss similarity index 96% rename from source/style/maintenance.scss rename to source/style/demo_basic.scss index 320218f..bc2e4b6 100644 --- a/source/style/maintenance.scss +++ b/source/style/demo_basic.scss @@ -13,4 +13,4 @@ @import "modules/demo/demo_module"; // @import "modules/YOUR-MODULE/YOUR-FILES"; // New -@import "new"; +@import "demo_new"; diff --git a/source/style/hippie/elements/_textlevel.scss b/source/style/hippie/elements/_textlevel.scss index 6a3e1c2..d324701 100644 --- a/source/style/hippie/elements/_textlevel.scss +++ b/source/style/hippie/elements/_textlevel.scss @@ -185,6 +185,10 @@ del { font-size: 3em !important; } +.txt_hero { + font-size: $hero_size_1; +} + .txt_center { text-align: center !important; } @@ -202,3 +206,10 @@ del { .txt_black { color: black; } + +.txt_gradient { + background: linear-gradient(165deg, $alpha_color 30%, $bravo_color 45%, $charlie_color 50%, $delta_color, $echo_color 80%, $foxtrot_color); + background-clip: text; + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; +} diff --git a/source/style/hippie/global/_config.scss b/source/style/hippie/global/_config.scss index 2215a9d..a0410ab 100644 --- a/source/style/hippie/global/_config.scss +++ b/source/style/hippie/global/_config.scss @@ -52,6 +52,8 @@ $head_size_4: 1.35em !default; $text_size_1: 1em; $text_size_2: 20; +$hero_size_1: $head_size_1 * 3; + $text_line_basic: 1.3 !default; $text_line_mono: 1.1 !default; $head_line_basic: $text_line_basic !default; diff --git a/source/templates/default.njk b/source/templates/default.njk index 076ff87..df8c150 100644 --- a/source/templates/default.njk +++ b/source/templates/default.njk @@ -1,35 +1,35 @@ - - - - - - {% block head %} - {% block title %}{% endblock %} - HIPPIE - - - - - - - - - - - - - - - {% endblock %} - - - - {% block body_content %}{% endblock %} - - {# #} - - {% block script %}{% endblock %} - - + + + + + + {% block head %} + {% block title %}{% endblock %} - HIPPIE + + + + + + + + + + + + + + + {% endblock %} + + + + {% block body_content %}{% endblock %} + + {# #} + + {% block script %}{% endblock %} + + diff --git a/source/templates/demo.njk b/source/templates/demo.njk index a7a15d9..7741e5f 100644 --- a/source/templates/demo.njk +++ b/source/templates/demo.njk @@ -28,7 +28,7 @@ - + {% endblock %} diff --git a/source/templates/maintenance.njk b/source/templates/maintenance.njk index 1604c81..56be958 100644 --- a/source/templates/maintenance.njk +++ b/source/templates/maintenance.njk @@ -17,13 +17,11 @@ - + {% endblock %} -
- {% block body_content %}{% endblock %} -
+ {% block body_content %}{% endblock %} From 0a78f526f5cf80df1fc04a295d99e45410d448f9 Mon Sep 17 00:00:00 2001 From: Stephan Date: Fri, 31 Aug 2018 18:52:21 +0200 Subject: [PATCH 074/372] demo.4 * restructure of all templates and pages * fixed gulp reloading of pages * restructured style elements accroding to HTML5.2 doc * changed basic line-height * added positional styles * added demo_module styles --- gulpfile.js | 14 +- source/{data.json => demo_data.json} | 30 +- source/pages/blank.njk | 11 - source/pages/demo.njk | 33 +- source/pages/demo/blank.njk | 17 + source/pages/demo/elements.njk | 141 +- source/pages/demo/error/404.njk | 48 +- source/pages/demo/error/500.njk | 48 +- source/pages/demo/intro.njk | 1428 ++++++++--------- source/pages/demo/maintenance.njk | 19 + source/pages/demo/os.njk | 9 +- source/pages/{ => demo}/tests.njk | 10 +- source/pages/maintenance.njk | 13 - source/style/hippie/_basic.scss | 2 +- source/style/hippie/elements/_embedded.scss | 33 +- source/style/hippie/elements/_grouping.scss | 88 +- .../style/hippie/elements/_interactive.scss | 168 +- source/style/hippie/elements/_sections.scss | 127 +- source/style/hippie/elements/_tables.scss | 71 +- source/style/hippie/elements/_textlevel.scss | 92 +- source/style/hippie/global/_common.scss | 12 + source/style/hippie/global/_config.scss | 2 +- .../{elements => global}/_typography.scss | 124 +- .../modules/navigation/_nav_module.scss | 9 +- source/style/modules/demo/_demo_module.scss | 14 + .../{default.njk => hippie/demo-default.njk} | 71 +- .../{demo.njk => hippie/demo-extended.njk} | 8 +- .../demo-maintenance.njk} | 2 +- .../{ => hippie}/macros/nav-macro.njk | 0 .../{ => hippie}/macros/top-macro.njk | 0 .../{ => hippie}/partials/footer-status.njk | 0 .../{ => hippie}/partials/footer.njk | 0 .../hippie/partials/nav-page-meta.njk | 18 + .../{ => hippie}/partials/page-hover.njk | 0 34 files changed, 1454 insertions(+), 1208 deletions(-) rename source/{data.json => demo_data.json} (82%) delete mode 100644 source/pages/blank.njk create mode 100644 source/pages/demo/blank.njk create mode 100644 source/pages/demo/maintenance.njk rename source/pages/{ => demo}/tests.njk (86%) delete mode 100644 source/pages/maintenance.njk rename source/style/hippie/{elements => global}/_typography.scss (94%) rename source/templates/{default.njk => hippie/demo-default.njk} (77%) rename source/templates/{demo.njk => hippie/demo-extended.njk} (86%) rename source/templates/{maintenance.njk => hippie/demo-maintenance.njk} (90%) rename source/templates/{ => hippie}/macros/nav-macro.njk (100%) rename source/templates/{ => hippie}/macros/top-macro.njk (100%) rename source/templates/{ => hippie}/partials/footer-status.njk (100%) rename source/templates/{ => hippie}/partials/footer.njk (100%) create mode 100644 source/templates/hippie/partials/nav-page-meta.njk rename source/templates/{ => hippie}/partials/page-hover.njk (100%) diff --git a/gulpfile.js b/gulpfile.js index ee6ad8f..ea69054 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -13,6 +13,7 @@ var build_folder = { scripts: 'build/js', images: 'build/art', vendor: 'build/vendor', + pages: 'build/**/*.html', root: 'build' } @@ -95,7 +96,7 @@ gulp.task('nunjucks', function() { return gulp.src('source/pages/**/*.+(html|njk)') .pipe(plumbError('Error Running Nunjucks')) .pipe(data(function() { - return JSON.parse(fs.readFileSync('./source/data.json')) + return JSON.parse(fs.readFileSync('./source/demo_data.json')) })) .pipe(nunjucks({ path: ['source/templates'], @@ -114,12 +115,12 @@ gulp.task('nunjucks', function() { gulp.task('syncreload', function() { browsersync.init({ // online: false, - // watch: true, // logLevel: "info", + // proxy: "http://verser.vrt/virtual/", + // watch: true, + index: "demo.html", open: false, - server: 'build', - // index: "demo.html", - // proxy: "http://verser.vrt/virtual/" + server: 'build' }); }); @@ -165,6 +166,7 @@ gulp.task('lint:scss', function() { gulp.task('clean:dev', function() { del.sync([ build_folder.styles, + build_folder.pages, build_folder.root+'/*.html' ]); }); @@ -182,7 +184,7 @@ gulp.task('overwatch', function() { gulp.watch([ 'source/templates/**/*', 'source/pages/**/*.+(html|njk)', - 'source/data.json' + 'source/demo_data.json' ], ['nunjucks']); }); diff --git a/source/data.json b/source/demo_data.json similarity index 82% rename from source/data.json rename to source/demo_data.json index 5b6c22d..6a6be86 100644 --- a/source/data.json +++ b/source/demo_data.json @@ -1,5 +1,5 @@ { - "demolinks": [ + "demoadditionallinks": [ { "href": "demo/intro.html", "text": "Intro" @@ -12,6 +12,20 @@ "href": "demo/os.html", "text": "OS" }, + { + "href": "demo/tests.html", + "text": "Tests" + } + ], + "demolinks": [ + { + "href": "demo/blank.html", + "text": "Blank" + }, + { + "href": "demo/maintenance.html", + "text": "Maintenance" + }, { "href": "demo/error/404.html", "text": "404" @@ -20,19 +34,5 @@ "href": "demo/error/500.html", "text": "500" } - ], - "demoadditionallinks": [ - { - "href": "blank.html", - "text": "Blank" - }, - { - "href": "maintenance.html", - "text": "Maintenance" - }, - { - "href": "tests.html", - "text": "Tests" - } ] } diff --git a/source/pages/blank.njk b/source/pages/blank.njk deleted file mode 100644 index 7cf39c0..0000000 --- a/source/pages/blank.njk +++ /dev/null @@ -1,11 +0,0 @@ - -{% set pageId = "blank" %} -{% set pageClass = "height_full" %} - -{% extends "default.njk" %} - -{% block title %}blank{% endblock %} - -{% block body_content %} - -{% endblock %} diff --git a/source/pages/demo.njk b/source/pages/demo.njk index 4e96715..f6774d8 100644 --- a/source/pages/demo.njk +++ b/source/pages/demo.njk @@ -1,12 +1,14 @@ - + {% set pageId = "index" %} {% set pageClass = "height_full" %} -{% extends "default.njk" %} +{% extends "hippie/demo-default.njk" %} {% block title %}index{% endblock %} {% block head %} {{ super() }} + + {% endblock %} {% block body_content %} @@ -15,18 +17,6 @@

This is HIPPIE

You can start using it by replacing this file with your own index page.

The folder demo contains examples and also an overview of definitions made.
Follow the white rabbit.

- -

Demo Pages

-
    - - {% for link in demolinks %} -
  • {{link.text}}
    • - {% endfor %} -
- 
-  ()()
-  (..)
-C(")(")

Overview about all the styles

+
+ 
+  ()()
+  (..)
+C(")(")
+

Demo Pages

+
+
    + + {% for link in demolinks %} +
  • {{link.text}}
    • + {% endfor %} +
{% endblock %} {% block script %} +{{ super() }} + -{% endblock %} + +{% set pageId = "elements" %} +{% set pageClass = "" %} + +{% extends "hippie/demo-extended.njk" %} + +{% block title %}Elements{% endblock %} +{% block head %} +{{ super() }} +{% endblock %} + +{% block body_content %} +
+ +{% include "hippie/partials/nav-page-meta.njk" %} +
+
+
+
+

Bereiche

+

Um einleitenden Inhalt festzuhalten, wird das <header> Element eingesetzt. Es beinhaltet häufig auch Navigationselemente. Dabei bezieht es sich auf den nächsten, umgebenden Abschnitt.

+ +
+
+

Einen Abschnitt, welcher für sich alleine stehen kann, definiert sich durch <article>. Solch ein Element wird oft detailliert gestaltet, kommt aber auch ohne jegliche Gestaltung aus.

+

Noch allgemeiner ist das <section> Element. Es schafft Bereiche um Inhalte zu strukturieren.

+

Bestimmte Bereiche haben einen vorgegebene Zweck.
Folgende Bereiche sind vorgegeben:

+
+
+ +
+
+

Um einleitenden Inhalt festzuhalten, wird das <header> Element eingesetzt. Es beinhaltet häufig auch Navigationselemente. Dabei bezieht es sich auf den nächsten, umgebenden Abschnitt.

+ +
+
+

Auch abschließender Inhalt kann für einen Abschnitt definiert werden. Dazu wird <footer> eingesetzt.

+
+
+
+
+

Auch abschließender Inhalt kann für einen Abschnitt definiert werden. Dazu wird <footer> eingesetzt.

+
+
+
+{% include "hippie/partials/footer.njk" %} +{% endblock %} + +{% block script %} +{{ super() }} + + + +{% endblock %} diff --git a/source/pages/demo/error/404.njk b/source/pages/demo/error/404.njk index 260fbd5..95c4f43 100644 --- a/source/pages/demo/error/404.njk +++ b/source/pages/demo/error/404.njk @@ -1,23 +1,25 @@ - -{% set pageId = "404" %} -{% set pageClass = "body__status" %} - -{% extends "maintenance.njk" %} - -{% block title %}404{% endblock %} -{% block head %} -{{ super() }} -{% endblock %} - -{% block body_content %} -
-

404

-

Client-Fehler

-

Hier ist nichts. Not Found
-

-

Die angeforderte Ressource wurde nicht gefunden. Dieser Statuscode kann ebenfalls verwendet werden, um eine Anfrage ohne näheren Grund abzuweisen. Links, welche auf solche Fehlerseiten verweisen, werden auch als Tote Links bezeichnet.

-

Wikipedia

-
-
-{% include "partials/footer-status.njk" %} -{% endblock %} + +{% set pageId = "404" %} +{% set pageClass = "body__status" %} + +{% extends "hippie/demo-maintenance.njk" %} + +{% block title %}404{% endblock %} +{% block head %} +{{ super() }} + + +{% endblock %} + +{% block body_content %} +
+

404

+

Client-Fehler

+

Hier ist nichts. Not Found
+

+

Die angeforderte Ressource wurde nicht gefunden. Dieser Statuscode kann ebenfalls verwendet werden, um eine Anfrage ohne näheren Grund abzuweisen. Links, welche auf solche Fehlerseiten verweisen, werden auch als Tote Links bezeichnet.

+

Wikipedia

+
+
+{% include "hippie/partials/footer-status.njk" %} +{% endblock %} diff --git a/source/pages/demo/error/500.njk b/source/pages/demo/error/500.njk index 974bab4..464751e 100644 --- a/source/pages/demo/error/500.njk +++ b/source/pages/demo/error/500.njk @@ -1,23 +1,25 @@ - -{% set pageId = "500" %} -{% set pageClass = "body__status" %} - -{% extends "maintenance.njk" %} - -{% block title %}500{% endblock %} -{% block head %} -{{ super() }} -{% endblock %} - -{% block body_content %} -
-

500

-

Server-Fehler

-

Allgemeiner Server Fehler!!! Internal Server Error

-
-

Dies ist ein „Sammel-Statuscode“ für unerwartete Serverfehler.

-

Wikipedia

-
-
-{% include "partials/footer-status.njk" %} -{% endblock %} + +{% set pageId = "500" %} +{% set pageClass = "body__status" %} + +{% extends "hippie/demo-maintenance.njk" %} + +{% block title %}500{% endblock %} +{% block head %} +{{ super() }} + + +{% endblock %} + +{% block body_content %} +
+

500

+

Server-Fehler

+

Allgemeiner Server Fehler!!! Internal Server Error

+
+

Dies ist ein „Sammel-Statuscode“ für unerwartete Serverfehler.

+

Wikipedia

+
+
+{% include "hippie/partials/footer-status.njk" %} +{% endblock %} diff --git a/source/pages/demo/intro.njk b/source/pages/demo/intro.njk index 85ea3b1..e35d52f 100644 --- a/source/pages/demo/intro.njk +++ b/source/pages/demo/intro.njk @@ -1,715 +1,713 @@ - -{% set pageId = "intro" %} -{% set pageClass = "" %} - -{% extends "demo.njk" %} - -{% block title %}Intro{% endblock %} -{% block head %} -{{ super() }} -{% endblock %} - -{% block body_content %} -
- - -
- -
- Dies ist einfach nur Text.
Weniger wäre Nichts, denn dieser Text ist nicht durch ein spezifisches Element umschlossen. -

Es wirken nur die Eigenschaften des <body> Elements. Dieses Element umschließt den gesamten Inhalt des Dokumentes und kommt daher nur einmal vor. Inhalte sind normalerweise durch Elemente definiert. Grundlegende Elemente teilen das Dokument zunächst in Abschnitte.

-

Bereiche

-
-
-

Einen Abschnitt, welcher für sich alleine stehen kann, definiert sich durch <article>. Solch ein Element wird oft detailliert gestaltet, kommt aber auch ohne jegliche Gestaltung aus.

-

Noch allgemeiner ist das <section> Element. Es schafft Bereiche um Inhalte zu strukturieren.

-

Bestimmte Bereiche haben einen vorgegebene Zweck.
Folgende Bereiche sind vorgegeben:

-
- - -
-
-

Um einleitenden Inhalt festzuhalten, wird das <header> Element eingesetzt. Es beinhaltet häufig auch Navigationselemente. Dabei bezieht es sich auf den nächsten, umgebenden Abschnitt.

- -
-
-

Auch abschließender Inhalt kann für einen Abschnitt definiert werden. Dazu wird <footer> eingesetzt.

-
-
- -
-
-

Zur feineren Strukturierung und Gliederung von Texten sind einige weitere Elemente verfügbar. Diese werden nun der Reihe nach aufgeführt. Zu Beginn die Überschriften, da sie noch zu den Abschnitten gehören. Das kommt vermutlich daher, da Abschnitte häufig eine kennzeichnende Überschrift beinhalten.

-

Überschrift 1

-

Eine Überschrift erster Ordnung <h1> ist sehr groß und steht daher oft außerhalb eines Textflusses. Sie schafft eine deutliche Trennung sowohl inhaltlich wie auch optisch. Sie erzeugt einen Abstand gleich der horizontalen Linie über sich.

-

Überschrift 2

-

Die weiteren Überschriften <h2> bis <h6> gliedern Text und werden auch als Titel für andere Elemente eingesetzt.

-

Überschrift 3 ist in Großbuchstaben gesetzt

-

Überschrift 4 verwendet normale Buchstaben und gleicht ansonsten Überschrift 3

-
Überschrift 5 ist Überschrift 5
-
Überschrift 6
-

Schließlich eine Überschrift in der Größe des Fließtextes. Allerdings in fett.

-

Gruppierung

-

Ein Absatz <p>. Zugegeben ein kurzer.

-

Aus mehreren Absätzen wird ein ganzer Text. Solche Texte haben gelegentlich großen informativen oder unterhaltsamen Charakter.
Einfache Zeilenumbrüche werden darin mit <br> erreicht.

-

Die Unterteilung in Absätze ist eine von vielen Möglichkeiten Texte zu gruppieren und ihnen Struktur zu verleihen. In diesem Dokument flattert Text normalerweise von Links daher. Er ist schwarz und in einer serifenlosen Schrift gesetzt. Zu weiteren Formatierungen, die eher auf einer Ebene der Zeichen einzuordnen ist, wird im Verlauf näher eingegangen. Zunächst die Struktur:

-

Text sitzt gerne auch mal zentriert.

p.txt_center
-

Rechtsbündig ist schon eher eine Ausnahme bzw. Besonderheit.

p.txt_right
-

Texte können auf verschiedene Arten unterteilt werden. Dafür werden unterschiedlich formatierte <hr> Elemente verwendet. Die horizontale Linie ist die Ausgangsformatierung, daher auch der abgekürzte Name des Elements. Eine Linie ist schwarz und durchgezogen.

-
-

Es ist auch eine unsichtbare Unterteilung möglich:

-
hr.hr__hidden
-

Die Linie darf auch gepunkted sein. Zudem sind verschiedene Längen möglich. Diese sind immer ein Prozentwert der verfügbaren Breite. Hier in gleicher Reihenfolge 100%, 50% und 25%:

-
hr.hr__dotted
-
hr.center_50
-
hr.hr__dotted.center_25
-

Zur horizontalen Unterteilung kommt natürlich auch eine vertikale Trennung hinzu. Text kann so zum Beispiel in mehrere Spalten unterteilt werden. Dies ist hilfreich, wenn ein Text durch eine breite Fläche sehr lange Zeilen bekommen würde. Es ist dann schwer den neuen Zeilanfang zu finden. Die vertikale Trennung dient in erster Linie dazu, diesem Umstand zu begegnen. Auch hier kann die Unterteilung viele Formen annehmen.

p.block__column_2
-

Drei Spalten gilt es jetzt also zu Füllen. Dann erst wird die Trennung der Spalten durch eine Linie sichtbar.

p.block__column_3.block__column_line
-

Ist der Text nicht lang genug bleibt eventuell eine Spalte leer. Diesmal wird dies aber nicht passieren, denn das Anschauungsbeispiel ist ja nun durch den vorherigen Absatz schon gegeben.
Oft ist es sinnvoll, Absätze mit mehreren Spalten deutlich von nachfolgenden Absätzen zu trennen. Da der Textfluss spaltenweise verläuft, liest man eventuell an der falschen Stelle weiter. Ach das ziegen diese beiden Absätze ganz gut.

-

Es gibt die Möglichkeit vorformatierten Text darzustellen <pre>.

- 
Dadurch
	bleiben
		Einrückungen
			durch
				Tabulatoren
					erhalten.
-

Text bekommt durch Listen besondere optische wie auch inhaltliche Struktur. Es gibt ungeordnete <ul> und geordnete Listen <ol> sowie Beschreibungslisten <dl>. Die beiden ersten Varianten beinhalten das Listenelement <li>. Beschreibungslisten beinhalten jeweils das Paar von Ausdruck <dt> und Beschreibung <dd>. Im Folgenden eine Liste der Listen in ihrer Ausgangskonfiguration:

-
    -
  • Ungeordnete
    • -
  • Listen
    • -
-
    -
  • Verschiedener
    • -
  • Art
    • -
-
    -
  1. Geordnete
    2. -
  2. Liste
    3. -
-
-
Beschreibungsliste
-
Auch Definitionslisten genannt
-
Ausdruck
-
Beschreibung
-
-

Wird Bezug auf fremde Inhalte genommen, kommt ein Zitat <blockquote> zur Anwendung. Es besteht aus der Aussage und der Quelle.

-
-

Ein Zitat (das, lateinisch citatum „Angeführtes, Aufgerufenes“ zu lat. citāre „in Bewegung setzen, vorladen“, vgl. „jemanden vor Gericht zitieren“) ist eine wörtlich übernommene Stelle aus einem Text oder ein Hinweis auf eine bestimmte Textstelle.

-

Wikipedia

-
-
blockquote>p+p.quote__source
-

Auch Inhalte, die nicht in Textform sind, können durch einen Bezug integriert werden. Wie diese Fahne werden sie mit <figure> umschlossen und tragen eine Bezeichnung.

-
-
Fahne
- - - - - - - - - - - -
-
figure>figcaption+{element}
-

Eine von sich aus undefinierte Möglichkeit zur Gruppierung von Text besteht durch <div>. Dieses Element hat, ohne weitere Klassifizierung keine Auswirkungen auf die Erscheinung oder die inhaltliche Aussage. Daher der allgemeine Einsatz.

-

Es wird allerdings häufig eingesetzt und bekommt vielfältige Funktionen zugeordnet wie diese hervorgehobene Information zeigt.

-

Eine sehr klar definierte Gruppierung stellt das Element <main> dar. Es umschließt den hauptsächlichen Inhalt des Dokumentes.

-
-
-

Textebene

-

Verweise

-

Ein wesentlicher Bestandteil von Hypertext sind Verweise <a>. Sie dienen als Sprungmarken innerhalb des Netzwerks. Es kann grob zwischen internen und externen Verweisen unterschieden werden. Interne Verweisea.a__line können Verknüpfungen innerhalb des aktuellen Dokumentes sein oder auch Funktionen aktivieren. Externe Verweise verknüpfen Inhalte über das gesamte Netzwerk hinweg. Sie können auch auf E-Mail Adressen oder Dateien zeigen.

-

Nicht nur Text kann als Verweis verwendet werden. Auch andere Elemente wie Bilder können verknüpft werden. Abhängig von ihrer Funktion und ihrem Zweck, werden Verweise unterschiedlich formatiert. Farbige oder unterstrichene Varianten sind möglich.

-

Wird der Verweis innerhalb eines <nav> Elementes notiert, bekommt er die spezielle Bedeutung eines Navigationsverweises innerhalb des Dokumentes oder der Anwendung. Auf diese Verwendung wird im Folgenden genauer eingegangen ...

-

Formatierungen

-

Texte, Wörter oder Zeichen können vielfältig formatiert werden. Sie können fett <b> oder kursiv <i> geschrieben sein. Auch beides ist möglich!?! Sollen sie nicht nur anders aussehen, sondern auch eine besondere inhaltliche Bedeutung bekommen, werden sie mit <strong> und <em> ausgezeichnet.

-

Gerade bei wörtlichen Zitierungen kommt häufig das Anführungszeichen zum Einsatz. Es kann durch die Formatierung automatisch ergänzt werden.

-
-

Das kannst du schon so machen aber dann isses halt Kacke.

-

o. V.

-
-
blockquote.quote__mark>p+p.quote__source
-

Ein besonderer inhaltlicher Bezug ist der Titel eines Werkes. Sowas kann mit <cite> ausgezeichnet werden. Pulp Fiction, super Film - zum Beispiel.

-

Auch die Auszeichnung <code> wurde bis hier hin schon verwendet. Sie markiert Maschinensprache. Für zusammenhängende Blöcke wird die Auszeichnung oft in Kombination mit dem Element <pre> verwendet:

- 
<html>
  <head>
    <title>Hyper Text Markup Language</title>
  </head>
  <body id="root">
    <!-- Content goes here -->
    <p class="example">Just like this.</p>
  </body>
</html>
-

Dabei bleiben vorhandene Textformatierungen wie Zeilenumbrüche und Einrückung erhalten.

-

Die Zeichen in Absätzen bis hin zu ganzen Texten können, mit einem geeigneten Eingabegerät, markiert werden. Dies stellt sich wie folgt dar:

-

Beispiel zum markieren ^^.

-

Eine Markierung kann, mittels <mark>, auch durch den Autor geschehen. Diese stellt sich ein wenig anders dar: Diese Worte sind markiert.

- -

Änderungen

- -
-
-

Eingebundene Inhalte

- -
-
-

Tabellen

-

Tabellen bieten besonders geordnete Struktur. Häufig werden in ihnen Text und Daten kombiniert dargestellt. Dies erfordert individuelle Formatierungen. Einige grundlegende Eigenschaften werden im folgenden aufgezeigt. Tabellen sind in ihrer Größe entweder vordefiniert oder richten sich nach ihrem Inhalt. Das gilt auch für die einzelnen Zellen....

- - - - - - - - - - -
Eineeinfache
Tabelle
-
table.width_full>tbody>tr>td*2^tr>td[colspan=2]
-
- - - - - - - - - - -
Einefließende
Tabelle
-
table>tbody>tr>td*2^tr>td[colspan=2]
- - - - - - - - - - -
Mitohne
Linien
-
table.table__blank>tbody>tr>td*2^tr>td[colspan=2]
-
-

Die nächste Tabelle verwendet alle zur Auszeichnung verfügbaren Elemente und hat eine starre Zellverteilung:

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Beschreibung bzw. Zusammenhang der Tabelle
KopfzeileAB
FußzeileAB
Tabelle
mitTitel
Kopf-und
Fußzeile
-
table.width_full.table__fix>caption+thead>tr>th*3^^tfoot>tr>td*3^^tbody>(tr>td*3)*3
-
-

Viele weitere Formate sind möglich ...

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
KopfzeileAB
VorspalteEine
1erweiterte
2Tabelle
-
table.width_full>thead>tr>th.precol+th[colspan=2]^^tbody>tr>td.precol+td*2^tr>td.precol+td[colspan=2]
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
KopfzeileAB
Tabelle
ohneRahmen
jedochmit
Streifen
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Beschreibung bzw. Zusammenhang der Tabelle
Kopfzeile1>9000
Fußzeile--
Alpha09000
Bravo19001
Charlie09000
-
-
-

Formulare

-

Spätestens hier werden Betrachter zu Benutzern. Texteingabefelder und verschiedene Bedienelemente geben Möglichkeiten zur Interaktion. Diese Elemente sind in vielerlei Hinsicht besonders. Werden sie nicht explizit gestaltet, ist ihre Erscheinung system- bzw. browserabhängig. (Vielleicht ist das auch scheiße, hier darauf einzugehen) ... Üblicherweise stehen alle Formularelemente innerhalb eines <form> Elementes. Dieses ist notwendig um Angaben zur Kommunikation mit dem Server zu setzen. Es hat normalerweise keine gestalterische Funktion.

-

Grundlegend ist das Element <input>. Es hat viele Attribute um den Typ der Eingabe anzupassen. Ist es undefiniert nimmt es jegliche textbasierte Information auf und erhält eine Standardgröße.

-

-

Ein spezieller Typ des Eingabefeldes verändert seine Funktion zu einer Schaltfläche <input[type="button"]>. Es gibt allerdings auch ein eigenes Element <button> dafür. -

-

Interaktive Elemente können durch das Attribut <readonly> nur lesbar gemacht werden oder mittels <disabled> gänzlich deaktiviert werden.

-

-

Das Element <label> ergänzt interaktive Elemente um eine Beschriftung. Wichtig ist hier, dass die Beziehung beider Elemente zu einander deutlich ist.

-
-
- -
-
- -
-
-

Zusätzlich zur Beschriftung einzelner Elemente gibt es auch die Möglichkeit Gruppierungen zu schaffen. Diese werden mit <fieldset> realisiert.

-
- -
-

Sie können mittels <legend> auch eine eigene Beschriftung erhalten.

-
- Einfache Eingabefelder - - -
-
- Weitere Eingabemöglichkeiten -

Innerhalb einer Gruppe können nicht nur Ein- und Ausgabefelder platziert werden. Andere Elemente ergänzen Information oder lockern das Erscheinungsbild auf. Hier nun eine Liste möglicher Arten von Eingabefeldern.

- 
ul>(li>label>input[type="text"])
-
    -
    • -
    • -
    • -
    • -
    • -
-
- -
- - -
-
-
- - - - -
-

- Show me a - Sorted by - - - Matching - -

-
- -

Interaktive Elemente

-
-
-

Struktur

-
-
-
- - - - -
-
-
-
-
-

Medien

-
-
-

Druck

-
- -
-
-

Ende der Einführung

-

Dies war eine Übersicht der grundlegenden Elemente. Nun folgen weitere Elemente mit besonderen Formatierungen.

-
-
-
- -
-
-

HIPPIE Erklärung

-

Aufbau, Standardwerte

-
-
-

…

-
-
- -
-
-

Medienformat Abfragen

-
-
-
Umbruch bei 
-
-

Telefone und größer

-

Nur Telefone

-

Schreibtafeln hochkant

-

Schreibtafeln und größer

-

Schreibtafeln im Querformat

-

Schreibtafeln quer und größer

-

Nur Arbeitsplatzrechner

-

Arbeitsplatzrechner und größer

-

Richtige Monitore und größer

-
-
-
-
-
-

Sammlung formatierter Elemente

-

Die Elemente werden fortlaufend komplexer

-
-
- 
h3.txt_light_color+p
-

Helle Überschrift

-

Mit normalem Textabsatz

- 
a>h4
- -

Überschrift als Block-Verweis

- - 
section>div.float_space_left>img^p+p
-
-
Avatar
-

Vorname Name
Straße 1, 01234 Stadt

+49 (0)123 1337 0000
name@domain.tld

-
- 
div.box__main_indent
-
-
-

Eingerückter Inhalt

-
-
- 
nav>ul>(li>a.a__button{Punkt $})*4
-        nav>ul>(li>a.a__button_border{Stufe $})*4
-
- - -
- 
nav.nav__horizontal>ul>(li>a.a__button{Abschnitt $})*4
-          nav.nav__center_old>ul>(li>a.a__button{Typ $})*4
- -
- -
- 
header.header__page>h1+p+nav.nav__separate_right>ul>(li>a.a__button{Nav $})*4^+nav.nav__right>ul>(li>a.a__button{Nav $})*4
-
-

Aufmacher

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis nec consectetur diam. Sed nisl odio, volutpat nec nisi sit amet, commodo faucibus est. Donec lacinia vestibulum sapien. Morbi porttitor nibh quis imperdiet scelerisque. Praesent rutrum quam eu sodales luctus.

- - -
- 
header.header__page>nav.nav__right>ul>(li>a.a__button{Nav $})*4
-
-
- -
-
- 
footer.pos_abs.pin_bottom>nav.nav__column>ul>(li>a.a__button_text)*4
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -

Gruppierung

- 
ul.list__link>(li>a>img)*2+li>a
- - -

Tabellen

- 
table.table__link>thead>tr>th{&nbsp;}+th{Ab / Zy}+th{Neu / Alt}^^(tbody>tr>td.cell__icon[rowspan="2"]>img[width=16  height=16]^+td.cell__link>a[target=_blank]{Name}+a[target=_blank]{URL}^+td.cell__date[rowspan="2"]{YYY-MM-DD}^tr>td.cell__text>div.shorten{Beschreibung})*2
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Ab / ZyNeu / Alt
NameURLYYYY-MM-DD
-
Beschreibung
-
NameURLYYYY-MM-DD
-
Beschreibung
-
-

Eingebettet

-
- - - - - - - - - - - -
- - -
-
-
-
-

Autarke Seiten

-

Diese Elemente repräsentieren jeweils eine eigene Seite.

-
-
-
-
-

404

-

Hier ist nichts.

-
-

Die angeforderte Ressource wurde nicht gefunden. Dieser Statuscode kann ebenfalls verwendet werden, um eine Anfrage ohne näheren Grund abzuweisen. Links, welche auf solche Fehlerseiten verweisen, werden auch als Tote Links bezeichnet.

-

Wikipedia

-
-
- {% include "partials/footer-status.njk" %} -
-
-
-

403

-

Nicht erlaubt! Forbidden

-
-

Die Anfrage wurde mangels Berechtigung des Clients nicht durchgeführt, bspw. weil der authentifizierte Benutzer nicht berechtigt ist, oder eine als HTTPS konfigurierte URL nur mit HTTP aufgerufen wurde.

-

Wikipedia

-
-
- {% include "partials/footer-status.njk" %} -
-
-
-

400

-

Fehlerhafte Anfrage! Bad Request

-
-

Die Anfrage-Nachricht war fehlerhaft aufgebaut.

-

Wikipedia

-
-
- {% include "partials/footer-status.njk" %} -
-
-
- {% include "partials/footer.njk" %} - {% endblock %} - - {% block script %} - - {% endblock %} + +{% set pageId = "intro" %} +{% set pageClass = "" %} + +{% extends "hippie/demo-extended.njk" %} + +{% block title %}Intro{% endblock %} +{% block head %} +{{ super() }} +{% endblock %} + +{% block body_content %} +
+ +{% include "hippie/partials/nav-page-meta.njk" %} +
+ +
+ Dies ist einfach nur Text.
Weniger wäre Nichts, denn dieser Text ist nicht durch ein spezifisches Element umschlossen.
Dies ist normalerweise nicht vorgesehen und wird hier nur zur Einführung und Anschauung verwendet.

+

Es wirken nur die Eigenschaften des <body> Elements. Dieses Element umschließt den gesamten Inhalt des Dokumentes und kommt daher nur einmal vor. Inhalte sind normalerweise durch Elemente definiert. Grundlegende Elemente teilen das Dokument zunächst in Abschnitte.

+

Bereiche

+
+
+

Einen Abschnitt, welcher für sich alleine stehen kann, definiert sich durch <article>. Solch ein Element wird oft detailliert gestaltet, kommt aber auch ohne jegliche Gestaltung aus.

+

Noch allgemeiner ist das <section> Element. Es schafft Bereiche um Inhalte zu strukturieren.

+

Bestimmte Bereiche haben einen vorgegebene Zweck.
Folgende Bereiche sind vorgegeben:

+
+ + +
+
+

Um einleitenden Inhalt festzuhalten, wird das <header> Element eingesetzt. Es beinhaltet häufig auch Navigationselemente. Dabei bezieht es sich auf den nächsten, umgebenden Abschnitt.

+ +
+
+

Auch abschließender Inhalt kann für einen Abschnitt definiert werden. Dazu wird <footer> eingesetzt.

+
+
+
Das Element <address> hat den Zweck, Kontaktinformationen bereit zu stellen. Diese werden, je nach Position des Elements im Kontext der gesamten Seite, anders gewertet.
+ +
+
+

Zur feineren Strukturierung und Gliederung von Texten sind einige weitere Elemente verfügbar. Diese werden nun der Reihe nach aufgeführt. Zu Beginn die Überschriften, da sie noch zu den Abschnitten gehören. Das kommt vermutlich daher, da Abschnitte häufig eine kennzeichnende Überschrift beinhalten.

+

Überschrift 1

+

Eine Überschrift erster Ordnung <h1> ist sehr groß und steht daher oft außerhalb eines Textflusses. Sie schafft eine deutliche Trennung sowohl inhaltlich wie auch optisch. Sie erzeugt einen Abstand gleich der horizontalen Linie über sich.

+

Überschrift 2

+

Die weiteren Überschriften <h2> bis <h6> gliedern Text und werden auch als Titel für andere Elemente eingesetzt.

+

Überschrift 3 ist in Großbuchstaben gesetzt

+

Überschrift 4 verwendet normale Buchstaben und gleicht ansonsten Überschrift 3

+
Überschrift 5 ist Überschrift 5
+
Überschrift 6
+

Schließlich eine Überschrift in der Größe des Fließtextes. Allerdings in fett.

+

Gruppierung

+

Ein Absatz <p>. Zugegeben ein kurzer.

+

Aus mehreren Absätzen wird ein ganzer Text. Solche Texte haben gelegentlich großen informativen oder unterhaltsamen Charakter.
Einfache Zeilenumbrüche werden darin mit <br> erreicht.

+

Die Unterteilung in Absätze ist eine von vielen Möglichkeiten Texte zu gruppieren und ihnen Struktur zu verleihen. In diesem Dokument flattert Text normalerweise von Links daher. Er ist schwarz und in einer serifenlosen Schrift gesetzt. Zu weiteren Formatierungen, die eher auf einer Ebene der Zeichen einzuordnen ist, wird im Verlauf näher eingegangen. Zunächst die Struktur:

+

Text sitzt gerne auch mal zentriert.

p.txt_center
+

Rechtsbündig ist schon eher eine Ausnahme bzw. Besonderheit.

p.txt_right
+

Texte können auf verschiedene Arten unterteilt werden. Dafür werden unterschiedlich formatierte <hr> Elemente verwendet. Die horizontale Linie ist die Ausgangsformatierung, daher auch der abgekürzte Name des Elements. Eine Linie ist schwarz und durchgezogen.

+
+

Es ist auch eine unsichtbare Unterteilung möglich:

+
hr.hr__hidden
+

Die Linie darf auch gepunkted sein. Zudem sind verschiedene Längen möglich. Diese sind immer ein Prozentwert der verfügbaren Breite. Hier in gleicher Reihenfolge 100%, 50% und 25%:

+
hr.hr__dotted
+
hr.center_50
+
hr.hr__dotted.center_25
+

Zur horizontalen Unterteilung kommt natürlich auch eine vertikale Trennung hinzu. Text kann so zum Beispiel in mehrere Spalten unterteilt werden. Dies ist hilfreich, wenn ein Text durch eine breite Fläche sehr lange Zeilen bekommen würde. Es ist dann schwer den neuen Zeilanfang zu finden. Die vertikale Trennung dient in erster Linie dazu, diesem Umstand zu begegnen. Auch hier kann die Unterteilung viele Formen annehmen.

p.column__2
+

Drei Spalten gilt es jetzt also zu Füllen. Dann erst wird die Trennung der Spalten durch eine Linie sichtbar.

p.column__3.column__line
+

Ist der Text nicht lang genug bleibt eventuell eine Spalte leer. Diesmal wird dies aber nicht passieren, denn das Anschauungsbeispiel ist ja nun durch den vorherigen Absatz schon gegeben.
Oft ist es sinnvoll, Absätze mit mehreren Spalten deutlich von nachfolgenden Absätzen zu trennen. Da der Textfluss spaltenweise verläuft, liest man eventuell an der falschen Stelle weiter. Ach das ziegen diese beiden Absätze ganz gut.

+

Es gibt die Möglichkeit vorformatierten Text darzustellen <pre>.

+ 
Dadurch
	bleiben
		Einrückungen
			durch
				Tabulatoren
					erhalten.
+

Text bekommt durch Listen besondere optische wie auch inhaltliche Struktur. Es gibt ungeordnete <ul> und geordnete Listen <ol> sowie Beschreibungslisten <dl>. Die beiden ersten Varianten beinhalten das Listenelement <li>. Beschreibungslisten beinhalten jeweils das Paar von Ausdruck <dt> und Beschreibung <dd>. Im Folgenden eine Liste der Listen in ihrer Ausgangskonfiguration:

+
    +
  • Ungeordnete
    • +
  • Listen
    • +
+
    +
  • Verschiedener
    • +
  • Art
    • +
+
    +
  1. Geordnete
    2. +
  2. Liste
    3. +
+
+
Beschreibungsliste
+
Auch Definitionslisten genannt
+
Ausdruck
+
Beschreibung
+
+

Wird Bezug auf fremde Inhalte genommen, kommt ein Zitat <blockquote> zur Anwendung. Es besteht aus der Aussage und der Quelle.

+
+

Ein Zitat (das, lateinisch citatum „Angeführtes, Aufgerufenes“ zu lat. citāre „in Bewegung setzen, vorladen“, vgl. „jemanden vor Gericht zitieren“) ist eine wörtlich übernommene Stelle aus einem Text oder ein Hinweis auf eine bestimmte Textstelle.

+

Wikipedia

+
+
blockquote>p+p.quote__source
+

Auch Inhalte, die nicht in Textform sind, können durch einen Bezug integriert werden. Wie diese Fahne werden sie mit <figure> umschlossen und tragen eine Bezeichnung.

+
+
Fahne
+ + + + + + + + + + + +
+
figure>figcaption+{element}
+

Eine von sich aus undefinierte Möglichkeit zur Gruppierung von Text besteht durch <div>. Dieses Element hat, ohne weitere Klassifizierung keine Auswirkungen auf die Erscheinung oder die inhaltliche Aussage. Daher der allgemeine Einsatz.

+

Es wird allerdings häufig eingesetzt und bekommt vielfältige Funktionen zugeordnet wie diese hervorgehobene Information zeigt.

+

Eine sehr klar definierte Gruppierung stellt das Element <main> dar. Es umschließt den hauptsächlichen Inhalt des Dokumentes.

+
+
+

Textebene

+

Verweise

+

Ein wesentlicher Bestandteil von Hypertext sind Verweise <a>. Sie dienen als Sprungmarken innerhalb des Netzwerks. Es kann grob zwischen internen und externen Verweisen unterschieden werden. Interne Verweisea.a__line können Verknüpfungen innerhalb des aktuellen Dokumentes sein oder auch Funktionen aktivieren. Externe Verweise verknüpfen Inhalte über das gesamte Netzwerk hinweg. Sie können auch auf E-Mail Adressen oder Dateien zeigen.

+

Nicht nur Text kann als Verweis verwendet werden. Auch andere Elemente wie Bilder können verknüpft werden. Abhängig von ihrer Funktion und ihrem Zweck, werden Verweise unterschiedlich formatiert. Farbige oder unterstrichene Varianten sind möglich.

+

Wird der Verweis innerhalb eines <nav> Elementes notiert, bekommt er die spezielle Bedeutung eines Navigationsverweises innerhalb des Dokumentes oder der Anwendung. Auf diese Verwendung wird im Folgenden genauer eingegangen ...

+

Formatierungen

+

Texte, Wörter oder Zeichen können vielfältig formatiert werden. Sie können fett <b> oder kursiv <i> geschrieben sein. Auch beides ist möglich!?! Sollen sie nicht nur anders aussehen, sondern auch eine besondere inhaltliche Bedeutung bekommen, werden sie mit <strong> und <em> ausgezeichnet.

+

Gerade bei wörtlichen Zitierungen kommt häufig das Anführungszeichen zum Einsatz. Es kann durch die Formatierung automatisch ergänzt werden.

+
+

Das kannst du schon so machen aber dann isses halt Kacke.

+

o. V.

+
+
blockquote.quote__mark>p+p.quote__source
+

Ein besonderer inhaltlicher Bezug ist der Titel eines Werkes. Sowas kann mit <cite> ausgezeichnet werden. Pulp Fiction, super Film - zum Beispiel.

+

Auch die Auszeichnung <code> wurde bis hier hin schon verwendet. Sie markiert Maschinensprache. Für zusammenhängende Blöcke wird die Auszeichnung oft in Kombination mit dem Element <pre> verwendet:

+ 
<html>
  <head>
    <title>Hyper Text Markup Language</title>
  </head>
  <body id="root">
    <!-- Content goes here -->
    <p class="example">Just like this.</p>
  </body>
</html>
+

Dabei bleiben vorhandene Textformatierungen wie Zeilenumbrüche und Einrückung erhalten.

+

Die Zeichen in Absätzen bis hin zu ganzen Texten können, mit einem geeigneten Eingabegerät, markiert werden. Dies stellt sich wie folgt dar:

+

Beispiel zum markieren ^^.

+

Eine Markierung kann, mittels <mark>, auch durch den Autor geschehen. Diese stellt sich ein wenig anders dar: Diese Worte sind markiert.

+ +

Änderungen

+ +
+
+

Eingebundene Inhalte

+ +
+
+

Tabellen

+

Tabellen bieten besonders geordnete Struktur. Häufig werden in ihnen Text und Daten kombiniert dargestellt. Dies erfordert individuelle Formatierungen. Einige grundlegende Eigenschaften werden im folgenden aufgezeigt. Tabellen sind in ihrer Größe entweder vordefiniert oder richten sich nach ihrem Inhalt. Das gilt auch für die einzelnen Zellen....

+ + + + + + + + + + +
Eineeinfache
Tabelle
+
table.width_full>tbody>tr>td*2^tr>td[colspan=2]
+
+ + + + + + + + + + +
Einefließende
Tabelle
+
table>tbody>tr>td*2^tr>td[colspan=2]
+ + + + + + + + + + +
Mitohne
Linien
+
table.table__blank>tbody>tr>td*2^tr>td[colspan=2]
+
+

Die nächste Tabelle verwendet alle zur Auszeichnung verfügbaren Elemente und hat eine starre Zellverteilung:

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Beschreibung bzw. Zusammenhang der Tabelle
KopfzeileAB
FußzeileAB
Tabelle
mitTitel
Kopf-und
Fußzeile
+
table.width_full.table__fix>caption+thead>tr>th*3^^tfoot>tr>td*3^^tbody>(tr>td*3)*3
+
+

Viele weitere Formate sind möglich ...

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
KopfzeileAB
VorspalteEine
1erweiterte
2Tabelle
+
table.width_full>thead>tr>th.precol+th[colspan=2]^^tbody>tr>td.precol+td*2^tr>td.precol+td[colspan=2]
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
KopfzeileAB
Tabelle
ohneRahmen
jedochmit
Streifen
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Beschreibung bzw. Zusammenhang der Tabelle
Kopfzeile1>9000
Fußzeile--
Alpha09000
Bravo19001
Charlie09000
+
+
+

Formulare

+

Spätestens hier werden Betrachter zu Benutzern. Texteingabefelder und verschiedene Bedienelemente geben Möglichkeiten zur Interaktion. Diese Elemente sind in vielerlei Hinsicht besonders. Werden sie nicht explizit gestaltet, ist ihre Erscheinung system- bzw. browserabhängig. (Vielleicht ist das auch scheiße, hier darauf einzugehen) ... Üblicherweise stehen alle Formularelemente innerhalb eines <form> Elementes. Dieses ist notwendig um Angaben zur Kommunikation mit dem Server zu setzen. Es hat normalerweise keine gestalterische Funktion.

+

Grundlegend ist das Element <input>. Es hat viele Attribute um den Typ der Eingabe anzupassen. Ist es undefiniert nimmt es jegliche textbasierte Information auf und erhält eine Standardgröße.

+

+

Ein spezieller Typ des Eingabefeldes verändert seine Funktion zu einer Schaltfläche <input[type="button"]>. Es gibt allerdings auch ein eigenes Element <button> dafür. +

+

Interaktive Elemente können durch das Attribut <readonly> nur lesbar gemacht werden oder mittels <disabled> gänzlich deaktiviert werden.

+

+

Das Element <label> ergänzt interaktive Elemente um eine Beschriftung. Wichtig ist hier, dass die Beziehung beider Elemente zu einander deutlich ist.

+
+
+ +
+
+ +
+
+

Zusätzlich zur Beschriftung einzelner Elemente gibt es auch die Möglichkeit Gruppierungen zu schaffen. Diese werden mit <fieldset> realisiert.

+
+ +
+

Sie können mittels <legend> auch eine eigene Beschriftung erhalten.

+
+ Einfache Eingabefelder + + +
+
+ Weitere Eingabemöglichkeiten +

Innerhalb einer Gruppe können nicht nur Ein- und Ausgabefelder platziert werden. Andere Elemente ergänzen Information oder lockern das Erscheinungsbild auf. Hier nun eine Liste möglicher Arten von Eingabefeldern.

+ 
ul>(li>label>input[type="text"])
+
    +
    • +
    • +
    • +
    • +
    • +
+
+ +
+ + +
+
+
+ + + + +
+

+ Show me a + Sorted by + + + Matching + +

+
+ +

Interaktive Elemente

+
+
+

Struktur

+
+
+
+ + + + +
+
+
+
+
+

Medien

+
+
+

Druck

+
+ +
+
+

Ende der Einführung

+

Dies war eine Übersicht der grundlegenden Elemente. Nun folgen weitere Elemente mit besonderen Formatierungen.

+
+
+
+ +
+
+

HIPPIE Erklärung

+

Aufbau, Standardwerte

+
+
+

…

+
+
+ +
+
+

Medienformat Abfragen

+
+
+
Umbruch bei 
+
+

Telefone und größer

+

Nur Telefone

+

Schreibtafeln hochkant

+

Schreibtafeln und größer

+

Schreibtafeln im Querformat

+

Schreibtafeln quer und größer

+

Nur Arbeitsplatzrechner

+

Arbeitsplatzrechner und größer

+

Richtige Monitore und größer

+
+
+
+
+
+

Sammlung formatierter Elemente

+

Die Elemente werden fortlaufend komplexer

+
+
+ 
h3.txt_light_color+p
+

Helle Überschrift

+

Mit normalem Textabsatz

+ 
a>h4
+ +

Überschrift als Block-Verweis

+ + 
section>div.float_space_left>img^p+p
+
+
Avatar
+

Vorname Name
Straße 1, 01234 Stadt

+49 (0)123 1337 0000
name@domain.tld

+
+ 
div.box__main_indent
+
+
+

Eingerückter Inhalt

+
+
+ 
nav>ul>(li>a.a__button{Punkt $})*4
+        nav>ul>(li>a.a__button_border{Stufe $})*4
+
+ + +
+ 
nav.nav__horizontal>ul>(li>a.a__button{Abschnitt $})*4
+          nav.nav__center_old>ul>(li>a.a__button{Typ $})*4
+ +
+ +
+ 
header.header__page>h1+p+nav.nav__separate_right>ul>(li>a.a__button{Nav $})*4^+nav.nav__right>ul>(li>a.a__button{Nav $})*4
+
+

Aufmacher

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis nec consectetur diam. Sed nisl odio, volutpat nec nisi sit amet, commodo faucibus est. Donec lacinia vestibulum sapien. Morbi porttitor nibh quis imperdiet scelerisque. Praesent rutrum quam eu sodales luctus.

+ + +
+ 
header.header__page>nav.nav__right>ul>(li>a.a__button{Nav $})*4
+
+
+ +
+
+ 
footer.pos_abs.pin_bottom>nav.nav__column>ul>(li>a.a__button_text)*4
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +

Gruppierung

+ 
ul.list__link>(li>a>img)*2+li>a
+ + +

Tabellen

+ 
table.table__link>thead>tr>th{&nbsp;}+th{Ab / Zy}+th{Neu / Alt}^^(tbody>tr>td.cell__icon[rowspan="2"]>img[width=16  height=16]^+td.cell__link>a[target=_blank]{Name}+a[target=_blank]{URL}^+td.cell__date[rowspan="2"]{YYY-MM-DD}^tr>td.cell__text>div.shorten{Beschreibung})*2
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 Ab / ZyNeu / Alt
NameURLYYYY-MM-DD
+
Beschreibung
+
NameURLYYYY-MM-DD
+
Beschreibung
+
+

Eingebettet

+
+ + + + + + + + + + + +
+ + +
+
+
+
+

Autarke Seiten

+

Diese Elemente repräsentieren jeweils eine eigene Seite.

+
+
+
+
+

404

+

Hier ist nichts.

+
+

Die angeforderte Ressource wurde nicht gefunden. Dieser Statuscode kann ebenfalls verwendet werden, um eine Anfrage ohne näheren Grund abzuweisen. Links, welche auf solche Fehlerseiten verweisen, werden auch als Tote Links bezeichnet.

+

Wikipedia

+
+
+ {% include "hippie/partials/footer-status.njk" %} +
+
+
+

403

+

Nicht erlaubt! Forbidden

+
+

Die Anfrage wurde mangels Berechtigung des Clients nicht durchgeführt, bspw. weil der authentifizierte Benutzer nicht berechtigt ist, oder eine als HTTPS konfigurierte URL nur mit HTTP aufgerufen wurde.

+

Wikipedia

+
+
+ {% include "hippie/partials/footer-status.njk" %} +
+
+
+

400

+

Fehlerhafte Anfrage! Bad Request

+
+

Die Anfrage-Nachricht war fehlerhaft aufgebaut.

+

Wikipedia

+
+
+ {% include "hippie/partials/footer-status.njk" %} +
+
+
+ {% include "hippie/partials/footer.njk" %} + {% endblock %} + + {% block script %} + {{ super() }} + + + + {% endblock %} diff --git a/source/pages/demo/maintenance.njk b/source/pages/demo/maintenance.njk new file mode 100644 index 0000000..0b3eaf6 --- /dev/null +++ b/source/pages/demo/maintenance.njk @@ -0,0 +1,19 @@ + +{% set pageId = "blank" %} +{% set pageClass = "height_full" %} + +{% extends "hippie/demo-maintenance.njk" %} + +{% block title %}Wartung{% endblock %} + +{% block head %} +{{ super() }} + + +{% endblock %} + +{% block body_content %} +
+

HIPPIE

+
+{% endblock %} diff --git a/source/pages/demo/os.njk b/source/pages/demo/os.njk index ba29c44..c82fbfc 100644 --- a/source/pages/demo/os.njk +++ b/source/pages/demo/os.njk @@ -1,8 +1,8 @@ - + {% set pageId = "os" %} {% set pageClass = "" %} -{% extends "demo.njk" %} +{% extends "hippie/demo-extended.njk" %} {% block title %}demo{% endblock %} {% block head %} @@ -132,10 +132,13 @@ -{% include "partials/footer.njk" %} +{% include "hippie/partials/footer.njk" %} {% endblock %} {% block script %} +{{ super() }} + + - {# #} - - {% block script %}{% endblock %} - - + + + + + + + {% block head %} + {% block title %}{% endblock %} - HIPPIE + + + + + + + + + + + + + {% endblock %} + + + + {% block body_content %}{% endblock %} + + {% block script %} + + {# #} + + {% endblock %} + + diff --git a/source/templates/demo.njk b/source/templates/hippie/demo-extended.njk similarity index 86% rename from source/templates/demo.njk rename to source/templates/hippie/demo-extended.njk index 7741e5f..1ea1399 100644 --- a/source/templates/demo.njk +++ b/source/templates/hippie/demo-extended.njk @@ -1,4 +1,4 @@ - + @@ -28,13 +28,13 @@ - + {% endblock %} - {% include "partials/page-hover.njk" %} + {% include "hippie/partials/page-hover.njk" %}
{% block body_header %} @@ -50,8 +50,6 @@ integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"> {# #} - - {% block script %}{% endblock %} diff --git a/source/templates/maintenance.njk b/source/templates/hippie/demo-maintenance.njk similarity index 90% rename from source/templates/maintenance.njk rename to source/templates/hippie/demo-maintenance.njk index 56be958..c79248e 100644 --- a/source/templates/maintenance.njk +++ b/source/templates/hippie/demo-maintenance.njk @@ -1,3 +1,4 @@ + @@ -17,7 +18,6 @@ - {% endblock %} diff --git a/source/templates/macros/nav-macro.njk b/source/templates/hippie/macros/nav-macro.njk similarity index 100% rename from source/templates/macros/nav-macro.njk rename to source/templates/hippie/macros/nav-macro.njk diff --git a/source/templates/macros/top-macro.njk b/source/templates/hippie/macros/top-macro.njk similarity index 100% rename from source/templates/macros/top-macro.njk rename to source/templates/hippie/macros/top-macro.njk diff --git a/source/templates/partials/footer-status.njk b/source/templates/hippie/partials/footer-status.njk similarity index 100% rename from source/templates/partials/footer-status.njk rename to source/templates/hippie/partials/footer-status.njk diff --git a/source/templates/partials/footer.njk b/source/templates/hippie/partials/footer.njk similarity index 100% rename from source/templates/partials/footer.njk rename to source/templates/hippie/partials/footer.njk diff --git a/source/templates/hippie/partials/nav-page-meta.njk b/source/templates/hippie/partials/nav-page-meta.njk new file mode 100644 index 0000000..4e6886f --- /dev/null +++ b/source/templates/hippie/partials/nav-page-meta.njk @@ -0,0 +1,18 @@ + + diff --git a/source/templates/partials/page-hover.njk b/source/templates/hippie/partials/page-hover.njk similarity index 100% rename from source/templates/partials/page-hover.njk rename to source/templates/hippie/partials/page-hover.njk From 8b81ed92e1e7973673fc309cc99accd54548d730 Mon Sep 17 00:00:00 2001 From: Stephan Date: Mon, 1 Oct 2018 21:10:58 +0200 Subject: [PATCH 075/372] demo.5 * removed double underscore (__) separators in class names * more LF CR to LF * new scss config variables * some little style changes --- gulpfile.js | 9 +- source/pages/demo.njk | 6 +- source/pages/demo/elements.njk | 348 ++++- source/pages/demo/error/404.njk | 50 +- source/pages/demo/error/500.njk | 50 +- source/pages/demo/intro.njk | 1196 +++++++---------- source/pages/demo/os.njk | 50 +- source/style/hippie/elements/_grouping.scss | 55 +- .../style/hippie/elements/_interactive.scss | 8 +- source/style/hippie/elements/_sections.scss | 15 +- source/style/hippie/elements/_tables.scss | 10 +- source/style/hippie/elements/_textlevel.scss | 30 +- source/style/hippie/global/_common.scss | 16 +- source/style/hippie/global/_config.scss | 17 +- source/style/hippie/global/_typography.scss | 124 +- source/style/hippie/mixins/_media_query.scss | 5 +- .../breakpoint/_breakpoint_module.scss | 23 +- .../explanation/_explanation_module.scss | 230 ++-- .../maintenance/_maintenance_module.scss | 38 +- .../hippie/modules/media/_media_module.scss | 6 + .../style/hippie/modules/media/_sprites.scss | 13 +- .../modules/navigation/_nav_module.scss | 28 +- .../hippie/modules/tables/_tables_module.scss | 136 +- source/style/modules/demo/_demo_module.scss | 38 +- source/templates/hippie/demo-default.njk | 8 +- source/templates/hippie/demo-extended.njk | 10 +- source/templates/hippie/demo-maintenance.njk | 8 +- .../templates/hippie/partials/head-meta.njk | 8 + .../hippie/partials/nav-page-meta.njk | 13 +- .../templates/hippie/partials/page-hover.njk | 2 +- 30 files changed, 1288 insertions(+), 1262 deletions(-) create mode 100644 source/templates/hippie/partials/head-meta.njk diff --git a/gulpfile.js b/gulpfile.js index ea69054..5b31e3e 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -114,13 +114,16 @@ gulp.task('nunjucks', function() { // automagically reload browsers gulp.task('syncreload', function() { browsersync.init({ + // ------------------------------------------------------------------------------ + // comment out the line below to get rid of the demo index page. + // ------------------------------------------------------------------------------ + index: "demo.html", + open: false, + server: 'build' // online: false, // logLevel: "info", // proxy: "http://verser.vrt/virtual/", // watch: true, - index: "demo.html", - open: false, - server: 'build' }); }); diff --git a/source/pages/demo.njk b/source/pages/demo.njk index f6774d8..da591c5 100644 --- a/source/pages/demo.njk +++ b/source/pages/demo.njk @@ -16,9 +16,11 @@

This is HIPPIE

You can start using it by replacing this file with your own index page.

+

To do this you need to open the file /gulpfile.js and comment out the line index: "demo.html",. Then you need to place your index file (index.njk) into the folder /source/pages.

+

For a very basic start you can make a copy of the demo page blank.njk. You can find it at /source/pages/demo.

The folder demo contains examples and also an overview of definitions made.
Follow the white rabbit.

Overview about all the styles

-
    +
      {% for link in demoadditionallinks %}
    • {{link.text}}
      • @@ -31,7 +33,7 @@ C(")(")

      Demo Pages

-
    +
      {% for link in demolinks %}
    • {{link.text}}
      • diff --git a/source/pages/demo/elements.njk b/source/pages/demo/elements.njk index 559b893..a138837 100644 --- a/source/pages/demo/elements.njk +++ b/source/pages/demo/elements.njk @@ -1,69 +1,279 @@ - -{% set pageId = "elements" %} -{% set pageClass = "" %} - -{% extends "hippie/demo-extended.njk" %} - -{% block title %}Elements{% endblock %} -{% block head %} -{{ super() }} -{% endblock %} - -{% block body_content %} -
      - -{% include "hippie/partials/nav-page-meta.njk" %} -
      -
      -
      -
      -

      Bereiche

      -

      Um einleitenden Inhalt festzuhalten, wird das <header> Element eingesetzt. Es beinhaltet häufig auch Navigationselemente. Dabei bezieht es sich auf den nächsten, umgebenden Abschnitt.

      - -
      -
      -

      Einen Abschnitt, welcher für sich alleine stehen kann, definiert sich durch <article>. Solch ein Element wird oft detailliert gestaltet, kommt aber auch ohne jegliche Gestaltung aus.

      -

      Noch allgemeiner ist das <section> Element. Es schafft Bereiche um Inhalte zu strukturieren.

      -

      Bestimmte Bereiche haben einen vorgegebene Zweck.
      Folgende Bereiche sind vorgegeben:

      -
      -
      - -
      -
      -

      Um einleitenden Inhalt festzuhalten, wird das <header> Element eingesetzt. Es beinhaltet häufig auch Navigationselemente. Dabei bezieht es sich auf den nächsten, umgebenden Abschnitt.

      - -
      -
      -

      Auch abschließender Inhalt kann für einen Abschnitt definiert werden. Dazu wird <footer> eingesetzt.

      -
      -
      -
      -
      -

      Auch abschließender Inhalt kann für einen Abschnitt definiert werden. Dazu wird <footer> eingesetzt.

      -
      -
      -
      -{% include "hippie/partials/footer.njk" %} -{% endblock %} - -{% block script %} -{{ super() }} - - - -{% endblock %} + +{% set pageId = "elements" %} +{% set pageClass = "" %} + +{% extends "hippie/demo-extended.njk" %} + +{% block title %}Elements{% endblock %} +{% block head %} +{{ super() }} +{% endblock %} + +{% block body_content %} +
      + +{% include "hippie/partials/nav-page-meta.njk" %} +
      +
      +
      +
      +

      Medienformat Abfragen

      +
      +
      +
      Umbruch bei 
      +
      +

      Telefone und größer

      +

      Nur Telefone

      +

      Schreibtafeln hochkant

      +

      Schreibtafeln und größer

      +

      Schreibtafeln im Querformat

      +

      Schreibtafeln quer und größer

      +

      Nur Arbeitsplatzrechner

      +

      Arbeitsplatzrechner und größer

      +

      Richtige Monitore und größer

      +
      +
      +
      + +
      +
      +

      Sammlung formatierter Elemente

      +

      Die Elemente werden fortlaufend komplexer

      +
      +
      + 
      h3.txt_light_color+p
      +

      Helle Überschrift

      +

      Mit normalem Textabsatz

      + 
      a>h4
      +

      Überschrift als Block-Verweis

       + 
      section>div.float_space_left>img^p+p
      +
      +
      Avatar
      +

      Vorname Name
      Straße 1, 01234 Stadt

      +49 (0)123 1337 0000
      name@domain.tld

      +
      + 
      div.box_main_indent
      +
      +
      +

      Eingerückter Inhalt

      +
      +
      + 
      nav>ul>(li>a.a_button{Punkt $})*4nav>ul>(li>a.a_button_border{Stufe $})*4
      +
      + + +
      + 
      nav.nav_horizontal>ul>(li>a.a_button{Abschnitt $})*4nav.nav_center_old>ul>(li>a.a_button{Typ $})*4
      + +
      + +
      + 
      header.header_page>h1+p+nav.nav_separate_right>ul>(li>a.a_button{Nav $})*4^+nav.nav_right>ul>(li>a.a_button{Nav $})*4
      +
      +

      Aufmacher

      +

      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis nec consectetur diam. Sed nisl odio, volutpat nec nisi sit amet, commodo faucibus est. Donec lacinia vestibulum sapien. Morbi porttitor nibh quis imperdiet scelerisque. Praesent rutrum quam eu sodales luctus.

      + + +
      + 
      header.header_page>nav.nav_right>ul>(li>a.a_button{Nav $})*4
      +
      +
      + +
      +
      + 
      footer.pos_abs.pin_bottom>nav.nav_column>ul>(li>a.a_button_text)*4
      + +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      + +

      Gruppierung

      + 
      ul.list_link>(li>a>img)*2+li>a
      + + +

      Tabellen

      + 
      table.table_link>thead>tr>th{&nbsp;}+th{Ab / Zy}+th{Neu / Alt}^^(tbody>tr>td.cell_icon[rowspan="2"]>img[width=16  height=16]^+td.cell_link>a[target=_blank]{Name}+a[target=_blank]{URL}^+td.cell_date[rowspan="2"]{YYY-MM-DD}^tr>td.cell_text>div.shorten{Beschreibung})*2
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
       Ab / ZyNeu / Alt
      NameURLYYYY-MM-DD
      +
      Beschreibung
      +
      NameURLYYYY-MM-DD
      +
      Beschreibung
      +
      +

      Eingebettet

      +
      + + + + + + + + + + + +
      +
      +
      +
      +
      +

      Autarke Seiten

      +

      Diese Elemente repräsentieren jeweils eine eigene Seite.

      +
      +
      +
      +
      +

      404

      +

      Hier ist nichts.

      +
      +

      Die angeforderte Ressource wurde nicht gefunden. Dieser Statuscode kann ebenfalls verwendet werden, um eine Anfrage ohne näheren Grund abzuweisen. Links, welche auf solche Fehlerseiten verweisen, werden auch als Tote Links bezeichnet.

      +

      Wikipedia

      +
      +
      + {% include "hippie/partials/footer-status.njk" %} +
      +
      +
      +

      403

      +

      Nicht erlaubt! Forbidden

      +
      +

      Die Anfrage wurde mangels Berechtigung des Clients nicht durchgeführt, bspw. weil der authentifizierte Benutzer nicht berechtigt ist, oder eine als HTTPS konfigurierte URL nur mit HTTP aufgerufen wurde.

      +

      Wikipedia

      +
      +
      + {% include "hippie/partials/footer-status.njk" %} +
      +
      +
      +

      400

      +

      Fehlerhafte Anfrage! Bad Request

      +
      +

      Die Anfrage-Nachricht war fehlerhaft aufgebaut.

      +

      Wikipedia

      +
      +
      + {% include "hippie/partials/footer-status.njk" %} +
      +
      +
      + + +
      +{% include "hippie/partials/footer.njk" %} +{% endblock %} + +{% block script %} +{{ super() }} + + + +{% endblock %} diff --git a/source/pages/demo/error/404.njk b/source/pages/demo/error/404.njk index 95c4f43..5ed2efe 100644 --- a/source/pages/demo/error/404.njk +++ b/source/pages/demo/error/404.njk @@ -1,25 +1,25 @@ - -{% set pageId = "404" %} -{% set pageClass = "body__status" %} - -{% extends "hippie/demo-maintenance.njk" %} - -{% block title %}404{% endblock %} -{% block head %} -{{ super() }} - - -{% endblock %} - -{% block body_content %} -
      -

      404

      -

      Client-Fehler

      -

      Hier ist nichts. Not Found
      -

      -

      Die angeforderte Ressource wurde nicht gefunden. Dieser Statuscode kann ebenfalls verwendet werden, um eine Anfrage ohne näheren Grund abzuweisen. Links, welche auf solche Fehlerseiten verweisen, werden auch als Tote Links bezeichnet.

      -

      Wikipedia

      -
      -
      -{% include "hippie/partials/footer-status.njk" %} -{% endblock %} + +{% set pageId = "404" %} +{% set pageClass = "body_status" %} + +{% extends "hippie/demo-maintenance.njk" %} + +{% block title %}404{% endblock %} +{% block head %} +{{ super() }} + + +{% endblock %} + +{% block body_content %} +
      +

      404

      +

      Client-Fehler

      +

      Hier ist nichts. Not Found
      +

      +

      Die angeforderte Ressource wurde nicht gefunden. Dieser Statuscode kann ebenfalls verwendet werden, um eine Anfrage ohne näheren Grund abzuweisen. Links, welche auf solche Fehlerseiten verweisen, werden auch als Tote Links bezeichnet.

      +

      Wikipedia

      +
      +
      +{% include "hippie/partials/footer-status.njk" %} +{% endblock %} diff --git a/source/pages/demo/error/500.njk b/source/pages/demo/error/500.njk index 464751e..dec9770 100644 --- a/source/pages/demo/error/500.njk +++ b/source/pages/demo/error/500.njk @@ -1,25 +1,25 @@ - -{% set pageId = "500" %} -{% set pageClass = "body__status" %} - -{% extends "hippie/demo-maintenance.njk" %} - -{% block title %}500{% endblock %} -{% block head %} -{{ super() }} - - -{% endblock %} - -{% block body_content %} -
      -

      500

      -

      Server-Fehler

      -

      Allgemeiner Server Fehler!!! Internal Server Error

      -
      -

      Dies ist ein „Sammel-Statuscode“ für unerwartete Serverfehler.

      -

      Wikipedia

      -
      -
      -{% include "hippie/partials/footer-status.njk" %} -{% endblock %} + +{% set pageId = "500" %} +{% set pageClass = "body_status" %} + +{% extends "hippie/demo-maintenance.njk" %} + +{% block title %}500{% endblock %} +{% block head %} +{{ super() }} + + +{% endblock %} + +{% block body_content %} +
      +

      500

      +

      Server-Fehler

      +

      Allgemeiner Server Fehler!!! Internal Server Error

      +
      +

      Dies ist ein „Sammel-Statuscode“ für unerwartete Serverfehler.

      +

      Wikipedia

      +
      +
      +{% include "hippie/partials/footer-status.njk" %} +{% endblock %} diff --git a/source/pages/demo/intro.njk b/source/pages/demo/intro.njk index e35d52f..68e8aed 100644 --- a/source/pages/demo/intro.njk +++ b/source/pages/demo/intro.njk @@ -1,713 +1,483 @@ - -{% set pageId = "intro" %} -{% set pageClass = "" %} - -{% extends "hippie/demo-extended.njk" %} - -{% block title %}Intro{% endblock %} -{% block head %} -{{ super() }} -{% endblock %} - -{% block body_content %} -
      - -{% include "hippie/partials/nav-page-meta.njk" %} -
      - -
      - Dies ist einfach nur Text.
      Weniger wäre Nichts, denn dieser Text ist nicht durch ein spezifisches Element umschlossen.
      Dies ist normalerweise nicht vorgesehen und wird hier nur zur Einführung und Anschauung verwendet.

      -

      Es wirken nur die Eigenschaften des <body> Elements. Dieses Element umschließt den gesamten Inhalt des Dokumentes und kommt daher nur einmal vor. Inhalte sind normalerweise durch Elemente definiert. Grundlegende Elemente teilen das Dokument zunächst in Abschnitte.

      -

      Bereiche

      -
      -
      -

      Einen Abschnitt, welcher für sich alleine stehen kann, definiert sich durch <article>. Solch ein Element wird oft detailliert gestaltet, kommt aber auch ohne jegliche Gestaltung aus.

      -

      Noch allgemeiner ist das <section> Element. Es schafft Bereiche um Inhalte zu strukturieren.

      -

      Bestimmte Bereiche haben einen vorgegebene Zweck.
      Folgende Bereiche sind vorgegeben:

      -
      - - -
      -
      -

      Um einleitenden Inhalt festzuhalten, wird das <header> Element eingesetzt. Es beinhaltet häufig auch Navigationselemente. Dabei bezieht es sich auf den nächsten, umgebenden Abschnitt.

      - -
      -
      -

      Auch abschließender Inhalt kann für einen Abschnitt definiert werden. Dazu wird <footer> eingesetzt.

      -
      -
      -
      Das Element <address> hat den Zweck, Kontaktinformationen bereit zu stellen. Diese werden, je nach Position des Elements im Kontext der gesamten Seite, anders gewertet.
      - -
      -
      -

      Zur feineren Strukturierung und Gliederung von Texten sind einige weitere Elemente verfügbar. Diese werden nun der Reihe nach aufgeführt. Zu Beginn die Überschriften, da sie noch zu den Abschnitten gehören. Das kommt vermutlich daher, da Abschnitte häufig eine kennzeichnende Überschrift beinhalten.

      -

      Überschrift 1

      -

      Eine Überschrift erster Ordnung <h1> ist sehr groß und steht daher oft außerhalb eines Textflusses. Sie schafft eine deutliche Trennung sowohl inhaltlich wie auch optisch. Sie erzeugt einen Abstand gleich der horizontalen Linie über sich.

      -

      Überschrift 2

      -

      Die weiteren Überschriften <h2> bis <h6> gliedern Text und werden auch als Titel für andere Elemente eingesetzt.

      -

      Überschrift 3 ist in Großbuchstaben gesetzt

      -

      Überschrift 4 verwendet normale Buchstaben und gleicht ansonsten Überschrift 3

      -
      Überschrift 5 ist Überschrift 5
      -
      Überschrift 6
      -

      Schließlich eine Überschrift in der Größe des Fließtextes. Allerdings in fett.

      -

      Gruppierung

      -

      Ein Absatz <p>. Zugegeben ein kurzer.

      -

      Aus mehreren Absätzen wird ein ganzer Text. Solche Texte haben gelegentlich großen informativen oder unterhaltsamen Charakter.
      Einfache Zeilenumbrüche werden darin mit <br> erreicht.

      -

      Die Unterteilung in Absätze ist eine von vielen Möglichkeiten Texte zu gruppieren und ihnen Struktur zu verleihen. In diesem Dokument flattert Text normalerweise von Links daher. Er ist schwarz und in einer serifenlosen Schrift gesetzt. Zu weiteren Formatierungen, die eher auf einer Ebene der Zeichen einzuordnen ist, wird im Verlauf näher eingegangen. Zunächst die Struktur:

      -

      Text sitzt gerne auch mal zentriert.

      p.txt_center
      -

      Rechtsbündig ist schon eher eine Ausnahme bzw. Besonderheit.

      p.txt_right
      -

      Texte können auf verschiedene Arten unterteilt werden. Dafür werden unterschiedlich formatierte <hr> Elemente verwendet. Die horizontale Linie ist die Ausgangsformatierung, daher auch der abgekürzte Name des Elements. Eine Linie ist schwarz und durchgezogen.

      -
      -

      Es ist auch eine unsichtbare Unterteilung möglich:

      -
      hr.hr__hidden
      -

      Die Linie darf auch gepunkted sein. Zudem sind verschiedene Längen möglich. Diese sind immer ein Prozentwert der verfügbaren Breite. Hier in gleicher Reihenfolge 100%, 50% und 25%:

      -
      hr.hr__dotted
      -
      hr.center_50
      -
      hr.hr__dotted.center_25
      -

      Zur horizontalen Unterteilung kommt natürlich auch eine vertikale Trennung hinzu. Text kann so zum Beispiel in mehrere Spalten unterteilt werden. Dies ist hilfreich, wenn ein Text durch eine breite Fläche sehr lange Zeilen bekommen würde. Es ist dann schwer den neuen Zeilanfang zu finden. Die vertikale Trennung dient in erster Linie dazu, diesem Umstand zu begegnen. Auch hier kann die Unterteilung viele Formen annehmen.

      p.column__2
      -

      Drei Spalten gilt es jetzt also zu Füllen. Dann erst wird die Trennung der Spalten durch eine Linie sichtbar.

      p.column__3.column__line
      -

      Ist der Text nicht lang genug bleibt eventuell eine Spalte leer. Diesmal wird dies aber nicht passieren, denn das Anschauungsbeispiel ist ja nun durch den vorherigen Absatz schon gegeben.
      Oft ist es sinnvoll, Absätze mit mehreren Spalten deutlich von nachfolgenden Absätzen zu trennen. Da der Textfluss spaltenweise verläuft, liest man eventuell an der falschen Stelle weiter. Ach das ziegen diese beiden Absätze ganz gut.

      -

      Es gibt die Möglichkeit vorformatierten Text darzustellen <pre>.

      - 
      Dadurch
      	bleiben
      		Einrückungen
      			durch
      				Tabulatoren
      					erhalten.
      -

      Text bekommt durch Listen besondere optische wie auch inhaltliche Struktur. Es gibt ungeordnete <ul> und geordnete Listen <ol> sowie Beschreibungslisten <dl>. Die beiden ersten Varianten beinhalten das Listenelement <li>. Beschreibungslisten beinhalten jeweils das Paar von Ausdruck <dt> und Beschreibung <dd>. Im Folgenden eine Liste der Listen in ihrer Ausgangskonfiguration:

      -
        -
      • Ungeordnete
        • -
      • Listen
        • -
      -
        -
      • Verschiedener
        • -
      • Art
        • -
      -
        -
      1. Geordnete
        2. -
      2. Liste
        3. -
      -
      -
      Beschreibungsliste
      -
      Auch Definitionslisten genannt
      -
      Ausdruck
      -
      Beschreibung
      -
      -

      Wird Bezug auf fremde Inhalte genommen, kommt ein Zitat <blockquote> zur Anwendung. Es besteht aus der Aussage und der Quelle.

      -
      -

      Ein Zitat (das, lateinisch citatum „Angeführtes, Aufgerufenes“ zu lat. citāre „in Bewegung setzen, vorladen“, vgl. „jemanden vor Gericht zitieren“) ist eine wörtlich übernommene Stelle aus einem Text oder ein Hinweis auf eine bestimmte Textstelle.

      -

      Wikipedia

      -
      -
      blockquote>p+p.quote__source
      -

      Auch Inhalte, die nicht in Textform sind, können durch einen Bezug integriert werden. Wie diese Fahne werden sie mit <figure> umschlossen und tragen eine Bezeichnung.

      -
      -
      Fahne
      - - - - - - - - - - - -
      -
      figure>figcaption+{element}
      -

      Eine von sich aus undefinierte Möglichkeit zur Gruppierung von Text besteht durch <div>. Dieses Element hat, ohne weitere Klassifizierung keine Auswirkungen auf die Erscheinung oder die inhaltliche Aussage. Daher der allgemeine Einsatz.

      -

      Es wird allerdings häufig eingesetzt und bekommt vielfältige Funktionen zugeordnet wie diese hervorgehobene Information zeigt.

      -

      Eine sehr klar definierte Gruppierung stellt das Element <main> dar. Es umschließt den hauptsächlichen Inhalt des Dokumentes.

      -
      -
      -

      Textebene

      -

      Verweise

      -

      Ein wesentlicher Bestandteil von Hypertext sind Verweise <a>. Sie dienen als Sprungmarken innerhalb des Netzwerks. Es kann grob zwischen internen und externen Verweisen unterschieden werden. Interne Verweisea.a__line können Verknüpfungen innerhalb des aktuellen Dokumentes sein oder auch Funktionen aktivieren. Externe Verweise verknüpfen Inhalte über das gesamte Netzwerk hinweg. Sie können auch auf E-Mail Adressen oder Dateien zeigen.

      -

      Nicht nur Text kann als Verweis verwendet werden. Auch andere Elemente wie Bilder können verknüpft werden. Abhängig von ihrer Funktion und ihrem Zweck, werden Verweise unterschiedlich formatiert. Farbige oder unterstrichene Varianten sind möglich.

      -

      Wird der Verweis innerhalb eines <nav> Elementes notiert, bekommt er die spezielle Bedeutung eines Navigationsverweises innerhalb des Dokumentes oder der Anwendung. Auf diese Verwendung wird im Folgenden genauer eingegangen ...

      -

      Formatierungen

      -

      Texte, Wörter oder Zeichen können vielfältig formatiert werden. Sie können fett <b> oder kursiv <i> geschrieben sein. Auch beides ist möglich!?! Sollen sie nicht nur anders aussehen, sondern auch eine besondere inhaltliche Bedeutung bekommen, werden sie mit <strong> und <em> ausgezeichnet.

      -

      Gerade bei wörtlichen Zitierungen kommt häufig das Anführungszeichen zum Einsatz. Es kann durch die Formatierung automatisch ergänzt werden.

      -
      -

      Das kannst du schon so machen aber dann isses halt Kacke.

      -

      o. V.

      -
      -
      blockquote.quote__mark>p+p.quote__source
      -

      Ein besonderer inhaltlicher Bezug ist der Titel eines Werkes. Sowas kann mit <cite> ausgezeichnet werden. Pulp Fiction, super Film - zum Beispiel.

      -

      Auch die Auszeichnung <code> wurde bis hier hin schon verwendet. Sie markiert Maschinensprache. Für zusammenhängende Blöcke wird die Auszeichnung oft in Kombination mit dem Element <pre> verwendet:

      - 
      <html>
        <head>
          <title>Hyper Text Markup Language</title>
        </head>
        <body id="root">
          <!-- Content goes here -->
          <p class="example">Just like this.</p>
        </body>
      </html>
      -

      Dabei bleiben vorhandene Textformatierungen wie Zeilenumbrüche und Einrückung erhalten.

      -

      Die Zeichen in Absätzen bis hin zu ganzen Texten können, mit einem geeigneten Eingabegerät, markiert werden. Dies stellt sich wie folgt dar:

      -

      Beispiel zum markieren ^^.

      -

      Eine Markierung kann, mittels <mark>, auch durch den Autor geschehen. Diese stellt sich ein wenig anders dar: Diese Worte sind markiert.

      - -

      Änderungen

      - -
      -
      -

      Eingebundene Inhalte

      - -
      -
      -

      Tabellen

      -

      Tabellen bieten besonders geordnete Struktur. Häufig werden in ihnen Text und Daten kombiniert dargestellt. Dies erfordert individuelle Formatierungen. Einige grundlegende Eigenschaften werden im folgenden aufgezeigt. Tabellen sind in ihrer Größe entweder vordefiniert oder richten sich nach ihrem Inhalt. Das gilt auch für die einzelnen Zellen....

      - - - - - - - - - - -
      Eineeinfache
      Tabelle
      -
      table.width_full>tbody>tr>td*2^tr>td[colspan=2]
      -
      - - - - - - - - - - -
      Einefließende
      Tabelle
      -
      table>tbody>tr>td*2^tr>td[colspan=2]
      - - - - - - - - - - -
      Mitohne
      Linien
      -
      table.table__blank>tbody>tr>td*2^tr>td[colspan=2]
      -
      -

      Die nächste Tabelle verwendet alle zur Auszeichnung verfügbaren Elemente und hat eine starre Zellverteilung:

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      Beschreibung bzw. Zusammenhang der Tabelle
      KopfzeileAB
      FußzeileAB
      Tabelle
      mitTitel
      Kopf-und
      Fußzeile
      -
      table.width_full.table__fix>caption+thead>tr>th*3^^tfoot>tr>td*3^^tbody>(tr>td*3)*3
      -
      -

      Viele weitere Formate sind möglich ...

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      KopfzeileAB
      VorspalteEine
      1erweiterte
      2Tabelle
      -
      table.width_full>thead>tr>th.precol+th[colspan=2]^^tbody>tr>td.precol+td*2^tr>td.precol+td[colspan=2]
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      KopfzeileAB
      Tabelle
      ohneRahmen
      jedochmit
      Streifen
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      Beschreibung bzw. Zusammenhang der Tabelle
      Kopfzeile1>9000
      Fußzeile--
      Alpha09000
      Bravo19001
      Charlie09000
      -
      -
      -

      Formulare

      -

      Spätestens hier werden Betrachter zu Benutzern. Texteingabefelder und verschiedene Bedienelemente geben Möglichkeiten zur Interaktion. Diese Elemente sind in vielerlei Hinsicht besonders. Werden sie nicht explizit gestaltet, ist ihre Erscheinung system- bzw. browserabhängig. (Vielleicht ist das auch scheiße, hier darauf einzugehen) ... Üblicherweise stehen alle Formularelemente innerhalb eines <form> Elementes. Dieses ist notwendig um Angaben zur Kommunikation mit dem Server zu setzen. Es hat normalerweise keine gestalterische Funktion.

      -

      Grundlegend ist das Element <input>. Es hat viele Attribute um den Typ der Eingabe anzupassen. Ist es undefiniert nimmt es jegliche textbasierte Information auf und erhält eine Standardgröße.

      -

      -

      Ein spezieller Typ des Eingabefeldes verändert seine Funktion zu einer Schaltfläche <input[type="button"]>. Es gibt allerdings auch ein eigenes Element <button> dafür. -

      -

      Interaktive Elemente können durch das Attribut <readonly> nur lesbar gemacht werden oder mittels <disabled> gänzlich deaktiviert werden.

      -

      -

      Das Element <label> ergänzt interaktive Elemente um eine Beschriftung. Wichtig ist hier, dass die Beziehung beider Elemente zu einander deutlich ist.

      -
      -
      - -
      -
      - -
      -
      -

      Zusätzlich zur Beschriftung einzelner Elemente gibt es auch die Möglichkeit Gruppierungen zu schaffen. Diese werden mit <fieldset> realisiert.

      -
      - -
      -

      Sie können mittels <legend> auch eine eigene Beschriftung erhalten.

      -
      - Einfache Eingabefelder - - -
      -
      - Weitere Eingabemöglichkeiten -

      Innerhalb einer Gruppe können nicht nur Ein- und Ausgabefelder platziert werden. Andere Elemente ergänzen Information oder lockern das Erscheinungsbild auf. Hier nun eine Liste möglicher Arten von Eingabefeldern.

      - 
      ul>(li>label>input[type="text"])
      -
        -
        • -
        • -
        • -
        • -
        • -
      -
      - -
      - - -
      -
      -
      - - - - -
      -

      - Show me a - Sorted by - - - Matching - -

      -
      - -

      Interaktive Elemente

      -
      -
      -

      Struktur

      -
      -
      -
      - - - - -
      -
      -
      -
      -
      -

      Medien

      -
      -
      -

      Druck

      -
      - -
      -
      -

      Ende der Einführung

      -

      Dies war eine Übersicht der grundlegenden Elemente. Nun folgen weitere Elemente mit besonderen Formatierungen.

      -
      -
      -
      - -
      -
      -

      HIPPIE Erklärung

      -

      Aufbau, Standardwerte

      -
      -
      -

      …

      -
      -
      - -
      -
      -

      Medienformat Abfragen

      -
      -
      -
      Umbruch bei 
      -
      -

      Telefone und größer

      -

      Nur Telefone

      -

      Schreibtafeln hochkant

      -

      Schreibtafeln und größer

      -

      Schreibtafeln im Querformat

      -

      Schreibtafeln quer und größer

      -

      Nur Arbeitsplatzrechner

      -

      Arbeitsplatzrechner und größer

      -

      Richtige Monitore und größer

      -
      -
      -
      -
      -
      -

      Sammlung formatierter Elemente

      -

      Die Elemente werden fortlaufend komplexer

      -
      -
      - 
      h3.txt_light_color+p
      -

      Helle Überschrift

      -

      Mit normalem Textabsatz

      - 
      a>h4
      - -

      Überschrift als Block-Verweis

      -       - 
      section>div.float_space_left>img^p+p
      -
      -
      Avatar
      -

      Vorname Name
      Straße 1, 01234 Stadt

      +49 (0)123 1337 0000
      name@domain.tld

      -
      - 
      div.box__main_indent
      -
      -
      -

      Eingerückter Inhalt

      -
      -
      - 
      nav>ul>(li>a.a__button{Punkt $})*4
-        nav>ul>(li>a.a__button_border{Stufe $})*4
      -
      - - -
      - 
      nav.nav__horizontal>ul>(li>a.a__button{Abschnitt $})*4
-          nav.nav__center_old>ul>(li>a.a__button{Typ $})*4
      - -
      - -
      - 
      header.header__page>h1+p+nav.nav__separate_right>ul>(li>a.a__button{Nav $})*4^+nav.nav__right>ul>(li>a.a__button{Nav $})*4
      -
      -

      Aufmacher

      -

      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis nec consectetur diam. Sed nisl odio, volutpat nec nisi sit amet, commodo faucibus est. Donec lacinia vestibulum sapien. Morbi porttitor nibh quis imperdiet scelerisque. Praesent rutrum quam eu sodales luctus.

      - - -
      - 
      header.header__page>nav.nav__right>ul>(li>a.a__button{Nav $})*4
      -
      -
      - -
      -
      - 
      footer.pos_abs.pin_bottom>nav.nav__column>ul>(li>a.a__button_text)*4
      - -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      - -

      Gruppierung

      - 
      ul.list__link>(li>a>img)*2+li>a
      - - -

      Tabellen

      - 
      table.table__link>thead>tr>th{&nbsp;}+th{Ab / Zy}+th{Neu / Alt}^^(tbody>tr>td.cell__icon[rowspan="2"]>img[width=16  height=16]^+td.cell__link>a[target=_blank]{Name}+a[target=_blank]{URL}^+td.cell__date[rowspan="2"]{YYY-MM-DD}^tr>td.cell__text>div.shorten{Beschreibung})*2
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
       Ab / ZyNeu / Alt
      NameURLYYYY-MM-DD
      -
      Beschreibung
      -
      NameURLYYYY-MM-DD
      -
      Beschreibung
      -
      -

      Eingebettet

      -
      - - - - - - - - - - - -
      - - -
      -
      -
      -
      -

      Autarke Seiten

      -

      Diese Elemente repräsentieren jeweils eine eigene Seite.

      -
      -
      -
      -
      -

      404

      -

      Hier ist nichts.

      -
      -

      Die angeforderte Ressource wurde nicht gefunden. Dieser Statuscode kann ebenfalls verwendet werden, um eine Anfrage ohne näheren Grund abzuweisen. Links, welche auf solche Fehlerseiten verweisen, werden auch als Tote Links bezeichnet.

      -

      Wikipedia

      -
      -
      - {% include "hippie/partials/footer-status.njk" %} -
      -
      -
      -

      403

      -

      Nicht erlaubt! Forbidden

      -
      -

      Die Anfrage wurde mangels Berechtigung des Clients nicht durchgeführt, bspw. weil der authentifizierte Benutzer nicht berechtigt ist, oder eine als HTTPS konfigurierte URL nur mit HTTP aufgerufen wurde.

      -

      Wikipedia

      -
      -
      - {% include "hippie/partials/footer-status.njk" %} -
      -
      -
      -

      400

      -

      Fehlerhafte Anfrage! Bad Request

      -
      -

      Die Anfrage-Nachricht war fehlerhaft aufgebaut.

      -

      Wikipedia

      -
      -
      - {% include "hippie/partials/footer-status.njk" %} -
      -
      -
      - {% include "hippie/partials/footer.njk" %} - {% endblock %} - - {% block script %} - {{ super() }} - - - - {% endblock %} + +{% set pageId = "intro" %} +{% set pageClass = "" %} + +{% extends "hippie/demo-extended.njk" %} + +{% block title %}Intro{% endblock %} +{% block head %} +{{ super() }} +{% endblock %} + +{% block body_content %} +
      + +{% include "hippie/partials/nav-page-meta.njk" %} +
      + +
      + Dies ist einfach nur Text.
      Weniger wäre Nichts, denn dieser Text ist nicht durch ein spezifisches Element umschlossen.
      Dies ist normalerweise nicht vorgesehen und wird hier nur zur Einführung und Anschauung verwendet.

      +

      Es wirken nur die Eigenschaften des <body> Elements. Dieses Element umschließt den gesamten Inhalt des Dokumentes und kommt daher nur einmal vor. Inhalte sind normalerweise durch Elemente definiert. Grundlegende Elemente teilen das Dokument zunächst in Abschnitte.

      +

      Bereiche

      + {# // body // article // section // nav // aside // h1-h6 // header // footer #} +
      +
      +

      Einen Abschnitt, welcher für sich alleine stehen kann, definiert sich durch <article>. Solch ein Element wird oft detailliert gestaltet, kommt aber auch ohne jegliche Gestaltung aus.

      +

      Noch allgemeiner ist das <section> Element. Es schafft Bereiche um Inhalte zu strukturieren.

      +

      Bestimmte Bereiche haben einen vorgegebene Zweck.
      Folgende Bereiche sind vorgegeben:

      +
      + + +
      +
      +

      Um einleitenden Inhalt festzuhalten, wird das <header> Element eingesetzt. Es beinhaltet häufig auch Navigationselemente. Dabei bezieht es sich auf den nächsten, umgebenden Abschnitt.

      + +
      +
      +

      Auch abschließender Inhalt kann für einen Abschnitt definiert werden. Dazu wird <footer> eingesetzt.

      +
      +
      + +

      Zur feineren Strukturierung und Gliederung von Texten sind einige weitere Elemente verfügbar. Diese werden nun der Reihe nach aufgeführt. Zu Beginn die Überschriften, da sie noch zu den Abschnitten gehören. Das kommt vermutlich daher, da Abschnitte häufig eine kennzeichnende Überschrift beinhalten.

      +

      Überschrift 1

      +

      Eine Überschrift erster Ordnung <h1> ist sehr groß und steht daher oft außerhalb eines Textflusses. Sie schafft eine deutliche Trennung sowohl inhaltlich wie auch optisch. Sie erzeugt einen Abstand gleich der horizontalen Linie über sich.

      +

      Überschrift 2

      +

      Die weiteren Überschriften <h2> bis <h6> gliedern Text und werden auch als Titel für andere Elemente eingesetzt.

      +

      Überschrift 3 ist in Großbuchstaben gesetzt

      +

      Überschrift 4 verwendet normale Buchstaben und gleicht ansonsten Überschrift 3

      +
      Überschrift 5 ist Überschrift 5
      +
      Überschrift 6
      +

      Schließlich eine Überschrift in der Größe des Fließtextes. Allerdings in fett.

      +
      +
      +

      Gruppierung

      + {# // p // address // hr // pre // blockquote // ol // ul // li // dl // dt // dd // figure // figcaption // main // div #} +

      Ein Absatz <p>. Zugegeben ein kurzer.

      +

      Aus mehreren Absätzen wird ein ganzer Text. Solche Texte haben gelegentlich großen informativen oder unterhaltsamen Charakter.
      Einfache Zeilenumbrüche werden darin mit <br> erreicht.

      +

      Die Unterteilung in Absätze ist eine von vielen Möglichkeiten Texte zu gruppieren und ihnen Struktur zu verleihen. In diesem Dokument flattert Text normalerweise von Links daher. Er ist schwarz und in einer serifenlosen Schrift gesetzt. Zu weiteren Formatierungen, die eher auf einer Ebene der Zeichen einzuordnen ist, wird im Verlauf näher eingegangen. Zunächst die Struktur:

      +

      Text sitzt gerne auch mal zentriert.

      p.txt_center
      +

      Rechtsbündig ist schon eher eine Ausnahme bzw. Besonderheit.

      p.txt_right
      +
      Das Element <address> hat den Zweck, Kontaktinformationen bereit zu stellen. Diese werden, je nach Position des Elements im Kontext der gesamten Seite, anders gewertet.
      +

      Texte können auf verschiedene Arten unterteilt werden. Dafür werden unterschiedlich formatierte <hr> Elemente verwendet. Die horizontale Linie ist die Ausgangsformatierung, daher auch der abgekürzte Name des Elements. Eine Linie ist schwarz und durchgezogen.

      +
      +

      Es ist auch eine unsichtbare Unterteilung möglich:

      +
      hr.hr_hidden
      +

      Die Linie darf auch gepunkted sein. Zudem sind verschiedene Längen möglich. Diese sind immer ein Prozentwert der verfügbaren Breite. Hier in gleicher Reihenfolge 100%, 50% und 25%:

      +
      hr.hr_dotted
      +
      hr.center_50
      +
      hr.hr_dotted.center_25
      +

      Zur horizontalen Unterteilung kommt natürlich auch eine vertikale Trennung hinzu. Text kann so zum Beispiel in mehrere Spalten unterteilt werden. Dies ist hilfreich, wenn ein Text durch eine breite Fläche sehr lange Zeilen bekommen würde. Es ist dann schwer den neuen Zeilanfang zu finden. Die vertikale Trennung dient in erster Linie dazu, diesem Umstand zu begegnen. Auch hier kann die Unterteilung viele Formen annehmen.

      p.column_2
      +

      Drei Spalten gilt es jetzt also zu Füllen. Dann erst wird die Trennung der Spalten durch eine Linie sichtbar.

      p.column_3.column_line
      +

      Ist der Text nicht lang genug bleibt eventuell eine Spalte leer. Diesmal wird dies aber nicht passieren, denn das Anschauungsbeispiel ist ja nun durch den vorherigen Absatz schon gegeben.
      Oft ist es sinnvoll, Absätze mit mehreren Spalten deutlich von nachfolgenden Absätzen zu trennen. Da der Textfluss spaltenweise verläuft, liest man eventuell an der falschen Stelle weiter. Ach das ziegen diese beiden Absätze ganz gut.

      +

      Es gibt die Möglichkeit vorformatierten Text darzustellen <pre>.

      + 
      Dadurch
      	bleiben
      		Einrückungen
      			durch
      				Tabulatoren
      					erhalten.
      +

      Wird Bezug auf fremde Inhalte genommen, kommt ein Zitat <blockquote> zur Anwendung. Es besteht aus der Aussage und der Quelle.

      +
      +

      Ein Zitat (das, lateinisch citatum „Angeführtes, Aufgerufenes“ zu lat. citāre „in Bewegung setzen, vorladen“, vgl. „jemanden vor Gericht zitieren“) ist eine wörtlich übernommene Stelle aus einem Text oder ein Hinweis auf eine bestimmte Textstelle.

      +

      Wikipedia

      +
      +
      blockquote>p+p.quote_source
      +

      Text bekommt durch Listen besondere optische wie auch inhaltliche Struktur. Es gibt ungeordnete <ul> und geordnete Listen <ol> sowie Beschreibungslisten <dl>. Die beiden ersten Varianten beinhalten das Listenelement <li>. Beschreibungslisten beinhalten jeweils das Paar von Ausdruck <dt> und Beschreibung <dd>. Im Folgenden eine Liste der Listen in ihrer Ausgangskonfiguration:

      +
        +
      • Ungeordnete
        • +
      • Listen
        • +
      +
        +
      • Verschiedener
        • +
      • Art
        • +
      +
        +
      1. Geordnete
        2. +
      2. Liste
        3. +
      +
      +
      Beschreibungsliste
      +
      Auch Definitionslisten genannt
      +
      Ausdruck
      +
      Beschreibung
      +
      +

      Auch Inhalte, die nicht in Textform sind, können durch einen Bezug integriert werden. Wie diese Fahne werden sie mit <figure> umschlossen und tragen eine Bezeichnung.

      +
      +
      Fahne
      + + + + + + + + + + + +
      +
      figure>figcaption+{element}
      +

      Eine sehr klar definierte Gruppierung stellt das Element <main> dar. Es umschließt den hauptsächlichen Inhalt des Dokumentes.

      +

      Eine von sich aus undefinierte Möglichkeit zur Gruppierung von Text besteht durch <div>. Dieses Element hat, ohne weitere Klassifizierung keine Auswirkungen auf die Erscheinung oder die inhaltliche Aussage. Daher der allgemeine Einsatz.

      +

      Es wird allerdings häufig eingesetzt und bekommt vielfältige Funktionen zugeordnet wie diese hervorgehobene Information zeigt.

      +
      +
      +

      Textebene

      + {# // a // em // strong // small // s // cite // q // dfn // abbr // ruby // rb // rt // rtc // rp // data // time // code // var // samp // kbd // sub // sup // i // b // u // mark // bdi // bdo // span // br // wbr // -- Edits -- // ins // del #} +

      Verweise

      +

      Ein wesentlicher Bestandteil von Hypertext sind Verweise <a>. Sie dienen als Sprungmarken innerhalb des Netzwerks. Es kann grob zwischen internen und externen Verweisen unterschieden werden. Interne Verweisea.a_line können Verknüpfungen innerhalb des aktuellen Dokumentes sein oder auch Funktionen aktivieren. Externe Verweise verknüpfen Inhalte über das gesamte Netzwerk hinweg. Sie können auch auf E-Mail Adressen oder Dateien zeigen.

      +

      Nicht nur Text kann als Verweis verwendet werden. Auch andere Elemente wie Bilder können verknüpft werden. Abhängig von ihrer Funktion und ihrem Zweck, werden Verweise unterschiedlich formatiert. Farbige oder unterstrichene Varianten sind möglich.

      +

      Wird der Verweis innerhalb eines <nav> Elementes notiert, bekommt er die spezielle Bedeutung eines Navigationsverweises innerhalb des Dokumentes oder der Anwendung. Auf diese Verwendung wird im Folgenden genauer eingegangen ...

      +

      Formatierungen

      +

      Texte, Wörter oder Zeichen können vielfältig formatiert werden.

      +

      Sie können fett <b> oder kursiv <i> geschrieben sein. Auch beides ist möglich!?! Sollen sie nicht nur anders aussehen, sondern auch eine besondere inhaltliche Bedeutung bekommen, werden sie mit <strong> und <em> ausgezeichnet.

      +

      Das <u> Element stellt eine Spanne von Text mit einer unartikulierten, wenn auch explizit dargestellten, nicht-textuellen Anmerkung dar, wie z.B. die Beschriftung des Textes als Eigenname wie Interaktionsweise, oder die Beschriftung des Textes als falsch geschrieben.

      +

      Ähnlich ist es mit dem Element <small>. Es steht für Randnotizen wird aber häufig auch kleiner dargestellt.

      +

      Gerade bei wörtlichen Zitierungen kommt häufig das Anführungszeichen zum Einsatz. Es kann durch die Formatierung automatisch ergänzt werden.

      +
      +

      Das kannst du schon so machen aber dann isses halt Kacke.

      +

      o. V.

      +
      +
      blockquote.quote_mark>p+p.quote_source
      +

      Ein besonderer inhaltlicher Bezug ist der Titel eines Werkes. Sowas kann mit <cite> ausgezeichnet werden. Pulp Fiction, super Film - zum Beispiel.

      +

      Auch die Auszeichnung <code> wurde bis hier hin schon verwendet. Sie markiert Maschinensprache.var code = "Das ist code";

      +

      In diesem Beispiel wird die Variable code definiert. Solch ein spezieller Text kann mit dem dafür vorgesehenen Element <var> ausgezeichnet werden.

      +

      Für zusammenhängende Blöcke wird die Auszeichnung oft in Kombination mit dem Element <pre> verwendet:

      + 
      <html>
        <head>
          <title>Hyper Text Markup Language</title>
        </head>
        <body id="root">
          <!-- Content goes here -->
          <p class="example">Just like this.</p>
        </body>
      </html>
      +

      Dabei bleiben vorhandene Textformatierungen wie Zeilenumbrüche und Einrückung erhalten.

      +

      Soll beispielhaft auf Ausgaben von Computern verwiesen werden, wird das <samp> Element verwendet. Der Computer hat gesagt: Ich kann das angegebene Objekt nicht finden.

      +

      Benutzereingaben haben ebenfalls ein eigenes Element <kbd>. Damit werden Eingaben durch den Nutzer, wie Drücken Sie gleichzeitig Strg und A, gekennzeichnet.

      +

      Die Zeichen in Absätzen bis hin zu ganzen Texten können, mit einem geeigneten Eingabegerät, markiert werden. Dies stellt sich wie folgt dar:

      +

      Beispiel zum markieren ^^.

      +

      Eine Markierung kann, mittels <mark>, auch durch den Autor geschehen. Diese stellt sich ein wenig anders dar: Diese Worte sind markiert.

      +

      Um Text, dessen schreibweise nicht vorhersehbar ist, zu markieren wie z.B. Benutzernamen كائن بشري, die auch rechtsbündig geschrieben sein können, wird das <bdi> Element eingesetzt.
      Die Schreibweise kann auch auch vom Author vorgegeben und expliziert geändert werden. Dies wird dem <bdo> Element umgesetzt.

      + +
        +
      • كائن بشري
        • +
      • إنسان آلي
        • +
      +       +

      Neben den vielen speziellen Elmenten gibt es auch ein Element, das keine vordefinierte Bedeutung hat. Es ist das <span> Element.

      +

      ...

      +

      Änderungen

      +
      +
      +

      Eingebundene Inhalte

      + +
      +
      +

      Tabellen

      +

      Tabellen bieten besonders geordnete Struktur. Häufig werden in ihnen Text und Daten kombiniert dargestellt. Dies erfordert individuelle Formatierungen. Einige grundlegende Eigenschaften werden im folgenden aufgezeigt. Tabellen sind in ihrer Größe entweder vordefiniert oder richten sich nach ihrem Inhalt. Das gilt auch für die einzelnen Zellen....

      + + + + + + + + + + +
      Eineeinfache
      Tabelle
      +
      table.width_full>tbody>tr>td*2^tr>td[colspan=2]
      +
      + + + + + + + + + + +
      Einefließende
      Tabelle
      +
      table>tbody>tr>td*2^tr>td[colspan=2]
      + + + + + + + + + + +
      Mitohne
      Linien
      +
      table.table_blank>tbody>tr>td*2^tr>td[colspan=2]
      +
      +

      Die nächste Tabelle verwendet alle zur Auszeichnung verfügbaren Elemente und hat eine starre Zellverteilung:

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      Beschreibung bzw. Zusammenhang der Tabelle
      KopfzeileAB
      FußzeileAB
      Tabelle
      mitTitel
      Kopf-und
      Fußzeile
      +
      table.width_full.table_fix>caption+thead>tr>th*3^^tfoot>tr>td*3^^tbody>(tr>td*3)*3
      +
      +

      Viele weitere Formate sind möglich ...

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      KopfzeileAB
      VorspalteEine
      1erweiterte
      2Tabelle
      +
      table.width_full>thead>tr>th.precol+th[colspan=2]^^tbody>tr>td.precol+td*2^tr>td.precol+td[colspan=2]
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      KopfzeileAB
      Tabelle
      ohneRahmen
      jedochmit
      Streifen
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      Beschreibung bzw. Zusammenhang der Tabelle
      Kopfzeile1>9000
      Fußzeile--
      Alpha09000
      Bravo19001
      Charlie09000
      +
      +
      +

      Formulare

      +

      Spätestens hier werden Betrachter zu Benutzern. Texteingabefelder und verschiedene Bedienelemente geben Möglichkeiten zur Interaktion. Diese Elemente sind in vielerlei Hinsicht besonders. Werden sie nicht explizit gestaltet, ist ihre Erscheinung system- bzw. browserabhängig. (Vielleicht ist das auch scheiße, hier darauf einzugehen) ... Üblicherweise stehen alle Formularelemente innerhalb eines <form> Elementes. Dieses ist notwendig um Angaben zur Kommunikation mit dem Server zu setzen. Es hat normalerweise keine gestalterische Funktion.

      +

      Grundlegend ist das Element <input>. Es hat viele Attribute um den Typ der Eingabe anzupassen. Ist es undefiniert nimmt es jegliche textbasierte Information auf und erhält eine Standardgröße.

      +

      +

      Ein spezieller Typ des Eingabefeldes verändert seine Funktion zu einer Schaltfläche <input[type="button"]>. Es gibt allerdings auch ein eigenes Element <button> dafür.

      +

      +

      Interaktive Elemente können durch das Attribut <readonly> nur lesbar gemacht werden oder mittels <disabled> gänzlich deaktiviert werden.

      +

      +

      Das Element <label> ergänzt interaktive Elemente um eine Beschriftung. Wichtig ist hier, dass die Beziehung beider Elemente zu einander deutlich ist.

      +
      +
      + +
      +
      + +
      +
      +

      Zusätzlich zur Beschriftung einzelner Elemente gibt es auch die Möglichkeit Gruppierungen zu schaffen. Diese werden mit <fieldset> realisiert.

      +
      + +
      +

      Sie können mittels <legend> auch eine eigene Beschriftung erhalten.

      +
      + Einfache Eingabefelder + + +
      +
      + Weitere Eingabemöglichkeiten +

      Innerhalb einer Gruppe können nicht nur Ein- und Ausgabefelder platziert werden. Andere Elemente ergänzen Information oder lockern das Erscheinungsbild auf. Hier nun eine Liste möglicher Arten von Eingabefeldern.

      + 
      ul>(li>label>input[type="text"])
      +
        +
        • +
        • +
        • +
        • +
        • +
      +
      + +
      + + +
      +
      +
      + + + + +
      +

      + Show me a + Sorted by + + + Matching + +

      +
      + +

      Interaktive Elemente

      +
      +
      +

      Struktur

      +
      +
      +
      + + + + +
      +
      +
      +
      +
      +

      Medien

      +
      +
      +

      Druck

      +
      + +
      +
      +

      Ende der Einführung

      +

      Dies war eine Übersicht der grundlegenden Elemente. Nun folgen weitere Elemente mit besonderen Formatierungen.

      +
      +
      +
      + +
      +
      +

      HIPPIE Erklärung

      +

      Aufbau, Standardwerte

      +
      +
      +

      …

      +
      +
      + +{% include "hippie/partials/footer.njk" %} +{% endblock %} + +{% block script %} +{{ super() }} + + +{% endblock %} diff --git a/source/pages/demo/os.njk b/source/pages/demo/os.njk index c82fbfc..9df5bc6 100644 --- a/source/pages/demo/os.njk +++ b/source/pages/demo/os.njk @@ -12,7 +12,7 @@ {% block body_content %} {# {% include "partials/page-hover.njk" %} #}
      -
      +
      @@ -21,10 +21,10 @@
      -
      - +
      +
      -
      - -
      -
      -
      -
      +
      + +
      +
      +
      +

      Dateiname 1

      Auszeichnung 1

      -
      -
      -
      +
      +
      +

      Dateiname 2

      Auszeichnung 2

      -
      -
      -
      +
      +
      +

      Dateiname 3

      Auszeichnung 3

      -
      -
      -
      +
      +
      +

      Dateiname 4

      Auszeichnung 4

      -
      - +
      +
      - + - +
      Objektname 1Objektpfad 1Objektpfad 1
      Objektname 2Objektpfad 2Objektpfad 2
      -
      +

      Status

      diff --git a/source/style/hippie/elements/_grouping.scss b/source/style/hippie/elements/_grouping.scss index 5cbc119..460515b 100644 --- a/source/style/hippie/elements/_grouping.scss +++ b/source/style/hippie/elements/_grouping.scss @@ -45,12 +45,12 @@ hr { border-color: $darkest_color; } -.hr__hidden { +.hr_hidden { @extend hr; border-color: transparent; } -.hr__dotted { +.hr_dotted { @extend hr; border-style: dotted; } @@ -60,8 +60,8 @@ pre { @extend %basic_mono; } -.pre__code { - // overflow-x: scroll; +.pre_code { + overflow-x: auto; border-color: rgba($brightest_color,.1); border-style: dotted; border-width: 0 0 0 $border_width_4; @@ -80,14 +80,14 @@ blockquote { padding-left: $basic_indent; } -.quote__mark { +.quote_mark { p::before { content: "\201E \0020"; } p::after { content: "\201C \0020"; } - .quote__source { + .quote_source { &::before, &::after { content: ""; } @@ -107,7 +107,7 @@ li, dt, dd { @extend %basic; } -dd, .list__basic li { +dd, .list_basic li { margin-bottom: $basic_space; } @@ -144,7 +144,7 @@ div { // General Classes // ------------------------------------------------------------------------------ -.list__dash { +.list_dash { li { list-style: none; position: relative; @@ -157,7 +157,7 @@ div { } } -.list__link { +.list_link { li { margin-bottom: $tiny_space * 2; text-transform: uppercase; @@ -180,52 +180,52 @@ div { } } -.list__horizontal { +.list_horizontal { overflow: auto; li { @extend .float_space_left; } } -.box__info { +.box_info { padding: $double_space $basic_indent; border-right: $basic_space solid rgba($echo_color, 0.6); background-color: rgba($echo_color, 0.1) !important; } -.box__main_indent { +.box_main_indent { margin-left: 25%; } -.box__full_width { +.box_full_width { // position: relative; // overflow: hidden; // width: 100%; } // Columns -.column__line { +.column_line { column-rule: $basic_border; } -.column__2, .column__3 { +.column_2, .column_3 { @extend p; } -.column__2 { +.column_2 { column-count: 2; column-gap: $space_3; } -.column__3 { +.column_3 { column-count: 3; column-gap: $space_4; } // Space and placeholders -.box__space { +.box_space { position: relative; width: 100%; } -.box__cube { +.box_cube { float: left; display: table; width: $space_4; @@ -236,7 +236,7 @@ div { } } -.box__placeholder { +.box_placeholder { width: 100%; height: $space_4; border: $border_width_4 solid rgba($alpha_color,.1); @@ -244,33 +244,34 @@ div { background-color: rgba($alpha_color,.2); } -.box__placeholder_bkg { +.box_placeholder_bkg { width: 100%; height: $space_4 * 2; border: $border_width_4 solid rgba($brightest_color,.1); border-radius: $basic_corner; padding: $basic_space; /*data:[][;charset=][;base64],*/ - background: url("data:image/svg+xml;utf8,") no-repeat; + background: url("data:image/svg+xml;utf8,") no-repeat; background-color: rgba($brightest_color,.1); } // Data -.box__file_tile { +.box_file_tile { @extend .float_space_left; } // Flex -.flex__column_wrap { +.flex_column_wrap { @extend .flex; + flex-wrap: wrap; - .flex__column { - @extend .flex__child; + .flex_column { + @extend .flex_child; flex-grow: 1; } } // Sprites -.sprite__img { +.sprite_img { display: inline-block; } diff --git a/source/style/hippie/elements/_interactive.scss b/source/style/hippie/elements/_interactive.scss index defed38..41b072e 100644 --- a/source/style/hippie/elements/_interactive.scss +++ b/source/style/hippie/elements/_interactive.scss @@ -105,7 +105,7 @@ legend { } label + input, -.input__label_right, +.input_label_right, .label > input, .label > select { margin: 0 $basic_space; @@ -192,7 +192,7 @@ canvas { line-height: 2.5; } -.label__table { +.label_table { display: table; input { @@ -200,10 +200,10 @@ canvas { } } -.input__default { +.input_default { label { - @extend .label__table; + @extend .label_table; margin: $half_space 0; input { diff --git a/source/style/hippie/elements/_sections.scss b/source/style/hippie/elements/_sections.scss index 3a1ee9e..e03ebec 100644 --- a/source/style/hippie/elements/_sections.scss +++ b/source/style/hippie/elements/_sections.scss @@ -38,9 +38,10 @@ body { } &:hover { - - .layer__hover { - background-color: transparent; + + .layer_hover { + background-color: transparent !important; + transition: background-color $double_duration $basic_timing 0s !important; } } } @@ -55,7 +56,7 @@ section { } -.sec__main_center { +.sec_main_center { width: $basic_width; margin: 0 auto; padding-top: $space_3; @@ -71,7 +72,7 @@ section { } } -.sec__main_status { +.sec_main_status { border-top-width: $border_width_8; border-top-style: solid; border-color: $basic_border_color; @@ -161,11 +162,11 @@ header { } -.header__page { +.header_page { overflow: auto; } -.header__txt { +.header_txt { margin-bottom: $space_3; border-bottom: $dotted_border; diff --git a/source/style/hippie/elements/_tables.scss b/source/style/hippie/elements/_tables.scss index 23159b0..ddd3626 100644 --- a/source/style/hippie/elements/_tables.scss +++ b/source/style/hippie/elements/_tables.scss @@ -80,7 +80,7 @@ td:last-child { border-right: $basic_border; } -.table__blank { +.table_blank { border: $basic_border_width solid transparent; th, td { @@ -88,11 +88,11 @@ td:last-child { } } -.table__free { +.table_free { border: $basic_border_width solid transparent; } -.table__stripe { +.table_stripe { td { border-top: 0; border-bottom: 0; @@ -103,11 +103,11 @@ td:last-child { } } -.table__fix { +.table_fix { table-layout: fixed; } // Data -.table__file_simple { +.table_file_simple { @extend .width_full; } diff --git a/source/style/hippie/elements/_textlevel.scss b/source/style/hippie/elements/_textlevel.scss index 8f1d071..69f06a0 100644 --- a/source/style/hippie/elements/_textlevel.scss +++ b/source/style/hippie/elements/_textlevel.scss @@ -52,7 +52,7 @@ a { } } -.a__line { +.a_line { border-bottom-width: $tiny_space; border-bottom-style: dotted; border-color: $basic_border_color; @@ -68,19 +68,19 @@ a { } } -.a__button { +.a_button { @extend %default_button; } -.a__button_text { +.a_button_text { @extend %default_button; padding: $wide_padding; background-color: transparent; color: $basic_font_color; } -.a__button_border { - @extend .a__button_text; +.a_button_border { + @extend .a_button_text; border: $cell_border; } @@ -90,7 +90,7 @@ i, em { font-style: italic; } -.i__bright { +.i_bright { font-style: normal; color: $brightest_color; } @@ -159,10 +159,10 @@ time { // Code code { @extend %basic_mono; - color: lighten($basic_font_color, 12%); + color: lighten($basic_font_color, $basic_color_diff); background-color: rgba($brightest_color,.1); } -.code__solo { +.code_solo { @extend %basic_mono; padding: $tiny_space $half_space; color: $basic_font_color; @@ -177,7 +177,15 @@ samp { } kbd { - + @extend %basic_mono; + // font-size: .9em; + // font-weight: bold; + padding: 0 $half_space; + border-width: $basic_border_width; + border-style: solid; + border-color: darken($basic_back_color, $basic_color_diff); + border-radius: $basic_corner; + color: lighten($basic_font_color, $basic_color_diff); } sub, sup { @@ -192,7 +200,7 @@ u { mark { background-color: $alpha_color; } -.mark__cursor { +.mark_cursor { color: $basic_highlight_color; background-color: $darkest_color; } @@ -213,7 +221,7 @@ bdi, bdo { span { } -.span__solo { +.span_solo { @extend %solo; } diff --git a/source/style/hippie/global/_common.scss b/source/style/hippie/global/_common.scss index 1b71d2e..8fd23aa 100644 --- a/source/style/hippie/global/_common.scss +++ b/source/style/hippie/global/_common.scss @@ -189,7 +189,7 @@ } .hover_back_change { - background-color: darken($basic_back_color, 10%); + background-color: darken($basic_back_color, $basic_color_diff); transition: background-color 0.2s ease-in-out; &:hover { @@ -201,7 +201,7 @@ @extend %full_viewport; z-index: $z_heaven; background-color: transparentize($darkest_color, 0.5); - transition: background-color 0.2s ease-in-out; + transition: background-color $extended_duration $basic_timing $extended_duration; pointer-events: none; } @@ -209,27 +209,27 @@ display: flex; } -.flex__wrap { +.flex_wrap { @extend .flex; flex-wrap: wrap; } -.flex__row { +.flex_row { @extend .flex; flex-direction: column; // align-items: flex-start; justify-content: flex-start; } -.flex__child { +.flex_child { flex: 0 1 auto; } -.flex__child_one { +.flex_child_one { flex: 1; } -.flex__child_end { +.flex_child_end { align-self: flex-end; } @@ -237,7 +237,7 @@ // Colors // ------------------------------------------------------------------------------ .txt_light_color { - color: darken($basic_back_color, 10%); + color: darken($basic_back_color, $basic_color_diff); } diff --git a/source/style/hippie/global/_config.scss b/source/style/hippie/global/_config.scss index 4048996..3e64efb 100644 --- a/source/style/hippie/global/_config.scss +++ b/source/style/hippie/global/_config.scss @@ -101,13 +101,13 @@ $basic_link_color: $echo_color !default; $basic_highlight_color: $brightest_color !default; $basic_action_color: $foxtrot_color !default; - - $basic_border_color: $basic_front_color !default; // default shadow colors // $shadow_color: fade-out($medium_color, 0.5); +$basic_color_diff: 12% !default; + $basic_color_list: (); @each $key, $value in $color_palette { @@ -147,8 +147,9 @@ $io_margin: 0 $space_3 !default; $basic_padding: calc(#{$basic_space} - 3px) $basic_space !default; $wide_padding: calc(#{$basic_space} - 1px) calc(#{$basic_space} * 2) !default; -$basic_corner: $tiny_space; +$basic_corner: $tiny_space * 2; +// Borders $basic_border_width: $tiny_space !default; $border_width_4: $tiny_space * 4; $border_width_8: $tiny_space * 8; @@ -197,8 +198,8 @@ $basic_focus_list: 'textarea:not([disabled])', '*[tabindex]'; -$basic_io_font_color: lighten($basic_font_color, 10%); -$basic_io_back_color: darken($brightest_color, 10%); +$basic_io_font_color: lighten($basic_font_color, $basic_color_diff); +$basic_io_back_color: darken($brightest_color, $basic_color_diff); $basic_io_border_color: $brightest_color; $basic_io_border_width: $tiny_space * 2 !default; @@ -212,8 +213,10 @@ $basic_focus_shadow: $basic_shadow, 0 0 5px adjust-color($basic_action_color, $l // ANIMATIONS // ------------------------------------------------------------------------------ -$basic_duration: 150ms; -$basic_timing: ease; +$basic_duration: 250ms; +$double_duration: 500ms; +$extended_duration: 2s; +$basic_timing: ease-out; // HARDWARE BREAKPOINTS diff --git a/source/style/hippie/global/_typography.scss b/source/style/hippie/global/_typography.scss index 9a099aa..2986a6d 100644 --- a/source/style/hippie/global/_typography.scss +++ b/source/style/hippie/global/_typography.scss @@ -1,62 +1,62 @@ -// Basic styles -// ----------------------------------------------------------------------------- - -%basic { - font-family: $primary_font_family; - font-size: $text_size_1; - line-height: $text_line_basic; -} - -%basic_mono { - font-family: $monospace_font_family; - font-size: $text_size_1; - line-height: $text_line_mono; -} - -%basic_print { - font-family: $print_font_family; - font-size: $text_size_1; - line-height: $text_line_basic; -} - -%head_all { - color: $basic_head_color; -} - -%head_1 { - font-family: $secondary_font_family; - font-size: $head_size_1; - font-weight: 300; - line-height: $head_line_basic; -} - -%head_2 { - font-family: $secondary_font_family; - font-size: $head_size_2; - font-weight: 300; - line-height: $head_line_2; -} - -%head_3 { - font-family: $secondary_font_family; - font-size: $head_size_3; - font-weight: 300; - line-height: $head_line_3; -} - -%head_4 { - font-family: $secondary_font_family; - font-size: $head_size_4; - font-weight: 300; - line-height: $head_line_4; -} - -%solo { - @extend %basic; -} - -%short { - overflow: hidden; - text-overflow: ellipsis; - -o-text-overflow: ellipsis; // vendor -} +// Basic styles +// ----------------------------------------------------------------------------- + +%basic { + font-family: $primary_font_family; + font-size: $text_size_1; + line-height: $text_line_basic; +} + +%basic_mono { + font-family: $monospace_font_family; + font-size: $text_size_1; + line-height: $text_line_mono; +} + +%basic_print { + font-family: $print_font_family; + font-size: $text_size_1; + line-height: $text_line_basic; +} + +%head_all { + color: $basic_head_color; +} + +%head_1 { + font-family: $secondary_font_family; + font-size: $head_size_1; + font-weight: 300; + line-height: $head_line_basic; +} + +%head_2 { + font-family: $secondary_font_family; + font-size: $head_size_2; + font-weight: 300; + line-height: $head_line_2; +} + +%head_3 { + font-family: $secondary_font_family; + font-size: $head_size_3; + font-weight: 300; + line-height: $head_line_3; +} + +%head_4 { + font-family: $secondary_font_family; + font-size: $head_size_4; + font-weight: 300; + line-height: $head_line_4; +} + +%solo { + @extend %basic; +} + +%short { + overflow: hidden; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; // vendor +} diff --git a/source/style/hippie/mixins/_media_query.scss b/source/style/hippie/mixins/_media_query.scss index 35ffa22..86a4e89 100644 --- a/source/style/hippie/mixins/_media_query.scss +++ b/source/style/hippie/mixins/_media_query.scss @@ -1,9 +1,12 @@ //Sections for Media Queries +@mixin forPhoneUp { + @media (min-width: #{$screen_tiny - 1}) { @content; } //599px +} @mixin forPhoneOnly { @media (max-width: #{$screen_tiny - 1}) { @content; } //599px } @mixin forTabletPortraitUp { - @media (min-width: $screen_tiny) { @content; } //600px + @media (min-width: $screen_small) { @content; } //600px } @mixin forTabletPortraitOnly { @media (min-width: $screen_tiny) and (max-width: #{$screen_small - 1}) { @content; } //600px - 899px diff --git a/source/style/hippie/modules/breakpoint/_breakpoint_module.scss b/source/style/hippie/modules/breakpoint/_breakpoint_module.scss index dc9c5a4..fd0174a 100644 --- a/source/style/hippie/modules/breakpoint/_breakpoint_module.scss +++ b/source/style/hippie/modules/breakpoint/_breakpoint_module.scss @@ -1,46 +1,47 @@ -.query__goingLarge { +.query_goingLarge { @include goingLarge($screen_tiny) {}; } -.query__goingSmall { +.query_goingSmall { @include goingSmall($screen_gigantic) {}; } -.query__phoneUp { +.query_phoneUp { + @include forPhoneUp {} } -.query__phoneOnly { +.query_phoneOnly { @include forPhoneOnly {} } -.query__tabletPortaitOnly { +.query_tabletPortaitOnly { @include forTabletPortraitOnly { } } -.query__tabletPortraitUp { +.query_tabletPortraitUp { @include forTabletPortraitUp { } } -.query__tabletLandscapeOnly { +.query_tabletLandscapeOnly { @include forTabletLandscapeOnly {} } -.query__tabletLandscapeUp { +.query_tabletLandscapeUp { @include forTabletLandscapeUp {} } -.query__desktopOnly { +.query_desktopOnly { @include forDesktopOnly { } } -.query__desktopUp { +.query_desktopUp { @include forDesktopUp { } } -.query__bigDesktopUp { +.query_bigDesktopUp { @include forBigDesktopUp {} } diff --git a/source/style/hippie/modules/explanation/_explanation_module.scss b/source/style/hippie/modules/explanation/_explanation_module.scss index a12aee9..1538405 100644 --- a/source/style/hippie/modules/explanation/_explanation_module.scss +++ b/source/style/hippie/modules/explanation/_explanation_module.scss @@ -1,115 +1,115 @@ -// Custom extends and mixins -// ------------------------------------------------------------------------------ -@import "mixins"; -@import "extends"; - -// Explanation module styles -// ------------------------------------------------------------------------------ - -%expose_after { - &::after { - content: ""; - display: block; - height: 48px; - background-color: rgba($delta_color, 0.1) !important; - } -} -%expose_before { - &::before { - content: ""; - display: block; - height: 48px; - background-color: rgba($delta_color, 0.1) !important; - } -} -%expose { - &::before, &::after { - content: ""; - display: block; - height: 48px; - background-color: rgba($delta_color, 0.1) !important; - } -} -%exp { -} -%exp_hidden { - display: none; -} - -.exp_wrap { - position: relative; -} - -.exp_pop { - @extend %exp_hidden !optional; - position: absolute; - z-index: 100; - top: $space_5; - left: $space_5; - padding: $half_space; - border: 4px solid $basic_back_color; - border-radius: 4px; - background-color: $basic_back_color; - pointer-events: none; -} -.exp_marker_pop { - position: absolute; - top: -$basic_size / 4 * 3; - right: -$basic_size / 2; - width: $basic_size; - height: $basic_size; - border: $tiny_space solid $basic_highlight_color; - border-radius: $basic_size; - color: $basic_highlight_color; - background-color: $darkest_color; -} - -.exp_expose { - @extend %expose !optional; -} -.exp_expose_pre { - @extend %expose_after; -} -.exp_expose_post { - @extend %expose_before; -} - -.exp_overlay_btn { - position: fixed; - width: 3em; - height: 2em; - // padding: $basic_space $basic_space * 2; - cursor: pointer; -} -.exp_help_btn { - display: table; - right: $double_space; - bottom: $double_space; - background-color: rgba($darkest_color, 0.4); - &:hover { - background-color: $brightest_color; - > .span__solo { - color: $darkest_color; - } - } - .span__solo { - display: table-cell; - color: rgba($brightest_color, 0.8); - font-family: $monospace_font_family; - font-size: 1.4em; - text-align: center; - vertical-align: middle; - } -} - - - -.expose_height { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - background-color: rgba($delta_color, 0.1) !important; - @include vendor-prefix(transition, height 0.5s ease); -} +// Custom extends and mixins +// ------------------------------------------------------------------------------ +@import "mixins"; +@import "extends"; + +// Explanation module styles +// ------------------------------------------------------------------------------ + +%expose_after { + &::after { + content: ""; + display: block; + height: 48px; + background-color: rgba($delta_color, 0.1) !important; + } +} +%expose_before { + &::before { + content: ""; + display: block; + height: 48px; + background-color: rgba($delta_color, 0.1) !important; + } +} +%expose { + &::before, &::after { + content: ""; + display: block; + height: 48px; + background-color: rgba($delta_color, 0.1) !important; + } +} +%exp { +} +%exp_hidden { + display: none; +} + +.exp_wrap { + position: relative; +} + +.exp_pop { + @extend %exp_hidden !optional; + position: absolute; + z-index: 100; + top: $space_5; + left: $space_5; + padding: $half_space; + border: 4px solid $basic_back_color; + border-radius: 4px; + background-color: $basic_back_color; + pointer-events: none; +} +.exp_marker_pop { + position: absolute; + top: -$basic_size / 4 * 3; + right: -$basic_size / 2; + width: $basic_size; + height: $basic_size; + border: $tiny_space solid $basic_highlight_color; + border-radius: $basic_size; + color: $basic_highlight_color; + background-color: $darkest_color; +} + +.exp_expose { + @extend %expose !optional; +} +.exp_expose_pre { + @extend %expose_after; +} +.exp_expose_post { + @extend %expose_before; +} + +.exp_overlay_btn { + position: fixed; + width: 3em; + height: 2em; + // padding: $basic_space $basic_space * 2; + cursor: pointer; +} +.exp_help_btn { + display: table; + right: $double_space; + bottom: $double_space; + background-color: rgba($darkest_color, 0.4); + &:hover { + background-color: $brightest_color; + > .span_solo { + color: $darkest_color; + } + } + .span_solo { + display: table-cell; + color: rgba($brightest_color, 0.8); + font-family: $monospace_font_family; + font-size: 1.4em; + text-align: center; + vertical-align: middle; + } +} + + + +.expose_height { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + background-color: rgba($delta_color, 0.1) !important; + @include vendor-prefix(transition, height 0.5s ease); +} diff --git a/source/style/hippie/modules/maintenance/_maintenance_module.scss b/source/style/hippie/modules/maintenance/_maintenance_module.scss index 96660a7..bbd4c3f 100644 --- a/source/style/hippie/modules/maintenance/_maintenance_module.scss +++ b/source/style/hippie/modules/maintenance/_maintenance_module.scss @@ -1,19 +1,19 @@ -.body__status { - @extend .sec__main_status; - height: 100vh; - border-color: $foxtrot_color; - - .main__site { - @extend .wrap_center; - & > h1:first-of-type { - margin-top: 0; - margin-bottom: 0; - font-weight: bold; - line-height: 1; - } - & > h1 + h3 { - margin-top: 0; - margin-bottom: $space_3; - } - } -} +.body_status { + @extend .sec_main_status; + height: 100vh; + border-color: $foxtrot_color; + + .main_site { + @extend .wrap_center; + & > h1:first-of-type { + margin-top: 0; + margin-bottom: 0; + font-weight: bold; + line-height: 1; + } + & > h1 + h3 { + margin-top: 0; + margin-bottom: $space_3; + } + } +} diff --git a/source/style/hippie/modules/media/_media_module.scss b/source/style/hippie/modules/media/_media_module.scss index 62bff9f..e166783 100644 --- a/source/style/hippie/modules/media/_media_module.scss +++ b/source/style/hippie/modules/media/_media_module.scss @@ -1,3 +1,9 @@ .up { @include sprite($up); } +.down { + @include sprite($down); +} +.meta { + @include sprite($meta); +} diff --git a/source/style/hippie/modules/media/_sprites.scss b/source/style/hippie/modules/media/_sprites.scss index ae0484a..5aefabd 100644 --- a/source/style/hippie/modules/media/_sprites.scss +++ b/source/style/hippie/modules/media/_sprites.scss @@ -20,6 +20,17 @@ $down-total-width: 64px; $down-total-height: 64px; $down-image: 'sprites.png'; $down: (32px, 0px, -32px, 0px, 32px, 32px, 64px, 64px, 'sprites.png', 'down', ); +$meta-name: 'meta'; +$meta-x: 32px; +$meta-y: 32px; +$meta-offset-x: -32px; +$meta-offset-y: -32px; +$meta-width: 32px; +$meta-height: 32px; +$meta-total-width: 64px; +$meta-total-height: 64px; +$meta-image: 'sprites.png'; +$meta: (32px, 32px, -32px, -32px, 32px, 32px, 64px, 64px, 'sprites.png', 'meta', ); $up-name: 'up'; $up-x: 0px; $up-y: 0px; @@ -34,7 +45,7 @@ $up: (0px, 0px, 0px, 0px, 32px, 64px, 64px, 64px, 'sprites.png', 'up', ); $spritesheet-width: 64px; $spritesheet-height: 64px; $spritesheet-image: 'sprites.png'; -$spritesheet-sprites: ($down, $up, ); +$spritesheet-sprites: ($down, $meta, $up, ); $spritesheet: (64px, 64px, 'sprites.png', $spritesheet-sprites, ); // The provided mixins are intended to be used with the array-like variables diff --git a/source/style/hippie/modules/navigation/_nav_module.scss b/source/style/hippie/modules/navigation/_nav_module.scss index 789496d..a43c6df 100644 --- a/source/style/hippie/modules/navigation/_nav_module.scss +++ b/source/style/hippie/modules/navigation/_nav_module.scss @@ -10,7 +10,7 @@ nav { } } -.nav__horizontal { +.nav_horizontal { ul { @extend .overflow; @@ -30,7 +30,7 @@ nav { } } -.nav__right { +.nav_right { float: right; margin-left: $basic_space; @@ -39,7 +39,7 @@ nav { } } -.nav__separate { +.nav_separate { li { position: relative; padding-left: $tiny_space; @@ -59,7 +59,7 @@ nav { } } -.nav__separate_right { +.nav_separate_right { float: right; li { position: relative; @@ -81,8 +81,8 @@ nav { } } -.nav__center_old { - @extend .nav__horizontal; +.nav_center_old { + @extend .nav_horizontal; float: right; position: relative; left: -50%; @@ -94,7 +94,7 @@ nav { } } -.nav__column { +.nav_column { position: relative; margin: $basic_space 0; @@ -103,7 +103,7 @@ nav { margin: 0 $space_5; li { - @extend .flex__child; + @extend .flex_child; flex-grow: 1; margin: 0; text-align: center; @@ -115,7 +115,7 @@ nav { } } -.nav__page_meta { +.nav_page_meta { position: fixed; // display: table; // width: 3em; @@ -128,13 +128,14 @@ nav { li { margin-bottom: 0; + line-height: 1; } button { width: 32px; margin-right: 0; margin-left: 0; } - .a__button_meta { + .a_button_meta { // display: table-cell; display: inline-block; @@ -147,12 +148,15 @@ nav { background-color: $basic_action_color; } } + .sprite_img { + vertical-align: top; + } } -.header__page { +.header_page { nav { - @extend .nav__horizontal; + @extend .nav_horizontal; a { diff --git a/source/style/hippie/modules/tables/_tables_module.scss b/source/style/hippie/modules/tables/_tables_module.scss index f6e625c..f653e11 100644 --- a/source/style/hippie/modules/tables/_tables_module.scss +++ b/source/style/hippie/modules/tables/_tables_module.scss @@ -1,68 +1,68 @@ -.table__link { - width: 100%; - border: 0; - table-layout: auto; - - tbody { - border-bottom: $cell_border; - - &:hover { - background-color: $bright_color; - } - } - - th, td { - border: 0; - } - - .cell__icon { - width: 48px; - text-align: center; - img { - vertical-align: text-top; - } - } - - .cell__link { - padding-right: $basic_space; - padding-left: $basic_space; - - &:hover { - background-color: $foxtrot_color; - a:first-child { - display: none; - } - a:last-child { - display: block; - color: $basic_highlight_color; - } - } - - a { - display: block; - } - - a:last-child { - display: none; - } - } - - th:last-child, .cell__date { - width: 16%; - text-align: center; - } - - .cell__text { - padding-right: $basic_space; - padding-left: $basic_space; - - div { - width: 100%; - } - - .shorten { - @extend %short; - max-height: 44px; - } - } -} +.table_link { + width: 100%; + border: 0; + table-layout: auto; + + tbody { + border-bottom: $cell_border; + + &:hover { + background-color: $bright_color; + } + } + + th, td { + border: 0; + } + + .cell_icon { + width: 48px; + text-align: center; + img { + vertical-align: text-top; + } + } + + .cell_link { + padding-right: $basic_space; + padding-left: $basic_space; + + &:hover { + background-color: $foxtrot_color; + a:first-child { + display: none; + } + a:last-child { + display: block; + color: $basic_highlight_color; + } + } + + a { + display: block; + } + + a:last-child { + display: none; + } + } + + th:last-child, .cell_date { + width: 16%; + text-align: center; + } + + .cell_text { + padding-right: $basic_space; + padding-left: $basic_space; + + div { + width: 100%; + } + + .shorten { + @extend %short; + max-height: 44px; + } + } +} diff --git a/source/style/modules/demo/_demo_module.scss b/source/style/modules/demo/_demo_module.scss index 6fa414f..add8138 100644 --- a/source/style/modules/demo/_demo_module.scss +++ b/source/style/modules/demo/_demo_module.scss @@ -1,10 +1,10 @@ .demo__intro { - @extend .sec__main_center; - @extend .sec__main_status; + @extend .sec_main_center; + @extend .sec_main_status; } .demo__status { - @extend .sec__main_status; + @extend .sec_main_status; position: relative; min-height: 50vh; border-color: $foxtrot_color; @@ -32,7 +32,7 @@ } } -.header__fancy { +.header_fancy { background-color: transparentize($bravo_color, 0.4); nav { @@ -51,7 +51,7 @@ } } -.header__fix { +.header_fix { position: relative; top: 0; left: 0; @@ -101,6 +101,13 @@ background-position: 0 0; } +.demo__sprite_meta { + width: 32px; + height: 32px; + background-image: url(../art/sprites.png); + background-position: -32px 32px; +} + .demo__avatar { img { @@ -133,39 +140,39 @@ padding: $basic_padding; } -.query__phoneUp { - background-color: rgba($basic_front_color, 0.2); +.query_phoneUp { + @include forPhoneUp {background-color: rgba($basic_front_color, 0.2)}; } -.query__phoneOnly { +.query_phoneOnly { @include forPhoneOnly { background-color: rgba($basic_front_color, 0.2); } } -.query__tabletPortaitOnly { +.query_tabletPortaitOnly { @include forTabletPortraitOnly { background-color: rgba($basic_front_color, 0.2); } } -.query__tabletPortraitUp { +.query_tabletPortraitUp { @include forTabletPortraitUp { background-color: rgba($basic_front_color, 0.2); } } -.query__tabletLandscapeOnly { +.query_tabletLandscapeOnly { @include forTabletLandscapeOnly { background-color: rgba($basic_front_color, 0.2); } } -.query__tabletLandscapeUp { +.query_tabletLandscapeUp { @include forTabletLandscapeUp { background-color: rgba($basic_front_color, 0.2); } } -.query__desktopOnly { +.query_desktopOnly { @include forDesktopOnly { background-color: rgba($basic_front_color, 0.2); } } -.query__desktopUp { +.query_desktopUp { @include forDesktopUp { background-color: rgba($basic_front_color, 0.2); } } -.query__bigDesktopUp { +.query_bigDesktopUp { @include forBigDesktopUp { background-color: rgba($basic_front_color, 0.2); } } @@ -200,6 +207,7 @@ content: '< 768px'; padding: $basic_padding; border-radius: $basic_corner_radius; + color: $brightest_color; background-color: rgba($basic_front_color, 0.2); } } diff --git a/source/templates/hippie/demo-default.njk b/source/templates/hippie/demo-default.njk index e735637..8612521 100644 --- a/source/templates/hippie/demo-default.njk +++ b/source/templates/hippie/demo-default.njk @@ -7,13 +7,7 @@ {% block head %} {% block title %}{% endblock %} - HIPPIE - - - - - - - + {% include "hippie/partials/head-meta.njk" %} diff --git a/source/templates/hippie/demo-extended.njk b/source/templates/hippie/demo-extended.njk index 1ea1399..a089c5c 100644 --- a/source/templates/hippie/demo-extended.njk +++ b/source/templates/hippie/demo-extended.njk @@ -16,13 +16,7 @@ - - - - - - - + {% include "hippie/partials/head-meta.njk" %} @@ -33,7 +27,7 @@ {% endblock %} - + {% include "hippie/partials/page-hover.njk" %}
      diff --git a/source/templates/hippie/demo-maintenance.njk b/source/templates/hippie/demo-maintenance.njk index c79248e..959493a 100644 --- a/source/templates/hippie/demo-maintenance.njk +++ b/source/templates/hippie/demo-maintenance.njk @@ -7,13 +7,7 @@ {% block head %} {% block title %}{% endblock %} - - - - - - - + {% include "hippie/partials/head-meta.njk" %} diff --git a/source/templates/hippie/partials/head-meta.njk b/source/templates/hippie/partials/head-meta.njk new file mode 100644 index 0000000..f38f8ae --- /dev/null +++ b/source/templates/hippie/partials/head-meta.njk @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/source/templates/hippie/partials/nav-page-meta.njk b/source/templates/hippie/partials/nav-page-meta.njk index 4e6886f..9722a3d 100644 --- a/source/templates/hippie/partials/nav-page-meta.njk +++ b/source/templates/hippie/partials/nav-page-meta.njk @@ -1,16 +1,21 @@ -
      +
      +

      + Show me a + Sorted by + + + Matching + +

      +

      Gruppierung

      ul.list_link>(li>a>img)*2+li>a
      diff --git a/source/pages/demo/intro.njk b/source/pages/demo/intro.njk index 68e8aed..3bea93b 100644 --- a/source/pages/demo/intro.njk +++ b/source/pages/demo/intro.njk @@ -168,7 +168,7 @@

      Tabellen

      -

      Tabellen bieten besonders geordnete Struktur. Häufig werden in ihnen Text und Daten kombiniert dargestellt. Dies erfordert individuelle Formatierungen. Einige grundlegende Eigenschaften werden im folgenden aufgezeigt. Tabellen sind in ihrer Größe entweder vordefiniert oder richten sich nach ihrem Inhalt. Das gilt auch für die einzelnen Zellen....

      +

      Tabellen bieten besonders geordnete Struktur. Häufig werden in ihnen Text und Daten kombiniert dargestellt. Dies erfordert individuelle Formatierungen. Einige grundlegende Eigenschaften werden im folgenden aufgezeigt. Tabellen sind in ihrer Größe entweder vordefiniert (fixiert) oder richten sich nach ihrem Inhalt. Das bedeutet, die Spaltenbreite entspricht der breitesten ihrer Zellen.

      @@ -186,7 +186,7 @@ - + @@ -249,11 +249,11 @@
      Einefließendefreie (nicht fixierte)
      Tabelle
      table.width_full.table_fix>caption+thead>tr>th*3^^tfoot>tr>td*3^^tbody>(tr>td*3)*3
      -

      Viele weitere Formate sind möglich ...

      - +

      Viele weitere Formate sind möglich. Hier nur einige typische Beispiele:

      +
      - + @@ -261,34 +261,27 @@ - + - + - +
      Kopfzeile A B
      VorspalteVorspalte Eine
      11 erweiterte
      22 Tabelle
      -
      table.width_full>thead>tr>th.precol+th[colspan=2]^^tbody>tr>td.precol+td*2^tr>td.precol+td[colspan=2]
      - - - - - - - - +
      table.width_full.table_stripe.table_free>tbody>tr>td*3
      +
      KopfzeileAB
      @@ -312,119 +305,169 @@
      Tabelle
      - - +
      Beschreibung bzw. Zusammenhang der Tabelle
      + - - + + - - - + + + - - + + + - - - + +
      Die Verteilung der Zellen ist hier von ihrem Inhalt abhängig.
      Kopfzeile1BezeichnungMenge >9000
      Fußzeile--Summe9001
      Alpha0900018990
      Bravo10 19001
      Charlie0900011

      Formulare

      -

      Spätestens hier werden Betrachter zu Benutzern. Texteingabefelder und verschiedene Bedienelemente geben Möglichkeiten zur Interaktion. Diese Elemente sind in vielerlei Hinsicht besonders. Werden sie nicht explizit gestaltet, ist ihre Erscheinung system- bzw. browserabhängig. (Vielleicht ist das auch scheiße, hier darauf einzugehen) ... Üblicherweise stehen alle Formularelemente innerhalb eines <form> Elementes. Dieses ist notwendig um Angaben zur Kommunikation mit dem Server zu setzen. Es hat normalerweise keine gestalterische Funktion.

      +

      Spätestens hier werden Betrachter zu Benutzern. Texteingabefelder und verschiedene Bedienelemente geben Möglichkeiten zur Interaktion. Diese Elemente sind in vielerlei Hinsicht besonders. Werden sie nicht explizit gestaltet, ist ihre Erscheinung system- bzw. browserabhängig.
      Üblicherweise stehen alle Bedienelemente innerhalb eines <form> Elementes. Dieses ist notwendig um Angaben zur Kommunikation mit dem Server zu setzen. Es hat normalerweise keine gestalterische Funktion.

      Grundlegend ist das Element <input>. Es hat viele Attribute um den Typ der Eingabe anzupassen. Ist es undefiniert nimmt es jegliche textbasierte Information auf und erhält eine Standardgröße.

      -

      -

      Ein spezieller Typ des Eingabefeldes verändert seine Funktion zu einer Schaltfläche <input[type="button"]>. Es gibt allerdings auch ein eigenes Element <button> dafür.

      +

      +

      Ein spezieller Typ des Eingabefeldes hat die Funktion einer Schaltfläche <input[type="button"]>. Es gibt allerdings auch ein eigenes Element <button> dafür.

      +

      Interaktive Elemente können durch das Attribut <readonly> nur lesbar gemacht werden oder mittels <disabled> gänzlich deaktiviert werden.

      -

      +

      +

      Das Element <label> ergänzt interaktive Elemente um eine Beschriftung. Wichtig ist hier, dass die Beziehung beider Elemente zu einander deutlich ist.

      +

      + +

      -
      - -
      -
      - +
      + + + + + + + + + + + +
      + + + + + + + + + + + + + + + + + + + + + +

      Zusätzlich zur Beschriftung einzelner Elemente gibt es auch die Möglichkeit Gruppierungen zu schaffen. Diese werden mit <fieldset> realisiert.

      - +
      + + +

      Sie können mittels <legend> auch eine eigene Beschriftung erhalten.

      - Einfache Eingabefelder - - + Einfache Eingabeelemente +
      +
      +
      +
      +
      + +
      + + +
      + + +
      +
      +
      + Einfache Eingabeelemente mit Stil +
      +
      +
      +
      +
      + +
      + + +
      + + +
      Weitere Eingabemöglichkeiten -

      Innerhalb einer Gruppe können nicht nur Ein- und Ausgabefelder platziert werden. Andere Elemente ergänzen Information oder lockern das Erscheinungsbild auf. Hier nun eine Liste möglicher Arten von Eingabefeldern.

      - 
      ul>(li>label>input[type="text"])
      -
        -
        • -
        • -
        • -
        • -
        • -
      -
      - -
      - - -
      +

      Innerhalb einer Gruppe können nicht nur Ein- und Ausgabefelder platziert werden. Andere Elemente ergänzen Information oder lockern das Erscheinungsbild auf.

      +

      Hier nun eine Liste weiterer Arten von Eingabefeldern:

      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      - - - - -
      -

      - Show me a - Sorted by - - - Matching - -

      -

      Interaktive Elemente

      diff --git a/source/style/hippie/elements/_grouping.scss b/source/style/hippie/elements/_grouping.scss index 460515b..e1feca4 100644 --- a/source/style/hippie/elements/_grouping.scss +++ b/source/style/hippie/elements/_grouping.scss @@ -39,10 +39,10 @@ address { // Line hr { - margin: $space_3 auto; + margin: $space_small auto; border-width: $basic_border_width 0 0; border-style: solid; - border-color: $darkest_color; + border-color: $basic_border_color; } .hr_hidden { @@ -62,12 +62,12 @@ pre { .pre_code { overflow-x: auto; - border-color: rgba($brightest_color,.1); + border-color: darken($basic_back_color, $tiny_color_diff); border-style: dotted; border-width: 0 0 0 $border_width_4; border-radius: $basic_corner; padding: $basic_space; - background-color: rgba($brightest_color,.1); + background-color: lighten($basic_back_color, $tiny_color_diff); code { background-color: transparent; } @@ -212,11 +212,11 @@ div { } .column_2 { column-count: 2; - column-gap: $space_3; + column-gap: $space_small; } .column_3 { column-count: 3; - column-gap: $space_4; + column-gap: $space_medium; } // Space and placeholders @@ -228,7 +228,7 @@ div { .box_cube { float: left; display: table; - width: $space_4; + width: $space_medium; text-align: center; vertical-align: middle; span { @@ -238,21 +238,21 @@ div { .box_placeholder { width: 100%; - height: $space_4; - border: $border_width_4 solid rgba($alpha_color,.1); + height: $space_medium; + border: $border_width_4 solid transparentize($alpha_color, 0.1); border-radius: $basic_corner; - background-color: rgba($alpha_color,.2); + background-color: transparentize($alpha_color, 0.2); } .box_placeholder_bkg { width: 100%; - height: $space_4 * 2; - border: $border_width_4 solid rgba($brightest_color,.1); + height: $space_medium * 2; + border: $border_width_4 solid transparentize($basic_front_color, 0.1); border-radius: $basic_corner; padding: $basic_space; /*data:[][;charset=][;base64],*/ background: url("data:image/svg+xml;utf8,") no-repeat; - background-color: rgba($brightest_color,.1); + background-color: transparentize($basic_front_color, 0.1); } // Data diff --git a/source/style/hippie/elements/_interactive.scss b/source/style/hippie/elements/_interactive.scss index 41b072e..35abf28 100644 --- a/source/style/hippie/elements/_interactive.scss +++ b/source/style/hippie/elements/_interactive.scss @@ -24,17 +24,12 @@ form { label { @extend %basic; - input, textarea { + input, button, textarea, select { margin-left: $basic_space; } } -label + textarea { - @extend %solo; - display: block; -} - -input, button, textarea { +input, button, textarea, select { margin: $io_margin; &[disabled="disabled"], @@ -45,51 +40,60 @@ input, button, textarea { input { color: $basic_io_font_color; - - &[disabled="disabled"], - &[disabled] { - cursor: not-allowed; - } } -@each $input in $basic_input_list, textarea, select { +@each $input in $io_input_list, textarea, select { #{$input} { @extend %basic_mono; - padding: $half_space; - background-color: $basic_io_back_color; - - &:hover { - background-color: $basic_highlight_color; - } - - &[readonly="readonly"], - &[readonly] { - border-color: darken($basic_io_border_color, 30%); - background-color: darken($basic_io_back_color, 30%); - } - - &[disabled="disabled"], - &[disabled] { - border-color: transparent; - } - } -} - -@each $input in $basic_input_list, textarea { - #{$input} { - border: $basic_io_border; - } -} - -@each $input in $basic_input_list { - #{$input} { line-height: 1; } } -@each $input in $basic_button_list { +.io_input, .io_textarea, .io_select { + padding: $half_space; + background-color: $basic_io_back_color; + + &:hover { + background-color: $basic_highlight_color; + } + + &[readonly="readonly"], + &[readonly] { + background-color: darken($basic_io_back_color, 30%); + } + + &[disabled="disabled"], + &[disabled] { + &:hover { + background-color: $basic_io_back_color; + } + } +} + +@each $input in $io_date_list { #{$input} { - padding: $basic_padding; + padding-top: 0; + padding-bottom: 0; + } +} + +@each $input in $io_input_list, textarea { + #{$input} { + // border: $basic_io_border; + } +} + +.io_input, .io_textarea { + border: $basic_io_border; + + &[readonly="readonly"], + &[readonly] { + border-color: darken($basic_io_border_color, 30%); + } + + &[disabled="disabled"], + &[disabled] { + border-color: transparent; } } @@ -104,17 +108,35 @@ legend { padding: 0 $half_space; } -label + input, -.input_label_right, -.label > input, -.label > select { - margin: 0 $basic_space; -} - button { } +.io_button { + @extend %basic_button; + border: $basic_io_border_width solid $oi_border_color; + padding: $basic_padding; + color: $oi_font_color; + background-color: $oi_back_color; + + &:hover { + // border-color: #0059F6; + border-color: transparent; + color: white; + background-color: $foxtrot_color; + } + + &[disabled="disabled"], + &[disabled] { + border-color: transparent; + color: $oi_border_color; + + &:hover { + background-color: $oi_back_color; + } + } +} + select { border: none; } @@ -132,7 +154,10 @@ option { } textarea { +} +.io_textarea { + line-height: 1.2; } output { @@ -192,6 +217,12 @@ canvas { line-height: 2.5; } +.label > input, +.label > textarea, +.label > select { + margin: 0 $basic_space; +} + .label_table { display: table; @@ -200,23 +231,45 @@ canvas { } } -.input_default { +label + input { + margin-left: $basic_space; +} - label { - @extend .label_table; - margin: $half_space 0; +input + label { + margin-left: $basic_space; +} - input { - padding: $half_space ($half_space + 1); - border-style: solid; - border-color: transparent; - background-color: $basic_io_back_color; - color: $basic_io_font_color; +td > input, +td > button, +td > select, +td > textarea { + margin: 0; +} - &:hover { - background-color: $darkest_color; - color: $brightest_color; - } - } + + +.grid { + display: grid; + grid-gap: $basic_space; + + & > input, + & > select, + & > textarea { + margin: 0; + } + + & > label { + display: inline-block; + margin: $basic_io_border_width; + padding: $half_space; } } + +.grid_column_2 { + grid-template-columns: max-content max-content; + +} + +.grid_column_4 { + grid-template-columns: max-content max-content max-content max-content; +} diff --git a/source/style/hippie/elements/_sections.scss b/source/style/hippie/elements/_sections.scss index e03ebec..2b8951a 100644 --- a/source/style/hippie/elements/_sections.scss +++ b/source/style/hippie/elements/_sections.scss @@ -24,6 +24,7 @@ html { body { position: relative; box-sizing: $box_sizing; + margin: 0; font-family: $primary_font_family; font-size: $basic_size; line-height: $basic_line; @@ -38,7 +39,7 @@ body { } &:hover { - + .layer_hover { background-color: transparent !important; transition: background-color $double_duration $basic_timing 0s !important; @@ -59,7 +60,7 @@ section { .sec_main_center { width: $basic_width; margin: 0 auto; - padding-top: $space_3; + padding-top: $space_small; @include forTabletPortraitUp { width: $width_small; @@ -76,7 +77,7 @@ section { border-top-width: $border_width_8; border-top-style: solid; border-color: $basic_border_color; - padding-top: $space_3; + padding-top: $space_small; } // Navigation @@ -111,12 +112,12 @@ aside { // Headings h1, h2, h3, h4, h5, h6 { - + @extend %head_all; } h1 { @extend %head_1; - margin: $space_5 0 $space_3; + margin: $space_large 0 $space_small; } h1 + h1 { @@ -125,7 +126,7 @@ h1 + h1 { h2 { @extend %head_2; - margin: $space_4 0 $space_3; + margin: $space_medium 0 $space_small; } h2 + h2 { @@ -167,7 +168,7 @@ header { } .header_txt { - margin-bottom: $space_3; + margin-bottom: $space_small; border-bottom: $dotted_border; h1 { diff --git a/source/style/hippie/elements/_tables.scss b/source/style/hippie/elements/_tables.scss index ddd3626..a1f2551 100644 --- a/source/style/hippie/elements/_tables.scss +++ b/source/style/hippie/elements/_tables.scss @@ -76,8 +76,10 @@ td:last-child { // General Classes // ------------------------------------------------------------------------------ -.precol { - border-right: $basic_border; +.cell_pre { + // border-right-width: $border_width_4; + // border-right-color: lighten($basic_back_color, $basic_color_diff); + background-color: lighten($basic_back_color, $tiny_color_diff); } .table_blank { @@ -99,7 +101,7 @@ td:last-child { } tr:nth-child(even) td { - background-color: rgba($brightest_color, 0.1); + background-color: lighten($basic_back_color, $tiny_color_diff); } } diff --git a/source/style/hippie/elements/_textlevel.scss b/source/style/hippie/elements/_textlevel.scss index 69f06a0..d530b10 100644 --- a/source/style/hippie/elements/_textlevel.scss +++ b/source/style/hippie/elements/_textlevel.scss @@ -92,7 +92,7 @@ i, em { .i_bright { font-style: normal; - color: $brightest_color; + color: $basic_highlight_color; } // Bold, Strong @@ -160,7 +160,7 @@ time { code { @extend %basic_mono; color: lighten($basic_font_color, $basic_color_diff); - background-color: rgba($brightest_color,.1); + background-color: lighten($basic_back_color, $tiny_color_diff); } .code_solo { @extend %basic_mono; @@ -200,17 +200,9 @@ u { mark { background-color: $alpha_color; } -.mark_cursor { - color: $basic_highlight_color; - background-color: $darkest_color; -} -::-moz-selection { - color: $basic_highlight_color; - background-color: $darkest_color; -} -::selection { - color: $basic_highlight_color; - background-color: $darkest_color; +.mark_cursor, ::-moz-selection, ::selection { + color: invert($basic_font_color); + background-color: $basic_font_color; } bdi, bdo { @@ -281,6 +273,14 @@ del { text-align: left !important; } +.txt_top { + vertical-align: top !important; +} + +.txt_bottom { + vertical-align: bottom !important; +} + .txt_white { color: white; } diff --git a/source/style/hippie/global/_common.scss b/source/style/hippie/global/_common.scss index 8fd23aa..61ad5af 100644 --- a/source/style/hippie/global/_common.scss +++ b/source/style/hippie/global/_common.scss @@ -22,10 +22,16 @@ @extend %hidden; } +.center_auto { + margin-right: auto; + margin-left: auto; +} + .center_50 { margin-right: 25%; margin-left: 25%; } + .center_25 { margin-right: 37.5%; margin-left: 37.5%; @@ -58,7 +64,7 @@ } .space_right { - margin-right: $space_3; + margin-right: $space_small; } .wrap_center { @@ -108,7 +114,7 @@ .float_space_left { @extend .float_left; - margin-right: $space_3; + margin-right: $space_small; } .float_half_size { diff --git a/source/style/hippie/global/_config.scss b/source/style/hippie/global/_config.scss index 3e64efb..f5b2bf0 100644 --- a/source/style/hippie/global/_config.scss +++ b/source/style/hippie/global/_config.scss @@ -86,28 +86,30 @@ $color_palette: ( @include addDefaultColors; +$basic_color_diff: 12% !default; +$tiny_color_diff: 4% !default; +$double_color_diff: $basic_color_diff * 2; + $darkest_color: black !default; $brightest_color: white !default; -$medium_color: lighten($darkest_color, 50%) !default; -$dark_color: lighten($darkest_color, 20%) !default; -$bright_color: darken($brightest_color, 20%) !default; -$basic_front_color: $darkest_color !default; -$basic_back_color: $medium_color !default; -$basic_font_color: $basic_front_color !default; -$basic_head_color: $basic_front_color !default; +$basic_font_color: black !default; +$basic_back_color: #808080 !default; +$basic_border_color: lighten($basic_font_color, $basic_color_diff) !default; +$basic_front_color: white !default; +$medium_color: lighten($darkest_color, 50%); +$dark_color: lighten($darkest_color, $double_color_diff); +$bright_color: darken($brightest_color, $double_color_diff); + +$basic_head_color: $basic_font_color !default; $basic_link_color: $echo_color !default; -$basic_highlight_color: $brightest_color !default; +$basic_highlight_color: $basic_front_color !default; $basic_action_color: $foxtrot_color !default; -$basic_border_color: $basic_front_color !default; - // default shadow colors // $shadow_color: fade-out($medium_color, 0.5); -$basic_color_diff: 12% !default; - $basic_color_list: (); @each $key, $value in $color_palette { @@ -132,17 +134,17 @@ $width_small: 80% !default; $width_medium: 60% !default; $width_large: 48% !default; -$basic_space: 8px !default; $tiny_space: 1px !default; -$half_space: $basic_space / 2 !default; -$double_space: $basic_space * 2 !default; -$space_3: $basic_space * 4; -$space_4: $basic_space * 8; -$space_5: $basic_space * 16; +$basic_space: $tiny_space * 8 !default; +$half_space: $basic_space / 2; +$double_space: $basic_space * 2; +$space_small: $basic_space * 4; +$space_medium: $basic_space * 8; +$space_large: $basic_space * 16; $basic_margin: $basic_space 0 !default; $high_margin: $double_space 0 !default; -$io_margin: 0 $space_3 !default; +$io_margin: 0 $space_small 0 0 !default; $basic_padding: calc(#{$basic_space} - 3px) $basic_space !default; $wide_padding: calc(#{$basic_space} - 1px) calc(#{$basic_space} * 2) !default; @@ -151,8 +153,8 @@ $basic_corner: $tiny_space * 2; // Borders $basic_border_width: $tiny_space !default; -$border_width_4: $tiny_space * 4; -$border_width_8: $tiny_space * 8; +$border_width_4: $basic_border_width * 4; +$border_width_8: $basic_border_width * 8; $basic_border: $tiny_space solid $basic_border_color; $dotted_border: $tiny_space dotted $basic_border_color; $cell_border: $tiny_space solid $darkest_color; @@ -165,31 +167,39 @@ $basic_aside_width: 20%; // IO // ------------------------------------------------------------------------------ -$basic_input_list: +$io_input_list: + 'input[type="text"]', + 'input[type="number"]', 'input[type="color"]', + 'input[type="range"]', 'input[type="date"]', - 'input[type="datetime"]', - 'input[type="datetime-local"]', - 'input[type="email"]', - 'input[type="month"]', - 'input[type="number"]', - 'input[type="password"]', - 'input[type="search"]', - 'input[type="tel"]', - 'input[type="text"]', 'input[type="time"]', - 'input[type="url"]', - 'input[type="week"]', + 'input[type="datetime-local"]', + 'input[type="month"]', + 'input[type="week"]', + 'input[type="email"]', + 'input[type="password"]', + 'input[type="tel"]', + 'input[type="url"]', + 'input[type="search"]', 'input:not([type])'; -$basic_button_list: +$io_date_list: + '.io_input[type="date"]', + '.io_input[type="time"]', + '.io_input[type="datetime-local"]', + '.io_input[type="month"]', + '.io_input[type="week"]'; + +$io_button_list: 'button', 'input[type="button"]', // 'input[type="file"]', 'input[type="reset"]', + 'input[type="image"]', 'input[type="submit"]'; -$basic_focus_list: +$io_focus_list: 'a[href]', 'area[href]', 'button:not([disabled])', @@ -199,12 +209,16 @@ $basic_focus_list: '*[tabindex]'; $basic_io_font_color: lighten($basic_font_color, $basic_color_diff); -$basic_io_back_color: darken($brightest_color, $basic_color_diff); -$basic_io_border_color: $brightest_color; +$basic_io_back_color: darken($basic_front_color, $basic_color_diff); +$basic_io_border_color: $basic_front_color; + +$oi_font_color: $basic_font_color; +$oi_back_color: darken($basic_back_color, $basic_color_diff); +$oi_border_color: darken($oi_back_color, $basic_color_diff); $basic_io_border_width: $tiny_space * 2 !default; $basic_io_border: $basic_io_border_width solid $basic_io_border_color; -$dotted_io_border: $tiny_space dotted $basic_io_border_color; +$dotted_io_border: $basic_io_border_width dotted $basic_io_border_color; $basic_shadow: inset 0 1px 3px rgba($darkest_color, 0.06); $basic_focus_shadow: $basic_shadow, 0 0 5px adjust-color($basic_action_color, $lightness: -5%, $alpha: -0.3); diff --git a/source/style/hippie/global/_typography.scss b/source/style/hippie/global/_typography.scss index 2986a6d..03f3af5 100644 --- a/source/style/hippie/global/_typography.scss +++ b/source/style/hippie/global/_typography.scss @@ -51,6 +51,10 @@ line-height: $head_line_4; } +%basic_button { + @extend %basic; +} + %solo { @extend %basic; } diff --git a/source/style/hippie/mixins/_user_agent.scss b/source/style/hippie/mixins/_user_agent.scss index 6701740..bf21661 100644 --- a/source/style/hippie/mixins/_user_agent.scss +++ b/source/style/hippie/mixins/_user_agent.scss @@ -1,6 +1,6 @@ @mixin overrideUserAgent() { @if $no_agent_focus == true { - @each $el in $basic_focus_list { + @each $el in $io_focus_list { #{$el}:focus { outline: 0; } diff --git a/source/style/hippie/modules/explanation/_explanation_module.scss b/source/style/hippie/modules/explanation/_explanation_module.scss index 1538405..40669fc 100644 --- a/source/style/hippie/modules/explanation/_explanation_module.scss +++ b/source/style/hippie/modules/explanation/_explanation_module.scss @@ -1,115 +1,115 @@ -// Custom extends and mixins -// ------------------------------------------------------------------------------ -@import "mixins"; -@import "extends"; - -// Explanation module styles -// ------------------------------------------------------------------------------ - -%expose_after { - &::after { - content: ""; - display: block; - height: 48px; - background-color: rgba($delta_color, 0.1) !important; - } -} -%expose_before { - &::before { - content: ""; - display: block; - height: 48px; - background-color: rgba($delta_color, 0.1) !important; - } -} -%expose { - &::before, &::after { - content: ""; - display: block; - height: 48px; - background-color: rgba($delta_color, 0.1) !important; - } -} -%exp { -} -%exp_hidden { - display: none; -} - -.exp_wrap { - position: relative; -} - -.exp_pop { - @extend %exp_hidden !optional; - position: absolute; - z-index: 100; - top: $space_5; - left: $space_5; - padding: $half_space; - border: 4px solid $basic_back_color; - border-radius: 4px; - background-color: $basic_back_color; - pointer-events: none; -} -.exp_marker_pop { - position: absolute; - top: -$basic_size / 4 * 3; - right: -$basic_size / 2; - width: $basic_size; - height: $basic_size; - border: $tiny_space solid $basic_highlight_color; - border-radius: $basic_size; - color: $basic_highlight_color; - background-color: $darkest_color; -} - -.exp_expose { - @extend %expose !optional; -} -.exp_expose_pre { - @extend %expose_after; -} -.exp_expose_post { - @extend %expose_before; -} - -.exp_overlay_btn { - position: fixed; - width: 3em; - height: 2em; - // padding: $basic_space $basic_space * 2; - cursor: pointer; -} -.exp_help_btn { - display: table; - right: $double_space; - bottom: $double_space; - background-color: rgba($darkest_color, 0.4); - &:hover { - background-color: $brightest_color; - > .span_solo { - color: $darkest_color; - } - } - .span_solo { - display: table-cell; - color: rgba($brightest_color, 0.8); - font-family: $monospace_font_family; - font-size: 1.4em; - text-align: center; - vertical-align: middle; - } -} - - - -.expose_height { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - background-color: rgba($delta_color, 0.1) !important; - @include vendor-prefix(transition, height 0.5s ease); -} +// Custom extends and mixins +// ------------------------------------------------------------------------------ +@import "mixins"; +@import "extends"; + +// Explanation module styles +// ------------------------------------------------------------------------------ + +%expose_after { + &::after { + content: ""; + display: block; + height: 48px; + background-color: rgba($delta_color, 0.1) !important; + } +} +%expose_before { + &::before { + content: ""; + display: block; + height: 48px; + background-color: rgba($delta_color, 0.1) !important; + } +} +%expose { + &::before, &::after { + content: ""; + display: block; + height: 48px; + background-color: rgba($delta_color, 0.1) !important; + } +} +%exp { +} +%exp_hidden { + display: none; +} + +.exp_wrap { + position: relative; +} + +.exp_pop { + @extend %exp_hidden !optional; + position: absolute; + z-index: 100; + top: $space_large; + left: $space_large; + padding: $half_space; + border: 4px solid $basic_back_color; + border-radius: 4px; + background-color: $basic_back_color; + pointer-events: none; +} +.exp_marker_pop { + position: absolute; + top: -$basic_size / 4 * 3; + right: -$basic_size / 2; + width: $basic_size; + height: $basic_size; + border: $tiny_space solid $basic_highlight_color; + border-radius: $basic_size; + color: $basic_highlight_color; + background-color: $darkest_color; +} + +.exp_expose { + @extend %expose !optional; +} +.exp_expose_pre { + @extend %expose_after; +} +.exp_expose_post { + @extend %expose_before; +} + +.exp_overlay_btn { + position: fixed; + width: 3em; + height: 2em; + // padding: $basic_space $basic_space * 2; + cursor: pointer; +} +.exp_help_btn { + display: table; + right: $double_space; + bottom: $double_space; + background-color: rgba($darkest_color, 0.4); + &:hover { + background-color: $brightest_color; + > .span_solo { + color: $darkest_color; + } + } + .span_solo { + display: table-cell; + color: rgba($brightest_color, 0.8); + font-family: $monospace_font_family; + font-size: 1.4em; + text-align: center; + vertical-align: middle; + } +} + + + +.expose_height { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + background-color: rgba($delta_color, 0.1) !important; + @include vendor-prefix(transition, height 0.5s ease); +} diff --git a/source/style/hippie/modules/maintenance/_maintenance_module.scss b/source/style/hippie/modules/maintenance/_maintenance_module.scss index bbd4c3f..815648c 100644 --- a/source/style/hippie/modules/maintenance/_maintenance_module.scss +++ b/source/style/hippie/modules/maintenance/_maintenance_module.scss @@ -1,19 +1,19 @@ -.body_status { - @extend .sec_main_status; - height: 100vh; - border-color: $foxtrot_color; - - .main_site { - @extend .wrap_center; - & > h1:first-of-type { - margin-top: 0; - margin-bottom: 0; - font-weight: bold; - line-height: 1; - } - & > h1 + h3 { - margin-top: 0; - margin-bottom: $space_3; - } - } -} +.body_status { + @extend .sec_main_status; + height: 100vh; + border-color: $foxtrot_color; + + .main_site { + @extend .wrap_center; + & > h1:first-of-type { + margin-top: 0; + margin-bottom: 0; + font-weight: bold; + line-height: 1; + } + & > h1 + h3 { + margin-top: 0; + margin-bottom: $space_small; + } + } +} diff --git a/source/style/hippie/modules/navigation/_nav_module.scss b/source/style/hippie/modules/navigation/_nav_module.scss index a43c6df..cf972c2 100644 --- a/source/style/hippie/modules/navigation/_nav_module.scss +++ b/source/style/hippie/modules/navigation/_nav_module.scss @@ -53,7 +53,7 @@ nav { height: 100%; left: 0; top: 0; - background-color: $darkest_color; + background-color: $basic_border_color; } } } @@ -74,7 +74,7 @@ nav { height: 100%; left: 0; top: 0; - background-color: $brightest_color; + background-color: $basic_front_color; margin: 0 $basic_space; } } @@ -100,7 +100,7 @@ nav { ul { @extend .flex; - margin: 0 $space_5; + margin: 0 $space_large; li { @extend .flex_child; diff --git a/source/style/hippie/modules/print/_print_module.scss b/source/style/hippie/modules/print/_print_module.scss index e1d52ff..ef5322c 100644 --- a/source/style/hippie/modules/print/_print_module.scss +++ b/source/style/hippie/modules/print/_print_module.scss @@ -7,7 +7,7 @@ // ------------------------------------------------------------------------------ %paper { - background-color: $brightest_color; + background-color: $basic_front_color; } $a4: ".dina4" 1.2cm 1.2cm 1.2cm 2.4cm; @@ -97,7 +97,7 @@ $din: $a4, $a5, $a6; margin-top: 10cm; margin-bottom: 2cm; } - margin: $space_3 auto; + margin: $space_small auto; } .page_title, .page_date { @@ -125,4 +125,4 @@ $din: $a4, $a5, $a6; top: 5cm; left: 0; } -} \ No newline at end of file +} diff --git a/source/style/modules/demo/_demo_module.scss b/source/style/modules/demo/_demo_module.scss index add8138..d0ddbdd 100644 --- a/source/style/modules/demo/_demo_module.scss +++ b/source/style/modules/demo/_demo_module.scss @@ -126,7 +126,7 @@ } .demo__credits { - margin: $space_3 0 $basic_space 0; + margin: $space_small 0 $basic_space 0; } .demo__button_32 { @@ -141,39 +141,39 @@ } .query_phoneUp { - @include forPhoneUp {background-color: rgba($basic_front_color, 0.2)}; + @include forPhoneUp {background-color: rgba($basic_font_color, 0.2)}; } .query_phoneOnly { - @include forPhoneOnly { background-color: rgba($basic_front_color, 0.2); } + @include forPhoneOnly { background-color: rgba($basic_font_color, 0.2); } } .query_tabletPortaitOnly { - @include forTabletPortraitOnly { background-color: rgba($basic_front_color, 0.2); } + @include forTabletPortraitOnly { background-color: rgba($basic_font_color, 0.2); } } .query_tabletPortraitUp { - @include forTabletPortraitUp { background-color: rgba($basic_front_color, 0.2); } + @include forTabletPortraitUp { background-color: rgba($basic_font_color, 0.2); } } .query_tabletLandscapeOnly { - @include forTabletLandscapeOnly { background-color: rgba($basic_front_color, 0.2); } + @include forTabletLandscapeOnly { background-color: rgba($basic_font_color, 0.2); } } .query_tabletLandscapeUp { - @include forTabletLandscapeUp { background-color: rgba($basic_front_color, 0.2); } + @include forTabletLandscapeUp { background-color: rgba($basic_font_color, 0.2); } } .query_desktopOnly { - @include forDesktopOnly { background-color: rgba($basic_front_color, 0.2); } + @include forDesktopOnly { background-color: rgba($basic_font_color, 0.2); } } .query_desktopUp { - @include forDesktopUp { background-color: rgba($basic_front_color, 0.2); } + @include forDesktopUp { background-color: rgba($basic_font_color, 0.2); } } .query_bigDesktopUp { - @include forBigDesktopUp { background-color: rgba($basic_front_color, 0.2); } + @include forBigDesktopUp { background-color: rgba($basic_font_color, 0.2); } } .demo__query_example { @@ -183,8 +183,8 @@ @include goingLarge($screen_large/1px) {background-color: $delta_color; } @include goingLarge($screen_huge/1px) {background-color: $echo_color; } @include goingLarge($screen_gigantic/1px) {background-color: $foxtrot_color; } - margin-bottom: $space_3; - padding: $space_3; + margin-bottom: $space_small; + padding: $space_small; text-align: center; &:after { @@ -212,6 +212,23 @@ } } +// Tables +.demo__td_no_bl { + border-left: none; +} + +.demo__td_no_br { + border-right: none; +} + +.demo__td_pr { + padding-right: $double_space; +} + +.demo__td_pl { + padding-left: $double_space; +} + // Index // ----------------------------------------------------------------------------- .wrap { From 48437cc4f4e29c9d2b4758e399564ab1aa73604a Mon Sep 17 00:00:00 2001 From: Stephan Date: Sun, 7 Oct 2018 16:58:07 +0200 Subject: [PATCH 077/372] demo.6 - Demo content and style changes - sorted many styles for better groups - started renaming of variables $basic_front_color becomes $color_front_basic for example - new demo page examples - moved config file examples to deprecated file --- DEPRECATED.md | 185 +++++++++++ source/demo_data.json | 8 +- source/pages/demo.njk | 4 +- source/pages/demo/elements.njk | 255 ++-------------- source/pages/demo/examples.njk | 289 ++++++++++++++++++ source/pages/demo/intro.njk | 13 +- source/style/_demo_config.scss | 2 +- source/style/hippie/elements/_grouping.scss | 156 ++++++---- .../style/hippie/elements/_interactive.scss | 118 ++++--- source/style/hippie/elements/_sections.scss | 19 +- source/style/hippie/elements/_tables.scss | 99 +++--- source/style/hippie/elements/_textlevel.scss | 126 ++++---- source/style/hippie/global/_common.scss | 135 +++++--- source/style/hippie/global/_config.scss | 221 ++------------ .../explanation/_explanation_module.scss | 4 +- .../hippie/modules/tables/_tables_module.scss | 2 +- source/style/modules/demo/_demo_module.scss | 8 +- source/templates/hippie/demo-extended.njk | 2 +- 18 files changed, 907 insertions(+), 739 deletions(-) create mode 100644 source/pages/demo/examples.njk diff --git a/DEPRECATED.md b/DEPRECATED.md index 673d3ce..87dcd08 100644 --- a/DEPRECATED.md +++ b/DEPRECATED.md @@ -2,9 +2,194 @@ ## Packages +``` "gulp-ruby-sass": "^2.1.1", "gulp-cssnano": "^2.1.3", "gulp-rename": "^1.2.3", "gulp-changed": "^3.2.0", "gulp-newer": "^1.4.0", "gulp-useref": "^3.1.5", +``` + +## Style + +``` +The config file is intended to allow users to quickly redefine core elements of the design +that will cascade throughout the css to get your design up and running FAST! + +For instruction, please see https://github.com/Anotheruiguy/toadstool/blob/master/sass/doc-src/config.md + +///// Typography configuration/////// +----------------------------------------------------------------------------- +$font_size: 12; + +$heading_1: 46; +$heading_2: 32; +$heading_3: 28; +$heading_4: 18; +$heading_5: 18; +$heading_6: 18; + +$line: $font_size * 1.5; + +$small_point_size: 10; +$large_point_size: 14; + +$primary_font_family: #{"Helvetica Neue", Arial, sans-serif}; +$secondary_font_family: #{"Helvetica Neue", Arial, sans-serif}; +$heading_font_family: #{"Helvetica Neue", Arial, sans-serif}; + +$icon_font_alpha: #{'ico-fonts'}; + +///// Default webfont directory/////// +----------------------------------------------------------------------------- +$webfont_directory: "/fonts/"; + +///// default image directory /////// +----------------------------------------------------------------------------- +In Sinatra, the images folder resides in the public directory. This directory is not made publically accessible, +so simply referencing the images directory will be fine. +$imgDir: "/images/"; + +///// OOCSS generic base colors/////// +----------------------------------------------------------------------------- +Red, green, yellow, blue, accent and black is not law, but a common theme in most designs. +Using Toadstool, all you need to do is edit these 6 hex values and everything else is created +by magic, unicorns and fairy dust! + +$alpha_primary: #5a2e2e; // red +$bravo_primary: #3e4147; // green +$charlie_primary: #fffedf; // yellow +$delta_primary: #2a2c31; // blue +$echo_primary: #dfba69; // accent + +$alpha_gray: #333; //black + +///// Toadstool color math /////// +----------------------------------------------------------------------------- +Local color functions to create default color palette +@import "color/color_math"; +@import "color/grayscale_math"; +@import "color/color_defaults"; + +///// Grid configuration /////// +----------------------------------------------------------------------------- +setting default units of measurement for Toadstool grid solution +$grid_type: 12; // sets default column grid +$grid_uom: percent; // use either ``em`` or ``percent`` +$grid_padding_l: 0; // sets default left/right padding inside grid block +$grid_padding_r: 0; // sets default left/right padding inside grid block +$grid_padding_tb: 0; // sets default top/bottom padding inside grid block +$grid_border: 0; // sets default border width on all grid blocks +$grid_child: none; // sets parent child relationship between grid blocks +$grid_align: default; // by default grids float left. Optional argument is ``center`` +$col_base: 10; // equal to 10px in the standard 960.gs +$col_gutter: $col_base * 2; // sets default grid gutter width +$grid_960: 960 / 100%; // grid math for percentages + + + +///// HTML 5 feature colors /////// +----------------------------------------------------------------------------- +used with the `ins` tag +http://www.w3schools.com/tags/tag_ins.asp +$ins_color: $charlie_color; + +used with the `mark` tag +http://www.w3schools.com/html5/tag_mark.asp +$mark_color: $charlie_color; + +webkit tap highlight color +$webkit_tap_hightlight: $delta_color_bravo; + +overrides the default content selection color in the browser +$selection_color: $charlie_color; +$selection_text_color: $primary_text; + + + +///// Config defaults for forms /////// +----------------------------------------------------------------------------- +$alert_back_color: $alpha_color; + +$input_disabled: $bravo_gray; +$input_disabled_bkg: lighten($input_disabled, 75%); +$input_disabled_border: lighten($input_disabled, 50%); +$input_disabled_text: lighten($input_disabled, 50%); + +$form_field_back_color: $brightest_color; +$form_field_focus_color: $brightest_color; +$form_field_fail_bkg: $alpha_color_juliet; + +$form_field_border: $charlie_gray; +$form_field_border_fail: $alpha_color_echo; +$form_field_focus_border_color: $charlie_gray; + +$form_field_text_fail: $alpha_color_echo; +$form_label_color: $alpha_gray; +$optional_field_text_color: $delta_gray; +$instructional_text: $charlie_gray; +$placeholder_text: $hotel_gray; +$inline_alert_bkg_color: $alpha_color_delta; +$inline_alert_text_color: $brightest_color; + +Non-color defaults (currently not represented in the SG view) +--------------------------------------------------------- +$form_field_border_radius: $standard_round_corner; +$form_field_text: $primary_text; +$form_field_height: 35; +$form_field_padding: 6; +$form_label_weight: bold; +$form_label_lineheight: 20; +$inline_alert_lineheight: 30; +$inline_alert_left_padding: 12; +$inline_alert_weight: bold; +$inline_alert_top_margin: 12; +$inline_alert_border_width: 1; + + + +///// Config defaults for buttons /////// +----------------------------------------------------------------------------- +$button-color: $delta-color; +$button-text-color: $brightest_color; +$button-line-height: 32; +$button-border-radius: 3; +$button-padding: 20; +$button-font-size: 18; +$button-weight: bold; +$button-text-shadow: true; +$button-box-shadow: true; + +///// Config defaults for ``standard_rounded_border`` mixin /////// +----------------------------------------------------------------------------- +$standard_round_corner: 3; // sets default border radius +$standard_corner_width: 1px; // sets default border width +$standard_border_color: $border_color; // sets default border color + +///// Config defaults for ``standard_block_spacing`` mixin /////// +----------------------------------------------------------------------------- +$default_block_spacing: 20; // sets margin-bottom + +///// Config defaults for site border style /////// +----------------------------------------------------------------------------- +$standard_border_style: solid; + +///// Config defaults for ``standard_hr`` mixin /////// +----------------------------------------------------------------------------- +$standard_hr_spacing: 40; // sets padding and margin bottom +$standard_hr_color: $delta_gray; +$standard_hr_width: 1px; + +///// Config values for all default shadows /////// +----------------------------------------------------------------------------- +$h-shadow: 0; // horizontal shadow settings +$v-shadow: 2; // vertical shaddow settings +$blur: 3; // blur settings + +$inset_color: $shadow_color; // for use with ``dual_box_shadow`` mixin +$ih-shadow: 0; // inset horizontal shadow settings +$iv-shadow: 2; // inset vertical shaddow settings +$is-shadow: 2; // inset spread shaddow settings +$iblur: 3; // inset blur settings +``` diff --git a/source/demo_data.json b/source/demo_data.json index 6a6be86..90f05d5 100644 --- a/source/demo_data.json +++ b/source/demo_data.json @@ -9,8 +9,8 @@ "text": "Elements" }, { - "href": "demo/os.html", - "text": "OS" + "href": "demo/examples.html", + "text": "Examples" }, { "href": "demo/tests.html", @@ -33,6 +33,10 @@ { "href": "demo/error/500.html", "text": "500" + }, + { + "href": "demo/os.html", + "text": "OS" } ] } diff --git a/source/pages/demo.njk b/source/pages/demo.njk index da591c5..90dfcdc 100644 --- a/source/pages/demo.njk +++ b/source/pages/demo.njk @@ -18,8 +18,8 @@

      You can start using it by replacing this file with your own index page.

      To do this you need to open the file /gulpfile.js and comment out the line index: "demo.html",. Then you need to place your index file (index.njk) into the folder /source/pages.

      For a very basic start you can make a copy of the demo page blank.njk. You can find it at /source/pages/demo.

      -

      The folder demo contains examples and also an overview of definitions made.
      Follow the white rabbit.

      -

      Overview about all the styles

      +

      The demo folder contains an overview of all elements and also examples for style combinations and even whole page layouts.
      Follow the white rabbit.

      +

      Overview

        {% for link in demoadditionallinks %} diff --git a/source/pages/demo/elements.njk b/source/pages/demo/elements.njk index 89317ec..1da2ffd 100644 --- a/source/pages/demo/elements.njk +++ b/source/pages/demo/elements.njk @@ -39,248 +39,27 @@
        -

        Sammlung formatierter Elemente

        -

        Die Elemente werden fortlaufend komplexer

        +

        Übersicht aller Elemente

        +

        Es werden alle grundlegenden Elemente sowie ihre gestalteten Varianten angegeben. Die Elemente sind in Gruppen eingeteilt, die auch das W3Consortium (www.w3.org/TR/2017/REC-html52-20171214/index.html#contents) verwendet.

        +

        Zu jedem Element werden alle Attribute aufgelistet und die Umsetzung im HTML Dokument als Emmet Syntax dargestellt.

        - 
        h3.txt_light_color+p
        -

        Helle Überschrift

        -

        Mit normalem Textabsatz

        - 
        a>h4
        -

        Überschrift als Block-Verweis

         - 
        section>div.float_space_left>img^p+p
        -
        -
        Avatar
        -

        Vorname Name
        Straße 1, 01234 Stadt

        +49 (0)123 1337 0000
        name@domain.tld

        -
        - 
        div.box_main_indent
        -
        -
        -

        Eingerückter Inhalt

        -
        -
        - 
        nav>ul>(li>a.a_button{Punkt $})*4nav>ul>(li>a.a_button_border{Stufe $})*4
        -
        - - -
        - 
        nav.nav_horizontal>ul>(li>a.a_button{Abschnitt $})*4nav.nav_center_old>ul>(li>a.a_button{Typ $})*4
        - -
        - -
        - 
        header.header_page>h1+p+nav.nav_separate_right>ul>(li>a.a_button{Nav $})*4^+nav.nav_right>ul>(li>a.a_button{Nav $})*4
        -
        -

        Aufmacher

        -

        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis nec consectetur diam. Sed nisl odio, volutpat nec nisi sit amet, commodo faucibus est. Donec lacinia vestibulum sapien. Morbi porttitor nibh quis imperdiet scelerisque. Praesent rutrum quam eu sodales luctus.

        - - -
        - 
        header.header_page>nav.nav_right>ul>(li>a.a_button{Nav $})*4
        -
        -
        - -
        -
        - 
        footer.pos_abs.pin_bottom>nav.nav_column>ul>(li>a.a_button_text)*4
        - -
        -
        -
        -
        -
        -
        -
        -
        -
        -
        -
        -
        -
        -
        -
        -
        -
        -

        - Show me a - Sorted by - - - Matching - -

        -
        - -

        Gruppierung

        - 
        ul.list_link>(li>a>img)*2+li>a
        - - -

        Tabellen

        - 
        table.table_link>thead>tr>th{&nbsp;}+th{Ab / Zy}+th{Neu / Alt}^^(tbody>tr>td.cell_icon[rowspan="2"]>img[width=16  height=16]^+td.cell_link>a[target=_blank]{Name}+a[target=_blank]{URL}^+td.cell_date[rowspan="2"]{YYY-MM-DD}^tr>td.cell_text>div.shorten{Beschreibung})*2
        - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
         Ab / ZyNeu / Alt
        NameURLYYYY-MM-DD
        -
        Beschreibung
        -
        NameURLYYYY-MM-DD
        -
        Beschreibung
        -
        -

        Eingebettet

        -
        - - - - - - - - - - - -
        +

        Bereiche

        +

        Elemente:

        + 
        // body
        // article
        // section
        // nav
        // aside
        // h1-h6
        // header
        // footer
        +

        <body>

        +

        Keine speziellen Attribute. Bekommt überlicherweise allgemeine Klassen zur Steuerung der Abmessungen zugewiesen.

        +

        <article>

        +

        Keine speziellen Attribute. Bekommt überlicherweise allgemeine Klassen zur Steuerung der Abmessungen zugewiesen.

        +

        <section>

        +

        Keine speziellen Attribute. Bekommt überlicherweise allgemeine Klassen zur Steuerung der Abmessungen zugewiesen.

        +

        Varianten

        + 
        section.sec_main_center
        + 
        section.sec_main_status
        +

        <h3>

        +

        <h4>

        -
        -
        -

        Autarke Seiten

        -

        Diese Elemente repräsentieren jeweils eine eigene Seite.

        -
        -
        -
        -
        -

        404

        -

        Hier ist nichts.

        -
        -

        Die angeforderte Ressource wurde nicht gefunden. Dieser Statuscode kann ebenfalls verwendet werden, um eine Anfrage ohne näheren Grund abzuweisen. Links, welche auf solche Fehlerseiten verweisen, werden auch als Tote Links bezeichnet.

        -

        Wikipedia

        -
        -
        - {% include "hippie/partials/footer-status.njk" %} -
        -
        -
        -

        403

        -

        Nicht erlaubt! Forbidden

        -
        -

        Die Anfrage wurde mangels Berechtigung des Clients nicht durchgeführt, bspw. weil der authentifizierte Benutzer nicht berechtigt ist, oder eine als HTTPS konfigurierte URL nur mit HTTP aufgerufen wurde.

        -

        Wikipedia

        -
        -
        - {% include "hippie/partials/footer-status.njk" %} -
        -
        -
        -

        400

        -

        Fehlerhafte Anfrage! Bad Request

        -
        -

        Die Anfrage-Nachricht war fehlerhaft aufgebaut.

        -

        Wikipedia

        -
        -
        - {% include "hippie/partials/footer-status.njk" %} -
        -
        -
        - -
      {% include "hippie/partials/footer.njk" %} {% endblock %} diff --git a/source/pages/demo/examples.njk b/source/pages/demo/examples.njk new file mode 100644 index 0000000..5c6131b --- /dev/null +++ b/source/pages/demo/examples.njk @@ -0,0 +1,289 @@ + +{% set pageId = "examples" %} +{% set pageClass = "" %} + +{% extends "hippie/demo-extended.njk" %} + +{% block title %}Examples{% endblock %} +{% block head %} +{{ super() }} +{% endblock %} + +{% block body_content %} +
      + +{% include "hippie/partials/nav-page-meta.njk" %} +
      +
      +
      +
      +

      Sammlung formatierter Elemente

      +

      Die Elemente werden fortlaufend komplexer

      +
      +
      +

      <h3>

      +

      Beispiele

      + 
      h3.txt_color_dark+p
      +

      Dunkle Überschrift

      +

      Mit normalem Textabsatz

      +

      <h4>

      +

      Beispiele

      + 
      a>h4
      +

      Überschrift als Block-Verweis

       +

      <section>

      + 
      section>div.float_space_left>img^p+p
      +
      +
      Avatar
      +

      Vorname Name
      Straße 1, 01234 Stadt

      +49 (0)123 1337 0000
      name@domain.tld

      +
      + 
      div.space_left_fourth
      +
      +
      +

      Eingerückter Inhalt

      +
      +
      + 
      nav>ul>(li>a.a_button{Punkt $})*4nav>ul>(li>a.a_button_border{Stufe $})*4
      +
      + + +
      + 
      nav.nav_horizontal>ul>(li>a.a_button{Abschnitt $})*4nav.nav_center_old>ul>(li>a.a_button{Typ $})*4
      + +
      + +
      + 
      header.header_page>h1+p+nav.nav_separate_right>ul>(li>a.a_button{Nav $})*4^+nav.nav_right>ul>(li>a.a_button{Nav $})*4
      +
      +

      Aufmacher

      +

      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis nec consectetur diam. Sed nisl odio, volutpat nec nisi sit amet, commodo faucibus est. Donec lacinia vestibulum sapien. Morbi porttitor nibh quis imperdiet scelerisque. Praesent rutrum quam eu sodales luctus.

      + + +
      + 
      header.header_page>nav.nav_right>ul>(li>a.a_button{Nav $})*4
      +
      +
      + +
      +
      + 
      footer.pos_abs.pin_bottom>nav.nav_column>ul>(li>a.a_button_text)*4
      + +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +

      + Show me a + Sorted by + + + Matching + +

      +
      + +

      Gruppierung

      + 
      ul.list_link>(li>a>img)*2+li>a
      + + +

      Tabellen

      + 
      table.table_link>thead>tr>th{&nbsp;}+th{Ab / Zy}+th{Neu / Alt}^^(tbody>tr>td.cell_icon[rowspan="2"]>img[width=16  height=16]^+td.cell_link>a[target=_blank]{Name}+a[target=_blank]{URL}^+td.cell_date[rowspan="2"]{YYY-MM-DD}^tr>td.cell_text>div.shorten{Beschreibung})*2
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
       Ab / ZyNeu / Alt
      NameURLYYYY-MM-DD
      +
      Beschreibung
      +
      NameURLYYYY-MM-DD
      +
      Beschreibung
      +
      +

      Eingebettet

      +
      + + + + + + + + + + + +
      +
      +
      +
      +
      +

      Autarke Seiten

      +

      Diese Elemente repräsentieren jeweils eine eigene Seite.

      +
      +
      +
      +
      +

      404

      +

      Hier ist nichts.

      +
      +

      Die angeforderte Ressource wurde nicht gefunden. Dieser Statuscode kann ebenfalls verwendet werden, um eine Anfrage ohne näheren Grund abzuweisen. Links, welche auf solche Fehlerseiten verweisen, werden auch als Tote Links bezeichnet.

      +

      Wikipedia

      +
      +
      + {% include "hippie/partials/footer-status.njk" %} +
      +
      +
      +

      403

      +

      Nicht erlaubt! Forbidden

      +
      +

      Die Anfrage wurde mangels Berechtigung des Clients nicht durchgeführt, bspw. weil der authentifizierte Benutzer nicht berechtigt ist, oder eine als HTTPS konfigurierte URL nur mit HTTP aufgerufen wurde.

      +

      Wikipedia

      +
      +
      + {% include "hippie/partials/footer-status.njk" %} +
      +
      +
      +

      400

      +

      Fehlerhafte Anfrage! Bad Request

      +
      +

      Die Anfrage-Nachricht war fehlerhaft aufgebaut.

      +

      Wikipedia

      +
      +
      + {% include "hippie/partials/footer-status.njk" %} +
      +
      +
      + + +
      +{% include "hippie/partials/footer.njk" %} +{% endblock %} + +{% block script %} +{{ super() }} + + + +{% endblock %} diff --git a/source/pages/demo/intro.njk b/source/pages/demo/intro.njk index 3bea93b..2724106 100644 --- a/source/pages/demo/intro.njk +++ b/source/pages/demo/intro.njk @@ -70,8 +70,8 @@
      hr.hr_hidden

      Die Linie darf auch gepunkted sein. Zudem sind verschiedene Längen möglich. Diese sind immer ein Prozentwert der verfügbaren Breite. Hier in gleicher Reihenfolge 100%, 50% und 25%:

      hr.hr_dotted
      -
      hr.center_50
      -
      hr.hr_dotted.center_25
      +
      hr.space_even_half
      +
      hr.hr_dotted.space_even_fourth

      Zur horizontalen Unterteilung kommt natürlich auch eine vertikale Trennung hinzu. Text kann so zum Beispiel in mehrere Spalten unterteilt werden. Dies ist hilfreich, wenn ein Text durch eine breite Fläche sehr lange Zeilen bekommen würde. Es ist dann schwer den neuen Zeilanfang zu finden. Die vertikale Trennung dient in erster Linie dazu, diesem Umstand zu begegnen. Auch hier kann die Unterteilung viele Formen annehmen.

      p.column_2

      Drei Spalten gilt es jetzt also zu Füllen. Dann erst wird die Trennung der Spalten durch eine Linie sichtbar.

      p.column_3.column_line

      Ist der Text nicht lang genug bleibt eventuell eine Spalte leer. Diesmal wird dies aber nicht passieren, denn das Anschauungsbeispiel ist ja nun durch den vorherigen Absatz schon gegeben.
      Oft ist es sinnvoll, Absätze mit mehreren Spalten deutlich von nachfolgenden Absätzen zu trennen. Da der Textfluss spaltenweise verläuft, liest man eventuell an der falschen Stelle weiter. Ach das ziegen diese beiden Absätze ganz gut.

      @@ -120,15 +120,18 @@
      figure>figcaption+{element}

      Eine sehr klar definierte Gruppierung stellt das Element <main> dar. Es umschließt den hauptsächlichen Inhalt des Dokumentes.

      Eine von sich aus undefinierte Möglichkeit zur Gruppierung von Text besteht durch <div>. Dieses Element hat, ohne weitere Klassifizierung keine Auswirkungen auf die Erscheinung oder die inhaltliche Aussage. Daher der allgemeine Einsatz.

      -

      Es wird allerdings häufig eingesetzt und bekommt vielfältige Funktionen zugeordnet wie diese hervorgehobene Information zeigt.

      +

      Es wird allerdings häufig eingesetzt und bekommt vielfältige Funktionen zugeordnet wie diese hervorgehobene Information zeigt.

      Textebene

      {# // a // em // strong // small // s // cite // q // dfn // abbr // ruby // rb // rt // rtc // rp // data // time // code // var // samp // kbd // sub // sup // i // b // u // mark // bdi // bdo // span // br // wbr // -- Edits -- // ins // del #}

      Verweise

      -

      Ein wesentlicher Bestandteil von Hypertext sind Verweise <a>. Sie dienen als Sprungmarken innerhalb des Netzwerks. Es kann grob zwischen internen und externen Verweisen unterschieden werden. Interne Verweisea.a_line können Verknüpfungen innerhalb des aktuellen Dokumentes sein oder auch Funktionen aktivieren. Externe Verweise verknüpfen Inhalte über das gesamte Netzwerk hinweg. Sie können auch auf E-Mail Adressen oder Dateien zeigen.

      +

      Ein wesentlicher Bestandteil von Hypertext sind Verweise <a>. Sie dienen als Sprungmarken innerhalb des Netzwerks. Es kann grob zwischen internen und externen Verweisen unterschieden werden. Interne Verweisea.a_line können Verknüpfungen innerhalb des aktuellen Dokumentes sein oder auch Funktionen aktivieren. Externe Verweise verknüpfen Inhalte über das gesamte Netzwerk hinweg. Sie können zum Beispiel auch auf E-Mail Adressen oder Dateien zeigen. Theoretisch kann solch ein Verweis Alles auslösen. Anweisungen werden im URL Standard übergeben.

      Nicht nur Text kann als Verweis verwendet werden. Auch andere Elemente wie Bilder können verknüpft werden. Abhängig von ihrer Funktion und ihrem Zweck, werden Verweise unterschiedlich formatiert. Farbige oder unterstrichene Varianten sind möglich.

      -

      Wird der Verweis innerhalb eines <nav> Elementes notiert, bekommt er die spezielle Bedeutung eines Navigationsverweises innerhalb des Dokumentes oder der Anwendung. Auf diese Verwendung wird im Folgenden genauer eingegangen ...

      +

      Wird der Verweis innerhalb eines <nav> Elementes notiert, bekommt er die spezielle Bedeutung eines Navigationsverweises innerhalb des Dokumentes oder der Anwendung. Verweise werden dann durchaus auch wie Schaltflächen dargestellt.

      +

      Formatierungen

      Texte, Wörter oder Zeichen können vielfältig formatiert werden.

      Sie können fett <b> oder kursiv <i> geschrieben sein. Auch beides ist möglich!?! Sollen sie nicht nur anders aussehen, sondern auch eine besondere inhaltliche Bedeutung bekommen, werden sie mit <strong> und <em> ausgezeichnet.

      diff --git a/source/style/_demo_config.scss b/source/style/_demo_config.scss index ed30d63..24e90b0 100644 --- a/source/style/_demo_config.scss +++ b/source/style/_demo_config.scss @@ -2,5 +2,5 @@ // All variables setup with !default in gloabl/_config.scss can be used // ------------------------------------------------------------------------------ -// $basic_back_color: yellow; +// $color_back_basic: yellow; // $basic_link_color: magenta; diff --git a/source/style/hippie/elements/_grouping.scss b/source/style/hippie/elements/_grouping.scss index e1feca4..b6dde56 100644 --- a/source/style/hippie/elements/_grouping.scss +++ b/source/style/hippie/elements/_grouping.scss @@ -19,6 +19,7 @@ // Paragraph +// ----------------------------------------------------------------------------- p { @extend %basic; margin-top: $basic_space; @@ -30,7 +31,23 @@ p { } } +.column_line { + column-rule: $basic_border; +} +.column_2, .column_3 { + @extend p; +} +.column_2 { + column-count: 2; + column-gap: $space_small; +} +.column_3 { + column-count: 3; + column-gap: $space_medium; +} + // Address +// ----------------------------------------------------------------------------- address { // @extend %basic; margin-top: $double_space; @@ -38,6 +55,7 @@ address { } // Line +// ----------------------------------------------------------------------------- hr { margin: $space_small auto; border-width: $basic_border_width 0 0; @@ -56,24 +74,26 @@ hr { } // Preformat +// ----------------------------------------------------------------------------- pre { @extend %basic_mono; } .pre_code { overflow-x: auto; - border-color: darken($basic_back_color, $tiny_color_diff); + border-color: darken($color_back_basic, $tiny_color_diff); border-style: dotted; border-width: 0 0 0 $border_width_4; border-radius: $basic_corner; padding: $basic_space; - background-color: lighten($basic_back_color, $tiny_color_diff); + background-color: lighten($color_back_basic, $tiny_color_diff); code { background-color: transparent; } } // Quote +// ----------------------------------------------------------------------------- blockquote { margin: $basic_space 0; padding-right: $basic_indent; @@ -95,6 +115,7 @@ blockquote { } // List +// ----------------------------------------------------------------------------- dl, ul, ol { margin: $double_space 0 $basic_space; } @@ -121,29 +142,6 @@ ul { } } -// Embedded -figure { - margin: $double_space $basic_indent; -} - -figcaption { - @extend %basic; -} - -// Main content -main { - -} - -// Div -div { - -} - - - -// General Classes -// ------------------------------------------------------------------------------ .list_dash { li { list-style: none; @@ -187,39 +185,34 @@ div { } } -.box_info { +// Embedded +// ----------------------------------------------------------------------------- +figure { + margin: $double_space $basic_indent; +} + +figcaption { + @extend %basic; +} + +// Main content +// ----------------------------------------------------------------------------- +main { + +} + +// Div +// ----------------------------------------------------------------------------- +div { + +} + +.div_info { padding: $double_space $basic_indent; border-right: $basic_space solid rgba($echo_color, 0.6); background-color: rgba($echo_color, 0.1) !important; } -.box_main_indent { - margin-left: 25%; -} - -.box_full_width { - // position: relative; - // overflow: hidden; - // width: 100%; -} - -// Columns -.column_line { - column-rule: $basic_border; -} -.column_2, .column_3 { - @extend p; -} -.column_2 { - column-count: 2; - column-gap: $space_small; -} -.column_3 { - column-count: 3; - column-gap: $space_medium; -} - -// Space and placeholders .box_space { position: relative; width: 100%; @@ -231,6 +224,7 @@ div { width: $space_medium; text-align: center; vertical-align: middle; + span { display: table-cell; } @@ -255,15 +249,41 @@ div { background-color: transparentize($basic_front_color, 0.1); } -// Data .box_file_tile { @extend .float_space_left; } // Flex -.flex_column_wrap { +.flex { + display: flex; +} + +.flex_wrap { @extend .flex; flex-wrap: wrap; +} + +.flex_row { + @extend .flex; + flex-direction: column; + // align-items: flex-start; + justify-content: flex-start; +} + +.flex_child { + flex: 0 1 auto; +} + +.flex_child_one { + flex: 1; +} + +.flex_child_end { + align-self: flex-end; +} + +.flex_column_wrap { + @extend .flex_wrap; .flex_column { @extend .flex_child; @@ -271,6 +291,32 @@ div { } } +// Grid +.grid { + display: grid; + grid-gap: $basic_space; + + & > input, + & > select, + & > textarea { + margin: 0; + } + + & > label { + margin: $basic_io_border_width; + padding: $half_space; + } +} + +.grid_column_2 { + grid-template-columns: max-content max-content; + +} + +.grid_column_4 { + grid-template-columns: max-content max-content max-content max-content; +} + // Sprites .sprite_img { display: inline-block; diff --git a/source/style/hippie/elements/_interactive.scss b/source/style/hippie/elements/_interactive.scss index 35abf28..89c05c0 100644 --- a/source/style/hippie/elements/_interactive.scss +++ b/source/style/hippie/elements/_interactive.scss @@ -17,10 +17,14 @@ +// Form +// ----------------------------------------------------------------------------- form { } +// Label +// ----------------------------------------------------------------------------- label { @extend %basic; @@ -29,6 +33,30 @@ label { } } +input + label { + margin-left: $basic_space; +} + +.label { + line-height: 2.5; +} + +.label > input, +.label > textarea, +.label > select { + margin: 0 $basic_space; +} + +// Input +// ----------------------------------------------------------------------------- +input { + color: $basic_io_font_color; +} + +label + input { + margin-left: $basic_space; +} + input, button, textarea, select { margin: $io_margin; @@ -38,8 +66,11 @@ input, button, textarea, select { } } -input { - color: $basic_io_font_color; +td > input, +td > button, +td > select, +td > textarea { + margin: 0; } @each $input in $io_input_list, textarea, select { @@ -97,17 +128,23 @@ input { } } +// Fieldset +// ----------------------------------------------------------------------------- fieldset { margin: $high_margin; padding: $basic_space; border: $basic_border; } +// Legend +// ----------------------------------------------------------------------------- legend { @extend %basic; padding: 0 $half_space; } +// Button +// ----------------------------------------------------------------------------- button { } @@ -137,14 +174,20 @@ button { } } +// Selection +// ----------------------------------------------------------------------------- select { border: none; } +// Datalist +// ----------------------------------------------------------------------------- datalist { } +// Options +// ----------------------------------------------------------------------------- optgroup { } @@ -153,6 +196,8 @@ option { } +// Textarea +// ----------------------------------------------------------------------------- textarea { } @@ -160,10 +205,14 @@ textarea { line-height: 1.2; } +// Output +// ----------------------------------------------------------------------------- output { } +// Progress +// ----------------------------------------------------------------------------- progress { } @@ -208,68 +257,3 @@ dialog { canvas { } - - - -// General Classes -// ------------------------------------------------------------------------------ -.label { - line-height: 2.5; -} - -.label > input, -.label > textarea, -.label > select { - margin: 0 $basic_space; -} - -.label_table { - display: table; - - input { - display: table-cell; - } -} - -label + input { - margin-left: $basic_space; -} - -input + label { - margin-left: $basic_space; -} - -td > input, -td > button, -td > select, -td > textarea { - margin: 0; -} - - - -.grid { - display: grid; - grid-gap: $basic_space; - - & > input, - & > select, - & > textarea { - margin: 0; - } - - & > label { - display: inline-block; - margin: $basic_io_border_width; - padding: $half_space; - } -} - -.grid_column_2 { - grid-template-columns: max-content max-content; - -} - -.grid_column_4 { - grid-template-columns: max-content max-content max-content max-content; -} diff --git a/source/style/hippie/elements/_sections.scss b/source/style/hippie/elements/_sections.scss index 2b8951a..abc8859 100644 --- a/source/style/hippie/elements/_sections.scss +++ b/source/style/hippie/elements/_sections.scss @@ -1,6 +1,5 @@ // Root // ----------------------------------------------------------------------------- - html { height: 100%; } @@ -21,6 +20,7 @@ html { // Body +// ----------------------------------------------------------------------------- body { position: relative; box-sizing: $box_sizing; @@ -30,7 +30,7 @@ body { line-height: $basic_line; line-height: $text_line_basic; color: $basic_font_color; - background-color: $basic_back_color; + background-color: $color_back_basic; *, ::before, @@ -48,11 +48,13 @@ body { } // Article +// ----------------------------------------------------------------------------- article { } // Section +// ----------------------------------------------------------------------------- section { } @@ -81,11 +83,13 @@ section { } // Navigation +// ----------------------------------------------------------------------------- nav { } // Aside element +// ----------------------------------------------------------------------------- aside { width: $basic_aside_width; @@ -97,20 +101,21 @@ aside { margin-left: calc(#{$basic_aside_width} + #{$basic_space}); } - &.left { - float: left; - } - &.right { float: right; } + &.left { + float: left; + } + *:first-child { margin-top: 0; } } // Headings +// ----------------------------------------------------------------------------- h1, h2, h3, h4, h5, h6 { @extend %head_all; } @@ -159,6 +164,7 @@ h6 { } // Header +// ----------------------------------------------------------------------------- header { } @@ -177,6 +183,7 @@ header { } // Footer +// ----------------------------------------------------------------------------- footer { } diff --git a/source/style/hippie/elements/_tables.scss b/source/style/hippie/elements/_tables.scss index a1f2551..2acc22d 100644 --- a/source/style/hippie/elements/_tables.scss +++ b/source/style/hippie/elements/_tables.scss @@ -13,12 +13,47 @@ +// Table +// ----------------------------------------------------------------------------- table { margin: $high_margin; border: $basic_border; border-collapse: collapse; } +.table_blank { + border: $basic_border_width solid transparent; + + th, td { + border: $basic_border_width solid transparent; + } +} + +.table_free { + border: $basic_border_width solid transparent; +} + +.table_stripe { + td { + border-top: 0; + border-bottom: 0; + } + + tr:nth-child(even) td { + background-color: lighten($color_back_basic, $tiny_color_diff); + } +} + +.table_fix { + table-layout: fixed; +} + +.table_file_simple { + @extend .width_full; +} + +// Caption +// ----------------------------------------------------------------------------- caption { @extend p; padding: $half_space 0; @@ -26,6 +61,8 @@ caption { text-align: center; } +// Columns +// ----------------------------------------------------------------------------- colgroup { } @@ -34,14 +71,20 @@ col { } +// Table body +// ----------------------------------------------------------------------------- tbody { } +// Table head +// ----------------------------------------------------------------------------- thead { } +// Table foot +// ----------------------------------------------------------------------------- tfoot { tr:first-child td { @@ -49,10 +92,14 @@ tfoot { } } -tr:last-child td { - border-bottom: 0; +// Row +// ----------------------------------------------------------------------------- +tr { + } +// Cells +// ----------------------------------------------------------------------------- th, td { @extend %basic; padding: $half_space; @@ -64,52 +111,20 @@ th { } td { - border-right: $cell_border; - border-bottom: $cell_border; + border-right: $basic_border; + border-bottom: $basic_border; } td:last-child { border-right: 0; + + td { + border-bottom: 0; + } } - - -// General Classes -// ------------------------------------------------------------------------------ .cell_pre { // border-right-width: $border_width_4; - // border-right-color: lighten($basic_back_color, $basic_color_diff); - background-color: lighten($basic_back_color, $tiny_color_diff); -} - -.table_blank { - border: $basic_border_width solid transparent; - - th, td { - border: $basic_border_width solid transparent; - } -} - -.table_free { - border: $basic_border_width solid transparent; -} - -.table_stripe { - td { - border-top: 0; - border-bottom: 0; - } - - tr:nth-child(even) td { - background-color: lighten($basic_back_color, $tiny_color_diff); - } -} - -.table_fix { - table-layout: fixed; -} - -// Data -.table_file_simple { - @extend .width_full; + // border-right-color: lighten($color_back_basic, $color_diff_basic); + background-color: lighten($color_back_basic, $tiny_color_diff); } diff --git a/source/style/hippie/elements/_textlevel.scss b/source/style/hippie/elements/_textlevel.scss index d530b10..7ce3c00 100644 --- a/source/style/hippie/elements/_textlevel.scss +++ b/source/style/hippie/elements/_textlevel.scss @@ -31,15 +31,11 @@ // span // br // wbr -// ----------------------------------------------------------------------------- -// Edits -// ----------------------------------------------------------------------------- -// ins -// del // Links +// ----------------------------------------------------------------------------- a { color: $basic_link_color; // color: lighten($basic_action_color, 20%); @@ -81,11 +77,12 @@ a { .a_button_border { @extend .a_button_text; - border: $cell_border; + border: $basic_border; } // Italic, Emphasis +// ----------------------------------------------------------------------------- i, em { font-style: italic; } @@ -96,38 +93,49 @@ i, em { } // Bold, Strong +// ----------------------------------------------------------------------------- b, strong { font-weight: 500; // TODO maybe bolder } // Small +// ----------------------------------------------------------------------------- small { } // No longer accurate or no longer relevant +// ----------------------------------------------------------------------------- s { } // Citation +// ----------------------------------------------------------------------------- cite { font-style: italic; } // Phrasing content, quoted +// ----------------------------------------------------------------------------- q { } +// Definition +// ----------------------------------------------------------------------------- dfn { } +// Abbreviation +// ----------------------------------------------------------------------------- abbr { } +// Ruby annotations +// ----------------------------------------------------------------------------- ruby { } @@ -148,34 +156,46 @@ rp { } +// Machine readable data +// ----------------------------------------------------------------------------- data { } +// Machine readable time +// ----------------------------------------------------------------------------- time { } // Code +// ----------------------------------------------------------------------------- code { @extend %basic_mono; - color: lighten($basic_font_color, $basic_color_diff); - background-color: lighten($basic_back_color, $tiny_color_diff); + color: lighten($basic_font_color, $color_diff_basic); + background-color: lighten($color_back_basic, $tiny_color_diff); } + .code_solo { @extend %basic_mono; padding: $tiny_space $half_space; color: $basic_font_color; } +// Variable +// ----------------------------------------------------------------------------- var { } +// Sample +// ----------------------------------------------------------------------------- samp { } +// Keyboard input +// ----------------------------------------------------------------------------- kbd { @extend %basic_mono; // font-size: .9em; @@ -183,41 +203,62 @@ kbd { padding: 0 $half_space; border-width: $basic_border_width; border-style: solid; - border-color: darken($basic_back_color, $basic_color_diff); + border-color: darken($color_back_basic, $color_diff_basic); border-radius: $basic_corner; - color: lighten($basic_font_color, $basic_color_diff); + color: lighten($basic_font_color, $color_diff_basic); } +// Sub- and superscript +// ----------------------------------------------------------------------------- sub, sup { } +// Unarticulated, non-textual annotation +// ----------------------------------------------------------------------------- u { } // Marks +// ----------------------------------------------------------------------------- mark { background-color: $alpha_color; } -.mark_cursor, ::-moz-selection, ::selection { + +.mark_cursor { color: invert($basic_font_color); background-color: $basic_font_color; } +::-moz-selection { + color: invert($basic_font_color); + background-color: $basic_font_color; +} + +::selection { + color: invert($basic_font_color); + background-color: $basic_font_color; +} + +// Text direction +// ----------------------------------------------------------------------------- bdi, bdo { } // Span +// ----------------------------------------------------------------------------- span { } + .span_solo { @extend %solo; } -// Linebreak +// Linebreaks +// ----------------------------------------------------------------------------- br { } @@ -230,6 +271,10 @@ wbr { // Edits // ----------------------------------------------------------------------------- +// ins +// del + + ins { @@ -238,60 +283,3 @@ ins { del { } - - - -// General Classes -// ------------------------------------------------------------------------------ -.txt_tiny { - font-size: .5em !important; -} - -.txt_smaller { - font-size: .75em !important; -} - -.txt_larger { - font-size: 1.2em !important; -} - -.txt_huge { - font-size: 3em !important; -} - -.txt_hero { - font-size: $hero_size_1; -} - -.txt_center { - text-align: center !important; -} -.txt_right { - text-align: right !important; -} -.txt_left { - text-align: left !important; -} - -.txt_top { - vertical-align: top !important; -} - -.txt_bottom { - vertical-align: bottom !important; -} - -.txt_white { - color: white; -} - -.txt_black { - color: black; -} - -.txt_gradient { - background: linear-gradient(165deg, $alpha_color 30%, $bravo_color 45%, $charlie_color 50%, $delta_color, $echo_color 80%, $foxtrot_color); - background-clip: text; - -webkit-background-clip: text; - -webkit-text-fill-color: transparent; -} diff --git a/source/style/hippie/global/_common.scss b/source/style/hippie/global/_common.scss index 61ad5af..86fa378 100644 --- a/source/style/hippie/global/_common.scss +++ b/source/style/hippie/global/_common.scss @@ -1,5 +1,8 @@ -// General layout attributes -// ------------------------------------------------------------------------------ +// General classes +// ----------------------------------------------------------------------------- + + + %size_content { box-sizing: content-box; } @@ -22,21 +25,29 @@ @extend %hidden; } -.center_auto { +.space_even_auto { margin-right: auto; margin-left: auto; } -.center_50 { +.space_even_half { margin-right: 25%; margin-left: 25%; } -.center_25 { +.space_even_fourth { margin-right: 37.5%; margin-left: 37.5%; } +.space_right_small { + margin-right: $space_small; +} + +.space_left_fourth { + margin-left: 25%; +} + .width_full { width: 100%; margin-right: 0; @@ -63,10 +74,6 @@ height: 100vh; } -.space_right { - margin-right: $space_small; -} - .wrap_center { & > * { margin-right: (100% - $basic_width) / 2; @@ -90,7 +97,7 @@ // Clearing and floating -// ------------------------------------------------------------------------------ +// ----------------------------------------------------------------------------- .clear { clear: both; @@ -127,9 +134,9 @@ } -// Inlining -// ------------------------------------------------------------------------------ +// Inlining +// ----------------------------------------------------------------------------- .inline { display: inline-block; } @@ -137,7 +144,7 @@ // Positioned elements -// ------------------------------------------------------------------------------ +// ----------------------------------------------------------------------------- %full_viewport { position: fixed; top: 0; @@ -195,11 +202,11 @@ } .hover_back_change { - background-color: darken($basic_back_color, $basic_color_diff); + background-color: darken($color_back_basic, $color_diff_basic); transition: background-color 0.2s ease-in-out; &:hover { - background-color: $basic_back_color; + background-color: $color_back_basic; } } @@ -211,45 +218,81 @@ pointer-events: none; } -.flex { - display: flex; -} - -.flex_wrap { - @extend .flex; - flex-wrap: wrap; -} - -.flex_row { - @extend .flex; - flex-direction: column; - // align-items: flex-start; - justify-content: flex-start; -} - -.flex_child { - flex: 0 1 auto; -} - -.flex_child_one { - flex: 1; -} - -.flex_child_end { - align-self: flex-end; -} // Colors -// ------------------------------------------------------------------------------ -.txt_light_color { - color: darken($basic_back_color, $basic_color_diff); +// ----------------------------------------------------------------------------- +.txt_color_light { + color: $color_font_light; +} + +.txt_color_dark { + color: $color_font_dark; +} + + + +// Text +// ----------------------------------------------------------------------------- +.txt_tiny { + font-size: .5em !important; +} + +.txt_smaller { + font-size: .75em !important; +} + +.txt_larger { + font-size: 1.2em !important; +} + +.txt_huge { + font-size: 3em !important; +} + +.txt_hero { + font-size: $hero_size_1; +} + +.txt_center { + text-align: center !important; +} + +.txt_right { + text-align: right !important; +} + +.txt_left { + text-align: left !important; +} + +.txt_top { + vertical-align: top !important; +} + +.txt_bottom { + vertical-align: bottom !important; +} + +.txt_white { + color: white; +} + +.txt_black { + color: black; +} + +.txt_gradient { + background: linear-gradient(165deg, $alpha_color 30%, $bravo_color 45%, $charlie_color 50%, $delta_color, $echo_color 80%, $foxtrot_color); + background-clip: text; + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; } // Input -// ------------------------------------------------------------------------------ +// ----------------------------------------------------------------------------- %default_button { display: inline-block; padding: $basic_padding; diff --git a/source/style/hippie/global/_config.scss b/source/style/hippie/global/_config.scss index f5b2bf0..2029a8e 100644 --- a/source/style/hippie/global/_config.scss +++ b/source/style/hippie/global/_config.scss @@ -2,9 +2,9 @@ // ------------------------------------------------------------------------------ + // TEXT // ------------------------------------------------------------------------------ - $basic_size: 17px !default; $basic_print_size: 10pt !default; @@ -69,12 +69,10 @@ $secondary_font_family: $primary_font_family !default; $third_font_family: $monospace_font_family !default; $fourth_font_family: $print_font_family !default; -$basic_indent: 2em !default; // COLORS // ------------------------------------------------------------------------------ - $color_palette: ( alpha: #fad803, bravo: #d30a51, @@ -86,16 +84,16 @@ $color_palette: ( @include addDefaultColors; -$basic_color_diff: 12% !default; +$color_diff_basic: 12% !default; $tiny_color_diff: 4% !default; -$double_color_diff: $basic_color_diff * 2; +$double_color_diff: $color_diff_basic * 2; $darkest_color: black !default; $brightest_color: white !default; $basic_font_color: black !default; -$basic_back_color: #808080 !default; -$basic_border_color: lighten($basic_font_color, $basic_color_diff) !default; +$color_back_basic: #808080 !default; +$basic_border_color: lighten($basic_font_color, $color_diff_basic) !default; $basic_front_color: white !default; $medium_color: lighten($darkest_color, 50%); @@ -107,6 +105,9 @@ $basic_link_color: $echo_color !default; $basic_highlight_color: $basic_front_color !default; $basic_action_color: $foxtrot_color !default; +$color_font_light: lighten($color_back_basic, $color_diff_basic); +$color_font_dark: darken($color_back_basic, $color_diff_basic); + // default shadow colors // $shadow_color: fade-out($medium_color, 0.5); @@ -119,9 +120,9 @@ $basic_color_list: (); } + // LAYOUT // ------------------------------------------------------------------------------ - $box_sizing: border-box !default; $z_heaven: 100 !default; @@ -149,6 +150,8 @@ $io_margin: 0 $space_small 0 0 !default; $basic_padding: calc(#{$basic_space} - 3px) $basic_space !default; $wide_padding: calc(#{$basic_space} - 1px) calc(#{$basic_space} * 2) !default; +$basic_indent: 2em !default; + $basic_corner: $tiny_space * 2; // Borders @@ -157,16 +160,15 @@ $border_width_4: $basic_border_width * 4; $border_width_8: $basic_border_width * 8; $basic_border: $tiny_space solid $basic_border_color; $dotted_border: $tiny_space dotted $basic_border_color; -$cell_border: $tiny_space solid $darkest_color; $basic_corner_radius: $tiny_space * 2; $basic_aside_width: 20%; + // IO // ------------------------------------------------------------------------------ - $io_input_list: 'input[type="text"]', 'input[type="number"]', @@ -208,13 +210,13 @@ $io_focus_list: 'textarea:not([disabled])', '*[tabindex]'; -$basic_io_font_color: lighten($basic_font_color, $basic_color_diff); -$basic_io_back_color: darken($basic_front_color, $basic_color_diff); +$basic_io_font_color: lighten($basic_font_color, $color_diff_basic); +$basic_io_back_color: darken($basic_front_color, $color_diff_basic); $basic_io_border_color: $basic_front_color; $oi_font_color: $basic_font_color; -$oi_back_color: darken($basic_back_color, $basic_color_diff); -$oi_border_color: darken($oi_back_color, $basic_color_diff); +$oi_back_color: darken($color_back_basic, $color_diff_basic); +$oi_border_color: darken($oi_back_color, $color_diff_basic); $basic_io_border_width: $tiny_space * 2 !default; $basic_io_border: $basic_io_border_width solid $basic_io_border_color; @@ -224,18 +226,18 @@ $basic_shadow: inset 0 1px 3px rgba($darkest_color, 0.06); $basic_focus_shadow: $basic_shadow, 0 0 5px adjust-color($basic_action_color, $lightness: -5%, $alpha: -0.3); + // ANIMATIONS // ------------------------------------------------------------------------------ - $basic_duration: 250ms; $double_duration: 500ms; $extended_duration: 2s; $basic_timing: ease-out; + // HARDWARE BREAKPOINTS // ------------------------------------------------------------------------------ - $screen_tiny: 768px; $screen_small: 1024px; $screen_medium: 1280px; @@ -244,9 +246,9 @@ $screen_huge: 1680px; $screen_gigantic: 1920px; + // VENDOR PREFIX // ------------------------------------------------------------------------------ - $prefix_defaults: -moz- -webkit- -o- -ms- ''; $webkit_support: -webkit- ''; $moz_support: -moz- ''; @@ -256,9 +258,9 @@ $moz_ms_support: -moz- -ms- ''; $webkit_ms_support: -webkit- -ms- ''; + // SYMBOLS // ------------------------------------------------------------------------------ - $icons: ( glass: "\f000", music: "\f001", @@ -273,189 +275,10 @@ $icons: ( } } + + // USER AGENT // ------------------------------------------------------------------------------ - $no_agent_focus: true; @include overrideUserAgent; - - -// The config file is intended to allow users to quickly redefine core elements of the design -// that will cascade throughout the css to get your design up and running FAST! - -// For instruction, please see https://github.com/Anotheruiguy/toadstool/blob/master/sass/doc-src/config.md - -/////// Typography configuration/////// -// ----------------------------------------------------------------------------- -// $font_size: 12; -// -// $heading_1: 46; -// $heading_2: 32; -// $heading_3: 28; -// $heading_4: 18; -// $heading_5: 18; -// $heading_6: 18; -// -// $line: $font_size * 1.5; -// -// $small_point_size: 10; -// $large_point_size: 14; -// -// $primary_font_family: #{"Helvetica Neue", Arial, sans-serif}; -// $secondary_font_family: #{"Helvetica Neue", Arial, sans-serif}; -// $heading_font_family: #{"Helvetica Neue", Arial, sans-serif}; - -// $icon_font_alpha: #{'ico-fonts'}; - -/////// Default webfont directory/////// -// ----------------------------------------------------------------------------- -// $webfont_directory: "/fonts/"; - -/////// default image directory /////// -// ----------------------------------------------------------------------------- -// In Sinatra, the images folder resides in the public directory. This directory is not made publically accessible, -// so simply referencing the images directory will be fine. -// $imgDir: "/images/"; - -/////// OOCSS generic base colors/////// -// ----------------------------------------------------------------------------- -// Red, green, yellow, blue, accent and black is not law, but a common theme in most designs. -// Using Toadstool, all you need to do is edit these 6 hex values and everything else is created -// by magic, unicorns and fairy dust! - -// $alpha_primary: #5a2e2e; // red -// $bravo_primary: #3e4147; // green -// $charlie_primary: #fffedf; // yellow -// $delta_primary: #2a2c31; // blue -// $echo_primary: #dfba69; // accent - -// $alpha_gray: #333; //black - -/////// Toadstool color math /////// -// ----------------------------------------------------------------------------- -// Local color functions to create default color palette -//@import "color/color_math"; -//@import "color/grayscale_math"; -//@import "color/color_defaults"; - -/////// Grid configuration /////// -// ----------------------------------------------------------------------------- -// setting default units of measurement for Toadstool grid solution -// $grid_type: 12; // sets default column grid -// $grid_uom: percent; // use either ``em`` or ``percent`` -// $grid_padding_l: 0; // sets default left/right padding inside grid block -// $grid_padding_r: 0; // sets default left/right padding inside grid block -// $grid_padding_tb: 0; // sets default top/bottom padding inside grid block -// $grid_border: 0; // sets default border width on all grid blocks -// $grid_child: none; // sets parent child relationship between grid blocks -// $grid_align: default; // by default grids float left. Optional argument is ``center`` -// $col_base: 10; // equal to 10px in the standard 960.gs -// $col_gutter: $col_base * 2; // sets default grid gutter width -// $grid_960: 960 / 100%; // grid math for percentages - - - -/////// HTML 5 feature colors /////// -// ----------------------------------------------------------------------------- -// used with the `ins` tag -// http://www.w3schools.com/tags/tag_ins.asp -// $ins_color: $charlie_color; - -// used with the `mark` tag -// http://www.w3schools.com/html5/tag_mark.asp -// $mark_color: $charlie_color; - -// webkit tap highlight color -// $webkit_tap_hightlight: $delta_color_bravo; - -// overrides the default content selection color in the browser -// $selection_color: $charlie_color; -// $selection_text_color: $primary_text; - - - -/////// Config defaults for forms /////// -// ----------------------------------------------------------------------------- -// $alert_back_color: $alpha_color; - -// $input_disabled: $bravo_gray; -// $input_disabled_bkg: lighten($input_disabled, 75%); -// $input_disabled_border: lighten($input_disabled, 50%); -// $input_disabled_text: lighten($input_disabled, 50%); -// -// $form_field_back_color: $brightest_color; -// $form_field_focus_color: $brightest_color; -// $form_field_fail_bkg: $alpha_color_juliet; - -// $form_field_border: $charlie_gray; -// $form_field_border_fail: $alpha_color_echo; -// $form_field_focus_border_color: $charlie_gray; - -// $form_field_text_fail: $alpha_color_echo; -// $form_label_color: $alpha_gray; -// $optional_field_text_color: $delta_gray; -// $instructional_text: $charlie_gray; -// $placeholder_text: $hotel_gray; -// $inline_alert_bkg_color: $alpha_color_delta; -// $inline_alert_text_color: $brightest_color; - -// Non-color defaults (currently not represented in the SG view) -// --------------------------------------------------------- -// $form_field_border_radius: $standard_round_corner; -// $form_field_text: $primary_text; -// $form_field_height: 35; -// $form_field_padding: 6; -// $form_label_weight: bold; -// $form_label_lineheight: 20; -// $inline_alert_lineheight: 30; -// $inline_alert_left_padding: 12; -// $inline_alert_weight: bold; -// $inline_alert_top_margin: 12; -// $inline_alert_border_width: 1; - - - -/////// Config defaults for buttons /////// -// ----------------------------------------------------------------------------- -// $button-color: $delta-color; -// $button-text-color: $brightest_color; -// $button-line-height: 32; -// $button-border-radius: 3; -// $button-padding: 20; -// $button-font-size: 18; -// $button-weight: bold; -// $button-text-shadow: true; -// $button-box-shadow: true; - -/////// Config defaults for ``standard_rounded_border`` mixin /////// -// ----------------------------------------------------------------------------- -// $standard_round_corner: 3; // sets default border radius -// $standard_corner_width: 1px; // sets default border width -// $standard_border_color: $border_color; // sets default border color - -/////// Config defaults for ``standard_block_spacing`` mixin /////// -// ----------------------------------------------------------------------------- -// $default_block_spacing: 20; // sets margin-bottom - -/////// Config defaults for site border style /////// -// ----------------------------------------------------------------------------- -// $standard_border_style: solid; - -/////// Config defaults for ``standard_hr`` mixin /////// -// ----------------------------------------------------------------------------- -// $standard_hr_spacing: 40; // sets padding and margin bottom -// $standard_hr_color: $delta_gray; -// $standard_hr_width: 1px; - -/////// Config values for all default shadows /////// -// ----------------------------------------------------------------------------- -// $h-shadow: 0; // horizontal shadow settings -// $v-shadow: 2; // vertical shaddow settings -// $blur: 3; // blur settings -// -// $inset_color: $shadow_color; // for use with ``dual_box_shadow`` mixin -// $ih-shadow: 0; // inset horizontal shadow settings -// $iv-shadow: 2; // inset vertical shaddow settings -// $is-shadow: 2; // inset spread shaddow settings -// $iblur: 3; // inset blur settings diff --git a/source/style/hippie/modules/explanation/_explanation_module.scss b/source/style/hippie/modules/explanation/_explanation_module.scss index 40669fc..a806eee 100644 --- a/source/style/hippie/modules/explanation/_explanation_module.scss +++ b/source/style/hippie/modules/explanation/_explanation_module.scss @@ -47,9 +47,9 @@ top: $space_large; left: $space_large; padding: $half_space; - border: 4px solid $basic_back_color; + border: 4px solid $color_back_basic; border-radius: 4px; - background-color: $basic_back_color; + background-color: $color_back_basic; pointer-events: none; } .exp_marker_pop { diff --git a/source/style/hippie/modules/tables/_tables_module.scss b/source/style/hippie/modules/tables/_tables_module.scss index f653e11..6e6f3de 100644 --- a/source/style/hippie/modules/tables/_tables_module.scss +++ b/source/style/hippie/modules/tables/_tables_module.scss @@ -4,7 +4,7 @@ table-layout: auto; tbody { - border-bottom: $cell_border; + border-bottom: $basic_border; &:hover { background-color: $bright_color; diff --git a/source/style/modules/demo/_demo_module.scss b/source/style/modules/demo/_demo_module.scss index d0ddbdd..36e2ef5 100644 --- a/source/style/modules/demo/_demo_module.scss +++ b/source/style/modules/demo/_demo_module.scss @@ -233,15 +233,17 @@ // ----------------------------------------------------------------------------- .wrap { display: flex; - height: 100%; + // height: 100%; align-items: center; justify-content: center; } .hello { - flex: 0 1 auto; + flex: 0 1 auto; + width: 80%; + ul { padding: 1em 5em; - background-color: rgba(black, 0.25); + background-color: darken($color_back_basic, $color_diff_basic); } } diff --git a/source/templates/hippie/demo-extended.njk b/source/templates/hippie/demo-extended.njk index a089c5c..71b7ac6 100644 --- a/source/templates/hippie/demo-extended.njk +++ b/source/templates/hippie/demo-extended.njk @@ -27,7 +27,7 @@ {% endblock %} - + {% include "hippie/partials/page-hover.njk" %}
      From 92d16092131baa095ccfd7978b2c4187c071a91d Mon Sep 17 00:00:00 2001 From: Stephan Date: Tue, 9 Oct 2018 23:47:51 +0200 Subject: [PATCH 078/372] Next content push - changed .gitignore for art folder - add gulp processing for art - changed nunjucks templates file structure to reflect demo files - removed file for new styles - renamed most sass variables - added sass function for space classes - great progress with content of the intro page - moved old gulp tasks to DEPRECATED.md --- .gitignore | 4 +- DEPRECATED.md | 134 ++++++++++++++- gulpfile.js | 153 ++--------------- source/pages/demo.njk | 4 +- source/pages/demo/blank.njk | 4 +- source/pages/demo/elements.njk | 2 +- source/pages/demo/error/404.njk | 4 +- source/pages/demo/error/500.njk | 4 +- source/pages/demo/examples.njk | 2 +- source/pages/demo/intro.njk | 122 +++++++++++--- source/pages/demo/maintenance.njk | 2 +- source/pages/demo/os.njk | 2 +- source/pages/demo/tests.njk | 6 +- source/style/_demo_config.scss | 6 +- source/style/_demo_new.scss | 38 ----- source/style/demo.scss | 2 - source/style/demo_basic.scss | 2 - source/style/hippie/elements/_grouping.scss | 86 +++++----- .../style/hippie/elements/_interactive.scss | 48 +++--- source/style/hippie/elements/_sections.scss | 36 ++-- source/style/hippie/elements/_tables.scss | 30 ++-- source/style/hippie/elements/_textlevel.scss | 72 ++++---- source/style/hippie/global/_common.scss | 53 +++--- source/style/hippie/global/_config.scss | 157 ++++++++---------- source/style/hippie/global/_typography.scss | 38 ++--- .../hippie/modules/editor/_editor_module.scss | 2 +- .../explanation/_explanation_module.scss | 34 ++-- .../modules/navigation/_nav_module.scss | 38 ++--- .../hippie/modules/print/_print_module.scss | 4 +- .../hippie/modules/tables/_tables_module.scss | 136 +++++++-------- source/style/modules/demo/_demo_module.scss | 54 +++--- .../demo-default.njk => demo/default.njk} | 6 +- .../demo-extended.njk => demo/extended.njk} | 6 +- .../{hippie => demo}/macros/nav-macro.njk | 2 +- .../maintenance.njk} | 6 +- .../partials/footer-status.njk | 0 .../{hippie => demo}/partials/head-meta.njk | 2 + 37 files changed, 664 insertions(+), 637 deletions(-) delete mode 100644 source/style/_demo_new.scss rename source/templates/{hippie/demo-default.njk => demo/default.njk} (81%) rename source/templates/{hippie/demo-extended.njk => demo/extended.njk} (91%) rename source/templates/{hippie => demo}/macros/nav-macro.njk (85%) rename source/templates/{hippie/demo-maintenance.njk => demo/maintenance.njk} (72%) rename source/templates/{hippie => demo}/partials/footer-status.njk (100%) rename source/templates/{hippie => demo}/partials/head-meta.njk (87%) diff --git a/.gitignore b/.gitignore index 6fdc0ab..fb3ee1e 100644 --- a/.gitignore +++ b/.gitignore @@ -188,4 +188,6 @@ typings/ ################### ################### build/ -art/ +**/art/* +**/art/sprites/ +!**/art/demo/ diff --git a/DEPRECATED.md b/DEPRECATED.md index 87dcd08..875a550 100644 --- a/DEPRECATED.md +++ b/DEPRECATED.md @@ -1,6 +1,8 @@ # Deprecated stuff -## Packages +## Gulp + +### Packages ``` "gulp-ruby-sass": "^2.1.1", @@ -11,6 +13,136 @@ "gulp-useref": "^3.1.5", ``` +### Code + +``` +// NOTE // to be deleted + +var oldsource = { + watch: ['source/style/hippie/**/*.scss', 'source/style/**/*.scss', 'source/templates/**/*.+(html|njk)', 'source/pages/**/*.+(html|njk)'], + styles: ['source/style/demo.scss', 'source/style/maintenance.scss'], + scripts: ['source/code/hippie/variables.js', 'source/code/hippie/functions.js', 'source/code/hippie/global.js', 'source/code/**/*.coffee', '!source/vendor/**/*', ], + images: 'source/art/**/*', + pages: 'source/pages/**/*.+(html|njk)', + vendor: 'vendor/**/*' +}; +var oldbuild = { + styles: 'build/css', + scripts: 'build/js', + images: 'build/art', + vendor: 'build/vendor', + root: 'build' +} + +// Task - Clean build directory +gulp.task('clean', function() { + return del([oldbuild.scripts, oldbuild.styles, oldbuild.images]); +}); + +// Task - Styles +gulp.task('styles', () => rubysass(oldsource.styles, {sourcemap: true}) +.on('error', rubysass.logError) +// .pipe(newer({dest: oldbuild.styles, ext: '.css'})) +.pipe(prefix('last 2 version')) +.pipe(gulp.dest(oldbuild.styles)) +.pipe(rename({suffix: '.min'})) +.pipe(cssnano()) +.pipe(sourcemap.write('.', { + includeContent: false, + sourceRoot: 'source' +})) +.pipe(gulp.dest(oldbuild.styles)) +.pipe(browsersync.stream({match: '**/*.css'})) +// .pipe(notify({message: 'Style task complete'})) +); + +// Task - Scripts +gulp.task('scripts', function(cb) { + pump([ + gulp.src(oldsource.scripts), + cache('scripts'), + jshint('.jshintrc'), + jshint.reporter('default'), + sourcemap.init(), + minify(), + remember('scripts'), + concat('all.min.js'), + sourcemap.write(), + gulp.dest(oldbuild.scripts), + browsersync.stream() + ], cb); +}); + +// Task - Images +gulp.task('images', function() { + return gulp.src(oldsource.images) + .pipe(changed(oldbuild.images)) + // .pipe(cache(imagemin({ + // optimizationLevel: 3, + // progressive: true, + // interlaced: true }))) + // ) + .pipe(gulp.dest(oldbuild.images)) + // .pipe(notify({ message: 'Images task complete' })) + ; + }); + + // Task - Vendor + gulp.task('oldvendor', function() { + return gulp.src(oldsource.vendor) + .pipe(plumbError()) + .pipe(gulp.dest(oldbuild.vendor)) + ; + }); + + //Task - Nunjucks + gulp.task('oldnunjucks', function() { + return gulp.src(oldsource.pages) + // .pipe(changed(oldbuild.root)) + .pipe(nunjucks({ + path: ['source/templates'], + envOptions: { + trimBlocks: true + } + })) + .pipe(gulp.dest(oldbuild.root)) + }); + + // a task that ensures the other task is complete before reloading browsers + gulp.task('prewatch', ['oldnunjucks', 'styles'], function(done) { + browsersync.reload(); + done(); + }); + + // Old watch for file changes + gulp.task('oldwatch', ['styles', 'scripts', 'oldnunjucks'], function() { + browsersync.init({ + open: false, + server: oldbuild.root, + // proxy: "http://verser.vrt/virtual/" + }); + + gulp.watch(oldsource.scripts, ['scripts']).on('change', function(event) { + if (event.type === 'deleted') { + delete cache.caches['scripts'][event.path]; + remember.forget('scripts', event.path); + } + }); + // gulp.watch(oldsource.watch, ['prewatch']); + gulp.watch(oldsource.watch, ['styles', 'oldnunjucks']).on('change', browsersync.reload); + // gulp.watch(oldsource.images, ['images']); + }); + + gulp.task('olddefault', ['clean', 'styles', 'scripts', 'images', 'nunjucks']); + + // function errorHandler(err) { + // // Logs out error in the command line + // console.log(err.toString()); + // // Ends the current pipe, so Gulp watch doesn't break + // this.emit('end'); + // } +``` + ## Style ``` diff --git a/gulpfile.js b/gulpfile.js index cea3fb6..54ce553 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -3,7 +3,7 @@ var source_folder = { watch: ['source/style/hippie/**/*.scss', 'source/style/**/*.scss', 'source/templates/**/*.+(html|njk)', 'source/pages/**/*.+(html|njk)'], styles: ['source/style/hippie/*.+(scss|sass)', 'source/style/**/*.+(scss|sass)'], scripts: ['source/code/hippie/variables.js', 'source/code/hippie/functions.js', 'source/code/hippie/global.js', 'source/code/**/*.coffee', '!source/vendor/**/*', ], - images: 'source/art/**/*', + images: 'source/art/images/**/*', pages: 'source/pages/**/*.+(html|njk)', vendor: 'vendor/**/*', root: 'source' @@ -11,7 +11,7 @@ var source_folder = { var build_folder = { styles: 'build/css', scripts: 'build/js', - images: 'build/art', + art: 'build/art', vendor: 'build/vendor', pages: 'build/**/*.html', root: 'build' @@ -135,10 +135,18 @@ gulp.task('sprites', function() { cssName: '_sprites.scss', imgName: 'sprites.png' })) - .pipe(gulpif('*.png', gulp.dest(build_folder.images))) + .pipe(gulpif('*.png', gulp.dest(build_folder.art))) .pipe(gulpif('*.scss', gulp.dest('source/style/hippie/modules/media'))); }); +// copy art files +gulp.task('art', function() { + return gulp.src(source_folder.images) + .pipe(plumbError()) + .pipe(gulp.dest(build_folder.art)) + ; +}); + // copy vendor files gulp.task('vendor', function() { return gulp.src(source_folder.vendor) @@ -194,6 +202,7 @@ gulp.task('overwatch', function() { gulp.watch([ 'source/templates/**/*', 'source/pages/**/*.+(html|njk)', + 'source/art/**/*', 'source/demo_data.json' ], ['nunjucks']); }); @@ -203,7 +212,7 @@ gulp.task('overwatch', function() { gulp.task('default', function(callback) { sequencer( 'clean:dev', - ['sprites', 'vendor', 'lint:js', 'lint:scss'], + ['sprites', 'art', 'vendor', 'lint:js', 'lint:scss'], ['sass', 'js', 'nunjucks'], ['syncreload', 'overwatch'], callback @@ -216,141 +225,7 @@ function plumbError(errTitle) { errorHandler: notify.onError({ // Customizing error title title: errTitle || "Error running Gulp", - message: "Error: <%= error.message %>", - sound: true + message: "<%= error.message %>" }) }); } - - - - - - - - -// NOTE // to be deleted - -var oldsource = { - watch: ['source/style/hippie/**/*.scss', 'source/style/**/*.scss', 'source/templates/**/*.+(html|njk)', 'source/pages/**/*.+(html|njk)'], - styles: ['source/style/demo.scss', 'source/style/maintenance.scss'], - scripts: ['source/code/hippie/variables.js', 'source/code/hippie/functions.js', 'source/code/hippie/global.js', 'source/code/**/*.coffee', '!source/vendor/**/*', ], - images: 'source/art/**/*', - pages: 'source/pages/**/*.+(html|njk)', - vendor: 'vendor/**/*' -}; -var oldbuild = { - styles: 'build/css', - scripts: 'build/js', - images: 'build/art', - vendor: 'build/vendor', - root: 'build' -} - -// Task - Clean build directory -gulp.task('clean', function() { - return del([oldbuild.scripts, oldbuild.styles, oldbuild.images]); -}); - -// Task - Styles -gulp.task('styles', () => rubysass(oldsource.styles, {sourcemap: true}) -.on('error', rubysass.logError) -// .pipe(newer({dest: oldbuild.styles, ext: '.css'})) -.pipe(prefix('last 2 version')) -.pipe(gulp.dest(oldbuild.styles)) -.pipe(rename({suffix: '.min'})) -.pipe(cssnano()) -.pipe(sourcemap.write('.', { - includeContent: false, - sourceRoot: 'source' -})) -.pipe(gulp.dest(oldbuild.styles)) -.pipe(browsersync.stream({match: '**/*.css'})) -// .pipe(notify({message: 'Style task complete'})) -); - -// Task - Scripts -gulp.task('scripts', function(cb) { - pump([ - gulp.src(oldsource.scripts), - cache('scripts'), - jshint('.jshintrc'), - jshint.reporter('default'), - sourcemap.init(), - minify(), - remember('scripts'), - concat('all.min.js'), - sourcemap.write(), - gulp.dest(oldbuild.scripts), - browsersync.stream() - ], cb); -}); - -// Task - Images -gulp.task('images', function() { - return gulp.src(oldsource.images) - .pipe(changed(oldbuild.images)) - // .pipe(cache(imagemin({ - // optimizationLevel: 3, - // progressive: true, - // interlaced: true }))) - // ) - .pipe(gulp.dest(oldbuild.images)) - // .pipe(notify({ message: 'Images task complete' })) - ; - }); - - // Task - Vendor - gulp.task('oldvendor', function() { - return gulp.src(oldsource.vendor) - .pipe(plumbError()) - .pipe(gulp.dest(oldbuild.vendor)) - ; - }); - - //Task - Nunjucks - gulp.task('oldnunjucks', function() { - return gulp.src(oldsource.pages) - // .pipe(changed(oldbuild.root)) - .pipe(nunjucks({ - path: ['source/templates'], - envOptions: { - trimBlocks: true - } - })) - .pipe(gulp.dest(oldbuild.root)) - }); - - // a task that ensures the other task is complete before reloading browsers - gulp.task('prewatch', ['oldnunjucks', 'styles'], function(done) { - browsersync.reload(); - done(); - }); - - // Old watch for file changes - gulp.task('oldwatch', ['styles', 'scripts', 'oldnunjucks'], function() { - browsersync.init({ - open: false, - server: oldbuild.root, - // proxy: "http://verser.vrt/virtual/" - }); - - gulp.watch(oldsource.scripts, ['scripts']).on('change', function(event) { - if (event.type === 'deleted') { - delete cache.caches['scripts'][event.path]; - remember.forget('scripts', event.path); - } - }); - // gulp.watch(oldsource.watch, ['prewatch']); - gulp.watch(oldsource.watch, ['styles', 'oldnunjucks']).on('change', browsersync.reload); - // gulp.watch(oldsource.images, ['images']); - }); - - gulp.task('olddefault', ['clean', 'styles', 'scripts', 'images', 'nunjucks']); - - // function errorHandler(err) { - // // Logs out error in the command line - // console.log(err.toString()); - // // Ends the current pipe, so Gulp watch doesn't break - // this.emit('end'); - // } diff --git a/source/pages/demo.njk b/source/pages/demo.njk index 90dfcdc..0dd36ca 100644 --- a/source/pages/demo.njk +++ b/source/pages/demo.njk @@ -2,9 +2,9 @@ {% set pageId = "index" %} {% set pageClass = "height_full" %} -{% extends "hippie/demo-default.njk" %} +{% extends "demo/default.njk" %} -{% block title %}index{% endblock %} +{% block title %}index - HIPPIE{% endblock %} {% block head %} {{ super() }} diff --git a/source/pages/demo/blank.njk b/source/pages/demo/blank.njk index 13070e9..a653c60 100644 --- a/source/pages/demo/blank.njk +++ b/source/pages/demo/blank.njk @@ -2,9 +2,9 @@ {% set pageId = "blank" %} {% set pageClass = "height_full" %} -{% extends "hippie/demo-default.njk" %} +{% extends "demo/default.njk" %} -{% block title %}blank{% endblock %} +{% block title %}blank - HIPPIE{% endblock %} {% block head %} {{ super() }} diff --git a/source/pages/demo/elements.njk b/source/pages/demo/elements.njk index 1da2ffd..c53df80 100644 --- a/source/pages/demo/elements.njk +++ b/source/pages/demo/elements.njk @@ -2,7 +2,7 @@ {% set pageId = "elements" %} {% set pageClass = "" %} -{% extends "hippie/demo-extended.njk" %} +{% extends "demo/extended.njk" %} {% block title %}Elements{% endblock %} {% block head %} diff --git a/source/pages/demo/error/404.njk b/source/pages/demo/error/404.njk index 5ed2efe..33c26d0 100644 --- a/source/pages/demo/error/404.njk +++ b/source/pages/demo/error/404.njk @@ -2,7 +2,7 @@ {% set pageId = "404" %} {% set pageClass = "body_status" %} -{% extends "hippie/demo-maintenance.njk" %} +{% extends "demo/maintenance.njk" %} {% block title %}404{% endblock %} {% block head %} @@ -21,5 +21,5 @@

      Wikipedia

      -{% include "hippie/partials/footer-status.njk" %} +{% include "demo/partials/footer-status.njk" %} {% endblock %} diff --git a/source/pages/demo/error/500.njk b/source/pages/demo/error/500.njk index dec9770..e74624a 100644 --- a/source/pages/demo/error/500.njk +++ b/source/pages/demo/error/500.njk @@ -2,7 +2,7 @@ {% set pageId = "500" %} {% set pageClass = "body_status" %} -{% extends "hippie/demo-maintenance.njk" %} +{% extends "demo/maintenance.njk" %} {% block title %}500{% endblock %} {% block head %} @@ -21,5 +21,5 @@

      Wikipedia

      -{% include "hippie/partials/footer-status.njk" %} +{% include "demo/partials/footer-status.njk" %} {% endblock %} diff --git a/source/pages/demo/examples.njk b/source/pages/demo/examples.njk index 5c6131b..fea23ee 100644 --- a/source/pages/demo/examples.njk +++ b/source/pages/demo/examples.njk @@ -2,7 +2,7 @@ {% set pageId = "examples" %} {% set pageClass = "" %} -{% extends "hippie/demo-extended.njk" %} +{% extends "demo/extended.njk" %} {% block title %}Examples{% endblock %} {% block head %} diff --git a/source/pages/demo/intro.njk b/source/pages/demo/intro.njk index 2724106..17eb303 100644 --- a/source/pages/demo/intro.njk +++ b/source/pages/demo/intro.njk @@ -2,7 +2,7 @@ {% set pageId = "intro" %} {% set pageClass = "" %} -{% extends "hippie/demo-extended.njk" %} +{% extends "demo/extended.njk" %} {% block title %}Intro{% endblock %} {% block head %} @@ -19,10 +19,10 @@
      Dies ist einfach nur Text.
      Weniger wäre Nichts, denn dieser Text ist nicht durch ein spezifisches Element umschlossen.
      Dies ist normalerweise nicht vorgesehen und wird hier nur zur Einführung und Anschauung verwendet.

      -

      Es wirken nur die Eigenschaften des <body> Elements. Dieses Element umschließt den gesamten Inhalt des Dokumentes und kommt daher nur einmal vor. Inhalte sind normalerweise durch Elemente definiert. Grundlegende Elemente teilen das Dokument zunächst in Abschnitte.

      -

      Bereiche

      - {# // body // article // section // nav // aside // h1-h6 // header // footer #}
      +

      Es wirken nur die Eigenschaften des <body> Elements. Dieses Element umschließt den gesamten Inhalt des Dokumentes und kommt daher nur einmal vor. Inhalte sind normalerweise durch Elemente definiert. Grundlegende Elemente teilen das Dokument zunächst in Abschnitte.

      +

      Bereiche

      + {# // body // article // section // nav // aside // h1-h6 // header // footer #}

      Einen Abschnitt, welcher für sich alleine stehen kann, definiert sich durch <article>. Solch ein Element wird oft detailliert gestaltet, kommt aber auch ohne jegliche Gestaltung aus.

      Noch allgemeiner ist das <section> Element. Es schafft Bereiche um Inhalte zu strukturieren.

      @@ -59,7 +59,7 @@

      Gruppierung

      {# // p // address // hr // pre // blockquote // ol // ul // li // dl // dt // dd // figure // figcaption // main // div #}

      Ein Absatz <p>. Zugegeben ein kurzer.

      -

      Aus mehreren Absätzen wird ein ganzer Text. Solche Texte haben gelegentlich großen informativen oder unterhaltsamen Charakter.
      Einfache Zeilenumbrüche werden darin mit <br> erreicht.

      +

      Aus mehreren Absätzen wird ein ganzer Text. Solche Texte haben gelegentlich großen informativen oder unterhaltsamen Charakter.
      Einfache Zeilenumbrüche werden darin mit <br> erreicht. Dies ist allerdings ein Element der Textebene und keine Gruppierung.

      Die Unterteilung in Absätze ist eine von vielen Möglichkeiten Texte zu gruppieren und ihnen Struktur zu verleihen. In diesem Dokument flattert Text normalerweise von Links daher. Er ist schwarz und in einer serifenlosen Schrift gesetzt. Zu weiteren Formatierungen, die eher auf einer Ebene der Zeichen einzuordnen ist, wird im Verlauf näher eingegangen. Zunächst die Struktur:

      Text sitzt gerne auch mal zentriert.

      p.txt_center

      Rechtsbündig ist schon eher eine Ausnahme bzw. Besonderheit.

      p.txt_right
      @@ -83,6 +83,13 @@

      Wikipedia

      blockquote>p+p.quote_source
      +

      Gerade bei wörtlichen Zitierungen kommt häufig das Anführungszeichen zum Einsatz. Es kann durch die Formatierung automatisch ergänzt werden.

      +
      +

      Das kannst du schon so machen aber dann isses halt Kacke.

      +

      o. V.

      +
      +
      blockquote.quote_mark>p+p.quote_source
      +

      Listen

      Text bekommt durch Listen besondere optische wie auch inhaltliche Struktur. Es gibt ungeordnete <ul> und geordnete Listen <ol> sowie Beschreibungslisten <dl>. Die beiden ersten Varianten beinhalten das Listenelement <li>. Beschreibungslisten beinhalten jeweils das Paar von Ausdruck <dt> und Beschreibung <dd>. Im Folgenden eine Liste der Listen in ihrer Ausgangskonfiguration:

      • Ungeordnete
        • @@ -102,7 +109,7 @@
        Ausdruck
        Beschreibung
        -

        Auch Inhalte, die nicht in Textform sind, können durch einen Bezug integriert werden. Wie diese Fahne werden sie mit <figure> umschlossen und tragen eine Bezeichnung.

        +

        Auch Inhalte, die nicht in Textform sind, können durch einen Bezug integriert werden. Wie diese Fahne werden sie mit <figure> umschlossen und tragen eine Bezeichnung, welche mit <figcaption> ausgezeichnet wird.

        Fahne
        @@ -127,47 +134,112 @@ {# // a // em // strong // small // s // cite // q // dfn // abbr // ruby // rb // rt // rtc // rp // data // time // code // var // samp // kbd // sub // sup // i // b // u // mark // bdi // bdo // span // br // wbr // -- Edits -- // ins // del #}

        Verweise

        Ein wesentlicher Bestandteil von Hypertext sind Verweise <a>. Sie dienen als Sprungmarken innerhalb des Netzwerks. Es kann grob zwischen internen und externen Verweisen unterschieden werden. Interne Verweisea.a_line können Verknüpfungen innerhalb des aktuellen Dokumentes sein oder auch Funktionen aktivieren. Externe Verweise verknüpfen Inhalte über das gesamte Netzwerk hinweg. Sie können zum Beispiel auch auf E-Mail Adressen oder Dateien zeigen. Theoretisch kann solch ein Verweis Alles auslösen. Anweisungen werden im URL Standard übergeben.

        -

        Nicht nur Text kann als Verweis verwendet werden. Auch andere Elemente wie Bilder können verknüpft werden. Abhängig von ihrer Funktion und ihrem Zweck, werden Verweise unterschiedlich formatiert. Farbige oder unterstrichene Varianten sind möglich.

        +

        Nicht nur Text kann als Verweis verwendet werden. Auch andere Elemente wie Bilder können verknüpft werden. Abhängig von ihrer Funktion und ihrem Zweck, werden Verweise unterschiedlich formatiert. Farbige oder unterstrichene Varianten sind einfache Beispiele.

        Wird der Verweis innerhalb eines <nav> Elementes notiert, bekommt er die spezielle Bedeutung eines Navigationsverweises innerhalb des Dokumentes oder der Anwendung. Verweise werden dann durchaus auch wie Schaltflächen dargestellt.

        +

        Formatierungen

        Texte, Wörter oder Zeichen können vielfältig formatiert werden.

        Sie können fett <b> oder kursiv <i> geschrieben sein. Auch beides ist möglich!?! Sollen sie nicht nur anders aussehen, sondern auch eine besondere inhaltliche Bedeutung bekommen, werden sie mit <strong> und <em> ausgezeichnet.

        Das <u> Element stellt eine Spanne von Text mit einer unartikulierten, wenn auch explizit dargestellten, nicht-textuellen Anmerkung dar, wie z.B. die Beschriftung des Textes als Eigenname wie Interaktionsweise, oder die Beschriftung des Textes als falsch geschrieben.

        Ähnlich ist es mit dem Element <small>. Es steht für Randnotizen wird aber häufig auch kleiner dargestellt.

        -

        Gerade bei wörtlichen Zitierungen kommt häufig das Anführungszeichen zum Einsatz. Es kann durch die Formatierung automatisch ergänzt werden.

        -
        -

        Das kannst du schon so machen aber dann isses halt Kacke.

        -

        o. V.

        -
        -
        blockquote.quote_mark>p+p.quote_source
        -

        Ein besonderer inhaltlicher Bezug ist der Titel eines Werkes. Sowas kann mit <cite> ausgezeichnet werden. Pulp Fiction, super Film - zum Beispiel.

        -

        Auch die Auszeichnung <code> wurde bis hier hin schon verwendet. Sie markiert Maschinensprache.var code = "Das ist code";

        -

        In diesem Beispiel wird die Variable code definiert. Solch ein spezieller Text kann mit dem dafür vorgesehenen Element <var> ausgezeichnet werden.

        +

        Ist ein Text nicht mehr korrekt oder relevant kann er mit <s> markiert werden:
        Die Erde ist eine Scheibe.

        +

        Ein besonderer inhaltlicher Bezug ist der Titel eines Werkes. Sowas kann mit <cite> ausgezeichnet werden. Pulp Fiction, ist ein super Film - zum Beispiel.

        +

        Um ein Zitat direkt im Text zu verwenden benutzt man das <q> Element. Es platziert Anführungszeichen um die Aussage:

        +

        Sie sagte: Du wolltest staubsaugen!
        Er sagte: Mach' ich morgen.

        +

        Mit dem <dfn> Element werden Begriffe definiert. Es wird häufig mit dem Element für Abkürzungen <abbr> gemeinsam verwendet. Die eigentliche Definition kann dabei auch im Attribut title stehen.

        +

        Hippie is an recursive acronym for Hippie interweaves preeminent personal interface elements.

        +

        Die besondere Auszeichnungen <ruby> bezeichnet ein Anmerkungssystem, bei dem der Text zusammen mit seiner Anmerkung in einer Zeile erscheint. Das System verwendet die folgenden weiteren Elemente mit spezifischer Bedeutung:

        +
        + <rb> +
        Basis Textkomponente
        + <rt> +
        Annotation
        + <rtc> +
        Einzelne Komponente einer Annotation
        + <rp> +
        Alternative bei fehlender Unterstützung
        +
        +
        +
        + BasisAuszeichnung + 今日きょう + + ♥: Herz, Cœur. + ☘: Kleeblatt, Trèfle. + ✶: Stern, Étoile. + +
        +
        +

        Wikipedia erklärt dies ausführlicher unter Ruby Annotation.

        +

        Es gibt auch mehrere besondere Elemente um Maschinensprache oder Programmkode zu bezeichnen. Dabei wird unterschieden, ob der Inhalt nur für Menschen ausgezeichnet wird oder auch maschinen-lesbar sein soll. Die Elemente <data> und <time> enthalten eine maschinen-lesbare Repräsentation des Inhaltes:

        +
        +
        0 ≠ NULL
        +
        <data>0</data> ≠ <data>NULL</data>
        +
        Der Wert NULL mit Attribut
        +
        <data value="NULL">NULL</data>
        +
        +
        <time>2018-10-08</time>
        +
        Die Zeitangabe mit Attribut
        +
        <time datetime="2018-10-08">Gestern</time>
        +
        +

        Die Auszeichnung <code> wurde bis hier hin schon verwendet. Sie markiert ebenfalls Maschinensprache. Allerdings dient sie dazu von Menschen gelesen zu werden. In diesem Dokument werden alle Elemente, die erklärt werden wiederum mit diesem Element markiert.

        Für zusammenhängende Blöcke wird die Auszeichnung oft in Kombination mit dem Element <pre> verwendet:

        <html>
          <head>
            <title>Hyper Text Markup Language</title>
          </head>
          <body id="root">
            <!-- Content goes here -->
            <p class="example">Just like this.</p>
          </body>
        </html>

        Dabei bleiben vorhandene Textformatierungen wie Zeilenumbrüche und Einrückung erhalten.

        +

        var def = "Definition einer Variablen";

        +

        In diesem Beispiel wird die Variable def definiert. Solch ein spezieller Typ Programmkode kann mit dem dafür vorgesehenen Element <var> ausgezeichnet werden.

        Soll beispielhaft auf Ausgaben von Computern verwiesen werden, wird das <samp> Element verwendet. Der Computer hat gesagt: Ich kann das angegebene Objekt nicht finden.

        -

        Benutzereingaben haben ebenfalls ein eigenes Element <kbd>. Damit werden Eingaben durch den Nutzer, wie Drücken Sie gleichzeitig Strg und A, gekennzeichnet.

        +

        Benutzereingaben haben ebenfalls ein eigenes Element <kbd>. Damit werden Eingaben durch den Nutzer, wie zum Beispiel Drücken Sie gleichzeitig Strg und A, gekennzeichnet.

        +

        Hoch- und Tiefgestellte Zeichen werden durch die Elemente <sup> und <sub> repräsentiert. Sie dienen nicht dazu rein optische Auszeichnungen zu erreichen sondern werden für ihren jeweiligen Zweck eingesetzt. In der Mathematik oder Chemie sind sie üblich:

        +

        Beispielsweise die Formel E=mc2 oder das Element H2O

        Die Zeichen in Absätzen bis hin zu ganzen Texten können, mit einem geeigneten Eingabegerät, markiert werden. Dies stellt sich wie folgt dar:

        -

        Beispiel zum markieren ^^.

        +

        Beispiel zum markieren 😉.

        Eine Markierung kann, mittels <mark>, auch durch den Autor geschehen. Diese stellt sich ein wenig anders dar: Diese Worte sind markiert.

        -

        Um Text, dessen schreibweise nicht vorhersehbar ist, zu markieren wie z.B. Benutzernamen كائن بشري, die auch rechtsbündig geschrieben sein können, wird das <bdi> Element eingesetzt.
        Die Schreibweise kann auch auch vom Author vorgegeben und expliziert geändert werden. Dies wird dem <bdo> Element umgesetzt.

        +

        Um Text, dessen schreibweise nicht vorhersehbar ist, zu markieren wie z.B. Benutzernamen كائن بشري, die auch rechtsbündig geschrieben sein können, wird das <bdi> Element eingesetzt.
        Die Schreibweise kann auch auch vom Author vorgegeben und expliziert geändert werden. Dies wird dem <bdo> Element umgesetzt. Die Richtung wird dann mit dem Attribut dir angegeben.

        • كائن بشري
        • إنسان آلي
         -

        Neben den vielen speziellen Elmenten gibt es auch ein Element, das keine vordefinierte Bedeutung hat. Es ist das <span> Element.

        -

        ...

        +

        Neben den vielen speziellen Elmenten gibt es auch ein Element, das keine vordefinierte Bedeutung hat. Es ist das <span> Element.
        Es dient dazu ganz individuelle Auszeichnungen zu ermöglichen die eher optische Auswirkungen haben und eben keine inhaltlichen. Mit den Attributen id oder class werden dazu eigene Typen des Elements definiert. Diese Möglichkeit der Definition von individuellen Elementen ist ein Grundprinzip der Auszeichnungssprache HTML.

        +

        Mit der Einführung von Absätzen wurde auch schon das <br> Element erwähnt und seitdem häufig benutzt. Es erzeugt einen Zeilenumbruch. Es wird dadurch kein neuer Absatz erstellt. Es dient auch nicht dazu optischen Abstand zu erzeugen, sondern innerhalb eines Absatzes den Text umzubrechen.

        +

        Eine besondere Form des Zeilenumbruchs kann mit <wbr> eingesetzt werden. Es stellt die Möglichkeit für einen Zeilenumbruch dar. Da das Format eines HTML-Dokumentes häufig nicht vorhersehbar ist, kann solch ein Element einen Umbruch erzeugen falls ein Wort zu lang für eine Textzeile sein sollte.

        +

        Und der Löwe brüllte "RRRRrrrrooooooooaaaaAAAAAAAAHHHHhhhhrrrrrrrrr"!

        +

        Es kann auch innerhalb von vorformatierten Texten Zeilenumbrüche ermöglichen

        Änderungen

        +

        Werden Texte geändert, können solche Änderungen sichtbar gemacht werden. Somit können sie besser nachvollzogen werden.
        Zum Beispiel eine Ergänzung von Inhalt.

        + +

        Der Inhalt wird dann mit <ins> ausgezeichnet. Wird Text entfernt, kommt das <del> zum Einsatz.

        +
        Zu Tun
        +
          +
        • Fahrrad reparieren
          • +
        • Staubsaugen
          • +
        • Tisch bauen
          • +
      -

      Eingebundene Inhalte

      - +

      Eingebundene Inhalte

      + {# // picture // source // img // iframe // embed // object // param // video // audio // track // map // area #} + Fahne von Interaktionsweise +

      Die ist ein Bild. Es wird mit dem Element <img> eingebunden. Solch ein Bild hat üblicherweise die Attribute width und height. Mit ihnen werden die Abmessungen (Breite und Höhe) festgelegt. Außerdem sollte immer das Attribut alt für eine alternative Beschreibung in Textform verwendet werden.

      +

      Das Bild selbst liegt normalerweise als Datei vor. Die Quelle wird mit dem Attribut src angegeben. Es können einige Alternativen zur Angabe einer konkreten Datei eingesetzt werden. Zum Beispiel können mehrere Dateien in Abhängigkeit zur Darstellung oder dem unterstützen Format angegeben werden. Dafür können dann die Elemente <source> und <picture> in Kombination verwendet werden.

      + + + +

      Tabellen

      @@ -351,7 +423,7 @@

      Ein spezieller Typ des Eingabefeldes hat die Funktion einer Schaltfläche <input[type="button"]>. Es gibt allerdings auch ein eigenes Element <button> dafür.

      -

      Interaktive Elemente können durch das Attribut <readonly> nur lesbar gemacht werden oder mittels <disabled> gänzlich deaktiviert werden.

      +

      Interaktive Elemente können durch das Attribut readonly nur lesbar gemacht werden oder mittels disabled gänzlich deaktiviert werden.

      Das Element <label> ergänzt interaktive Elemente um eine Beschriftung. Wichtig ist hier, dass die Beziehung beider Elemente zu einander deutlich ist.

      diff --git a/source/pages/demo/maintenance.njk b/source/pages/demo/maintenance.njk index 0b3eaf6..fee0a93 100644 --- a/source/pages/demo/maintenance.njk +++ b/source/pages/demo/maintenance.njk @@ -2,7 +2,7 @@ {% set pageId = "blank" %} {% set pageClass = "height_full" %} -{% extends "hippie/demo-maintenance.njk" %} +{% extends "demo/maintenance.njk" %} {% block title %}Wartung{% endblock %} diff --git a/source/pages/demo/os.njk b/source/pages/demo/os.njk index 9df5bc6..c177b8d 100644 --- a/source/pages/demo/os.njk +++ b/source/pages/demo/os.njk @@ -2,7 +2,7 @@ {% set pageId = "os" %} {% set pageClass = "" %} -{% extends "hippie/demo-extended.njk" %} +{% extends "demo/extended.njk" %} {% block title %}demo{% endblock %} {% block head %} diff --git a/source/pages/demo/tests.njk b/source/pages/demo/tests.njk index 17debd1..202bd43 100644 --- a/source/pages/demo/tests.njk +++ b/source/pages/demo/tests.njk @@ -2,9 +2,9 @@ {% set pageId = "blank" %} {% set pageClass = "height_full" %} -{% extends "hippie/demo-default.njk" %} +{% extends "demo/default.njk" %} -{% block title %}blank{% endblock %} +{% block title %}tests - HIPPIE{% endblock %} {% block head %} {{ super() }} @@ -29,7 +29,7 @@ Caps Lock is ON. -{% import "hippie/macros/nav-macro.njk" as forms %} +{% import "demo/macros/nav-macro.njk" as forms %} {{ forms.active('zubereitung') }} {% endblock %} diff --git a/source/style/_demo_config.scss b/source/style/_demo_config.scss index 24e90b0..82d2f3c 100644 --- a/source/style/_demo_config.scss +++ b/source/style/_demo_config.scss @@ -1,6 +1,6 @@ // Override for configuration file -// All variables setup with !default in gloabl/_config.scss can be used +// All variables setup with !default in global/_config.scss can be used // ------------------------------------------------------------------------------ -// $color_back_basic: yellow; -// $basic_link_color: magenta; +// $color_back_basic: beige; +// $color_link_basic: crimson; diff --git a/source/style/_demo_new.scss b/source/style/_demo_new.scss deleted file mode 100644 index 3a6c03d..0000000 --- a/source/style/_demo_new.scss +++ /dev/null @@ -1,38 +0,0 @@ -.test { - li::after { - content: ""; - display: block; - height: 16px; - } -} - -.front_color_1 { color: $alpha_color; &::after { background-color: $alpha_color; } } -.front_color_2 { color: $bravo_color; &::after { background-color: $bravo_color; } } -.front_color_3 { color: $charlie_color; &::after { background-color: $charlie_color; } } -.front_color_4 { color: $delta_color; &::after { background-color: $delta_color; } } -.front_color_5 { color: $echo_color; &::after { background-color: $echo_color; } } - -.back_color_1 { background-color: $alpha_color;} -.back_color_2 { background-color: $bravo_color;} -.back_color_3 { background-color: $charlie_color;} -.back_color_4 { background-color: $delta_color;} -.back_color_5 { background-color: $echo_color;} - -%label { - padding: 0 $half_space; -} - -.label_1 { - @extend %label; - @extend .back_color_1; -} - -.label_2 { - @extend %label; - @extend .back_color_2; -} - -.label_3 { - @extend %label; - @extend .back_color_3; -} diff --git a/source/style/demo.scss b/source/style/demo.scss index fa1ab3c..b66461e 100644 --- a/source/style/demo.scss +++ b/source/style/demo.scss @@ -12,5 +12,3 @@ // ----------------------------------------------------------------------------- @import "modules/demo/demo_module"; // @import "modules/YOUR-MODULE/YOUR-FILES"; -// New -@import "demo_new"; diff --git a/source/style/demo_basic.scss b/source/style/demo_basic.scss index bc2e4b6..dfeec2e 100644 --- a/source/style/demo_basic.scss +++ b/source/style/demo_basic.scss @@ -12,5 +12,3 @@ // ----------------------------------------------------------------------------- @import "modules/demo/demo_module"; // @import "modules/YOUR-MODULE/YOUR-FILES"; -// New -@import "demo_new"; diff --git a/source/style/hippie/elements/_grouping.scss b/source/style/hippie/elements/_grouping.scss index b6dde56..a9a6850 100644 --- a/source/style/hippie/elements/_grouping.scss +++ b/source/style/hippie/elements/_grouping.scss @@ -22,17 +22,17 @@ // ----------------------------------------------------------------------------- p { @extend %basic; - margin-top: $basic_space; - margin-bottom: $basic_space; + margin-top: $space_basic; + margin-bottom: $space_basic; code { - padding: $tiny_space $half_space; + padding: $space_tiny $space_half; font-size: 1em; line-height: 1; } } .column_line { - column-rule: $basic_border; + column-rule: $border_basic; } .column_2, .column_3 { @extend p; @@ -50,17 +50,18 @@ p { // ----------------------------------------------------------------------------- address { // @extend %basic; - margin-top: $double_space; - margin-bottom: $double_space; + margin-top: $space_double; + margin-bottom: $space_double; } // Line // ----------------------------------------------------------------------------- hr { - margin: $space_small auto; - border-width: $basic_border_width 0 0; + margin-top: $space_small; + margin-bottom: $space_small; + border-width: $width_border_basic 0 0; border-style: solid; - border-color: $basic_border_color; + border-color: $color_border_basic; } .hr_hidden { @@ -81,12 +82,12 @@ pre { .pre_code { overflow-x: auto; - border-color: darken($color_back_basic, $tiny_color_diff); + border-color: darken($color_back_basic, $color_diff_tiny); border-style: dotted; - border-width: 0 0 0 $border_width_4; - border-radius: $basic_corner; - padding: $basic_space; - background-color: lighten($color_back_basic, $tiny_color_diff); + border-width: 0 0 0 $width_border_4; + border-radius: $radius_basic; + padding: $space_basic; + background-color: lighten($color_back_basic, $color_diff_tiny); code { background-color: transparent; } @@ -95,9 +96,9 @@ pre { // Quote // ----------------------------------------------------------------------------- blockquote { - margin: $basic_space 0; - padding-right: $basic_indent; - padding-left: $basic_indent; + margin: $space_basic 0; + padding-right: $indent_basic; + padding-left: $indent_basic; } .quote_mark { @@ -105,7 +106,7 @@ blockquote { content: "\201E \0020"; } p::after { - content: "\201C \0020"; + content: "\0020 \201C"; } .quote_source { &::before, &::after { @@ -117,11 +118,15 @@ blockquote { // List // ----------------------------------------------------------------------------- dl, ul, ol { - margin: $double_space 0 $basic_space; + margin: $space_double 0; } ul, ol { - padding-left: $basic_indent; + padding-left: $indent_basic; +} + +dl { + margin-left: $indent_basic; } li, dt, dd { @@ -129,11 +134,11 @@ li, dt, dd { } dd, .list_basic li { - margin-bottom: $basic_space; + margin-bottom: $space_basic; } dd { - margin-left: $basic_indent; + margin-left: $indent_basic; } ul { @@ -157,22 +162,22 @@ ul { .list_link { li { - margin-bottom: $tiny_space * 2; + margin-bottom: $space_tiny * 2; text-transform: uppercase; a { display: block; - padding: $basic_padding; - color: $basic_font_color; + padding: $padding_basic; + color: $color_text_basic; img { - margin-right: $basic_space; + margin-right: $space_basic; padding-bottom: 0.2em; vertical-align: text-bottom; } &:active, &:focus, &:hover { - background-color: $basic_action_color; - color: $basic_highlight_color; + background-color: $color_action_basic; + color: $color_highlight_basic; } } } @@ -188,11 +193,12 @@ ul { // Embedded // ----------------------------------------------------------------------------- figure { - margin: $double_space $basic_indent; + margin: $space_double $indent_basic; } figcaption { @extend %basic; + color: $color_darker; } // Main content @@ -208,8 +214,8 @@ div { } .div_info { - padding: $double_space $basic_indent; - border-right: $basic_space solid rgba($echo_color, 0.6); + padding: $space_double $indent_basic; + border-right: $space_basic solid rgba($echo_color, 0.6); background-color: rgba($echo_color, 0.1) !important; } @@ -233,20 +239,20 @@ div { .box_placeholder { width: 100%; height: $space_medium; - border: $border_width_4 solid transparentize($alpha_color, 0.1); - border-radius: $basic_corner; + border: $width_border_4 solid transparentize($alpha_color, 0.1); + border-radius: $radius_basic; background-color: transparentize($alpha_color, 0.2); } .box_placeholder_bkg { width: 100%; height: $space_medium * 2; - border: $border_width_4 solid transparentize($basic_front_color, 0.1); - border-radius: $basic_corner; - padding: $basic_space; + border: $width_border_4 solid transparentize($color_front_basic, 0.1); + border-radius: $radius_basic; + padding: $space_basic; /*data:[][;charset=][;base64],*/ background: url("data:image/svg+xml;utf8,") no-repeat; - background-color: transparentize($basic_front_color, 0.1); + background-color: transparentize($color_front_basic, 0.1); } .box_file_tile { @@ -294,7 +300,7 @@ div { // Grid .grid { display: grid; - grid-gap: $basic_space; + grid-gap: $space_basic; & > input, & > select, @@ -303,8 +309,8 @@ div { } & > label { - margin: $basic_io_border_width; - padding: $half_space; + margin: $width_border_io; + padding: $space_half; } } diff --git a/source/style/hippie/elements/_interactive.scss b/source/style/hippie/elements/_interactive.scss index 89c05c0..2739650 100644 --- a/source/style/hippie/elements/_interactive.scss +++ b/source/style/hippie/elements/_interactive.scss @@ -29,12 +29,12 @@ label { @extend %basic; input, button, textarea, select { - margin-left: $basic_space; + margin-left: $space_basic; } } input + label { - margin-left: $basic_space; + margin-left: $space_basic; } .label { @@ -44,21 +44,20 @@ input + label { .label > input, .label > textarea, .label > select { - margin: 0 $basic_space; + margin: 0 $space_basic; } // Input // ----------------------------------------------------------------------------- input { - color: $basic_io_font_color; } label + input { - margin-left: $basic_space; + margin-left: $space_basic; } input, button, textarea, select { - margin: $io_margin; + margin: $margin_io; &[disabled="disabled"], &[disabled] { @@ -81,22 +80,23 @@ td > textarea { } .io_input, .io_textarea, .io_select { - padding: $half_space; - background-color: $basic_io_back_color; + padding: $space_half; + color: $color_text_io; + background-color: $color_back_io; &:hover { - background-color: $basic_highlight_color; + background-color: $color_highlight_basic; } &[readonly="readonly"], &[readonly] { - background-color: darken($basic_io_back_color, 30%); + background-color: darken($color_back_io, $color_diff_double); } &[disabled="disabled"], &[disabled] { &:hover { - background-color: $basic_io_back_color; + background-color: $color_back_io; } } } @@ -110,16 +110,16 @@ td > textarea { @each $input in $io_input_list, textarea { #{$input} { - // border: $basic_io_border; + // border: $border_io; } } .io_input, .io_textarea { - border: $basic_io_border; + border: $border_io; &[readonly="readonly"], &[readonly] { - border-color: darken($basic_io_border_color, 30%); + border-color: darken($color_border_io, $color_diff_double); } &[disabled="disabled"], @@ -131,16 +131,16 @@ td > textarea { // Fieldset // ----------------------------------------------------------------------------- fieldset { - margin: $high_margin; - padding: $basic_space; - border: $basic_border; + margin: $margin_double; + padding: $space_basic; + border: $border_basic; } // Legend // ----------------------------------------------------------------------------- legend { @extend %basic; - padding: 0 $half_space; + padding: 0 $space_half; } // Button @@ -151,10 +151,10 @@ button { .io_button { @extend %basic_button; - border: $basic_io_border_width solid $oi_border_color; - padding: $basic_padding; - color: $oi_font_color; - background-color: $oi_back_color; + border: $width_border_io solid $color_border_button; + padding: $padding_basic; + color: $color_text_button; + background-color: $color_back_button; &:hover { // border-color: #0059F6; @@ -166,10 +166,10 @@ button { &[disabled="disabled"], &[disabled] { border-color: transparent; - color: $oi_border_color; + color: lighten($color_text_button, $color_diff_double); &:hover { - background-color: $oi_back_color; + background-color: $color_back_button; } } } diff --git a/source/style/hippie/elements/_sections.scss b/source/style/hippie/elements/_sections.scss index abc8859..6a4f709 100644 --- a/source/style/hippie/elements/_sections.scss +++ b/source/style/hippie/elements/_sections.scss @@ -25,11 +25,11 @@ body { position: relative; box-sizing: $box_sizing; margin: 0; - font-family: $primary_font_family; - font-size: $basic_size; - line-height: $basic_line; - line-height: $text_line_basic; - color: $basic_font_color; + font-family: $family_text_basic; + font-size: $size_text_basic; + line-height: $line_basic; + line-height: $line_text_basic; + color: $color_text_basic; background-color: $color_back_basic; *, @@ -42,7 +42,7 @@ body { .layer_hover { background-color: transparent !important; - transition: background-color $double_duration $basic_timing 0s !important; + transition: background-color $duration_double $timing_basic 0s !important; } } } @@ -60,7 +60,7 @@ section { } .sec_main_center { - width: $basic_width; + width: $width_basic; margin: 0 auto; padding-top: $space_small; @@ -76,9 +76,9 @@ section { } .sec_main_status { - border-top-width: $border_width_8; + border-top-width: $width_border_8; border-top-style: solid; - border-color: $basic_border_color; + border-color: $color_border_basic; padding-top: $space_small; } @@ -91,14 +91,14 @@ nav { // Aside element // ----------------------------------------------------------------------------- aside { - width: $basic_aside_width; + width: $width_aside_basic; &.right + .bside { - margin-right: calc(#{$basic_aside_width} + #{$basic_space}); + margin-right: calc(#{$width_aside_basic} + #{$space_basic}); } &.left + .bside { - margin-left: calc(#{$basic_aside_width} + #{$basic_space}); + margin-left: calc(#{$width_aside_basic} + #{$space_basic}); } &.right { @@ -140,25 +140,25 @@ h2 + h2 { h3 { @extend %head_3; - margin: $double_space 0; + margin: $space_double 0; text-transform: uppercase; } h4 { @extend %head_3; - margin: $double_space 0; + margin: $space_double 0; text-transform: none; } h5 { @extend %head_4; - margin: $double_space 0 $basic_space; + margin: $space_double 0 $space_basic; text-transform: none; } h6 { @extend %basic; - margin: $basic_space 0; + margin: $space_basic 0; text-transform: none; font-weight: bold; } @@ -175,10 +175,10 @@ header { .header_txt { margin-bottom: $space_small; - border-bottom: $dotted_border; + border-bottom: $border_dotted; h1 { - border-top: $basic_border; + border-top: $border_basic; } } diff --git a/source/style/hippie/elements/_tables.scss b/source/style/hippie/elements/_tables.scss index 2acc22d..da04d62 100644 --- a/source/style/hippie/elements/_tables.scss +++ b/source/style/hippie/elements/_tables.scss @@ -16,21 +16,21 @@ // Table // ----------------------------------------------------------------------------- table { - margin: $high_margin; - border: $basic_border; + margin: $margin_double; + border: $border_basic; border-collapse: collapse; } .table_blank { - border: $basic_border_width solid transparent; + border: $width_border_basic solid transparent; th, td { - border: $basic_border_width solid transparent; + border: $width_border_basic solid transparent; } } .table_free { - border: $basic_border_width solid transparent; + border: $width_border_basic solid transparent; } .table_stripe { @@ -40,7 +40,7 @@ table { } tr:nth-child(even) td { - background-color: lighten($color_back_basic, $tiny_color_diff); + background-color: lighten($color_back_basic, $color_diff_tiny); } } @@ -56,8 +56,8 @@ table { // ----------------------------------------------------------------------------- caption { @extend p; - padding: $half_space 0; - border: $dotted_border; + padding: $space_half 0; + border: $border_dotted; text-align: center; } @@ -88,7 +88,7 @@ thead { tfoot { tr:first-child td { - border-top: $basic_border; + border-top: $border_basic; } } @@ -102,17 +102,17 @@ tr { // ----------------------------------------------------------------------------- th, td { @extend %basic; - padding: $half_space; + padding: $space_half; } th { - border: $basic_border; + border: $border_basic; text-align: left; } td { - border-right: $basic_border; - border-bottom: $basic_border; + border-right: $border_basic; + border-bottom: $border_basic; } td:last-child { @@ -124,7 +124,7 @@ td:last-child { } .cell_pre { - // border-right-width: $border_width_4; + // border-right-width: $width_border_4; // border-right-color: lighten($color_back_basic, $color_diff_basic); - background-color: lighten($color_back_basic, $tiny_color_diff); + background-color: lighten($color_back_basic, $color_diff_tiny); } diff --git a/source/style/hippie/elements/_textlevel.scss b/source/style/hippie/elements/_textlevel.scss index 7ce3c00..067f284 100644 --- a/source/style/hippie/elements/_textlevel.scss +++ b/source/style/hippie/elements/_textlevel.scss @@ -37,47 +37,57 @@ // Links // ----------------------------------------------------------------------------- a { - color: $basic_link_color; - // color: lighten($basic_action_color, 20%); + color: $color_link_basic; + // color: lighten($color_action_basic, 20%); text-decoration: none; &:active, &:focus, &:hover { - color: $basic_highlight_color; + color: $color_highlight_basic; } } .a_line { - border-bottom-width: $tiny_space; + border-bottom-width: $space_tiny; border-bottom-style: dotted; - border-color: $basic_border_color; + border-color: $color_border_basic; + color: $color_text_basic; background-color: transparent; - color: $basic_font_color; - transition: color $basic_duration $basic_timing; + transition: color $duration_basic $timing_basic; &:active, &:focus, &:hover { - background-color: $basic_action_color; - color: $basic_highlight_color; + color: $color_highlight_basic; + background-color: $color_action_basic; } } .a_button { - @extend %default_button; + display: inline-block; + padding: $padding_basic; + border-radius: $radius_basic; + background-color: transparentize($color_link_basic, 0.8); + + &:active, + &:focus, + &:hover { + border-color: transparent; + background-color: transparentize($color_highlight_basic, 0.8); + } } .a_button_text { - @extend %default_button; - padding: $wide_padding; + @extend .a_button; + padding: $padding_link; + color: $color_text_basic; background-color: transparent; - color: $basic_font_color; } .a_button_border { @extend .a_button_text; - border: $basic_border; + border: $border_basic; } @@ -88,8 +98,8 @@ i, em { } .i_bright { + color: $color_highlight_basic; font-style: normal; - color: $basic_highlight_color; } // Bold, Strong @@ -172,14 +182,14 @@ time { // ----------------------------------------------------------------------------- code { @extend %basic_mono; - color: lighten($basic_font_color, $color_diff_basic); - background-color: lighten($color_back_basic, $tiny_color_diff); + color: lighten($color_text_basic, $color_diff_basic); + background-color: lighten($color_back_basic, $color_diff_tiny); } .code_solo { @extend %basic_mono; - padding: $tiny_space $half_space; - color: $basic_font_color; + padding: $space_tiny $space_half; + color: $color_text_basic; } // Variable @@ -191,7 +201,7 @@ var { // Sample // ----------------------------------------------------------------------------- samp { - + @extend %basic_mono; } // Keyboard input @@ -200,12 +210,12 @@ kbd { @extend %basic_mono; // font-size: .9em; // font-weight: bold; - padding: 0 $half_space; - border-width: $basic_border_width; + padding: 0 $space_half; + border-width: $width_border_basic; border-style: solid; - border-color: darken($color_back_basic, $color_diff_basic); - border-radius: $basic_corner; - color: lighten($basic_font_color, $color_diff_basic); + border-color: $color_darker; + border-radius: $radius_basic; + color: lighten($color_text_basic, $color_diff_basic); } // Sub- and superscript @@ -227,18 +237,18 @@ mark { } .mark_cursor { - color: invert($basic_font_color); - background-color: $basic_font_color; + color: invert($color_text_basic); + background-color: $color_text_basic; } ::-moz-selection { - color: invert($basic_font_color); - background-color: $basic_font_color; + color: invert($color_text_basic); + background-color: $color_text_basic; } ::selection { - color: invert($basic_font_color); - background-color: $basic_font_color; + color: invert($color_text_basic); + background-color: $color_text_basic; } // Text direction diff --git a/source/style/hippie/global/_common.scss b/source/style/hippie/global/_common.scss index 86fa378..d8c715d 100644 --- a/source/style/hippie/global/_common.scss +++ b/source/style/hippie/global/_common.scss @@ -40,8 +40,22 @@ margin-left: 37.5%; } -.space_right_small { - margin-right: $space_small; +@each $size, $variable in (basic, #{$space_basic}), + (small, #{$space_small}), + (medium, #{$space_medium}), + (large, #{$space_large}) { + .space_top_#{$size} { + margin-top: $variable; + } + .space_right_#{$size} { + margin-right: $variable; + } + .space_bottom_#{$size} { + margin-bottom: $variable; + } + .space_left_#{$size} { + margin-left: $variable; + } } .space_left_fourth { @@ -76,8 +90,8 @@ .wrap_center { & > * { - margin-right: (100% - $basic_width) / 2; - margin-left: (100% - $basic_width) / 2; + margin-right: (100% - $width_basic) / 2; + margin-left: (100% - $width_basic) / 2; @include forTabletPortraitUp { margin-right: (100% - $width_small) / 2; @@ -202,7 +216,7 @@ } .hover_back_change { - background-color: darken($color_back_basic, $color_diff_basic); + background-color: $color_darker; transition: background-color 0.2s ease-in-out; &:hover { @@ -213,8 +227,8 @@ .hover_full_view_change { @extend %full_viewport; z-index: $z_heaven; - background-color: transparentize($darkest_color, 0.5); - transition: background-color $extended_duration $basic_timing $extended_duration; + background-color: transparentize($color_darkest, 0.5); + transition: background-color $duration_long $timing_basic $duration_long; pointer-events: none; } @@ -223,11 +237,11 @@ // Colors // ----------------------------------------------------------------------------- .txt_color_light { - color: $color_font_light; + color: $color_brighter; } .txt_color_dark { - color: $color_font_dark; + color: $color_darker; } @@ -251,7 +265,7 @@ } .txt_hero { - font-size: $hero_size_1; + font-size: $size_hero; } .txt_center { @@ -288,22 +302,3 @@ -webkit-background-clip: text; -webkit-text-fill-color: transparent; } - - - -// Input -// ----------------------------------------------------------------------------- -%default_button { - display: inline-block; - padding: $basic_padding; - background-color: transparentize($basic_link_color, 0.8); - border-radius: $basic_corner; - - &:active, - &:focus, - &:hover { - background-color: rgba($basic_highlight_color, 0.1); - color: $basic_highlight_color; - border-color: transparent; - } -} diff --git a/source/style/hippie/global/_config.scss b/source/style/hippie/global/_config.scss index 2029a8e..dd6635f 100644 --- a/source/style/hippie/global/_config.scss +++ b/source/style/hippie/global/_config.scss @@ -5,12 +5,10 @@ // TEXT // ------------------------------------------------------------------------------ -$basic_size: 17px !default; -$basic_print_size: 10pt !default; +$size_text_basic: 17px !default; +$size_text_print: 10pt !default; -$size_1: $basic_size * 4; - -$basic_line: 1; +$line_basic: 1; // $i: 1; // @while $i < 7 { @@ -44,30 +42,24 @@ $basic_line: 1; // ), // ); -$head_size_1: 3.1em !default; -$head_size_2: 2.5em !default; -$head_size_3: 1.8em !default; -$head_size_4: 1.35em !default; +$size_head_1: 3.1em !default; +$size_head_2: 2.5em !default; +$size_head_3: 1.8em !default; +$size_head_4: 1.35em !default; -$text_size_1: 1em; -$text_size_2: 20; +$size_text_1: 1em; +$size_text_2: 20; -$hero_size_1: $head_size_1 * 3; +$size_hero: $size_head_1 * 3; -$text_line_basic: 1.28 !default; -$text_line_mono: 1.1 !default; -$head_line_basic: $text_line_basic !default; -$head_line_2: $head_line_basic; -$head_line_3: $head_line_basic; -$head_line_4: $head_line_basic; +$line_text_basic: 1.28 !default; +$line_text_mono: 1.1 !default; +$line_head_basic: $line_text_basic !default; -$print_font_family: #{'Times New Roman', times} !default; -$monospace_font_family: #{'Courier New', monospace} !default; - -$primary_font_family: #{'Roboto', 'Segoe UI', 'Liberation Sans', 'Source Sans', 'Trebuchet MS', Helvetica, Arial, sans-serif, sans} !default; -$secondary_font_family: $primary_font_family !default; -$third_font_family: $monospace_font_family !default; -$fourth_font_family: $print_font_family !default; +$family_text_basic: #{'Roboto', 'Segoe UI', 'Liberation Sans', 'Source Sans', 'Trebuchet MS', Helvetica, Arial, sans-serif, sans} !default; +$family_text_print: #{'Times New Roman', times} !default; +$family_text_mono: #{'Courier New', monospace} !default; +$family_head_basic: $family_text_basic !default; @@ -85,38 +77,38 @@ $color_palette: ( @include addDefaultColors; $color_diff_basic: 12% !default; -$tiny_color_diff: 4% !default; -$double_color_diff: $color_diff_basic * 2; +$color_diff_tiny: 4% !default; +$color_diff_double: $color_diff_basic * 2; -$darkest_color: black !default; -$brightest_color: white !default; +$color_darkest: black !default; +$color_brightest: white !default; -$basic_font_color: black !default; +$color_text_basic: black !default; $color_back_basic: #808080 !default; -$basic_border_color: lighten($basic_font_color, $color_diff_basic) !default; -$basic_front_color: white !default; +$color_border_basic: lighten($color_text_basic, $color_diff_basic) !default; +$color_front_basic: white !default; -$medium_color: lighten($darkest_color, 50%); -$dark_color: lighten($darkest_color, $double_color_diff); -$bright_color: darken($brightest_color, $double_color_diff); +$color_medium: lighten($color_darkest, 50%); +$color_dark: lighten($color_darkest, $color_diff_double); +$color_darker: darken($color_back_basic, $color_diff_basic); +$color_brighter: lighten($color_back_basic, $color_diff_basic); +$color_bright: darken($color_brightest, $color_diff_double); -$basic_head_color: $basic_font_color !default; -$basic_link_color: $echo_color !default; -$basic_highlight_color: $basic_front_color !default; -$basic_action_color: $foxtrot_color !default; +$color_head_basic: $color_text_basic !default; +$color_link_basic: $echo_color !default; +$color_highlight_basic: $color_front_basic !default; +$color_action_basic: $foxtrot_color !default; -$color_font_light: lighten($color_back_basic, $color_diff_basic); -$color_font_dark: darken($color_back_basic, $color_diff_basic); // default shadow colors -// $shadow_color: fade-out($medium_color, 0.5); +// $shadow_color: fade-out($color_medium, 0.5); -$basic_color_list: (); +$color_list: (); @each $key, $value in $color_palette { $map: (); $map: map-merge($map, ($key: createColorMap($value, 15%, 0.5)) ); - $basic_color_list: map-merge($basic_color_list, $map); + $color_list: map-merge($color_list, $map); } @@ -130,40 +122,36 @@ $z_top: 10 !default; $z_basic: 1 !default; $z_earth: -100 !default; -$basic_width: 96% !default; +$width_basic: 96% !default; $width_small: 80% !default; $width_medium: 60% !default; $width_large: 48% !default; +$width_aside_basic: 20% !default; -$tiny_space: 1px !default; -$basic_space: $tiny_space * 8 !default; -$half_space: $basic_space / 2; -$double_space: $basic_space * 2; -$space_small: $basic_space * 4; -$space_medium: $basic_space * 8; -$space_large: $basic_space * 16; +$space_tiny: 1px !default; +$space_basic: $space_tiny * 8 !default; +$space_half: $space_basic / 2; +$space_double: $space_basic * 2; +$space_small: $space_basic * 4; +$space_medium: $space_basic * 8; +$space_large: $space_basic * 16; -$basic_margin: $basic_space 0 !default; -$high_margin: $double_space 0 !default; -$io_margin: 0 $space_small 0 0 !default; +$margin_basic: $space_basic 0 !default; +$margin_double: $space_double 0 !default; +$margin_io: 0 $space_small 0 0 !default; -$basic_padding: calc(#{$basic_space} - 3px) $basic_space !default; -$wide_padding: calc(#{$basic_space} - 1px) calc(#{$basic_space} * 2) !default; +$padding_basic: calc(#{$space_basic} - 3px) $space_basic !default; +$padding_link: calc(#{$space_basic} - 1px) calc(#{$space_basic} * 2) !default; -$basic_indent: 2em !default; +$indent_basic: 2em !default; -$basic_corner: $tiny_space * 2; +$border_basic: $space_tiny solid $color_border_basic; +$border_dotted: $space_tiny dotted $color_border_basic; +$width_border_basic: $space_tiny !default; +$width_border_4: $width_border_basic * 4; +$width_border_8: $width_border_basic * 8; -// Borders -$basic_border_width: $tiny_space !default; -$border_width_4: $basic_border_width * 4; -$border_width_8: $basic_border_width * 8; -$basic_border: $tiny_space solid $basic_border_color; -$dotted_border: $tiny_space dotted $basic_border_color; - -$basic_corner_radius: $tiny_space * 2; - -$basic_aside_width: 20%; +$radius_basic: $space_tiny * 2 !default; @@ -210,29 +198,28 @@ $io_focus_list: 'textarea:not([disabled])', '*[tabindex]'; -$basic_io_font_color: lighten($basic_font_color, $color_diff_basic); -$basic_io_back_color: darken($basic_front_color, $color_diff_basic); -$basic_io_border_color: $basic_front_color; +$color_text_io: lighten($color_text_basic, $color_diff_basic) !default; +$color_text_button: $color_text_basic !default; +$color_back_io: darken($color_front_basic, $color_diff_basic) !default; +$color_back_button: $color_darker !default; +$color_border_io: $color_front_basic !default; +$color_border_button: $color_dark !default; -$oi_font_color: $basic_font_color; -$oi_back_color: darken($color_back_basic, $color_diff_basic); -$oi_border_color: darken($oi_back_color, $color_diff_basic); +$width_border_io: $space_tiny * 2 !default; +$border_io: $width_border_io solid $color_border_io; +$border_io_dotted: $width_border_io dotted $color_border_io; -$basic_io_border_width: $tiny_space * 2 !default; -$basic_io_border: $basic_io_border_width solid $basic_io_border_color; -$dotted_io_border: $basic_io_border_width dotted $basic_io_border_color; - -$basic_shadow: inset 0 1px 3px rgba($darkest_color, 0.06); -$basic_focus_shadow: $basic_shadow, 0 0 5px adjust-color($basic_action_color, $lightness: -5%, $alpha: -0.3); +$shadow_basic: inset 0 1px 3px rgba($color_darkest, 0.06); +$shadow_focus: $shadow_basic, 0 0 5px adjust-color($color_action_basic, $lightness: -5%, $alpha: -0.3); // ANIMATIONS // ------------------------------------------------------------------------------ -$basic_duration: 250ms; -$double_duration: 500ms; -$extended_duration: 2s; -$basic_timing: ease-out; +$duration_basic: 250ms !default; +$duration_double: $duration_basic * 2; +$duration_long: 2s !default; +$timing_basic: ease-out !default; diff --git a/source/style/hippie/global/_typography.scss b/source/style/hippie/global/_typography.scss index 03f3af5..3a35b6e 100644 --- a/source/style/hippie/global/_typography.scss +++ b/source/style/hippie/global/_typography.scss @@ -2,53 +2,47 @@ // ----------------------------------------------------------------------------- %basic { - font-family: $primary_font_family; - font-size: $text_size_1; - line-height: $text_line_basic; + font-family: $family_text_basic; + font-size: $size_text_1; + line-height: $line_text_basic; } %basic_mono { - font-family: $monospace_font_family; - font-size: $text_size_1; - line-height: $text_line_mono; + font-family: $family_text_mono; + font-size: $size_text_1; + line-height: $line_text_mono; } %basic_print { - font-family: $print_font_family; - font-size: $text_size_1; - line-height: $text_line_basic; + font-family: $family_text_print; + font-size: $size_text_1; + line-height: $line_text_basic; } %head_all { - color: $basic_head_color; + color: $color_head_basic; + font-family: $family_head_basic; + line-height: $line_head_basic; } %head_1 { - font-family: $secondary_font_family; - font-size: $head_size_1; + font-size: $size_head_1; font-weight: 300; - line-height: $head_line_basic; } %head_2 { - font-family: $secondary_font_family; - font-size: $head_size_2; + font-size: $size_head_2; font-weight: 300; - line-height: $head_line_2; } %head_3 { - font-family: $secondary_font_family; - font-size: $head_size_3; + font-size: $size_head_3; font-weight: 300; - line-height: $head_line_3; } %head_4 { - font-family: $secondary_font_family; - font-size: $head_size_4; + font-size: $size_head_4; font-weight: 300; - line-height: $head_line_4; } %basic_button { diff --git a/source/style/hippie/modules/editor/_editor_module.scss b/source/style/hippie/modules/editor/_editor_module.scss index 12fefc3..7aa9434 100644 --- a/source/style/hippie/modules/editor/_editor_module.scss +++ b/source/style/hippie/modules/editor/_editor_module.scss @@ -7,7 +7,7 @@ // ------------------------------------------------------------------------------ %wip { - border-right: $basic_space solid rgba(crimson, 0.8); + border-right: $space_basic solid rgba(crimson, 0.8); background-color: rgba(crimson, 0.1) !important; } .wip { diff --git a/source/style/hippie/modules/explanation/_explanation_module.scss b/source/style/hippie/modules/explanation/_explanation_module.scss index a806eee..5699bd1 100644 --- a/source/style/hippie/modules/explanation/_explanation_module.scss +++ b/source/style/hippie/modules/explanation/_explanation_module.scss @@ -46,7 +46,7 @@ z-index: 100; top: $space_large; left: $space_large; - padding: $half_space; + padding: $space_half; border: 4px solid $color_back_basic; border-radius: 4px; background-color: $color_back_basic; @@ -54,14 +54,14 @@ } .exp_marker_pop { position: absolute; - top: -$basic_size / 4 * 3; - right: -$basic_size / 2; - width: $basic_size; - height: $basic_size; - border: $tiny_space solid $basic_highlight_color; - border-radius: $basic_size; - color: $basic_highlight_color; - background-color: $darkest_color; + top: -$size_text_basic / 4 * 3; + right: -$size_text_basic / 2; + width: $size_text_basic; + height: $size_text_basic; + border: $space_tiny solid $color_highlight_basic; + border-radius: $size_text_basic; + color: $color_highlight_basic; + background-color: $color_darkest; } .exp_expose { @@ -78,24 +78,24 @@ position: fixed; width: 3em; height: 2em; - // padding: $basic_space $basic_space * 2; + // padding: $space_basic $space_basic * 2; cursor: pointer; } .exp_help_btn { display: table; - right: $double_space; - bottom: $double_space; - background-color: rgba($darkest_color, 0.4); + right: $space_double; + bottom: $space_double; + background-color: rgba($color_darkest, 0.4); &:hover { - background-color: $brightest_color; + background-color: $color_brightest; > .span_solo { - color: $darkest_color; + color: $color_darkest; } } .span_solo { display: table-cell; - color: rgba($brightest_color, 0.8); - font-family: $monospace_font_family; + color: rgba($color_brightest, 0.8); + font-family: $family_text_mono; font-size: 1.4em; text-align: center; vertical-align: middle; diff --git a/source/style/hippie/modules/navigation/_nav_module.scss b/source/style/hippie/modules/navigation/_nav_module.scss index cf972c2..608fd63 100644 --- a/source/style/hippie/modules/navigation/_nav_module.scss +++ b/source/style/hippie/modules/navigation/_nav_module.scss @@ -5,7 +5,7 @@ nav { } li { - margin-bottom: $basic_space; + margin-bottom: $space_basic; list-style: none; } } @@ -15,12 +15,12 @@ nav { @extend .overflow; ul { - margin: $basic_space 0; + margin: $space_basic 0; } li { @extend .float_space_left; - margin-right: $basic_space; + margin-right: $space_basic; margin-bottom: 0; &:last-child { @@ -32,28 +32,28 @@ nav { .nav_right { float: right; - margin-left: $basic_space; + margin-left: $space_basic; .align_parent { - margin-right: $basic_space * -1; + margin-right: $space_basic * -1; } } .nav_separate { li { position: relative; - padding-left: $tiny_space; + padding-left: $space_tiny; &:not(:first-child) { &::before { content: ""; position: absolute; - width: $tiny_space; + width: $space_tiny; height: 100%; left: 0; top: 0; - background-color: $basic_border_color; + background-color: $color_border_basic; } } } @@ -65,17 +65,17 @@ nav { position: relative; &:first-child { - padding-left: $basic_space * 2 + $tiny_space; + padding-left: $space_basic * 2 + $space_tiny; &::before { content: ""; position: absolute; - width: $tiny_space; + width: $space_tiny; height: 100%; left: 0; top: 0; - background-color: $basic_front_color; - margin: 0 $basic_space; + background-color: $color_front_basic; + margin: 0 $space_basic; } } } @@ -96,7 +96,7 @@ nav { .nav_column { position: relative; - margin: $basic_space 0; + margin: $space_basic 0; ul { @extend .flex; @@ -119,11 +119,11 @@ nav { position: fixed; // display: table; // width: 3em; - right: $half_space; - bottom: $double_space; + right: $space_half; + bottom: $space_double; ul { - margin: $basic_space 0; + margin: $space_basic 0; } li { @@ -145,7 +145,7 @@ nav { } &:hover { - background-color: $basic_action_color; + background-color: $color_action_basic; } } .sprite_img { @@ -163,8 +163,8 @@ nav { &:active, &:focus, &:hover { - background-color: rgba($basic_font_color, 0.2); - color: $basic_font_color; + background-color: rgba($color_text_basic, 0.2); + color: $color_text_basic; } } } diff --git a/source/style/hippie/modules/print/_print_module.scss b/source/style/hippie/modules/print/_print_module.scss index ef5322c..1e01a84 100644 --- a/source/style/hippie/modules/print/_print_module.scss +++ b/source/style/hippie/modules/print/_print_module.scss @@ -7,7 +7,7 @@ // ------------------------------------------------------------------------------ %paper { - background-color: $basic_front_color; + background-color: $color_front_basic; } $a4: ".dina4" 1.2cm 1.2cm 1.2cm 2.4cm; @@ -17,7 +17,7 @@ $a6: ".dina6" 0 0 0 1.2cm; $din: $a4, $a5, $a6; .print_body { - font-size: $basic_print_size; + font-size: $size_text_print; margin: 10vh 20vw; @page { diff --git a/source/style/hippie/modules/tables/_tables_module.scss b/source/style/hippie/modules/tables/_tables_module.scss index 6e6f3de..de2523e 100644 --- a/source/style/hippie/modules/tables/_tables_module.scss +++ b/source/style/hippie/modules/tables/_tables_module.scss @@ -1,68 +1,68 @@ -.table_link { - width: 100%; - border: 0; - table-layout: auto; - - tbody { - border-bottom: $basic_border; - - &:hover { - background-color: $bright_color; - } - } - - th, td { - border: 0; - } - - .cell_icon { - width: 48px; - text-align: center; - img { - vertical-align: text-top; - } - } - - .cell_link { - padding-right: $basic_space; - padding-left: $basic_space; - - &:hover { - background-color: $foxtrot_color; - a:first-child { - display: none; - } - a:last-child { - display: block; - color: $basic_highlight_color; - } - } - - a { - display: block; - } - - a:last-child { - display: none; - } - } - - th:last-child, .cell_date { - width: 16%; - text-align: center; - } - - .cell_text { - padding-right: $basic_space; - padding-left: $basic_space; - - div { - width: 100%; - } - - .shorten { - @extend %short; - max-height: 44px; - } - } -} +.table_link { + width: 100%; + border: 0; + table-layout: auto; + + tbody { + border-bottom: $border_basic; + + &:hover { + background-color: $color_bright; + } + } + + th, td { + border: 0; + } + + .cell_icon { + width: 48px; + text-align: center; + img { + vertical-align: text-top; + } + } + + .cell_link { + padding-right: $space_basic; + padding-left: $space_basic; + + &:hover { + background-color: $foxtrot_color; + a:first-child { + display: none; + } + a:last-child { + display: block; + color: $color_highlight_basic; + } + } + + a { + display: block; + } + + a:last-child { + display: none; + } + } + + th:last-child, .cell_date { + width: 16%; + text-align: center; + } + + .cell_text { + padding-right: $space_basic; + padding-left: $space_basic; + + div { + width: 100%; + } + + .shorten { + @extend %short; + max-height: 44px; + } + } +} diff --git a/source/style/modules/demo/_demo_module.scss b/source/style/modules/demo/_demo_module.scss index 36e2ef5..7ad0a85 100644 --- a/source/style/modules/demo/_demo_module.scss +++ b/source/style/modules/demo/_demo_module.scss @@ -22,7 +22,7 @@ } .demo__header { - padding: $double_space; + padding: $space_double; nav { @@ -44,8 +44,8 @@ &:active, &:focus, &:hover { - background-color: rgba($brightest_color, 0.2); - color: $brightest_color; + background-color: rgba($color_brightest, 0.2); + color: $color_brightest; } } } @@ -65,8 +65,8 @@ &:active, &:focus, &:hover { - background-color: rgba($brightest_color, 0.2); - color: $brightest_color; + background-color: rgba($color_brightest, 0.2); + color: $color_brightest; } } } @@ -75,14 +75,14 @@ .demo__footer { width: 100%; // height: 128px; - padding: $double_space 0; - background-color: $dark_color; - color: $bright_color; + padding: $space_double 0; + background-color: $color_dark; + color: $color_bright; nav { a { - color: $brightest_color; + color: $color_brightest; } } } @@ -126,7 +126,7 @@ } .demo__credits { - margin: $space_small 0 $basic_space 0; + margin: $space_small 0 $space_basic 0; } .demo__button_32 { @@ -137,43 +137,43 @@ .demo__queries > p { - padding: $basic_padding; + padding: $padding_basic; } .query_phoneUp { - @include forPhoneUp {background-color: rgba($basic_font_color, 0.2)}; + @include forPhoneUp {background-color: rgba($color_text_basic, 0.2)}; } .query_phoneOnly { - @include forPhoneOnly { background-color: rgba($basic_font_color, 0.2); } + @include forPhoneOnly { background-color: rgba($color_text_basic, 0.2); } } .query_tabletPortaitOnly { - @include forTabletPortraitOnly { background-color: rgba($basic_font_color, 0.2); } + @include forTabletPortraitOnly { background-color: rgba($color_text_basic, 0.2); } } .query_tabletPortraitUp { - @include forTabletPortraitUp { background-color: rgba($basic_font_color, 0.2); } + @include forTabletPortraitUp { background-color: rgba($color_text_basic, 0.2); } } .query_tabletLandscapeOnly { - @include forTabletLandscapeOnly { background-color: rgba($basic_font_color, 0.2); } + @include forTabletLandscapeOnly { background-color: rgba($color_text_basic, 0.2); } } .query_tabletLandscapeUp { - @include forTabletLandscapeUp { background-color: rgba($basic_font_color, 0.2); } + @include forTabletLandscapeUp { background-color: rgba($color_text_basic, 0.2); } } .query_desktopOnly { - @include forDesktopOnly { background-color: rgba($basic_font_color, 0.2); } + @include forDesktopOnly { background-color: rgba($color_text_basic, 0.2); } } .query_desktopUp { - @include forDesktopUp { background-color: rgba($basic_font_color, 0.2); } + @include forDesktopUp { background-color: rgba($color_text_basic, 0.2); } } .query_bigDesktopUp { - @include forBigDesktopUp { background-color: rgba($basic_font_color, 0.2); } + @include forBigDesktopUp { background-color: rgba($color_text_basic, 0.2); } } .demo__query_example { @@ -205,10 +205,10 @@ & { content: '1920px'; } } content: '< 768px'; - padding: $basic_padding; - border-radius: $basic_corner_radius; - color: $brightest_color; - background-color: rgba($basic_front_color, 0.2); + padding: $padding_basic; + border-radius: $radius_basic; + color: $color_brightest; + background-color: rgba($color_front_basic, 0.2); } } @@ -222,11 +222,11 @@ } .demo__td_pr { - padding-right: $double_space; + padding-right: $space_double; } .demo__td_pl { - padding-left: $double_space; + padding-left: $space_double; } // Index @@ -244,6 +244,6 @@ ul { padding: 1em 5em; - background-color: darken($color_back_basic, $color_diff_basic); + background-color: $color_darker; } } diff --git a/source/templates/hippie/demo-default.njk b/source/templates/demo/default.njk similarity index 81% rename from source/templates/hippie/demo-default.njk rename to source/templates/demo/default.njk index 8612521..b285196 100644 --- a/source/templates/hippie/demo-default.njk +++ b/source/templates/demo/default.njk @@ -1,13 +1,11 @@ - + {% block head %} - {% block title %}{% endblock %} - HIPPIE - - {% include "hippie/partials/head-meta.njk" %} + {% include "demo/partials/head-meta.njk" %} diff --git a/source/templates/hippie/demo-extended.njk b/source/templates/demo/extended.njk similarity index 91% rename from source/templates/hippie/demo-extended.njk rename to source/templates/demo/extended.njk index 71b7ac6..4b56136 100644 --- a/source/templates/hippie/demo-extended.njk +++ b/source/templates/demo/extended.njk @@ -1,11 +1,11 @@ - + {% block head %} - {% block title %}{% endblock %} - HIPPIE + {% include "demo/partials/head-meta.njk" %} - {% include "hippie/partials/head-meta.njk" %} - diff --git a/source/templates/hippie/macros/nav-macro.njk b/source/templates/demo/macros/nav-macro.njk similarity index 85% rename from source/templates/hippie/macros/nav-macro.njk rename to source/templates/demo/macros/nav-macro.njk index 62924cb..f1bb73b 100644 --- a/source/templates/hippie/macros/nav-macro.njk +++ b/source/templates/demo/macros/nav-macro.njk @@ -1,4 +1,4 @@ -{% set item = [['mateladen', 'shop'], ['zubereitung', 'preparation'], ['wissen', 'knowledge'], ['blog', 'blog'], ['kontakt', 'contact']] %} +{% set item = [['one', 'filename'], ['two', 'filename']] %} {% macro active(activePage='') %}
      - {% include "hippie/partials/footer-status.njk" %} + {% include "demo/partials/footer-status.njk" %}
      @@ -249,7 +249,7 @@

      Wikipedia

      - {% include "hippie/partials/footer-status.njk" %} + {% include "demo/partials/footer-status.njk" %}
      @@ -260,7 +260,7 @@

      Wikipedia

      - {% include "hippie/partials/footer-status.njk" %} + {% include "demo/partials/footer-status.njk" %}
      diff --git a/source/pages/demo/maintenance.njk b/source/pages/demo/maintenance.njk index fee0a93..b629390 100644 --- a/source/pages/demo/maintenance.njk +++ b/source/pages/demo/maintenance.njk @@ -4,7 +4,7 @@ {% extends "demo/maintenance.njk" %} -{% block title %}Wartung{% endblock %} +{% block title %}Maintenance{% endblock %} {% block head %} {{ super() }} diff --git a/source/pages/demo/os.njk b/source/pages/demo/os.njk index c177b8d..326bc2a 100644 --- a/source/pages/demo/os.njk +++ b/source/pages/demo/os.njk @@ -4,7 +4,7 @@ {% extends "demo/extended.njk" %} -{% block title %}demo{% endblock %} +{% block title %}OS{% endblock %} {% block head %} {{ super() }} {% endblock %} diff --git a/source/pages/demo/tests.njk b/source/pages/demo/tests.njk index 202bd43..5c4a6c4 100644 --- a/source/pages/demo/tests.njk +++ b/source/pages/demo/tests.njk @@ -1,10 +1,10 @@ -{% set pageId = "blank" %} +{% set pageId = "tests" %} {% set pageClass = "height_full" %} {% extends "demo/default.njk" %} -{% block title %}tests - HIPPIE{% endblock %} +{% block title %}Tests{% endblock %} {% block head %} {{ super() }} @@ -29,8 +29,9 @@ Caps Lock is ON. +

      Navigation

      {% import "demo/macros/nav-macro.njk" as forms %} -{{ forms.active('zubereitung') }} +{{ forms.active('Beispiel') }} {% endblock %} {% block script %} diff --git a/source/templates/demo/default.njk b/source/templates/demo/default.njk index b285196..1a31e59 100644 --- a/source/templates/demo/default.njk +++ b/source/templates/demo/default.njk @@ -5,6 +5,8 @@ {% block head %} + {% block title %}{% endblock %} - HIPPIE + {% include "demo/partials/head-meta.njk" %} diff --git a/source/templates/demo/extended.njk b/source/templates/demo/extended.njk index 4b56136..c928fe4 100644 --- a/source/templates/demo/extended.njk +++ b/source/templates/demo/extended.njk @@ -5,6 +5,8 @@ {% block head %} + {% block title %}{% endblock %} - HIPPIE + {% include "demo/partials/head-meta.njk" %} {%- endmacro %} -{% macro top() %} - -{%- endmacro %} diff --git a/source/templates/demo/maintenance.njk b/source/templates/demo/maintenance.njk index f074873..a2701d3 100644 --- a/source/templates/demo/maintenance.njk +++ b/source/templates/demo/maintenance.njk @@ -5,6 +5,8 @@ {% block head %} + {% block title %}{% endblock %} - HIPPIE + {% include "demo/partials/head-meta.njk" %} diff --git a/source/templates/demo/partials/head-meta.njk b/source/templates/demo/partials/head-meta.njk index e74eb8f..f38f8ae 100644 --- a/source/templates/demo/partials/head-meta.njk +++ b/source/templates/demo/partials/head-meta.njk @@ -1,6 +1,4 @@ -{% block title %}{% endblock %} - HIPPIE - From 8d9f440ac272a44e0e5a61dc88d6cb3d2f694f4d Mon Sep 17 00:00:00 2001 From: Stephan Date: Thu, 11 Oct 2018 18:53:26 +0200 Subject: [PATCH 080/372] Correction for 92d1609 .gitignore for art path wasn't correct --- .gitignore | 7 ++++--- source/art/images/demo/flag_websafe_128x80.gif | Bin 0 -> 1343 bytes source/art/images/demo/flag_websafe_128x80.webp | Bin 0 -> 832 bytes 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 source/art/images/demo/flag_websafe_128x80.gif create mode 100644 source/art/images/demo/flag_websafe_128x80.webp diff --git a/.gitignore b/.gitignore index fb3ee1e..fb311e6 100644 --- a/.gitignore +++ b/.gitignore @@ -188,6 +188,7 @@ typings/ ################### ################### build/ -**/art/* -**/art/sprites/ -!**/art/demo/ +source/art/*.* +source/art/images/*.* +source/art/sprites/ +!source/art/**/demo/ diff --git a/source/art/images/demo/flag_websafe_128x80.gif b/source/art/images/demo/flag_websafe_128x80.gif new file mode 100644 index 0000000000000000000000000000000000000000..7be5d958931e1dbebdfe9f96278e77e9740af9ad GIT binary patch literal 1343 zcmV-F1;F}8Nk%w1VSoTo0E7TB|I7gYnKS>H0RLt)%*_AHW;4t)Gt2;Hnauy0%*>gY z%$YN0nE+;H%*@#Mhfb9UibdQ(Gk|_T3rJTsGB?&mf=D^!XlVHaq>Rv=kI0~Xqi9mloqR6j7 z%s36~)LdHXCaaLJ2vEaE^`y$HRqqi+!NQ-Yj7-BSbIO8ALPJty1zjtYt;4Or93=2p zOsri!WOK6H>+FivtXTgFUI{l?xN&zA7a`kZ=Q9Or+e&sjc~ar7M`3_f%$Y}Cqab0} zm=$>C;L@mTZ8g$L7y_l8WAC`x?3wMalyg_st;uE4%rj*R_w1B!l)9#qr#=l>wQsJi z<0ybVJT`4tI}`EV&D|{o2n#5Fi#}sib=eRYEMSnn;78-Jn9En*-0JuB3&5)v-(Z-P z^NQi8-hk`fgce#DZT_cVca)@;AAb57aDV~gk@o^(0MeA6gX|4>00Revcz}CQy27!K<9pn4O=C?SQqlnBjaoamnEokIV_qphzj7-irAw{6P zhGUL-aJVCgKW6D;LB^4k;+HF4b)R}mI%#H;GIsNcOjA-B#Fad1DQA|CLI=oCblmSCL?%80HNv#tG=9ex~UXW-@qLC=hVMxag>i zs-hD+c&1uOlK3rv>8qLk>5VX0e9FV2>v2fxu8SHJl9Vb+S``Em@Cjb5$in)k0RvRj zpEzxzN1%ti{#Kji00jgf0008`Vb(Jz<~iA($10m_ve|AM008T*%gJ0cM4OnE)LLt8 z0qJVXt-jj=@JBoUO&aVDp=Ea69mKe{eF}C}Dyl~7w%iKp43`Hs!s|>81 z?8Xi^9rV*OyRjxQirt*EoCc)pvC~j@Ju(sp2~y(dD?Z*6ut~%6Un@F0l5;({?%h|5I`t3oZ5QDr!?8xiRd4G=k@RkQ7 zN^bYf&a~~sH*dKKF4TcahZ!4ix984h&pK;TNs8ang*UAI_+G#CPARf0nzaDTlka}< zpD=XIcduIC@B8?(O#;<-)cYg8`pTaG^|uaQl&f>X8=wNa)`GbGU_CzC8OIh#LA`aQ zK}m}d&nn2ly|KW7vBMJZI!HnfPKQ!SOIrz7c(|mbCu=`rp$zrr0P)T6hI$JD06U$4 Bjp+aY literal 0 HcmV?d00001 diff --git a/source/art/images/demo/flag_websafe_128x80.webp b/source/art/images/demo/flag_websafe_128x80.webp new file mode 100644 index 0000000000000000000000000000000000000000..71a25dbdc70a70e7edf9ad3a912b23ebd5df3b95 GIT binary patch literal 832 zcmV-G1Hb%INk&FE0{{S5MM6+kP&iC10{{Rof4~y}mtc@>q&l6`)BgMnvW--y*}l^; zy+9zzX@7*B=0E-oBpAUG#Eyv(u84sMH-jSqK-#7=!&TG&zg7{@z#Ss`@7itKFgjyK z;mj|+%<1+C|2)BFUVj(PC8n69;Xi|F?Wz~5=M>yM%F?ISX4KlOuk}zhv&+4rdJOJK z9M8#QJ-4+c0v92JwHg_Ks^_GPs=4E`1BV{j%t?2}dL5NZ z3`vztySqm!R?VDXF{zWudF#5U_RBFj_sr2HQ}ut6Ofzmw2J=RnOwU_=@|Zc}ywxR} z`Hz^lvWf3TWKY3enQUg{yj3V)h+Kr%*@V`?TAzF&a_O0)OQud7HOZ&h^JeZ2g)%X3 zHOlCFW_M_l@p?%rss7OSO!4*8wyAFoS^E0ix7~c|yeWF#bpO6JokQrnm5gm4nc>FX zGX-~B_XGWV*n~T}*lsi5fPU;p1OL34qr842{M+$`%s+8Nna>%*2LkrYDdOs@(-QBj(|Ngw5k0<@D zA>WuWYyJIR2aL(TTj%ZCUi&nq`GNj0+}-4S>s(o|-~F%l$H)+ryWZ7pEBw91Kac0Y zFGE1hoNz<8^rxc^X9^{=Ct45W2&qG>JBTPv$-^Vj+wFu=y`Kp#>}MYu-|L3wto6V!hAntpCMRF zaNf@H%=r1lcslL%-lFTS2$@(%#YjY^30zrw(-++ zfC#ETOH44{8NT+k7ph31dPQEpZTrSaQ+WWHTbSKO#LBbpwnzYXV00V4-%ooWkV$mn zq6q`iR5-dD@3(Wq(^LbRJK)~~k+Tv4`Se4&4NTPGUQNF+JZD3is>8nkKXR|aUsFJf Kt3|e#sfGb>c)48w literal 0 HcmV?d00001 From 90894f325358b2c94529e861337d348390d8129a Mon Sep 17 00:00:00 2001 From: Stephan Date: Wed, 7 Nov 2018 20:20:49 +0100 Subject: [PATCH 081/372] Maintenance and a little bit more content - added favicon - changes to the gulp sprite module - changes to gulp linting - fixed javascript scroll function and added setup function content - fixed javascript indentation - new error pages - changed css for link colors - fixed css sprites --- .bowerrc | 2 +- bower.json | 1 + gulpfile.js | 70 ++++++++++-------- source/code/hippie/functions.js | 43 +++++------ source/code/hippie/global.js | 47 +++++++----- source/code/hippie/variables.js | 16 ++-- source/demo_data.json | 12 +++ source/favicon.ico | Bin 0 -> 1406 bytes source/pages/demo.njk | 3 - source/pages/demo/blank.njk | 2 - source/pages/demo/elements.njk | 2 - source/pages/demo/error/304.njk | 23 ++++++ source/pages/demo/error/400.njk | 23 ++++++ source/pages/demo/error/403.njk | 23 ++++++ source/pages/demo/error/404.njk | 8 +- source/pages/demo/error/500.njk | 8 +- source/pages/demo/examples.njk | 45 ----------- source/pages/demo/intro.njk | 11 +-- source/pages/demo/maintenance.njk | 2 - source/pages/demo/os.njk | 1 - source/pages/demo/tests.njk | 2 - source/style/hippie/elements/_sections.scss | 2 +- source/style/hippie/elements/_textlevel.scss | 8 ++ source/style/hippie/global/_config.scss | 2 +- source/style/hippie/mixins/_all.scss | 1 + .../{modules/media => mixins}/_sprites.scss | 16 ++-- .../hippie/modules/media/_media_module.scss | 11 +-- source/style/modules/demo/_demo_module.scss | 27 ++++--- source/templates/demo/default.njk | 9 ++- source/templates/demo/extended.njk | 8 +- source/templates/demo/maintenance.njk | 12 ++- source/templates/demo/partials/exp-colors.njk | 7 ++ .../templates/demo/partials/footer-status.njk | 4 - .../templates/hippie/macros/footer-status.njk | 13 ++++ .../hippie/partials/nav-page-meta.njk | 9 ++- 35 files changed, 273 insertions(+), 200 deletions(-) create mode 100644 source/favicon.ico create mode 100644 source/pages/demo/error/304.njk create mode 100644 source/pages/demo/error/400.njk create mode 100644 source/pages/demo/error/403.njk rename source/style/hippie/{modules/media => mixins}/_sprites.scss (83%) create mode 100644 source/templates/demo/partials/exp-colors.njk delete mode 100644 source/templates/demo/partials/footer-status.njk create mode 100644 source/templates/hippie/macros/footer-status.njk diff --git a/.bowerrc b/.bowerrc index 201ba9d..ea25244 100644 --- a/.bowerrc +++ b/.bowerrc @@ -1,3 +1,3 @@ { - "directory": "source/bower_components/" + "directory": "vendor/" } diff --git a/bower.json b/bower.json index bb2622f..66d9bde 100644 --- a/bower.json +++ b/bower.json @@ -13,6 +13,7 @@ "node_modules", "bower_components", "build/bower_components", + "build/vendor", "test", "tests" ], diff --git a/gulpfile.js b/gulpfile.js index 54ce553..be19cfe 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -71,6 +71,14 @@ gulp.task('sass', function() { stream: true })) }); +// linting ... +gulp.task('lint:scss', function() { + return gulp.src('source/style/**/*.scss') + .pipe(plumbError('SASSLint Error')) + .pipe(sasslint({ + configFile: '.sass-lint.yml' + })) +}) // and this is functionality @@ -78,8 +86,8 @@ gulp.task('js', function(cb) { pump([ gulp.src(source_folder.scripts), cache('scripts'), - jshint('.jshintrc'), - jshint.reporter('default'), + // jshint('.jshintrc'), + // jshint.reporter('default'), sourcemap.init(), minify(), remember('scripts'), @@ -89,6 +97,22 @@ gulp.task('js', function(cb) { browsersync.stream() ], cb); }); +// linting ... +gulp.task('lint:js', function() { + return gulp.src('source/code/**/*.js') + .pipe(plumbError('JSHint Error')) + .pipe(jshint()) + .pipe(jshint.reporter('jshint-stylish')) + .pipe(jshint.reporter('fail', { + ignoreWarning: true, + ignoreInfo: true + })) + .pipe(jscs({ + fix: false, + configPath: '.jscsrc' + })) + // .pipe(jscs.reporter()); +}); // templating engine @@ -133,10 +157,14 @@ gulp.task('sprites', function() { gulp.src('source/art/sprites/**/*') .pipe(spritesmith({ cssName: '_sprites.scss', - imgName: 'sprites.png' + imgName: 'sprites.png', + imgPath: '../art/sprites.png', + // retinaSrcFilter: 'source/art/sprites/*@2x.png', + // retinaImgName: 'sprites@2x.png', + // retinaImgPath: '../art/sprites@2x.png' })) .pipe(gulpif('*.png', gulp.dest(build_folder.art))) - .pipe(gulpif('*.scss', gulp.dest('source/style/hippie/modules/media'))); + .pipe(gulpif('*.scss', gulp.dest('source/style/hippie/mixins'))); }); // copy art files @@ -155,34 +183,18 @@ gulp.task('vendor', function() { ; }); -// linting ... -gulp.task('lint:js', function() { - return gulp.src('source/code/**/*.js') - .pipe(plumbError('JSHint Error')) - .pipe(jshint()) - .pipe(jshint.reporter('jshint-stylish')) - .pipe(jshint.reporter('fail', { - ignoreWarning: true, - ignoreInfo: true - })) - .pipe(jscs({ - fix: false, - configPath: '.jscsrc' - })) - // .pipe(jscs.reporter()); +// copy additional files +gulp.task('favicon', function() { + return gulp.src('source/favicon.ico') + .pipe(plumbError()) + .pipe(gulp.dest(build_folder.root)) + ; }); -gulp.task('lint:scss', function() { - return gulp.src('source/style/**/*.scss') - .pipe(plumbError('SASSLint Error')) - .pipe(sasslint({ - configFile: '.sass-lint.yml' - })) -}) // cleans the build folder gulp.task('clean:dev', function() { - del.sync([ + return del.sync([ build_folder.styles, build_folder.pages, build_folder.root+'/*.html' @@ -202,9 +214,9 @@ gulp.task('overwatch', function() { gulp.watch([ 'source/templates/**/*', 'source/pages/**/*.+(html|njk)', - 'source/art/**/*', 'source/demo_data.json' ], ['nunjucks']); + gulp.watch('source/art/**/*', ['sprites']); }); @@ -212,7 +224,7 @@ gulp.task('overwatch', function() { gulp.task('default', function(callback) { sequencer( 'clean:dev', - ['sprites', 'art', 'vendor', 'lint:js', 'lint:scss'], + ['sprites', 'art', 'vendor', 'favicon', 'lint:js', 'lint:scss'], ['sass', 'js', 'nunjucks'], ['syncreload', 'overwatch'], callback diff --git a/source/code/hippie/functions.js b/source/code/hippie/functions.js index d120d16..94f4b75 100644 --- a/source/code/hippie/functions.js +++ b/source/code/hippie/functions.js @@ -1,6 +1,9 @@ "use strict"; function setup() { + console.log('\n', hippie_brand, '\n\n'); + console.info('Debug information:\n\nHTML height is', html_height, '\nBODY height is', body_height, '\nVIEW height is', view_height); + if($('#js_tph').length && full_view_hover) { // $('body').prepend("
      "); $('#js_tph').addClass("hover_full_view_change"); @@ -9,33 +12,31 @@ function setup() { // get document coordinates of the element function getCoords(elem) { - let box = elem.getBoundingClientRect(); + let box = elem.getBoundingClientRect(); - return { - top: box.top + pageYOffset, - left: box.left + pageXOffset - }; + return { + top: box.top + pageYOffset, + left: box.left + pageXOffset + }; } // https://stackoverflow.com/a/488073/1444149 -function Utils() { - -} +function Utils() {} Utils.prototype = { - constructor: Utils, - isElementInView: function (element, fullyInView) { - var pageTop = $(window).scrollTop(); - var pageBottom = pageTop + $(window).height(); - var elementTop = $(element).offset().top; - var elementBottom = elementTop + $(element).height(); + constructor: Utils, + isElementInView: function (element, fullyInView) { + var pageTop = $(window).scrollTop(); + var pageBottom = pageTop + $(window).height(); + var elementTop = $(element).offset().top; + var elementBottom = elementTop + $(element).height(); - if (fullyInView === true) { - return ((pageTop < elementTop) && (pageBottom > elementBottom)); - } else { - return ((elementTop <= pageBottom) && (elementBottom >= pageTop)); - } - } + if (fullyInView === true) { + return ((pageTop < elementTop) && (pageBottom > elementBottom)); + } else { + return ((elementTop <= pageBottom) && (elementBottom >= pageTop)); + } + } }; var Utils = new Utils(); @@ -51,7 +52,7 @@ function scrollNav() { $('.'+theClass).parent('li').addClass('active'); //Animate $('html, body').stop().animate({ - scrollTop: $( $(this).attr('href') ).offset().top - 160 + scrollTop: $( $(this).attr('href') ).offset().top - 160 }, 400); return false; }); diff --git a/source/code/hippie/global.js b/source/code/hippie/global.js index 1b8e7de..1f96a87 100644 --- a/source/code/hippie/global.js +++ b/source/code/hippie/global.js @@ -38,13 +38,13 @@ $( document ).ready(function() { // "left": ev.pageX - $(this).offset().left + 8 }); // TODO - needs more love - console.log(ev.pageX); + // console.log(ev.pageX); } ); // WIP Activates layer with explanation elements // Besser ::after oder ::before benutzen - $(".exp_help_btn").click(function(e){ + $(".js_showmeta").click(function(e){ var $wrap, $pop; if(exp_mode !== true){ @@ -80,24 +80,32 @@ $( document ).ready(function() { exp_mode = false; } - console.log("Explanation mode: "+ exp_mode); + console.log("Explanation mode", exp_mode); }); // WIP Scroll to top - $('#js_scrolltop').click(function(event) { + $('.js_scrolltop').click(function(event) { + event.preventDefault(); console.log('scroll to the top'); - event.preventDefault(); - // $('body').scrollTop(); - $('body').animate({scrollTop: 0}, basic_ease, function() { - console.log('arrived at top'); - }); + + document.documentElement.scrollTop = document.body.scrollTop = 0; + + // var body = document.querySelector('body'); + // // get scroll position in px + // console.log(body.scrollTop); + // // set scroll position in px + // body.scrollTop = 0; + + // $('body')[0].scrollTop = 0; + // $('body').animate({scrollTop: 0}, basic_ease, function() { + // console.log('arrived at top'); + // }); }); - $('#js_scrolldown').click(function(event) { - console.log('scroll down'); + $('.js_scrolldown').click(function(event) { event.preventDefault(); - $('body').animate({scrollTop: $(document).height()}, basic_ease * 2, function() { - console.log('arrived at bottom'); - }); + var pos = Math.max(html_height, body_height) - view_height; + console.log('scroll down to', pos); + document.documentElement.scrollTop = pos; }); @@ -113,10 +121,10 @@ $( document ).ready(function() { $( ".pass-def dd" ).each(function() { $( this ).find( "li" ).each(function( index ) { if ( 0 === $( this ).children( "ul" ).length ) { - //console.log( index + ": " + $( this ).text() ); + //console.log(index, ":", $( this ).text()); var tempContent = $( this ).html(); //$( this ).html( "" ); - $( this ).html( tempContent +""+ i +"" ); + $( this ).html(tempContent + "" + i + ""); i++; } }); @@ -135,12 +143,11 @@ $( document ).scroll(function() { // Toggle navigation elements doc_pos_y = $( document ).scrollTop(); // console.log(doc_pos_y); - var h = scroll_y_margin; // var demo_margin = $('.header__fix'); - if (doc_pos_y > h) { - $('#js_scrolltop').parent().removeClass('magic'); + if (doc_pos_y > scroll_y_margin) { + $('.js_scrolltop').parent().removeClass('magic'); } else { - $('#js_scrolltop').parent().addClass('magic'); + $('.js_scrolltop').parent().addClass('magic'); } diff --git a/source/code/hippie/variables.js b/source/code/hippie/variables.js index 3aa9cd6..0f19349 100644 --- a/source/code/hippie/variables.js +++ b/source/code/hippie/variables.js @@ -1,14 +1,16 @@ -"use strict"; +var hippie_brand = "|-| | |^ |^ | [- "; -var w = Math.max(document.documentElement.clientWidth, window.innerWidth || 0); -var h = Math.max(document.documentElement.clientHeight, window.innerHeight || 0); +var view_width = Math.max(document.documentElement.offsetWidth, document.documentElement.clientWidth, window.innerWidth, 0); +var view_height = Math.max(document.documentElement.clientHeight, window.innerHeight, 0); +var html_height = Math.max(document.documentElement.offsetHeight, document.documentElement.clientHeight, 0); +var body_height = Math.max(document.body.offsetHeight, document.body.clientHeight, 0); +var body_width = Math.max(document.body.offsetWidth, document.body.clientWidth, window.innerWidth, 0); var full_view_hover = true; var doc_pos_y = 0; var basic_ease = 600; -var scroll_y_margin = h; +var scroll_y_margin = view_height; - -// TEST -// var fixed_containers = []; +var onerow_alphabet = "/\\ ]3 ( |) [- /= (_, |-| | _T /< |_ |\\/| |\\| () |^ ()_ /? _\\~ ~|~ |_| \\/ \\/\\/ >< `/ ~/_ "; +var onerow_digits = "\'| ^/_ -} +| ;~ (o \"/ {} \"| (\\) "; diff --git a/source/demo_data.json b/source/demo_data.json index 90f05d5..6623626 100644 --- a/source/demo_data.json +++ b/source/demo_data.json @@ -26,10 +26,22 @@ "href": "demo/maintenance.html", "text": "Maintenance" }, + { + "href": "demo/error/304.html", + "text": "304" + }, { "href": "demo/error/404.html", "text": "404" }, + { + "href": "demo/error/403.html", + "text": "403" + }, + { + "href": "demo/error/400.html", + "text": "400" + }, { "href": "demo/error/500.html", "text": "500" diff --git a/source/favicon.ico b/source/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..745351c10378e875cb116eb849b4f19042632e1e GIT binary patch literal 1406 zcmeH{YfQ~?7{@=II+ZSph(wAGQ3`eF#-Y*PAoTs9-w8XIHGR^~-7aMJOwnadmV!b{)ZzR&h~UOdn9d-mH8%!K3Uh!CyG z5Q8(|C0Iz|E_f*aCz+XnNC-!CVTdh6s5Z>xc}F?>wUM|u+wkm;n&#|8Zq{$X+RB{P zV+owl6rl7t%<=RHs!HW7i=D#LOS=hDKPIlBk3As@I-Awl*;)t|({(+cVwoE4DX z22q5z(~=d3zD&-^+NGQ=T2E-@8$NzDVKSM>@A`z+U&*7kBAiB9Aq#e;v#}7RpN@v! z0s00^$Td9}G;64-kYgzp@$kGFeRLGDO??aqHEQ1vkSVRC`)V=cokvht8AD5UJW0L= zZuJjh929C8K5(XBBlT6`_;@+du2)eiU5n~QKUe#|602yVr=t`%S6e!ow^EZ3g2MY6 zIWNCZ_0CAuTO+#HM)bnH^sl~9{o*r$)x9+3WA;TVp_ zbMbUCx6i3~a5}@F4!{{|5eQ1KW!-GPAa1 zZ{3!YtJdV%<`)#MUb8lN-TIUbscGpOH*Hp`M6pZb;u92!iOZI+Sh*?*M5Bv-D}2o zcA4Nhagy6)_wNX!oyLrH9yk66V?WZtanw)5dW4Ow-7k#T(&|@4WNz^r3xDFj(Ko;F B($)X~ literal 0 HcmV?d00001 diff --git a/source/pages/demo.njk b/source/pages/demo.njk index 14de17c..2835071 100644 --- a/source/pages/demo.njk +++ b/source/pages/demo.njk @@ -7,8 +7,6 @@ {% block title %}Index{% endblock %} {% block head %} {{ super() }} - - {% endblock %} {% block body_content %} @@ -50,7 +48,6 @@ C(")(") // Page specific // ------------------------------------------------------------------------------ $( document ).ready(function() { - console.log('HIPPIE'); }); {% endblock %} diff --git a/source/pages/demo/blank.njk b/source/pages/demo/blank.njk index 7f12f0e..eb0a6c4 100644 --- a/source/pages/demo/blank.njk +++ b/source/pages/demo/blank.njk @@ -8,8 +8,6 @@ {% block head %} {{ super() }} - - {% endblock %} {% block body_content %} diff --git a/source/pages/demo/elements.njk b/source/pages/demo/elements.njk index c53df80..2895727 100644 --- a/source/pages/demo/elements.njk +++ b/source/pages/demo/elements.njk @@ -72,8 +72,6 @@ // Page specific // ------------------------------------------------------------------------------ $( document ).ready(function() { - console.log('HIPPIE'); - // jq-sticky-anything $('#js_demo_fix').stickThis({ pushup: '#js_demo_stop' diff --git a/source/pages/demo/error/304.njk b/source/pages/demo/error/304.njk new file mode 100644 index 0000000..f2ca90d --- /dev/null +++ b/source/pages/demo/error/304.njk @@ -0,0 +1,23 @@ + +{% set pageId = "304" %} +{% set pageClass = "body_status" %} + +{% extends "demo/maintenance.njk" %} + +{% block title %}{{ pageId }}{% endblock %} +{% block head %} +{{ super() }} +{% endblock %} + +{% block body_content %} +
      +

      {{ pageId }}

      +

      Umleitung

      +

      Unverändert Not Modified

      +
      +

      Der Inhalt der angeforderten Ressource hat sich seit der letzten Abfrage des Clients nicht verändert und wird deshalb nicht übertragen. Zu den Einzelheiten siehe Browser-Cache-Versionsvergleich.

      +

      Wikipedia

      +
      +
      +{{ super() }} +{% endblock %} diff --git a/source/pages/demo/error/400.njk b/source/pages/demo/error/400.njk new file mode 100644 index 0000000..b5204b0 --- /dev/null +++ b/source/pages/demo/error/400.njk @@ -0,0 +1,23 @@ + +{% set pageId = "400" %} +{% set pageClass = "body_status" %} + +{% extends "demo/maintenance.njk" %} + +{% block title %}{{ pageId }}{% endblock %} +{% block head %} +{{ super() }} +{% endblock %} + +{% block body_content %} +
      +

      {{ pageId }}

      +

      Client-Fehler

      +

      Fehlerhafte Anfrage! Bad Request

      +
      +

      Die Anfrage-Nachricht war fehlerhaft aufgebaut.

      +

      Wikipedia

      +
      +
      +{{ super() }} +{% endblock %} diff --git a/source/pages/demo/error/403.njk b/source/pages/demo/error/403.njk new file mode 100644 index 0000000..1a06a2e --- /dev/null +++ b/source/pages/demo/error/403.njk @@ -0,0 +1,23 @@ + +{% set pageId = "403" %} +{% set pageClass = "body_status" %} + +{% extends "demo/maintenance.njk" %} + +{% block title %}{{ pageId }}{% endblock %} +{% block head %} +{{ super() }} +{% endblock %} + +{% block body_content %} +
      +

      {{ pageId }}

      +

      Client-Fehler

      +

      Nicht erlaubt! Forbidden

      +
      +

      Die Anfrage wurde mangels Berechtigung des Clients nicht durchgeführt, bspw. weil der authentifizierte Benutzer nicht berechtigt ist, oder eine als HTTPS konfigurierte URL nur mit HTTP aufgerufen wurde.

      +

      Wikipedia

      +
      +
      +{{ super() }} +{% endblock %} diff --git a/source/pages/demo/error/404.njk b/source/pages/demo/error/404.njk index 33c26d0..5e9509b 100644 --- a/source/pages/demo/error/404.njk +++ b/source/pages/demo/error/404.njk @@ -4,16 +4,14 @@ {% extends "demo/maintenance.njk" %} -{% block title %}404{% endblock %} +{% block title %}{{ pageId }}{% endblock %} {% block head %} {{ super() }} - - {% endblock %} {% block body_content %}
      -

      404

      +

      {{ pageId }}

      Client-Fehler

      Hier ist nichts. Not Found

      @@ -21,5 +19,5 @@

      Wikipedia

      -{% include "demo/partials/footer-status.njk" %} +{{ super() }} {% endblock %} diff --git a/source/pages/demo/error/500.njk b/source/pages/demo/error/500.njk index e74624a..37b2ad6 100644 --- a/source/pages/demo/error/500.njk +++ b/source/pages/demo/error/500.njk @@ -4,16 +4,14 @@ {% extends "demo/maintenance.njk" %} -{% block title %}500{% endblock %} +{% block title %}{{ pageId }}{% endblock %} {% block head %} {{ super() }} - - {% endblock %} {% block body_content %}
      -

      500

      +

      {{ pageId }}

      Server-Fehler

      Allgemeiner Server Fehler!!! Internal Server Error

      @@ -21,5 +19,5 @@

      Wikipedia

      -{% include "demo/partials/footer-status.njk" %} +{{ super() }} {% endblock %} diff --git a/source/pages/demo/examples.njk b/source/pages/demo/examples.njk index 49a8cc3..3b9d82a 100644 --- a/source/pages/demo/examples.njk +++ b/source/pages/demo/examples.njk @@ -223,49 +223,6 @@
      -
      -
      -

      Autarke Seiten

      -

      Diese Elemente repräsentieren jeweils eine eigene Seite.

      -
      -
      -
      -
      -

      404

      -

      Hier ist nichts.

      -
      -

      Die angeforderte Ressource wurde nicht gefunden. Dieser Statuscode kann ebenfalls verwendet werden, um eine Anfrage ohne näheren Grund abzuweisen. Links, welche auf solche Fehlerseiten verweisen, werden auch als Tote Links bezeichnet.

      -

      Wikipedia

      -
      -
      - {% include "demo/partials/footer-status.njk" %} -
      -
      -
      -

      403

      -

      Nicht erlaubt! Forbidden

      -
      -

      Die Anfrage wurde mangels Berechtigung des Clients nicht durchgeführt, bspw. weil der authentifizierte Benutzer nicht berechtigt ist, oder eine als HTTPS konfigurierte URL nur mit HTTP aufgerufen wurde.

      -

      Wikipedia

      -
      -
      - {% include "demo/partials/footer-status.njk" %} -
      -
      -
      -

      400

      -

      Fehlerhafte Anfrage! Bad Request

      -
      -

      Die Anfrage-Nachricht war fehlerhaft aufgebaut.

      -

      Wikipedia

      -
      -
      - {% include "demo/partials/footer-status.njk" %} -
      -
      -
      - -
      {% include "hippie/partials/footer.njk" %} {% endblock %} @@ -278,8 +235,6 @@ // Page specific // ------------------------------------------------------------------------------ $( document ).ready(function() { - console.log('HIPPIE'); - // jq-sticky-anything $('#js_demo_fix').stickThis({ pushup: '#js_demo_stop' diff --git a/source/pages/demo/intro.njk b/source/pages/demo/intro.njk index 17eb303..6c71dea 100644 --- a/source/pages/demo/intro.njk +++ b/source/pages/demo/intro.njk @@ -11,9 +11,6 @@ {% block body_content %}
      - {% include "hippie/partials/nav-page-meta.njk" %}
      @@ -133,8 +130,8 @@

      Textebene

      {# // a // em // strong // small // s // cite // q // dfn // abbr // ruby // rb // rt // rtc // rp // data // time // code // var // samp // kbd // sub // sup // i // b // u // mark // bdi // bdo // span // br // wbr // -- Edits -- // ins // del #}

      Verweise

      -

      Ein wesentlicher Bestandteil von Hypertext sind Verweise <a>. Sie dienen als Sprungmarken innerhalb des Netzwerks. Es kann grob zwischen internen und externen Verweisen unterschieden werden. Interne Verweisea.a_line können Verknüpfungen innerhalb des aktuellen Dokumentes sein oder auch Funktionen aktivieren. Externe Verweise verknüpfen Inhalte über das gesamte Netzwerk hinweg. Sie können zum Beispiel auch auf E-Mail Adressen oder Dateien zeigen. Theoretisch kann solch ein Verweis Alles auslösen. Anweisungen werden im URL Standard übergeben.

      -

      Nicht nur Text kann als Verweis verwendet werden. Auch andere Elemente wie Bilder können verknüpft werden. Abhängig von ihrer Funktion und ihrem Zweck, werden Verweise unterschiedlich formatiert. Farbige oder unterstrichene Varianten sind einfache Beispiele.

      +

      Ein wesentlicher Bestandteil von Hypertext sind Verweise <a>. Sie dienen als Sprungmarken innerhalb des Netzwerks. Es kann grob zwischen internen und externen Verweisen unterschieden werden. Interne Verweisea.a_line können Verknüpfungen innerhalb des aktuellen Dokumentes sein oder auch Funktionen aktivieren. Externe Verweise verknüpfen Inhalte über das gesamte Netzwerk hinweg. Sie können zum Beispiel auch auf E-Mail Adressen oder Dateien zeigen. Theoretisch kann solch ein Verweis Alles auslösen. Anweisungen werden im URL Standard übergeben.

      +

      Nicht nur Text kann als Verweis verwendet werden. Auch andere Elemente wie Bilder können verknüpft werden. Abhängig von ihrer Funktion und ihrem Zweck, werden Verweise unterschiedlich formatiert. Farbige oder unterstrichene Varianten sind einfache Beispiele.

      Wird der Verweis innerhalb eines <nav> Elementes notiert, bekommt er die spezielle Bedeutung eines Navigationsverweises innerhalb des Dokumentes oder der Anwendung. Verweise werden dann durchaus auch wie Schaltflächen dargestellt.

header.header_page>nav.nav_right>ul>(li>a.a_button{Nav $})*4
-
+
+ 
article>h1+p{Elemente:}+pre+h4{Varianten}
-

Bereiche

+

Bereiche

Elemente:

// body
// article
// section
// nav
// aside
// h1-h6
// header
// footer

<body>

@@ -62,6 +63,125 @@ tags:

<h3>

<h4>

+
+

Gruppierung

+

Elemente:

+ 
// p // address // hr // pre // blockquote // ol // ul // li // dl // dt // dd // figure // figcaption // main // div
+

<p>

+

Varianten

+ 
p.txt_center
+ 
p.txt_right
+ 
p.column_2
+ 
p.column_3.column_line
+

<hr>

+

Varianten

+ 
hr.hr_hidden
+ 
hr.hr_dotted
+ 
hr.space_even_half
+ 
hr.hr_dotted.space_even_fourth
+

<blockquote>

+ 
blockquote>p+p.quote_source
+

<figure>

+ 
figure>figcaption+{element}
+

<div>

+ 
div.div_info>p
+

Varianten

+
+
+

Tabellen

+

Elemente:

+ 
// table // caption // colgroup // col // tbody // thead // tfoot // tr // td // th
+

<table>

+

Varianten

+ 
table.width_full.table_fix>(thead>tr>th.cell_pre[scope="col"]+th[scope="col"]*3)+tbody>tr>td.cell_pre+td*3
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
KopfzeileAB
VorspalteEine
1erweiterte
2Tabelle
+ 
table.width_full.table_stripe.table_fix.table_free>tr>td*3
+ + + + + + + + + + + + + + + + + + + + + +
Tabelle
ohneRahmen
jedochmit
Streifen
+ 
table.width_full.table_fix>(thead>tr>th[scope="col"]*3)+(tbody>tr>td*2+td.txt_right)+tfoot>tr>th[colspan="2"]+td.txt_right
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Die Verteilung der Zellen ist hier von ihrem Inhalt abhängig.
BezeichnungMengeWert
Alpha18990
Bravo101
Charlie11
Summe9001
+
{% endblock %} diff --git a/source/screens/demo/examples/ui/drag.njk b/source/screens/demo/examples/ui/drag.njk index 61ab554..15c24b1 100755 --- a/source/screens/demo/examples/ui/drag.njk +++ b/source/screens/demo/examples/ui/drag.njk @@ -147,6 +147,6 @@ tags: // Create a new NewDiv instance const newDiv = new NewDiv(100, 100, 800, 600, '#000'); newDiv.createDiv(); - newDiv.appendToFrame(document.getElementById('space')); + newDiv.appendToFrame(space); {% endblock %} \ No newline at end of file From 04a26a22894d25be81e832663bdf3fe32fcdc138 Mon Sep 17 00:00:00 2001 From: sthag Date: Sat, 12 Apr 2025 14:30:54 +0200 Subject: [PATCH 189/372] feat: Change meta link to button --- source/templates/hippie/partials/_body_nav.njk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/templates/hippie/partials/_body_nav.njk b/source/templates/hippie/partials/_body_nav.njk index 7d500b3..f38e940 100644 --- a/source/templates/hippie/partials/_body_nav.njk +++ b/source/templates/hippie/partials/_body_nav.njk @@ -10,9 +10,10 @@
  • {# #} - + {#
    -     + #} +
  • From 024540e389bf980bcd1137820d540816520c5859 Mon Sep 17 00:00:00 2001 From: sthag Date: Sat, 12 Apr 2025 15:49:46 +0200 Subject: [PATCH 190/372] feat: Move macros for general usage --- source/screens/demo/examples/portal.njk | 2 +- source/screens/demo/examples/ui/new.njk | 2 +- .../{demo/macros/_gates.njk => hippie/macros/_gate.njk} | 0 .../{demo/macros/_states.njk => hippie/macros/_state.njk} | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename source/templates/{demo/macros/_gates.njk => hippie/macros/_gate.njk} (100%) rename source/templates/{demo/macros/_states.njk => hippie/macros/_state.njk} (100%) diff --git a/source/screens/demo/examples/portal.njk b/source/screens/demo/examples/portal.njk index 8c6bb73..5b96681 100644 --- a/source/screens/demo/examples/portal.njk +++ b/source/screens/demo/examples/portal.njk @@ -7,7 +7,7 @@ tags: {% set bodyClass = "body_portal" %} {% extends "demo/_default.njk" %} -{% import "demo/macros/_gates.njk" as gate %} +{% import "hippie/macros/_gate.njk" as gate %} {% block title %}{{ title }}{% endblock %} diff --git a/source/screens/demo/examples/ui/new.njk b/source/screens/demo/examples/ui/new.njk index edc4d47..c567309 100755 --- a/source/screens/demo/examples/ui/new.njk +++ b/source/screens/demo/examples/ui/new.njk @@ -8,7 +8,7 @@ tags: {% set bodyClass = "body_new" %} {% extends "demo/_app.njk" %} -{% import "demo/macros/_states.njk" as state %} +{% import "hippie/macros/_state.njk" as state %} {% block title %}{{ title }} {% endblock %} diff --git a/source/templates/demo/macros/_gates.njk b/source/templates/hippie/macros/_gate.njk similarity index 100% rename from source/templates/demo/macros/_gates.njk rename to source/templates/hippie/macros/_gate.njk diff --git a/source/templates/demo/macros/_states.njk b/source/templates/hippie/macros/_state.njk similarity index 100% rename from source/templates/demo/macros/_states.njk rename to source/templates/hippie/macros/_state.njk From 2e2091a179f37eb6df5f900efd2c57ec25d61c75 Mon Sep 17 00:00:00 2001 From: sthag Date: Sat, 12 Apr 2025 16:41:47 +0200 Subject: [PATCH 191/372] feat: Add soungbook example - Add songbook to demo - Add macro for song - Add style module --- source/screens/demo/examples/songbook.njk | 51 +++++++++++++++++++ .../demo/examples/songbook/0_artist-title.md | 26 ++++++++++ source/style/demo.scss | 1 + .../modules/songbook/_songbook_module.scss | 20 ++++++++ source/templates/hippie/macros/_song.njk | 12 +++++ 5 files changed, 110 insertions(+) create mode 100755 source/screens/demo/examples/songbook.njk create mode 100755 source/screens/demo/examples/songbook/0_artist-title.md create mode 100755 source/style/modules/songbook/_songbook_module.scss create mode 100644 source/templates/hippie/macros/_song.njk diff --git a/source/screens/demo/examples/songbook.njk b/source/screens/demo/examples/songbook.njk new file mode 100755 index 0000000..0b91499 --- /dev/null +++ b/source/screens/demo/examples/songbook.njk @@ -0,0 +1,51 @@ +--- +title: Songbook +tags: + - demoExample +--- +{% set pageBase = "../" %} +{% set pageId = page.fileSlug %} + +{% extends "demo/_default.njk" %} +{% import "hippie/macros/_placeholder.njk" as ph %} +{% import "hippie/macros/_song.njk" as song %} + +{% block title %}{{ title }}{% endblock %} + +{% block head %} + {{ super() }} +{% endblock %} + +{% block body %} + +
    +
    +

    Titel

    +

    Jahr

    +
    +     +

    Vorwort

    +

    Liederbuch für + Name.

    +

    Gibt es gebunden und hier + {{ ph.link() }}.
    + Bestellungen bitte an + {{ ph.name() }} + richten.

    +
    + {%- for piece in collections.song -%} + {{ song.simple(loop.index0, piece.data, piece.content) }} + {%- endfor -%} +
    +
    {{ ph.name() }}
    +
    +{% endblock %} \ No newline at end of file diff --git a/source/screens/demo/examples/songbook/0_artist-title.md b/source/screens/demo/examples/songbook/0_artist-title.md new file mode 100755 index 0000000..ccf1b5c --- /dev/null +++ b/source/screens/demo/examples/songbook/0_artist-title.md @@ -0,0 +1,26 @@ +--- +tags: + - songbook + - song +title: "Interpret - Titel" +releaseDate: JJJJ +description: Text +--- +~~~ +[verse 1] +strophe 1 + +[chorus] +refrain + +[verse 2] +strophe 2 + +[chorus] +[bridge] +überleitung + +[interlude] +[chorus] +[outro] +~~~ diff --git a/source/style/demo.scss b/source/style/demo.scss index e46a622..b3d4100 100644 --- a/source/style/demo.scss +++ b/source/style/demo.scss @@ -11,5 +11,6 @@ // ----------------------------------------------------------------------------- @import "modules/card/card_module"; @import "modules/portal/portal_module"; +@import "modules/songbook/songbook_module"; @import "modules/demo/demo_module"; // @import "modules/YOUR-MODULE/YOUR-FILES"; diff --git a/source/style/modules/songbook/_songbook_module.scss b/source/style/modules/songbook/_songbook_module.scss new file mode 100755 index 0000000..321f8bd --- /dev/null +++ b/source/style/modules/songbook/_songbook_module.scss @@ -0,0 +1,20 @@ +.songbook_song { + pre { + @extend .pre_code + } + + header { + h2 { + margin-bottom: $space_basic; + } + + h6 { + color: $color_brightest; + } + + h2+h6 { + margin-top: 0; + margin-bottom: $space_small; + } + } +} \ No newline at end of file diff --git a/source/templates/hippie/macros/_song.njk b/source/templates/hippie/macros/_song.njk new file mode 100644 index 0000000..79083c0 --- /dev/null +++ b/source/templates/hippie/macros/_song.njk @@ -0,0 +1,12 @@ +{% macro simple(index, data, content) %} +
    +
    +

    {{ data.title }}

    +
    {{ data.releaseDate }}
    +

    {{ data.description }}

    +
    + {# 
    {{ content }}
    #} + {{ content | safe }} +
    {{ index }}
    +
    +{% endmacro %} \ No newline at end of file From 2c61450238d13b88b5997c50517ba3157fe2028f Mon Sep 17 00:00:00 2001 From: sthag Date: Mon, 14 Apr 2025 20:16:10 +0200 Subject: [PATCH 192/372] feat: Separate style for drag example --- source/style/modules/ui/_drag_module.scss | 18 ++++++++++++++++++ source/style/modules/ui/_new_module.scss | 22 ++-------------------- source/style/ui.scss | 1 + 3 files changed, 21 insertions(+), 20 deletions(-) create mode 100644 source/style/modules/ui/_drag_module.scss diff --git a/source/style/modules/ui/_drag_module.scss b/source/style/modules/ui/_drag_module.scss new file mode 100644 index 0000000..ac1dc6c --- /dev/null +++ b/source/style/modules/ui/_drag_module.scss @@ -0,0 +1,18 @@ +.body_drag { + height: 100vh; + // padding: $space_basic; +} + +#space { + position: relative; + height: 100%; + background-color: $color-dark; +} + +#addFrame { + @extend .io_button; + position: fixed; + top: 8px; + right: 8px; + margin: 0; +} \ No newline at end of file diff --git a/source/style/modules/ui/_new_module.scss b/source/style/modules/ui/_new_module.scss index 100284b..1c0d5a9 100755 --- a/source/style/modules/ui/_new_module.scss +++ b/source/style/modules/ui/_new_module.scss @@ -5,11 +5,6 @@ $module_top_height: 32px; padding: $module_top_height + $space_basic $space_basic $space_basic; } -.body_drag { - height: 100vh; - // padding: $space_basic; -} - .container { display: grid; height: 100%; @@ -29,7 +24,8 @@ $module_top_height: 32px; } } -.menu, #top { +.menu, +#top { nav ul { margin: 0; } @@ -112,18 +108,4 @@ $module_top_height: 32px; margin-right: 16px; text-align: right; } -} - -#space { - position: relative; - height: 100%; - background-color: $color-dark; -} - -#addFrame { - @extend .io_button; - position: fixed; - top: 8px; - right: 8px; - margin: 0; } \ No newline at end of file diff --git a/source/style/ui.scss b/source/style/ui.scss index 0a36d0d..d088323 100644 --- a/source/style/ui.scss +++ b/source/style/ui.scss @@ -3,3 +3,4 @@ @import "modules/ui/new_module"; @import "modules/ui/settings_module"; +@import "modules/ui/drag_module"; From a43def2e92ee4e6d511c05cfa0890c3f8ebe7e0c Mon Sep 17 00:00:00 2001 From: sthag Date: Mon, 14 Apr 2025 20:16:32 +0200 Subject: [PATCH 193/372] feat: New order for meta elements --- source/templates/hippie/partials/_head_meta.njk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/source/templates/hippie/partials/_head_meta.njk b/source/templates/hippie/partials/_head_meta.njk index 00c2efd..b55c7c2 100644 --- a/source/templates/hippie/partials/_head_meta.njk +++ b/source/templates/hippie/partials/_head_meta.njk @@ -1,7 +1,8 @@ - - - + + + + - + \ No newline at end of file From 58cb0eba2c6ba4ccc10024a4251d1cc054db63af Mon Sep 17 00:00:00 2001 From: sthag Date: Mon, 14 Apr 2025 20:50:23 +0200 Subject: [PATCH 194/372] feat: Add sprite folder to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d958f01..5e89ea2 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ ################### build/** reports/** +source/art/sprites/ source/art/images/sprite.* # https://gist.github.com/octocat/9257657 From 37986e7b4b5537993bbc4f6343fa9ef097c9107c Mon Sep 17 00:00:00 2001 From: sthag Date: Fri, 2 May 2025 14:05:33 +0200 Subject: [PATCH 195/372] feat: Reflect style changes in hippie-style - Update submodule - Rename changed classes --- source/code/hippie/functions.js | 6 +++--- source/style/hippie-style | 2 +- source/templates/hippie/partials/_body_nav.njk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/code/hippie/functions.js b/source/code/hippie/functions.js index 2e80761..602ca13 100644 --- a/source/code/hippie/functions.js +++ b/source/code/hippie/functions.js @@ -33,20 +33,20 @@ function HippieScroll($tp, $dn) { let initLeft = false; const initY = hippie.screen.vh; - $tp.addClass('hide'); + $tp.addClass('di_none'); // Check scroll position and toggle element this.check = function () { hippie.screen.y = Math.min($(document).scrollTop(), document.documentElement.scrollTop); if (hippie.screen.y > initY) { if (!initLeft) { - $tp.removeClass('hide'); + $tp.removeClass('di_none'); console.info('Initial viewport left'); } initLeft = true; } else { if (initLeft) { - $tp.addClass('hide'); + $tp.addClass('di_none'); console.info('Initial viewport entered'); } initLeft = false; diff --git a/source/style/hippie-style b/source/style/hippie-style index 2e100f7..9f3797f 160000 --- a/source/style/hippie-style +++ b/source/style/hippie-style @@ -1 +1 @@ -Subproject commit 2e100f72a90d9b29fdd1a053059631b8644d91dd +Subproject commit 9f3797f6516a63101fb8ebd23ab8229053ec57b6 diff --git a/source/templates/hippie/partials/_body_nav.njk b/source/templates/hippie/partials/_body_nav.njk index f38e940..db7ea52 100644 --- a/source/templates/hippie/partials/_body_nav.njk +++ b/source/templates/hippie/partials/_body_nav.njk @@ -2,7 +2,7 @@
    +

    Varianten

    +
    +
    + + + + Caps Lock is ON. +
    +
    +

    <select>

    + - - + + + {% endblock %} {% block script %} @@ -243,7 +265,7 @@ tags: .visibility = 'hidden'; } } - + function capsDetect() { const body = document.getElementsByTagName('body')[0]; const capsWarning = document.getElementById('error'); diff --git a/source/screens/demo/layouts.njk b/source/screens/demo/layouts.njk index 9672ea8..ab80554 100644 --- a/source/screens/demo/layouts.njk +++ b/source/screens/demo/layouts.njk @@ -15,304 +15,291 @@ tags: {% block main %} -
    -
    -
    -

    Sammlung formatierter Elemente

    -

    Die Elemente werden fortlaufend komplexer

    -
    -
    -

    <h3>

    -

    Beispiele

    - 
    h3.txt_color_dark+p
    -

    Dunkle Überschrift

    -

    Mit normalem Textabsatz

    -

    <h4>

    -

    Beispiele

    - 
    a>h4
    - -

    Überschrift als Block-Verweis

    -     -

    <section>

    - 
    section>div.float_space_left>img^p+p
    -
    -
    Fahne von interaktionsweise
    -

    Vorname Name
    Straße 1, 01234 Stadt

    -

    +49 (0)123 1337 0000
    - name@domain.tld -

    -
    - 
    div.space_left_fourth
    -
    -
    -

    Eingerückter Inhalt

    -
    -
    - 
    nav>ul>(li>a.a_button{punkt $})*4nav>ul>(li>a.a_button_border{stufe $})*4
    -
    - - -
    - 
    nav.nav_horizontal>ul>(li>a.a_button{abschnitt $})*4nav.nav_center_old>ul>(li>a.a_button{typ $})*4
    -
    +

    Tabellen

    + 
    table.table_link>thead>tr>th{&nbsp;}+th{ab / zy}+th{neu / alt}^^(tbody>tr>td.cell_icon[rowspan="2"]>img[width=16  height=16]^+td.cell_link>a[target=_blank]{name}+a[target=_blank]{url}^+td.cell_date[rowspan="2"]{yyy-mm-dd}^tr>td.cell_text>div.shorten{beschreibung})*2
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
     Ab / ZyNeu / Alt
    + Name + URL + YYYY-MM-DD
    +
    Beschreibung
    +
    + Name + URL + YYYY-MM-DD
    +
    Beschreibung
    +
    +

    Eingebettet

    +
    + + Background flag + + + + + + + + + + +
    + + {% endblock %} {% block script %} From 7950d23b145b4dffe5a11fbc7ea660f3456f919b Mon Sep 17 00:00:00 2001 From: sthag Date: Thu, 19 Jun 2025 14:20:56 +0200 Subject: [PATCH 218/372] feat: More content for components and layouts - Update hippie styles - Add demo images - New components content - New layout structure and content --- source/art/images/demo/bullet.gif | Bin 0 -> 67 bytes source/art/images/demo/letter.gif | Bin 0 -> 77 bytes source/screens/demo/components.njk | 83 ++++++++++++++++++++++++++--- source/screens/demo/layouts.njk | 55 ++++++++++++------- source/style/hippie-style | 2 +- 5 files changed, 112 insertions(+), 28 deletions(-) create mode 100644 source/art/images/demo/bullet.gif create mode 100644 source/art/images/demo/letter.gif diff --git a/source/art/images/demo/bullet.gif b/source/art/images/demo/bullet.gif new file mode 100644 index 0000000000000000000000000000000000000000..55a84abda4f23c8a666c7407220b5d6c3d29b233 GIT binary patch literal 67 zcmZ?wbhEHb6krfwXkcWJmzQT?U{L(Y!pOkD$e;sc1H}ax7?`Ab`d6NQo8K^JQeako VY}IPMlvx!MC0dqgMKLf~0|2-%5Q+c* literal 0 HcmV?d00001 diff --git a/source/art/images/demo/letter.gif b/source/art/images/demo/letter.gif new file mode 100644 index 0000000000000000000000000000000000000000..60aac08875a890ca2123c56ff6c0187c3a02f6ca GIT binary patch literal 77 zcmZ?wbhEHb6krfwXkcW30L7myKqe!D4u}hqVPI0}>0f#JEkEy!En%E@rYNp|)7o`I YR<3>C(^+cLPFXANM1GT&Wo57i0C18ONdN!< literal 0 HcmV?d00001 diff --git a/source/screens/demo/components.njk b/source/screens/demo/components.njk index 87c7a3c..5890112 100644 --- a/source/screens/demo/components.njk +++ b/source/screens/demo/components.njk @@ -80,7 +80,17 @@ tags:
    Überschrift 6

    Mit Absatz innerhalb von <hgroup>.

    +

    <header>

    +
    Kopfbereich
    + 
    header.header_page
    + 
    header.header_txt>h1
    +
    +

    Überschrift 1

    +

    Innerhalb eines <header>.

    +

    <footer>

    +

    Bekommt überlicherweise Klassen zur Positionierung und der Abmessungen zugewiesen.

    +
    Fußbereich
    {{ footer.pinned() }}
    @@ -90,24 +100,81 @@ tags:

    Elemente:

    // p // address // hr // pre // blockquote // ol // ul // li // dl // dt // dd // figure // figcaption // main // div

    <p>

    +

    Ein Absatz. Ein code Element innerhalb wird besonders behandelt.

    Varianten

    - 
    p.txt_center
    - 
    p.txt_right
    p.column_2
    +

    Spalten können angegeben werden.

    p.column_3.column_line
    +

    Spalten können angegeben werden.

    +

    <address>

    +
    Anschrift, mit bestimmtem, ##### Format.

    <hr>

    +

    Varianten

    - 
    hr.hr_hidden
    - 
    hr.hr_dotted
    - 
    hr.space_even_half
    - 
    hr.hr_dotted.space_even_fourth
    + 
    hr.hr_hidden+hr.hr_dotted+hr.hr_double
    +
    +
    +
    +

    <pre>

    + 
    Vorformatierter Text.
+	erhält Umbrüche und Einrückung.
+
    + 
    pre.pre_code>code*2
    + 
    let variable = true;
+()(){}

    <blockquote>

    - 
    blockquote>p+p.quote_source
    +
    Ein Zitat ist eingerückt.
    + 
    blockquote.quote_mark>p+p.quote_source
    +
    +

    Zitat mit automatischen Anführungszeichen

    +

    und Quellenangabe.

    +
    +

    <dl>, <ol>, <ul>

    +
    +
    Begriff
    +
    Definition
    +
    +
      +
    1. Eins
      2. +
    2. Zwei
      3. +
    +
      +
    • Obst
      • +
    • Gemüse
      • +
    +

    Varianten

    + 
    ul.list_basic.list_dash>li*2
    +
      +
    • Mehr Abstand und
      • +
    • mit Unterstrichen.
      • +
    + 
    ul.list_link>(li>a)*2
    +

    <figure>

    figure>figcaption+{element}
    +
    +
    Bezeichnung
    + Grafisches Element. +
    +

    <main>

    +
    Hauptbereich

    <div>

    - 
    div.div_info>p

    Varianten

    + 
    div.div_info>p
    +
    +

    Absatz in Informationsbox.

    +
    + 
    div.box_space>div.box_cube>span
    +
    +
    Text
    +
    + 
    div.box_placeholder+hr+div.box_placeholder_bkg
    +
    +
    +

    Tabellen

    diff --git a/source/screens/demo/layouts.njk b/source/screens/demo/layouts.njk index ab80554..a45a817 100644 --- a/source/screens/demo/layouts.njk +++ b/source/screens/demo/layouts.njk @@ -21,19 +21,9 @@ tags:

    Die Elemente werden fortlaufend komplexer

    -

    <h3>

    -

    Beispiele

    - 
    h3.txt_color_dark+p
    -

    Dunkle Überschrift

    -

    Mit normalem Textabsatz

    -

    <h4>

    -

    Beispiele

    - 
    a>h4
    - -

    Überschrift als Block-Verweis

    -     -

    <section>

    - 
    section>div.float_space_left>img^p+p
    +

    Bereiche

    +

    section

    + 
    section.overflow>div.float_space_left>img^p+p>br+a.lineLink
    Fahne von interaktionsweise

    Vorname Name
    Straße 1, 01234 Stadt

    @@ -41,13 +31,13 @@ tags: name@domain.tld

    - 
    div.space_left_fourth
    + 
    div.space_left_fourth>(hr+p+hr)

    Eingerückter Inhalt

    - 
    nav>ul>(li>a.a_button{punkt $})*4nav>ul>(li>a.a_button_border{stufe $})*4
    + 
    div.overflow>(nav.float_space_left>ul>(li>a.a_button{punkt $})*4+nav>ul>(li>a.a_button_border{stufe $})*4)
    - 
    nav.nav_horizontal>ul>(li>a.a_button{abschnitt $})*4nav.nav_center_old>ul>(li>a.a_button{typ $})*4
    + 
    nav.nav_horizontal>ul>(li>a.a_button{abschnitt $})*4
    + 
    div.overflow>nav.nav_center_old>ul>(li>a.a_button{typ $})*4
    +

    Show me a @@ -229,10 +221,34 @@ tags:

    Gruppierung

    +

    p

    + 
    p.txt_right+p.txt_center+p.txt_left
    +

    Rechts

    +

    Mittig

    +

    Links

    +

    h*

    + 
    h3.txt_color_dark+p.txt_tiny
    +

    Dunkle Überschrift

    +

    Mit winzigem Textabsatz

    + 
    a>h4
    + +

    Überschrift als Block-Verweis

    +     +

    Überschrift 1

    +

    Kann mehrmals, ohne großen Abstand oberhalb, untereinander stehen.

    +

    Überschrift 2

    +

    kann das ebenso.

    + +

    hr

    + 
    hr.space_even_half
    +
    + 
    hr.hr_dotted.space_even_fourth
    +
    +

    ul

    ul.list_link>(li>a>img)*2+li>a
    • - name@domain.tld + name@domain.tld
    • Work @@ -254,7 +270,7 @@ tags: - + Name URL @@ -269,7 +285,7 @@ tags: - + Name URL @@ -283,6 +299,7 @@ tags: +

      Eingebettet

      diff --git a/source/style/hippie-style b/source/style/hippie-style index d17f966..a1a4bd4 160000 --- a/source/style/hippie-style +++ b/source/style/hippie-style @@ -1 +1 @@ -Subproject commit d17f9667943a2f525707b1dc77d2d9bf95814e71 +Subproject commit a1a4bd408bedaa11f5e1aacca630d0b1bbbe7aa2 From 08e258d7aa09a9108e84be83db5862451584ff15 Mon Sep 17 00:00:00 2001 From: sthag Date: Thu, 19 Jun 2025 16:13:22 +0200 Subject: [PATCH 219/372] feat: Create new ui index - New index page for ui collection - Move intro to examples and rename --- source/screens/demo/examples/intro.njk | 149 ++++++++++++++++++++++ source/screens/demo/examples/ui/index.njk | 137 ++------------------ 2 files changed, 161 insertions(+), 125 deletions(-) create mode 100644 source/screens/demo/examples/intro.njk diff --git a/source/screens/demo/examples/intro.njk b/source/screens/demo/examples/intro.njk new file mode 100644 index 0000000..07eb1a1 --- /dev/null +++ b/source/screens/demo/examples/intro.njk @@ -0,0 +1,149 @@ +--- +title: Intro +tags: + - demoExample +--- + +{% set pageId = "init" %} +{% set pageClass = "html_ui" %} + +{% extends "demo/_app.njk" %} +{% import "hippie/macros/_placeholder.njk" as ph %} +{% block title %} + {{ title }} +{% endblock %} + +{% block links %} + +{% endblock %} + +{% block head %} + {{ super() }} +{% endblock %} + +{% block body %} +
      +
      +
      + I +
      +
      +
      +
      +
      0%
      +
      +
      +
      + + {{ ph.brand('brand') }} +

      Powered by

      +
        +
      • Vendor
        • +
      • IDE
        • +
      • Engine
        • +
      +
      +
      +

      Agreement

      +

      This needs to be seen and acknowledged.
      So an interaction must be made to continue.

      +
      +
      +
      +
      Hello World!
      +

      Only left mouse click or any key

      +
      +{% endblock %} + +{%- block script %} + {{ super() }} + + +{% endblock %} \ No newline at end of file diff --git a/source/screens/demo/examples/ui/index.njk b/source/screens/demo/examples/ui/index.njk index f7534f3..4a0dfed 100644 --- a/source/screens/demo/examples/ui/index.njk +++ b/source/screens/demo/examples/ui/index.njk @@ -1,9 +1,8 @@ --- -title: Init +title: UI tags: - demoExample - index - - ui --- {% set pageId = "init" %} @@ -24,128 +23,16 @@ tags: {% endblock %} {% block body %} -
      -
      -
      - I -
      -
      -
      -
      -
      0%
      -
      +
      +
      -
      - - {{ ph.brand('brand') }} -

      Powered by

      -
        -
      • Vendor
        • -
      • IDE
        • -
      • Engine
        • -
      -
      -
      -

      Agreement

      -

      This needs to be seen and acknowledged.
      So an interaction must be made to continue.

      -
      -
      -
      -
      Hello World!
      -

      Only left mouse click or any key

      -
      -{% endblock %} - -{%- block script %} - {{ super() }} - - {% endblock %} \ No newline at end of file From 3b380e954acd6beec2f346ec20edcdc03839424d Mon Sep 17 00:00:00 2001 From: sthag Date: Thu, 19 Jun 2025 16:21:09 +0200 Subject: [PATCH 220/372] feat: Changes to style and logic for ui parts - Update hippie styles - Move top element for new page to header macro - Reassign ui and example collections --- source/screens/demo/basics.njk | 50 +++++++++---------- source/screens/demo/examples/ui/drag.njk | 2 +- source/screens/demo/examples/ui/form.njk | 3 +- source/screens/demo/examples/ui/new.njk | 31 +++--------- source/screens/demo/examples/ui/settings.njk | 5 +- source/style/hippie-style | 2 +- source/style/modules/ui/_drag_module.scss | 15 +++--- source/style/modules/ui/_form_module.scss | 7 +-- source/style/modules/ui/_settings_module.scss | 6 --- source/style/ui.scss | 20 +++----- source/templates/demo/_app.njk | 1 - source/templates/hippie/macros/_header.njk | 25 ++++++++++ source/templates/hippie/macros/_state.njk | 4 +- 13 files changed, 79 insertions(+), 92 deletions(-) diff --git a/source/screens/demo/basics.njk b/source/screens/demo/basics.njk index d8cf064..8ab604a 100644 --- a/source/screens/demo/basics.njk +++ b/source/screens/demo/basics.njk @@ -629,7 +629,7 @@ tags: Elementes. Dieses ist notwendig um Angaben zur Kommunikation mit dem Server zu setzen. Es hat normalerweise keine gestalterische Funktion.

      Grundlegend ist das Element <input>. Es hat viele Attribute um den Typ der Eingabe anzupassen. Ist es undefiniert nimmt es jegliche textbasierte Information auf und erhält eine Standardgröße.

      -

      +

      Ein spezieller Typ des Eingabefeldes hat die Funktion einer Schaltfläche <input[type="button"]>. Es gibt allerdings auch ein eigenes Element <button> @@ -637,8 +637,8 @@ tags:

      -

      - +

      +

      Interaktive Elemente können durch das Attribut readonly @@ -649,8 +649,8 @@ tags:

      -

      - +

      +

      Das Element <label> @@ -677,31 +677,31 @@ tags:

      - + - + - + - + - + - + @@ -713,8 +713,8 @@ tags: realisiert.

      - - + +

      Sie können mittels @@ -753,9 +753,9 @@ tags:

      -
      +
      -
      +
      @@ -792,43 +792,43 @@ tags: -
      +
      -
      +
      -
      +
      -
      +
      -
      +
      -
      +
      -
      +
      -
      +
      -
      +
      -
      +
      diff --git a/source/screens/demo/examples/ui/drag.njk b/source/screens/demo/examples/ui/drag.njk index 09266b9..ac2276e 100755 --- a/source/screens/demo/examples/ui/drag.njk +++ b/source/screens/demo/examples/ui/drag.njk @@ -1,7 +1,7 @@ --- title: Drag tags: - - demoExample + - ui --- {% set pageId = page.fileSlug %} {% set pageClass = "h_full_view" %} diff --git a/source/screens/demo/examples/ui/form.njk b/source/screens/demo/examples/ui/form.njk index b9adc45..1ab3145 100644 --- a/source/screens/demo/examples/ui/form.njk +++ b/source/screens/demo/examples/ui/form.njk @@ -1,10 +1,9 @@ --- title: Form tags: - - demoExample - ui --- -{% set bodyClass = "body_form" %} +{% set pageClass = "html_ui" %} {% extends "demo/_app.njk" %} diff --git a/source/screens/demo/examples/ui/new.njk b/source/screens/demo/examples/ui/new.njk index c567309..536583d 100755 --- a/source/screens/demo/examples/ui/new.njk +++ b/source/screens/demo/examples/ui/new.njk @@ -1,14 +1,14 @@ --- title: New tags: - - demoExample + - ui --- {% set pageId = page.fileSlug %} {% set pageClass = "h_full_view" %} {% set bodyClass = "body_new" %} {% extends "demo/_app.njk" %} -{% import "hippie/macros/_state.njk" as state %} +{% import "hippie/macros/_header.njk" as header %} {% block title %}{{ title }} {% endblock %} @@ -23,27 +23,7 @@ tags: {% endblock %} {% block body %} -
      -

      - {{ hippie.brand | upper }} -

      - -
      -

      {{ state.coord("log")}} - / - {{ state.date("date")}} - / - {{ state.time("time")}}

      -
      -
      + {{ header.status(hippie, new) }}
      - + - +
      ■ Name URL @@ -285,7 +281,7 @@ tags:
      ■ Name URL @@ -302,18 +298,7 @@ tags:

      Eingebettet

      - - Background flag - - - - - - - - - - + {{ ph.flag() }}
      diff --git a/source/templates/hippie/macros/_placeholder.njk b/source/templates/hippie/macros/_placeholder.njk index 2e8d298..f3c2fa1 100644 --- a/source/templates/hippie/macros/_placeholder.njk +++ b/source/templates/hippie/macros/_placeholder.njk @@ -1,5 +1,9 @@ -{% macro email(class = '', text = 'name@domain.tld') %} - {{ text }} +{% macro email(class = '', text = '', address = 'name@domain.tld') %} + {% if text === '' %} + {% set text = address %} + {% endif %} + + {{ text }} {# {{ 'name@domain.tld' | urlize | safe }} #} {% endmacro %} @@ -15,6 +19,10 @@ {{ text }} {% endmacro %} +{% macro phone(class = '', text = '+49 (0)101 1337 48') %} + {{ text }} +{% endmacro %} + {% macro brand(class = '', name = 'Marke') %}
      {# Brand logo #} @@ -44,4 +52,49 @@

      {{ name }}

      +{% endmacro %} + +{% macro flag(type = '', src = '', id = '', desc = 'Fahne von Interaktionsweise', width = '128') %} + {% set height = width / 1.6 %} + {% if type === 'svg' or type === '' %} + + {# + + + + + + + + + + + #} + {% if desc !== '' %} + {{ desc }} + {% endif %} + + + + + + + + + + + {% elif type === 'img' %} + {% if src === 'file' %} + + + {{ desc }} + + {% else %} + {{ desc }} + {% endif %} + {% endif %} {% endmacro %} \ No newline at end of file From 8b7241c4dacee9f7e9361ac1668aedd14f13941a Mon Sep 17 00:00:00 2001 From: sthag Date: Sat, 21 Jun 2025 13:39:36 +0200 Subject: [PATCH 226/372] feat: Change styles and ui - Change to hippie styles - Remove unused styles and components - Change colors for ui pages --- source/screens/demo/components.njk | 33 ++++++++++++++----- source/screens/demo/examples/ui/drag.njk | 2 +- source/screens/demo/examples/ui/form.njk | 1 + source/screens/demo/examples/ui/new.njk | 8 ++--- source/screens/demo/examples/ui/settings.njk | 9 +++-- source/screens/demo/layouts.njk | 19 ++++------- source/style/hippie-style | 2 +- source/style/modules/ui/_drag_module.scss | 11 ++----- source/style/modules/ui/_new_module.scss | 8 +++-- source/style/modules/ui/_settings_module.scss | 25 +++++++------- source/style/ui.scss | 7 ++-- 11 files changed, 65 insertions(+), 60 deletions(-) diff --git a/source/screens/demo/components.njk b/source/screens/demo/components.njk index 8161aba..55c9596 100644 --- a/source/screens/demo/components.njk +++ b/source/screens/demo/components.njk @@ -152,8 +152,12 @@ tags: 
      ul.list_link>(li>a)*2

      <figure>

      figure>figcaption+{element}
      @@ -171,7 +175,8 @@ tags: 
      div.box_space>div.box_cube>span
      -
      Text
      +
      + Text
      div.box_placeholder+hr+div.box_placeholder_bkg
      @@ -278,14 +283,24 @@ tags:

      Elemente:

      // form // label // input // button // select // datalist // optgroup // option // textarea // output // progress // meter // fieldset // legend

      <input>

      -
      -
      -
      -
      -
      -
      +
      + + + + +

      Varianten

      + 
      input.button_io+button.button_io
      +
      + + +
      +
      + + + +
      diff --git a/source/screens/demo/examples/ui/drag.njk b/source/screens/demo/examples/ui/drag.njk index 25911b1..b943fee 100755 --- a/source/screens/demo/examples/ui/drag.njk +++ b/source/screens/demo/examples/ui/drag.njk @@ -5,7 +5,7 @@ tags: --- {% set pageId = page.fileSlug %} {% set pageClass = "h_full_view" %} -{% set bodyClass = "body_drag" %} +{% set bodyClass = "body_ui" %} {% extends "demo/_app.njk" %} diff --git a/source/screens/demo/examples/ui/form.njk b/source/screens/demo/examples/ui/form.njk index 5f279de..29ab5bd 100644 --- a/source/screens/demo/examples/ui/form.njk +++ b/source/screens/demo/examples/ui/form.njk @@ -4,6 +4,7 @@ tags: - ui --- {% set pageClass = "html_ui" %} +{% set bodyClass = "body_ui" %} {% extends "demo/_app.njk" %} diff --git a/source/screens/demo/examples/ui/new.njk b/source/screens/demo/examples/ui/new.njk index 536583d..ba2e4c0 100755 --- a/source/screens/demo/examples/ui/new.njk +++ b/source/screens/demo/examples/ui/new.njk @@ -24,9 +24,9 @@ tags: {% block body %} {{ header.status(hippie, new) }} -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      +
      + + + + +
      diff --git a/source/style/hippie-style b/source/style/hippie-style index 2f63dbe..35b55de 160000 --- a/source/style/hippie-style +++ b/source/style/hippie-style @@ -1 +1 @@ -Subproject commit 2f63dbe2b65ddb320c0a7ea186f04a9c3698c9e7 +Subproject commit 35b55de55002b4a13d7f0530b326f5e2a569bbb1 diff --git a/source/style/modules/ui/_drag_module.scss b/source/style/modules/ui/_drag_module.scss index c9a98dc..a345922 100644 --- a/source/style/modules/ui/_drag_module.scss +++ b/source/style/modules/ui/_drag_module.scss @@ -1,9 +1,4 @@ -.body_drag { - @extend .body_ui; - - #space { - position: relative; - height: 100%; - background-color: $color-dark; - } +#space { + position: relative; + height: 100%; } \ No newline at end of file diff --git a/source/style/modules/ui/_new_module.scss b/source/style/modules/ui/_new_module.scss index 1c0d5a9..db795cd 100755 --- a/source/style/modules/ui/_new_module.scss +++ b/source/style/modules/ui/_new_module.scss @@ -1,11 +1,13 @@ $module_top_height: 32px; +$body_top_space: $module_top_height + $space_basic; .body_new { - height: 100vh; - padding: $module_top_height + $space_basic $space_basic $space_basic; + @extend .body_ui; + + padding: $body_top_space $space_basic $space_basic; } -.container { +#frame { display: grid; height: 100%; // margin: $space_basic; diff --git a/source/style/modules/ui/_settings_module.scss b/source/style/modules/ui/_settings_module.scss index 337f523..a95c3bc 100755 --- a/source/style/modules/ui/_settings_module.scss +++ b/source/style/modules/ui/_settings_module.scss @@ -7,7 +7,15 @@ } } +.body_setting { + @extend .body_ui; + + background-color: $color_back_basic; +} + #frame { + @extend %flex-column; + position: relative; height: 100%; @@ -22,23 +30,16 @@ } main { + @extend %flex-row; + + flex: 1; + aside { background-color: $color_brighter; } - } -} -.frame-flex { - display: flex; - flex-direction: column; - gap: $space_basic; - - main { - flex: 1; - - aside, section { - height: 100%; + flex: 1; } } } diff --git a/source/style/ui.scss b/source/style/ui.scss index 99fb3cb..efe343b 100644 --- a/source/style/ui.scss +++ b/source/style/ui.scss @@ -1,11 +1,10 @@ @use "sass:map"; -$color_text_basic: white; -$color_head_basic: white; - @import "demo_config"; @import "hippie-style/hippie"; +$color_gui_back: $color_dark; + .op_show { transition: $transition_show; } @@ -20,12 +19,12 @@ $color_head_basic: white; body { position: relative; min-height: 100%; - background-color: black; } } .body_ui { height: 100vh; + background-color: $color_gui_back; } .step { From a33163d556f845bb39ced0d4f4cb3b0efa947e7a Mon Sep 17 00:00:00 2001 From: sthag Date: Sat, 21 Jun 2025 14:22:31 +0200 Subject: [PATCH 227/372] feat: Add bootstrap icons dependency - Add node package for bootstrap icons - New eleventy config addPassthroughCopy for package files - Change link to local resource - Change all node dependencies to production --- .eleventy.js | 1 + package-lock.json | 19 +++++++++++++++++++ package.json | 7 ++++--- source/screens/demo/examples/ui/settings.njk | 4 +--- 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/.eleventy.js b/.eleventy.js index 7e00e33..309a861 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -31,6 +31,7 @@ module.exports = function (eleventyConfig) { eleventyConfig.addPassthroughCopy({"source/data/**/*.json": "json"}); eleventyConfig.addPassthroughCopy("vendor"); + eleventyConfig.addPassthroughCopy({"node_modules/bootstrap-icons": "vendor/bootstrap-icons"}); eleventyConfig.addWatchTarget("./source/style/"); diff --git a/package-lock.json b/package-lock.json index 3fabd9d..1280873 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,9 @@ "name": "hippie", "version": "0.13.1", "license": "MIT", + "dependencies": { + "bootstrap-icons": "^1.13.1" + }, "devDependencies": { "@11ty/eleventy": "^2.0.1", "sass": "^1.69.4" @@ -449,6 +452,22 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/bootstrap-icons": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.13.1.tgz", + "integrity": "sha512-ijombt4v6bv5CLeXvRWKy7CuM3TRTuPEuGaGKvTV5cz65rQSY8RQ2JcHt6b90cBBAC7s8fsf2EkQDldzCoXUjw==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/twbs" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/bootstrap" + } + ], + "license": "MIT" + }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", diff --git a/package.json b/package.json index 1ca5063..b93abc0 100644 --- a/package.json +++ b/package.json @@ -30,8 +30,9 @@ "serve": "npm run style:watch & npx @11ty/eleventy --serve" }, "private": true, - "devDependencies": { + "dependencies": { "@11ty/eleventy": "^2.0.1", - "sass": "^1.69.4" + "sass": "^1.69.4", + "bootstrap-icons": "^1.13.1" } -} +} \ No newline at end of file diff --git a/source/screens/demo/examples/ui/settings.njk b/source/screens/demo/examples/ui/settings.njk index 212994c..6a81f81 100755 --- a/source/screens/demo/examples/ui/settings.njk +++ b/source/screens/demo/examples/ui/settings.njk @@ -14,9 +14,7 @@ tags: {% block links %} {{ super() }} - + {% endblock %} From 30ad2f3067b139759c6d992947c5ebd9e55c420a Mon Sep 17 00:00:00 2001 From: sthag Date: Sat, 21 Jun 2025 14:35:43 +0200 Subject: [PATCH 228/372] feat: Change normalize css dependency - Remove old v7.0.0 vendor file - Add node package for normalize css - Still not in use --- .eleventy.js | 1 + package-lock.json | 322 ++++----------------- package.json | 7 +- source/style/hippie-style | 2 +- vendor/normalizecss/normalize.css | 447 ------------------------------ 5 files changed, 61 insertions(+), 718 deletions(-) delete mode 100644 vendor/normalizecss/normalize.css diff --git a/.eleventy.js b/.eleventy.js index 309a861..98082aa 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -32,6 +32,7 @@ module.exports = function (eleventyConfig) { eleventyConfig.addPassthroughCopy("vendor"); eleventyConfig.addPassthroughCopy({"node_modules/bootstrap-icons": "vendor/bootstrap-icons"}); + // eleventyConfig.addPassthroughCopy({"node_modules/normalize.css/normalize.css": "vendor/normalize.css"}); eleventyConfig.addWatchTarget("./source/style/"); diff --git a/package-lock.json b/package-lock.json index 1280873..62279d6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,24 +9,21 @@ "version": "0.13.1", "license": "MIT", "dependencies": { - "bootstrap-icons": "^1.13.1" - }, - "devDependencies": { "@11ty/eleventy": "^2.0.1", + "bootstrap-icons": "^1.13.1", + "normalize.css": "^8.0.1", "sass": "^1.69.4" } }, "node_modules/@11ty/dependency-tree": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@11ty/dependency-tree/-/dependency-tree-2.0.1.tgz", - "integrity": "sha512-5R+DsT9LJ9tXiSQ4y+KLFppCkQyXhzAm1AIuBWE/sbU0hSXY5pkhoqQYEcPJQFg/nglL+wD55iv2j+7O96UAvg==", - "dev": true + "integrity": "sha512-5R+DsT9LJ9tXiSQ4y+KLFppCkQyXhzAm1AIuBWE/sbU0hSXY5pkhoqQYEcPJQFg/nglL+wD55iv2j+7O96UAvg==" }, "node_modules/@11ty/eleventy": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@11ty/eleventy/-/eleventy-2.0.1.tgz", "integrity": "sha512-t8XVUbCJByhVEa1RzO0zS2QzbL3wPY8ot1yUw9noqiSHxJWUwv6jiwm1/MZDPTYtkZH2ZHvdQIRQ5/SjG9XmLw==", - "dev": true, "dependencies": { "@11ty/dependency-tree": "^2.0.1", "@11ty/eleventy-dev-server": "^1.0.4", @@ -82,7 +79,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/@11ty/eleventy-dev-server/-/eleventy-dev-server-1.0.4.tgz", "integrity": "sha512-qVBmV2G1KF/0o5B/3fITlrrDHy4bONUI2YuN3/WJ3BNw4NU1d/we8XhKrlgq13nNvHoBx5czYp3LZt8qRG53Fg==", - "dev": true, "dependencies": { "@11ty/eleventy-utils": "^1.0.1", "chokidar": "^3.5.3", @@ -111,7 +107,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/@11ty/eleventy-utils/-/eleventy-utils-1.0.2.tgz", "integrity": "sha512-Zy2leMK1DQR6Q6ZPSagv7QpJaAz9uVbb+RmVetYFp3foMeQtOSZx7w2u5daRFmP+PeNq9vO9H4xtBToYFWZwHA==", - "dev": true, "dependencies": { "normalize-path": "^3.0.0" }, @@ -127,7 +122,6 @@ "version": "4.17.21", "resolved": "https://registry.npmjs.org/@11ty/lodash-custom/-/lodash-custom-4.17.21.tgz", "integrity": "sha512-Mqt6im1xpb1Ykn3nbcCovWXK3ggywRJa+IXIdoz4wIIK+cvozADH63lexcuPpGS/gJ6/m2JxyyXDyupkMr5DHw==", - "dev": true, "engines": { "node": ">=14" }, @@ -140,7 +134,6 @@ "version": "7.24.1", "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz", "integrity": "sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==", - "dev": true, "engines": { "node": ">=6.9.0" } @@ -149,7 +142,6 @@ "version": "7.22.20", "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", - "dev": true, "engines": { "node": ">=6.9.0" } @@ -158,7 +150,6 @@ "version": "7.24.1", "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.1.tgz", "integrity": "sha512-Zo9c7N3xdOIQrNip7Lc9wvRPzlRtovHVE4lkz8WEDr7uYh/GMQhSiIgFxGIArRHYdJE5kxtZjAf8rT0xhdLCzg==", - "dev": true, "bin": { "parser": "bin/babel-parser.js" }, @@ -170,7 +161,6 @@ "version": "7.24.0", "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz", "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==", - "dev": true, "dependencies": { "@babel/helper-string-parser": "^7.23.4", "@babel/helper-validator-identifier": "^7.22.20", @@ -183,14 +173,12 @@ "node_modules/@iarna/toml": { "version": "2.2.5", "resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz", - "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==", - "dev": true + "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==" }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, "dependencies": { "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" @@ -203,7 +191,6 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true, "engines": { "node": ">= 8" } @@ -212,7 +199,6 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, "dependencies": { "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" @@ -225,7 +211,6 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/@sindresorhus/slugify/-/slugify-1.1.2.tgz", "integrity": "sha512-V9nR/W0Xd9TSGXpZ4iFUcFGhuOJtZX82Fzxj1YISlbSgKvIiNa7eLEZrT0vAraPOt++KHauIVNYgGRgjc13dXA==", - "dev": true, "dependencies": { "@sindresorhus/transliterate": "^0.1.1", "escape-string-regexp": "^4.0.0" @@ -241,7 +226,6 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/@sindresorhus/transliterate/-/transliterate-0.1.2.tgz", "integrity": "sha512-5/kmIOY9FF32nicXH+5yLNTX4NJ4atl7jRgqAJuIn/iyDFXBktOKDxCvyGE/EzmF4ngSUvjXxQUQlQiZ5lfw+w==", - "dev": true, "dependencies": { "escape-string-regexp": "^2.0.0", "lodash.deburr": "^4.1.0" @@ -257,7 +241,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", - "dev": true, "engines": { "node": ">=8" } @@ -265,20 +248,17 @@ "node_modules/@types/minimatch": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", - "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==", - "dev": true + "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==" }, "node_modules/a-sync-waterfall": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz", - "integrity": "sha512-RYTOHHdWipFUliRFMCS4X2Yn2X8M87V/OpSqWzKKOGhzqyUxzyVmhHDH9sAvG+ZuQf/TAOFsLCpMw09I1ufUnA==", - "dev": true + "integrity": "sha512-RYTOHHdWipFUliRFMCS4X2Yn2X8M87V/OpSqWzKKOGhzqyUxzyVmhHDH9sAvG+ZuQf/TAOFsLCpMw09I1ufUnA==" }, "node_modules/acorn": { "version": "7.4.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", - "dev": true, "bin": { "acorn": "bin/acorn" }, @@ -290,7 +270,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "dependencies": { "color-convert": "^2.0.1" }, @@ -304,14 +283,12 @@ "node_modules/any-promise": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-0.1.0.tgz", - "integrity": "sha512-lqzY9o+BbeGHRCOyxQkt/Tgvz0IZhTmQiA+LxQW8wSNpcTbj8K+0cZiSEvbpNZZP9/11Gy7dnLO3GNWUXO4d1g==", - "dev": true + "integrity": "sha512-lqzY9o+BbeGHRCOyxQkt/Tgvz0IZhTmQiA+LxQW8wSNpcTbj8K+0cZiSEvbpNZZP9/11Gy7dnLO3GNWUXO4d1g==" }, "node_modules/anymatch": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", - "dev": true, "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -324,7 +301,6 @@ "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, "dependencies": { "sprintf-js": "~1.0.2" } @@ -333,7 +309,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz", "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==", - "dev": true, "engines": { "node": ">=8" } @@ -342,7 +317,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true, "engines": { "node": ">=8" } @@ -351,7 +325,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -360,7 +333,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", - "dev": true, "engines": { "node": ">=8" } @@ -368,26 +340,22 @@ "node_modules/asap": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", - "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==", - "dev": true + "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==" }, "node_modules/assert-never": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/assert-never/-/assert-never-1.2.1.tgz", - "integrity": "sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==", - "dev": true + "integrity": "sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==" }, "node_modules/async": { "version": "3.2.5", "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz", - "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==", - "dev": true + "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==" }, "node_modules/babel-walk": { "version": "3.0.0-canary-5", "resolved": "https://registry.npmjs.org/babel-walk/-/babel-walk-3.0.0-canary-5.tgz", "integrity": "sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw==", - "dev": true, "dependencies": { "@babel/types": "^7.9.6" }, @@ -398,14 +366,12 @@ "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, "node_modules/bcp-47": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/bcp-47/-/bcp-47-1.0.8.tgz", "integrity": "sha512-Y9y1QNBBtYtv7hcmoX0tR+tUNSFZGZ6OL6vKPObq8BbOhkCoyayF6ogfLTgAli/KuAEbsYHYUNq2AQuY6IuLag==", - "dev": true, "dependencies": { "is-alphabetical": "^1.0.0", "is-alphanumerical": "^1.0.0", @@ -420,7 +386,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/bcp-47-match/-/bcp-47-match-1.0.3.tgz", "integrity": "sha512-LggQ4YTdjWQSKELZF5JwchnBa1u0pIQSZf5lSdOHEdbVP55h0qICA/FUp3+W99q0xqxYa1ZQizTUH87gecII5w==", - "dev": true, "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" @@ -430,7 +395,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/bcp-47-normalize/-/bcp-47-normalize-1.1.1.tgz", "integrity": "sha512-jWZ1Jdu3cs0EZdfCkS0UE9Gg01PtxnChjEBySeB+Zo6nkqtFfnvtoQQgP1qU1Oo4qgJgxhTI6Sf9y/pZIhPs0A==", - "dev": true, "dependencies": { "bcp-47": "^1.0.0", "bcp-47-match": "^1.0.0" @@ -444,7 +408,6 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", - "dev": true, "engines": { "node": ">=8" }, @@ -472,7 +435,6 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -482,7 +444,6 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, "dependencies": { "fill-range": "^7.0.1" }, @@ -494,7 +455,6 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", - "dev": true, "dependencies": { "es-define-property": "^1.0.0", "es-errors": "^1.3.0", @@ -513,7 +473,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -529,7 +488,6 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz", "integrity": "sha512-+UqJQjFEFaTAs3bNsF2j2kEN1baG/zghZbdqoYEDxGZtJo9LBzl1A+m0D4n3qKx8N2FNv8/Xp6yV9mQmBuptaw==", - "dev": true, "dependencies": { "is-regex": "^1.0.3" } @@ -538,7 +496,6 @@ "version": "3.6.0", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", - "dev": true, "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -562,7 +519,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "dependencies": { "color-name": "~1.1.4" }, @@ -573,14 +529,12 @@ "node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "node_modules/commander": { "version": "10.0.1", "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", - "dev": true, "engines": { "node": ">=14" } @@ -588,14 +542,12 @@ "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, "node_modules/constantinople": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/constantinople/-/constantinople-4.0.1.tgz", "integrity": "sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw==", - "dev": true, "dependencies": { "@babel/parser": "^7.6.0", "@babel/types": "^7.6.1" @@ -605,7 +557,6 @@ "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -619,7 +570,6 @@ "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, "dependencies": { "ms": "2.1.2" }, @@ -636,7 +586,6 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", - "dev": true, "dependencies": { "es-define-property": "^1.0.0", "es-errors": "^1.3.0", @@ -653,7 +602,6 @@ "version": "0.11.0", "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz", "integrity": "sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==", - "dev": true, "engines": { "node": ">= 0.6.0" } @@ -662,7 +610,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/dev-ip/-/dev-ip-1.0.1.tgz", "integrity": "sha512-LmVkry/oDShEgSZPNgqCIp2/TlqtExeGmymru3uCELnfyjY11IzpAproLYs+1X88fXO6DBoYP3ul2Xo2yz2j6A==", - "dev": true, "bin": { "dev-ip": "lib/dev-ip.js" }, @@ -673,14 +620,12 @@ "node_modules/doctypes": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz", - "integrity": "sha512-LLBi6pEqS6Do3EKQ3J0NqHWV5hhb78Pi8vvESYwyOy2c31ZEZVdtitdzsQsKb7878PEERhzUk0ftqGhG6Mz+pQ==", - "dev": true + "integrity": "sha512-LLBi6pEqS6Do3EKQ3J0NqHWV5hhb78Pi8vvESYwyOy2c31ZEZVdtitdzsQsKb7878PEERhzUk0ftqGhG6Mz+pQ==" }, "node_modules/dom-serializer": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==", - "dev": true, "dependencies": { "domelementtype": "^2.0.1", "domhandler": "^4.2.0", @@ -694,7 +639,6 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", - "dev": true, "funding": { "url": "https://github.com/fb55/entities?sponsor=1" } @@ -703,7 +647,6 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", - "dev": true, "funding": [ { "type": "github", @@ -715,7 +658,6 @@ "version": "4.3.1", "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", - "dev": true, "dependencies": { "domelementtype": "^2.2.0" }, @@ -730,7 +672,6 @@ "version": "2.8.0", "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", - "dev": true, "dependencies": { "dom-serializer": "^1.0.1", "domelementtype": "^2.2.0", @@ -743,14 +684,12 @@ "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", - "dev": true + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/ejs": { "version": "3.1.9", "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz", "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==", - "dev": true, "dependencies": { "jake": "^10.8.5" }, @@ -765,7 +704,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", - "dev": true, "engines": { "node": ">= 0.8" } @@ -774,7 +712,6 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz", "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==", - "dev": true, "engines": { "node": ">=0.12" }, @@ -786,7 +723,6 @@ "version": "0.1.8", "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz", "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==", - "dev": true, "dependencies": { "prr": "~1.0.1" }, @@ -798,7 +734,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", - "dev": true, "dependencies": { "get-intrinsic": "^1.2.4" }, @@ -810,7 +745,6 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "dev": true, "engines": { "node": ">= 0.4" } @@ -818,14 +752,12 @@ "node_modules/escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", - "dev": true + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" }, "node_modules/escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true, "engines": { "node": ">=10" }, @@ -837,7 +769,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true, "bin": { "esparse": "bin/esparse.js", "esvalidate": "bin/esvalidate.js" @@ -850,7 +781,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", - "dev": true, "dependencies": { "is-extendable": "^0.1.0" }, @@ -862,7 +792,6 @@ "version": "3.3.2", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", - "dev": true, "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", @@ -878,7 +807,6 @@ "version": "1.17.1", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", - "dev": true, "dependencies": { "reusify": "^1.0.4" } @@ -887,7 +815,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", - "dev": true, "dependencies": { "minimatch": "^5.0.1" } @@ -896,7 +823,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, "dependencies": { "balanced-match": "^1.0.0" } @@ -905,7 +831,6 @@ "version": "5.1.6", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, "dependencies": { "brace-expansion": "^2.0.1" }, @@ -917,7 +842,6 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, "dependencies": { "to-regex-range": "^5.0.1" }, @@ -929,7 +853,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", - "dev": true, "dependencies": { "debug": "2.6.9", "encodeurl": "~1.0.2", @@ -947,7 +870,6 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, "dependencies": { "ms": "2.0.0" } @@ -955,20 +877,17 @@ "node_modules/finalhandler/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, "node_modules/fsevents": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, "hasInstallScript": true, "optional": true, "os": [ @@ -982,7 +901,6 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -991,7 +909,6 @@ "version": "1.2.4", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", - "dev": true, "dependencies": { "es-errors": "^1.3.0", "function-bind": "^1.1.2", @@ -1010,7 +927,6 @@ "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -1030,7 +946,6 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, "dependencies": { "is-glob": "^4.0.1" }, @@ -1042,7 +957,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "dev": true, "dependencies": { "get-intrinsic": "^1.1.3" }, @@ -1053,14 +967,12 @@ "node_modules/graceful-fs": { "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" }, "node_modules/gray-matter": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/gray-matter/-/gray-matter-4.0.3.tgz", "integrity": "sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==", - "dev": true, "dependencies": { "js-yaml": "^3.13.1", "kind-of": "^6.0.2", @@ -1074,14 +986,12 @@ "node_modules/hamljs": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/hamljs/-/hamljs-0.6.2.tgz", - "integrity": "sha512-/chXRp4WpL47I+HX1vCCdSbEXAljEG2FBMmgO7Am0bYsqgnEjreeWzUdX1onXqwZtcfgxbCg5WtEYYvuZ5muBg==", - "dev": true + "integrity": "sha512-/chXRp4WpL47I+HX1vCCdSbEXAljEG2FBMmgO7Am0bYsqgnEjreeWzUdX1onXqwZtcfgxbCg5WtEYYvuZ5muBg==" }, "node_modules/handlebars": { "version": "4.7.8", "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==", - "dev": true, "dependencies": { "minimist": "^1.2.5", "neo-async": "^2.6.2", @@ -1102,7 +1012,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, "engines": { "node": ">=8" } @@ -1111,7 +1020,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", - "dev": true, "dependencies": { "es-define-property": "^1.0.0" }, @@ -1123,7 +1031,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -1135,7 +1042,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -1147,7 +1053,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", - "dev": true, "dependencies": { "has-symbols": "^1.0.3" }, @@ -1162,7 +1067,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "dev": true, "dependencies": { "function-bind": "^1.1.2" }, @@ -1174,7 +1078,6 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz", "integrity": "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==", - "dev": true, "funding": [ "https://github.com/fb55/htmlparser2?sponsor=1", { @@ -1193,7 +1096,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/http-equiv-refresh/-/http-equiv-refresh-1.0.0.tgz", "integrity": "sha512-TScO04soylRN9i/QdOdgZyhydXg9z6XdaGzEyOgDKycePeDeTT4KvigjBcI+tgfTlieLWauGORMq5F1eIDa+1w==", - "dev": true, "engines": { "node": ">= 0.10" } @@ -1201,14 +1103,12 @@ "node_modules/immutable": { "version": "4.3.5", "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.5.tgz", - "integrity": "sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==", - "dev": true + "integrity": "sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==" }, "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "dev": true, "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -1217,14 +1117,12 @@ "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "node_modules/is-alphabetical": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz", "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==", - "dev": true, "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" @@ -1234,7 +1132,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz", "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==", - "dev": true, "dependencies": { "is-alphabetical": "^1.0.0", "is-decimal": "^1.0.0" @@ -1248,7 +1145,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, "dependencies": { "binary-extensions": "^2.0.0" }, @@ -1260,7 +1156,6 @@ "version": "2.13.1", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", - "dev": true, "dependencies": { "hasown": "^2.0.0" }, @@ -1272,7 +1167,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz", "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==", - "dev": true, "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" @@ -1282,7 +1176,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/is-expression/-/is-expression-4.0.0.tgz", "integrity": "sha512-zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A==", - "dev": true, "dependencies": { "acorn": "^7.1.1", "object-assign": "^4.1.1" @@ -1292,7 +1185,6 @@ "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -1301,7 +1193,6 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -1310,7 +1201,6 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, "dependencies": { "is-extglob": "^2.1.1" }, @@ -1321,14 +1211,12 @@ "node_modules/is-json": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-json/-/is-json-2.0.1.tgz", - "integrity": "sha512-6BEnpVn1rcf3ngfmViLM6vjUjGErbdrL4rwlv+u1NO1XO8kqT4YGL8+19Q+Z/bas8tY90BTWMk2+fW1g6hQjbA==", - "dev": true + "integrity": "sha512-6BEnpVn1rcf3ngfmViLM6vjUjGErbdrL4rwlv+u1NO1XO8kqT4YGL8+19Q+Z/bas8tY90BTWMk2+fW1g6hQjbA==" }, "node_modules/is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, "engines": { "node": ">=0.12.0" } @@ -1336,14 +1224,12 @@ "node_modules/is-promise": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz", - "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==", - "dev": true + "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==" }, "node_modules/is-regex": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", - "dev": true, "dependencies": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -1358,14 +1244,12 @@ "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" }, "node_modules/iso-639-1": { "version": "2.1.15", "resolved": "https://registry.npmjs.org/iso-639-1/-/iso-639-1-2.1.15.tgz", "integrity": "sha512-7c7mBznZu2ktfvyT582E2msM+Udc1EjOyhVRE/0ZsjD9LBtWSm23h3PtiRh2a35XoUsTQQjJXaJzuLjXsOdFDg==", - "dev": true, "engines": { "node": ">=6.0" } @@ -1374,7 +1258,6 @@ "version": "10.8.7", "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz", "integrity": "sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==", - "dev": true, "dependencies": { "async": "^3.2.3", "chalk": "^4.0.2", @@ -1391,14 +1274,12 @@ "node_modules/js-stringify": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz", - "integrity": "sha512-rtS5ATOo2Q5k1G+DADISilDA6lv79zIiwFd6CcjuIxGKLFm5C+RLImRscVap9k55i+MOZwgliw+NejvkLuGD5g==", - "dev": true + "integrity": "sha512-rtS5ATOo2Q5k1G+DADISilDA6lv79zIiwFd6CcjuIxGKLFm5C+RLImRscVap9k55i+MOZwgliw+NejvkLuGD5g==" }, "node_modules/js-yaml": { "version": "3.14.1", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, "dependencies": { "argparse": "^1.0.7", "esprima": "^4.0.0" @@ -1411,7 +1292,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz", "integrity": "sha512-C9YK3Rf8q6VAPDCCU9fnqo3mAfOH6vUGnMcP4AQAYIEpWtfGLpwOTmZ+igtdK5y+VvI2n3CyYSzy4Qh34eq24A==", - "dev": true, "dependencies": { "is-promise": "^2.0.0", "promise": "^7.0.1" @@ -1421,7 +1301,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/junk/-/junk-1.0.3.tgz", "integrity": "sha512-3KF80UaaSSxo8jVnRYtMKNGFOoVPBdkkVPsw+Ad0y4oxKXPduS6G6iHkrf69yJVff/VAaYXkV42rtZ7daJxU3w==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -1430,7 +1309,6 @@ "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -1439,7 +1317,6 @@ "version": "4.1.5", "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz", "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==", - "dev": true, "engines": { "node": ">=6" } @@ -1448,7 +1325,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz", "integrity": "sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==", - "dev": true, "dependencies": { "uc.micro": "^1.0.1" } @@ -1457,7 +1333,6 @@ "version": "10.10.2", "resolved": "https://registry.npmjs.org/liquidjs/-/liquidjs-10.10.2.tgz", "integrity": "sha512-UcuTUexKg/8CmX6I5KNghk13pl3c8Rqhm+WSWqrc17pQP9LjpYPpOLDKG9OMBeHDBQ70yyn/GOqyZ/EKJ4z5yg==", - "dev": true, "dependencies": { "commander": "^10.0.0" }, @@ -1476,20 +1351,17 @@ "node_modules/list-to-array": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/list-to-array/-/list-to-array-1.1.0.tgz", - "integrity": "sha512-+dAZZ2mM+/m+vY9ezfoueVvrgnHIGi5FvgSymbIgJOFwiznWyA59mav95L+Mc6xPtL3s9gm5eNTlNtxJLbNM1g==", - "dev": true + "integrity": "sha512-+dAZZ2mM+/m+vY9ezfoueVvrgnHIGi5FvgSymbIgJOFwiznWyA59mav95L+Mc6xPtL3s9gm5eNTlNtxJLbNM1g==" }, "node_modules/lodash.deburr": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/lodash.deburr/-/lodash.deburr-4.1.0.tgz", - "integrity": "sha512-m/M1U1f3ddMCs6Hq2tAsYThTBDaAKFDX3dwDo97GEYzamXi9SqUpjWi/Rrj/gf3X2n8ktwgZrlP1z6E3v/IExQ==", - "dev": true + "integrity": "sha512-m/M1U1f3ddMCs6Hq2tAsYThTBDaAKFDX3dwDo97GEYzamXi9SqUpjWi/Rrj/gf3X2n8ktwgZrlP1z6E3v/IExQ==" }, "node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, "dependencies": { "yallist": "^4.0.0" }, @@ -1501,7 +1373,6 @@ "version": "3.4.4", "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.4.tgz", "integrity": "sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==", - "dev": true, "engines": { "node": ">=12" } @@ -1510,7 +1381,6 @@ "version": "13.0.2", "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.2.tgz", "integrity": "sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w==", - "dev": true, "dependencies": { "argparse": "^2.0.1", "entities": "~3.0.1", @@ -1525,14 +1395,12 @@ "node_modules/markdown-it/node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" }, "node_modules/maximatch": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/maximatch/-/maximatch-0.1.0.tgz", "integrity": "sha512-9ORVtDUFk4u/NFfo0vG/ND/z7UQCVZBL539YW0+U1I7H1BkZwizcPx5foFv7LCPcBnm2U6RjFnQOsIvN4/Vm2A==", - "dev": true, "dependencies": { "array-differ": "^1.0.0", "array-union": "^1.0.1", @@ -1547,7 +1415,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", "integrity": "sha512-LeZY+DZDRnvP7eMuQ6LHfCzUGxAAIViUBliK24P3hWXL6y4SortgR6Nim6xrkfSLlmH0+k+9NYNwVC2s53ZrYQ==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -1556,7 +1423,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", "integrity": "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==", - "dev": true, "dependencies": { "array-uniq": "^1.0.1" }, @@ -1568,7 +1434,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -1576,14 +1441,12 @@ "node_modules/mdurl": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", - "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==", - "dev": true + "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==" }, "node_modules/merge2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true, "engines": { "node": ">= 8" } @@ -1592,7 +1455,6 @@ "version": "4.0.5", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", - "dev": true, "dependencies": { "braces": "^3.0.2", "picomatch": "^2.3.1" @@ -1605,7 +1467,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz", "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==", - "dev": true, "bin": { "mime": "cli.js" }, @@ -1617,7 +1478,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, "dependencies": { "brace-expansion": "^1.1.7" }, @@ -1629,7 +1489,6 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -1638,7 +1497,6 @@ "version": "3.3.6", "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, "dependencies": { "yallist": "^4.0.0" }, @@ -1650,7 +1508,6 @@ "version": "0.5.6", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "dev": true, "dependencies": { "minimist": "^1.2.6" }, @@ -1661,26 +1518,22 @@ "node_modules/moo": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz", - "integrity": "sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==", - "dev": true + "integrity": "sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==" }, "node_modules/morphdom": { "version": "2.7.2", "resolved": "https://registry.npmjs.org/morphdom/-/morphdom-2.7.2.tgz", - "integrity": "sha512-Dqb/lHFyTi7SZpY0a5R4I/0Edo+iPMbaUexsHHsLAByyixCDiLHPHyVoKVmrpL0THcT7V9Cgev9y21TQYq6wQg==", - "dev": true + "integrity": "sha512-Dqb/lHFyTi7SZpY0a5R4I/0Edo+iPMbaUexsHHsLAByyixCDiLHPHyVoKVmrpL0THcT7V9Cgev9y21TQYq6wQg==" }, "node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node_modules/multimatch": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz", "integrity": "sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==", - "dev": true, "dependencies": { "@types/minimatch": "^3.0.3", "array-differ": "^3.0.0", @@ -1699,7 +1552,6 @@ "version": "4.2.0", "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz", "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==", - "dev": true, "bin": { "mustache": "bin/mustache" } @@ -1707,23 +1559,26 @@ "node_modules/neo-async": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", - "dev": true + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" }, "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true, "engines": { "node": ">=0.10.0" } }, + "node_modules/normalize.css": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/normalize.css/-/normalize.css-8.0.1.tgz", + "integrity": "sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==", + "license": "MIT" + }, "node_modules/nunjucks": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.4.tgz", "integrity": "sha512-26XRV6BhkgK0VOxfbU5cQI+ICFUtMLixv1noZn1tGU38kQH5A5nmmbk/O45xdyBhD1esk47nKrY0mvQpZIhRjQ==", - "dev": true, "dependencies": { "a-sync-waterfall": "^1.0.0", "asap": "^2.0.3", @@ -1748,7 +1603,6 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==", - "dev": true, "engines": { "node": ">= 6" } @@ -1757,7 +1611,6 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -1766,7 +1619,6 @@ "version": "2.4.1", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "dev": true, "dependencies": { "ee-first": "1.1.1" }, @@ -1778,7 +1630,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, "dependencies": { "wrappy": "1" } @@ -1786,14 +1637,12 @@ "node_modules/parse-srcset": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz", - "integrity": "sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q==", - "dev": true + "integrity": "sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q==" }, "node_modules/parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", - "dev": true, "engines": { "node": ">= 0.8" } @@ -1802,7 +1651,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -1811,7 +1659,6 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true, "engines": { "node": ">=8" } @@ -1819,20 +1666,17 @@ "node_modules/path-parse": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" }, "node_modules/path-to-regexp": { "version": "6.2.1", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.1.tgz", - "integrity": "sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==", - "dev": true + "integrity": "sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==" }, "node_modules/picomatch": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true, "engines": { "node": ">=8.6" }, @@ -1844,7 +1688,6 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -1853,7 +1696,6 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz", "integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==", - "dev": true, "dependencies": { "semver-compare": "^1.0.0" } @@ -1862,7 +1704,6 @@ "version": "0.16.6", "resolved": "https://registry.npmjs.org/posthtml/-/posthtml-0.16.6.tgz", "integrity": "sha512-JcEmHlyLK/o0uGAlj65vgg+7LIms0xKXe60lcDOTU7oVX/3LuEuLwrQpW3VJ7de5TaFKiW4kWkaIpJL42FEgxQ==", - "dev": true, "dependencies": { "posthtml-parser": "^0.11.0", "posthtml-render": "^3.0.0" @@ -1875,7 +1716,6 @@ "version": "0.11.0", "resolved": "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.11.0.tgz", "integrity": "sha512-QecJtfLekJbWVo/dMAA+OSwY79wpRmbqS5TeXvXSX+f0c6pW4/SE6inzZ2qkU7oAMCPqIDkZDvd/bQsSFUnKyw==", - "dev": true, "dependencies": { "htmlparser2": "^7.1.1" }, @@ -1887,7 +1727,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/posthtml-render/-/posthtml-render-3.0.0.tgz", "integrity": "sha512-z+16RoxK3fUPgwaIgH9NGnK1HKY9XIDpydky5eQGgAFVXTCSezalv9U2jQuNV+Z9qV1fDWNzldcw4eK0SSbqKA==", - "dev": true, "dependencies": { "is-json": "^2.0.1" }, @@ -1899,7 +1738,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/posthtml-urls/-/posthtml-urls-1.0.0.tgz", "integrity": "sha512-CMJ0L009sGQVUuYM/g6WJdscsq6ooAwhUuF6CDlYPMLxKp2rmCYVebEU+wZGxnQstGJhZPMvXsRhtqekILd5/w==", - "dev": true, "dependencies": { "http-equiv-refresh": "^1.0.0", "list-to-array": "^1.1.0", @@ -1914,7 +1752,6 @@ "version": "7.3.1", "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", - "dev": true, "dependencies": { "asap": "~2.0.3" } @@ -1923,7 +1760,6 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/promise-each/-/promise-each-2.2.0.tgz", "integrity": "sha512-67roqt1k3QDA41DZ8xi0V+rF3GoaMiX7QilbXu0vXimut+9RcKBNZ/t60xCRgcsihmNUsEjh48xLfNqOrKblUg==", - "dev": true, "dependencies": { "any-promise": "^0.1.0" } @@ -1931,14 +1767,12 @@ "node_modules/prr": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", - "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==", - "dev": true + "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==" }, "node_modules/pug": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/pug/-/pug-3.0.2.tgz", "integrity": "sha512-bp0I/hiK1D1vChHh6EfDxtndHji55XP/ZJKwsRqrz6lRia6ZC2OZbdAymlxdVFwd1L70ebrVJw4/eZ79skrIaw==", - "dev": true, "dependencies": { "pug-code-gen": "^3.0.2", "pug-filters": "^4.0.0", @@ -1954,7 +1788,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/pug-attrs/-/pug-attrs-3.0.0.tgz", "integrity": "sha512-azINV9dUtzPMFQktvTXciNAfAuVh/L/JCl0vtPCwvOA21uZrC08K/UnmrL+SXGEVc1FwzjW62+xw5S/uaLj6cA==", - "dev": true, "dependencies": { "constantinople": "^4.0.1", "js-stringify": "^1.0.2", @@ -1965,7 +1798,6 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-3.0.2.tgz", "integrity": "sha512-nJMhW16MbiGRiyR4miDTQMRWDgKplnHyeLvioEJYbk1RsPI3FuA3saEP8uwnTb2nTJEKBU90NFVWJBk4OU5qyg==", - "dev": true, "dependencies": { "constantinople": "^4.0.1", "doctypes": "^1.1.0", @@ -1980,14 +1812,12 @@ "node_modules/pug-error": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/pug-error/-/pug-error-2.0.0.tgz", - "integrity": "sha512-sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ==", - "dev": true + "integrity": "sha512-sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ==" }, "node_modules/pug-filters": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/pug-filters/-/pug-filters-4.0.0.tgz", "integrity": "sha512-yeNFtq5Yxmfz0f9z2rMXGw/8/4i1cCFecw/Q7+D0V2DdtII5UvqE12VaZ2AY7ri6o5RNXiweGH79OCq+2RQU4A==", - "dev": true, "dependencies": { "constantinople": "^4.0.1", "jstransformer": "1.0.0", @@ -2000,7 +1830,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/pug-lexer/-/pug-lexer-5.0.1.tgz", "integrity": "sha512-0I6C62+keXlZPZkOJeVam9aBLVP2EnbeDw3An+k0/QlqdwH6rv8284nko14Na7c0TtqtogfWXcRoFE4O4Ff20w==", - "dev": true, "dependencies": { "character-parser": "^2.2.0", "is-expression": "^4.0.0", @@ -2011,7 +1840,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/pug-linker/-/pug-linker-4.0.0.tgz", "integrity": "sha512-gjD1yzp0yxbQqnzBAdlhbgoJL5qIFJw78juN1NpTLt/mfPJ5VgC4BvkoD3G23qKzJtIIXBbcCt6FioLSFLOHdw==", - "dev": true, "dependencies": { "pug-error": "^2.0.0", "pug-walk": "^2.0.0" @@ -2021,7 +1849,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/pug-load/-/pug-load-3.0.0.tgz", "integrity": "sha512-OCjTEnhLWZBvS4zni/WUMjH2YSUosnsmjGBB1An7CsKQarYSWQ0GCVyd4eQPMFJqZ8w9xgs01QdiZXKVjk92EQ==", - "dev": true, "dependencies": { "object-assign": "^4.1.1", "pug-walk": "^2.0.0" @@ -2031,7 +1858,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/pug-parser/-/pug-parser-6.0.0.tgz", "integrity": "sha512-ukiYM/9cH6Cml+AOl5kETtM9NR3WulyVP2y4HOU45DyMim1IeP/OOiyEWRr6qk5I5klpsBnbuHpwKmTx6WURnw==", - "dev": true, "dependencies": { "pug-error": "^2.0.0", "token-stream": "1.0.0" @@ -2040,14 +1866,12 @@ "node_modules/pug-runtime": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/pug-runtime/-/pug-runtime-3.0.1.tgz", - "integrity": "sha512-L50zbvrQ35TkpHwv0G6aLSuueDRwc/97XdY8kL3tOT0FmhgG7UypU3VztfV/LATAvmUfYi4wNxSajhSAeNN+Kg==", - "dev": true + "integrity": "sha512-L50zbvrQ35TkpHwv0G6aLSuueDRwc/97XdY8kL3tOT0FmhgG7UypU3VztfV/LATAvmUfYi4wNxSajhSAeNN+Kg==" }, "node_modules/pug-strip-comments": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-2.0.0.tgz", "integrity": "sha512-zo8DsDpH7eTkPHCXFeAk1xZXJbyoTfdPlNR0bK7rpOMuhBYb0f5qUVCO1xlsitYd3w5FQTK7zpNVKb3rZoUrrQ==", - "dev": true, "dependencies": { "pug-error": "^2.0.0" } @@ -2055,14 +1879,12 @@ "node_modules/pug-walk": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/pug-walk/-/pug-walk-2.0.0.tgz", - "integrity": "sha512-yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ==", - "dev": true + "integrity": "sha512-yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ==" }, "node_modules/queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true, "funding": [ { "type": "github", @@ -2082,7 +1904,6 @@ "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "dev": true, "dependencies": { "picomatch": "^2.2.1" }, @@ -2094,7 +1915,6 @@ "version": "2.0.14", "resolved": "https://registry.npmjs.org/recursive-copy/-/recursive-copy-2.0.14.tgz", "integrity": "sha512-K8WNY8f8naTpfbA+RaXmkaQuD1IeW9EgNEfyGxSqqTQukpVtoOKros9jUqbpEsSw59YOmpd8nCBgtqJZy5nvog==", - "dev": true, "dependencies": { "errno": "^0.1.2", "graceful-fs": "^4.1.4", @@ -2111,7 +1931,6 @@ "version": "1.22.8", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", - "dev": true, "dependencies": { "is-core-module": "^2.13.0", "path-parse": "^1.0.7", @@ -2128,7 +1947,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true, "engines": { "iojs": ">=1.0.0", "node": ">=0.10.0" @@ -2138,7 +1956,6 @@ "version": "2.7.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, "dependencies": { "glob": "^7.1.3" }, @@ -2150,7 +1967,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, "funding": [ { "type": "github", @@ -2173,7 +1989,6 @@ "version": "1.72.0", "resolved": "https://registry.npmjs.org/sass/-/sass-1.72.0.tgz", "integrity": "sha512-Gpczt3WA56Ly0Mn8Sl21Vj94s1axi9hDIzDFn9Ph9x3C3p4nNyvsqJoQyVXKou6cBlfFWEgRW4rT8Tb4i3XnVA==", - "dev": true, "dependencies": { "chokidar": ">=3.0.0 <4.0.0", "immutable": "^4.0.0", @@ -2190,7 +2005,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz", "integrity": "sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA==", - "dev": true, "dependencies": { "extend-shallow": "^2.0.1", "kind-of": "^6.0.0" @@ -2203,7 +2017,6 @@ "version": "7.6.0", "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", - "dev": true, "dependencies": { "lru-cache": "^6.0.0" }, @@ -2217,14 +2030,12 @@ "node_modules/semver-compare": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz", - "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==", - "dev": true + "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==" }, "node_modules/set-function-length": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", - "dev": true, "dependencies": { "define-data-property": "^1.1.4", "es-errors": "^1.3.0", @@ -2241,7 +2052,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, "dependencies": { "shebang-regex": "^3.0.0" }, @@ -2253,7 +2063,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true, "engines": { "node": ">=8" } @@ -2262,7 +2071,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", "integrity": "sha512-3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -2271,7 +2079,6 @@ "version": "1.6.6", "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.6.tgz", "integrity": "sha512-h+z7HKHYXj6wJU+AnS/+IH8Uh9fdcX1Lrhg1/VMdf9PwoBQXFcXiAdsy2tSK0P6gKwJLXp02r90ahUCqHk9rrw==", - "dev": true, "engines": { "node": ">=8.0.0" } @@ -2280,7 +2087,6 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -2289,7 +2095,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -2297,14 +2102,12 @@ "node_modules/sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", - "dev": true + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==" }, "node_modules/ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==", - "dev": true, "dependencies": { "minipass": "^3.1.1" }, @@ -2316,7 +2119,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", - "dev": true, "engines": { "node": ">= 0.8" } @@ -2325,7 +2127,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz", "integrity": "sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -2334,7 +2135,6 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, "dependencies": { "has-flag": "^4.0.0" }, @@ -2346,7 +2146,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -2358,7 +2157,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", - "dev": true, "engines": { "node": ">=4" } @@ -2367,7 +2165,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, "dependencies": { "is-number": "^7.0.0" }, @@ -2378,20 +2175,17 @@ "node_modules/token-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/token-stream/-/token-stream-1.0.0.tgz", - "integrity": "sha512-VSsyNPPW74RpHwR8Fc21uubwHY7wMDeJLys2IX5zJNih+OnAnaifKHo+1LHT7DAdloQ7apeaaWg8l7qnf/TnEg==", - "dev": true + "integrity": "sha512-VSsyNPPW74RpHwR8Fc21uubwHY7wMDeJLys2IX5zJNih+OnAnaifKHo+1LHT7DAdloQ7apeaaWg8l7qnf/TnEg==" }, "node_modules/uc.micro": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz", - "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==", - "dev": true + "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==" }, "node_modules/uglify-js": { "version": "3.17.4", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz", "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==", - "dev": true, "optional": true, "bin": { "uglifyjs": "bin/uglifyjs" @@ -2404,7 +2198,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", - "dev": true, "engines": { "node": ">= 0.8" } @@ -2413,7 +2206,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz", "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -2422,7 +2214,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, "dependencies": { "isexe": "^2.0.0" }, @@ -2437,7 +2228,6 @@ "version": "7.0.2", "resolved": "https://registry.npmjs.org/with/-/with-7.0.2.tgz", "integrity": "sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w==", - "dev": true, "dependencies": { "@babel/parser": "^7.9.6", "@babel/types": "^7.9.6", @@ -2451,20 +2241,17 @@ "node_modules/wordwrap": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==", - "dev": true + "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==" }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, "node_modules/ws": { "version": "8.16.0", "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==", - "dev": true, "engines": { "node": ">=10.0.0" }, @@ -2484,8 +2271,7 @@ "node_modules/yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" } } } diff --git a/package.json b/package.json index b93abc0..33ebec2 100644 --- a/package.json +++ b/package.json @@ -30,9 +30,12 @@ "serve": "npm run style:watch & npx @11ty/eleventy --serve" }, "private": true, + "devDependencies": { + "normalize.css": "^8.0.1" + }, "dependencies": { "@11ty/eleventy": "^2.0.1", - "sass": "^1.69.4", - "bootstrap-icons": "^1.13.1" + "bootstrap-icons": "^1.13.1", + "sass": "^1.69.4" } } \ No newline at end of file diff --git a/source/style/hippie-style b/source/style/hippie-style index 35b55de..b7ec209 160000 --- a/source/style/hippie-style +++ b/source/style/hippie-style @@ -1 +1 @@ -Subproject commit 35b55de55002b4a13d7f0530b326f5e2a569bbb1 +Subproject commit b7ec209761cac635ba8312dbb07bf831ebc32933 diff --git a/vendor/normalizecss/normalize.css b/vendor/normalizecss/normalize.css deleted file mode 100644 index b1d74e5..0000000 --- a/vendor/normalizecss/normalize.css +++ /dev/null @@ -1,447 +0,0 @@ -/*! normalize.css v7.0.0 | MIT License | github.com/necolas/normalize.css */ - -/* Document - ========================================================================== */ - -/** - * 1. Correct the line height in all browsers. - * 2. Prevent adjustments of font size after orientation changes in - * IE on Windows Phone and in iOS. - */ - -html { - line-height: 1.15; /* 1 */ - -ms-text-size-adjust: 100%; /* 2 */ - -webkit-text-size-adjust: 100%; /* 2 */ -} - -/* Sections - ========================================================================== */ - -/** - * Remove the margin in all browsers (opinionated). - */ - -body { - margin: 0; -} - -/** - * Add the correct display in IE 9-. - */ - -article, -aside, -footer, -header, -nav, -section { - display: block; -} - -/** - * Correct the font size and margin on `h1` elements within `section` and - * `article` contexts in Chrome, Firefox, and Safari. - */ - -h1 { - font-size: 2em; - margin: 0.67em 0; -} - -/* Grouping content - ========================================================================== */ - -/** - * Add the correct display in IE 9-. - * 1. Add the correct display in IE. - */ - -figcaption, -figure, -main { /* 1 */ - display: block; -} - -/** - * Add the correct margin in IE 8. - */ - -figure { - margin: 1em 40px; -} - -/** - * 1. Add the correct box sizing in Firefox. - * 2. Show the overflow in Edge and IE. - */ - -hr { - box-sizing: content-box; /* 1 */ - height: 0; /* 1 */ - overflow: visible; /* 2 */ -} - -/** - * 1. Correct the inheritance and scaling of font size in all browsers. - * 2. Correct the odd `em` font sizing in all browsers. - */ - -pre { - font-family: monospace, monospace; /* 1 */ - font-size: 1em; /* 2 */ -} - -/* Text-level semantics - ========================================================================== */ - -/** - * 1. Remove the gray background on active links in IE 10. - * 2. Remove gaps in links underline in iOS 8+ and Safari 8+. - */ - -a { - background-color: transparent; /* 1 */ - -webkit-text-decoration-skip: objects; /* 2 */ -} - -/** - * 1. Remove the bottom border in Chrome 57- and Firefox 39-. - * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. - */ - -abbr[title] { - border-bottom: none; /* 1 */ - text-decoration: underline; /* 2 */ - text-decoration: underline dotted; /* 2 */ -} - -/** - * Prevent the duplicate application of `bolder` by the next rule in Safari 6. - */ - -b, -strong { - font-weight: inherit; -} - -/** - * Add the correct font weight in Chrome, Edge, and Safari. - */ - -b, -strong { - font-weight: bolder; -} - -/** - * 1. Correct the inheritance and scaling of font size in all browsers. - * 2. Correct the odd `em` font sizing in all browsers. - */ - -code, -kbd, -samp { - font-family: monospace, monospace; /* 1 */ - font-size: 1em; /* 2 */ -} - -/** - * Add the correct font style in Android 4.3-. - */ - -dfn { - font-style: italic; -} - -/** - * Add the correct background and color in IE 9-. - */ - -mark { - background-color: #ff0; - color: #000; -} - -/** - * Add the correct font size in all browsers. - */ - -small { - font-size: 80%; -} - -/** - * Prevent `sub` and `sup` elements from affecting the line height in - * all browsers. - */ - -sub, -sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; -} - -sub { - bottom: -0.25em; -} - -sup { - top: -0.5em; -} - -/* Embedded content - ========================================================================== */ - -/** - * Add the correct display in IE 9-. - */ - -audio, -video { - display: inline-block; -} - -/** - * Add the correct display in iOS 4-7. - */ - -audio:not([controls]) { - display: none; - height: 0; -} - -/** - * Remove the border on images inside links in IE 10-. - */ - -img { - border-style: none; -} - -/** - * Hide the overflow in IE. - */ - -svg:not(:root) { - overflow: hidden; -} - -/* Forms - ========================================================================== */ - -/** - * 1. Change the font styles in all browsers (opinionated). - * 2. Remove the margin in Firefox and Safari. - */ - -button, -input, -optgroup, -select, -textarea { - font-family: sans-serif; /* 1 */ - font-size: 100%; /* 1 */ - line-height: 1.15; /* 1 */ - margin: 0; /* 2 */ -} - -/** - * Show the overflow in IE. - * 1. Show the overflow in Edge. - */ - -button, -input { /* 1 */ - overflow: visible; -} - -/** - * Remove the inheritance of text transform in Edge, Firefox, and IE. - * 1. Remove the inheritance of text transform in Firefox. - */ - -button, -select { /* 1 */ - text-transform: none; -} - -/** - * 1. Prevent a WebKit bug where (2) destroys native `audio` and `video` - * controls in Android 4. - * 2. Correct the inability to style clickable types in iOS and Safari. - */ - -button, -html [type="button"], /* 1 */ -[type="reset"], -[type="submit"] { - -webkit-appearance: button; /* 2 */ -} - -/** - * Remove the inner border and padding in Firefox. - */ - -button::-moz-focus-inner, -[type="button"]::-moz-focus-inner, -[type="reset"]::-moz-focus-inner, -[type="submit"]::-moz-focus-inner { - border-style: none; - padding: 0; -} - -/** - * Restore the focus styles unset by the previous rule. - */ - -button:-moz-focusring, -[type="button"]:-moz-focusring, -[type="reset"]:-moz-focusring, -[type="submit"]:-moz-focusring { - outline: 1px dotted ButtonText; -} - -/** - * Correct the padding in Firefox. - */ - -fieldset { - padding: 0.35em 0.75em 0.625em; -} - -/** - * 1. Correct the text wrapping in Edge and IE. - * 2. Correct the color inheritance from `fieldset` elements in IE. - * 3. Remove the padding so developers are not caught out when they zero out - * `fieldset` elements in all browsers. - */ - -legend { - box-sizing: border-box; /* 1 */ - color: inherit; /* 2 */ - display: table; /* 1 */ - max-width: 100%; /* 1 */ - padding: 0; /* 3 */ - white-space: normal; /* 1 */ -} - -/** - * 1. Add the correct display in IE 9-. - * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera. - */ - -progress { - display: inline-block; /* 1 */ - vertical-align: baseline; /* 2 */ -} - -/** - * Remove the default vertical scrollbar in IE. - */ - -textarea { - overflow: auto; -} - -/** - * 1. Add the correct box sizing in IE 10-. - * 2. Remove the padding in IE 10-. - */ - -[type="checkbox"], -[type="radio"] { - box-sizing: border-box; /* 1 */ - padding: 0; /* 2 */ -} - -/** - * Correct the cursor style of increment and decrement buttons in Chrome. - */ - -[type="number"]::-webkit-inner-spin-button, -[type="number"]::-webkit-outer-spin-button { - height: auto; -} - -/** - * 1. Correct the odd appearance in Chrome and Safari. - * 2. Correct the outline style in Safari. - */ - -[type="search"] { - -webkit-appearance: textfield; /* 1 */ - outline-offset: -2px; /* 2 */ -} - -/** - * Remove the inner padding and cancel buttons in Chrome and Safari on macOS. - */ - -[type="search"]::-webkit-search-cancel-button, -[type="search"]::-webkit-search-decoration { - -webkit-appearance: none; -} - -/** - * 1. Correct the inability to style clickable types in iOS and Safari. - * 2. Change font properties to `inherit` in Safari. - */ - -::-webkit-file-upload-button { - -webkit-appearance: button; /* 1 */ - font: inherit; /* 2 */ -} - -/* Interactive - ========================================================================== */ - -/* - * Add the correct display in IE 9-. - * 1. Add the correct display in Edge, IE, and Firefox. - */ - -details, /* 1 */ -menu { - display: block; -} - -/* - * Add the correct display in all browsers. - */ - -summary { - display: list-item; -} - -/* Scripting - ========================================================================== */ - -/** - * Add the correct display in IE 9-. - */ - -canvas { - display: inline-block; -} - -/** - * Add the correct display in IE. - */ - -template { - display: none; -} - -/* Hidden - ========================================================================== */ - -/** - * Add the correct display in IE 10-. - */ - -[hidden] { - display: none; -} From 6e722cd9071e2a2aba137f2daf10a0b7e72d1050 Mon Sep 17 00:00:00 2001 From: sthag Date: Sun, 22 Jun 2025 15:49:32 +0200 Subject: [PATCH 229/372] feat: Restructure settings - New styles - New content --- source/screens/demo/examples/ui/index.njk | 2 +- source/screens/demo/examples/ui/settings.njk | 76 ++++++++++++++----- source/style/hippie-style | 2 +- source/style/modules/ui/_settings_module.scss | 9 +-- 4 files changed, 64 insertions(+), 25 deletions(-) diff --git a/source/screens/demo/examples/ui/index.njk b/source/screens/demo/examples/ui/index.njk index 4e5367a..1712214 100644 --- a/source/screens/demo/examples/ui/index.njk +++ b/source/screens/demo/examples/ui/index.njk @@ -25,7 +25,7 @@ tags: {% block body %}
      - section-bar + section
      - state -
      + state +
      diff --git a/source/style/hippie-style b/source/style/hippie-style index b7ec209..3d23ba5 160000 --- a/source/style/hippie-style +++ b/source/style/hippie-style @@ -1 +1 @@ -Subproject commit b7ec209761cac635ba8312dbb07bf831ebc32933 +Subproject commit 3d23ba55d4c1c300d49cf91868cf65bb8307b5a6 diff --git a/source/style/modules/ui/_settings_module.scss b/source/style/modules/ui/_settings_module.scss index a95c3bc..9b41e4c 100755 --- a/source/style/modules/ui/_settings_module.scss +++ b/source/style/modules/ui/_settings_module.scss @@ -1,9 +1,6 @@ @mixin nav-spacer($name, $size, $orientation) { - .spacer-#{$name} { + .spacer.#{$name} { width: $size; - margin: 0; - border: $border_dotted; - opacity: .25; } } @@ -35,7 +32,7 @@ flex: 1; aside { - background-color: $color_brighter; + background-color: rgba(255, 255, 255, .1); } section { @@ -46,9 +43,9 @@ .io { .spacer { - width: $space_double; margin: 0; border: $border_dotted; + padding: 0; opacity: .25; } From 0a27169a1bb53ab6715bc22fb47ce3b1dde47aae Mon Sep 17 00:00:00 2001 From: sthag Date: Sun, 22 Jun 2025 15:57:55 +0200 Subject: [PATCH 230/372] fix: Layout of footer for settings --- source/screens/demo/examples/ui/settings.njk | 8 +++++--- source/style/hippie-style | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/source/screens/demo/examples/ui/settings.njk b/source/screens/demo/examples/ui/settings.njk index b7ac1ba..924b613 100755 --- a/source/screens/demo/examples/ui/settings.njk +++ b/source/screens/demo/examples/ui/settings.njk @@ -140,9 +140,11 @@ tags: section
      - state -
      - +
      {% endblock %} diff --git a/source/style/hippie-style b/source/style/hippie-style index 3d23ba5..8ffc1b8 160000 --- a/source/style/hippie-style +++ b/source/style/hippie-style @@ -1 +1 @@ -Subproject commit 3d23ba55d4c1c300d49cf91868cf65bb8307b5a6 +Subproject commit 8ffc1b8346977486044443e0c7dba0bead25b9d8 From 24efcefab313a60245616db9d2026fc55a26d337 Mon Sep 17 00:00:00 2001 From: sthag Date: Sun, 22 Jun 2025 17:40:23 +0200 Subject: [PATCH 231/372] feat: Move files - Template app is now part of hippie and not demo anymore - Update includes - Settings module is now called frame --- source/screens/demo/examples/intro.njk | 2 +- source/screens/demo/examples/ui/drag.njk | 2 +- source/screens/demo/examples/ui/form.njk | 2 +- source/screens/demo/examples/ui/index.njk | 2 +- source/screens/demo/examples/ui/new.njk | 2 +- source/style/modules/ui/_frame_module.scss | 93 +++++++++++++++++++ source/style/modules/ui/_settings_module.scss | 54 ----------- source/style/ui.scss | 2 +- source/templates/{demo => hippie}/_app.njk | 4 +- 9 files changed, 101 insertions(+), 62 deletions(-) create mode 100755 source/style/modules/ui/_frame_module.scss delete mode 100755 source/style/modules/ui/_settings_module.scss rename source/templates/{demo => hippie}/_app.njk (89%) diff --git a/source/screens/demo/examples/intro.njk b/source/screens/demo/examples/intro.njk index 07eb1a1..9eb0ebd 100644 --- a/source/screens/demo/examples/intro.njk +++ b/source/screens/demo/examples/intro.njk @@ -7,7 +7,7 @@ tags: {% set pageId = "init" %} {% set pageClass = "html_ui" %} -{% extends "demo/_app.njk" %} +{% extends "hippie/_app.njk" %} {% import "hippie/macros/_placeholder.njk" as ph %} {% block title %} {{ title }} diff --git a/source/screens/demo/examples/ui/drag.njk b/source/screens/demo/examples/ui/drag.njk index b943fee..3d82a7b 100755 --- a/source/screens/demo/examples/ui/drag.njk +++ b/source/screens/demo/examples/ui/drag.njk @@ -7,7 +7,7 @@ tags: {% set pageClass = "h_full_view" %} {% set bodyClass = "body_ui" %} -{% extends "demo/_app.njk" %} +{% extends "hippie/_app.njk" %} {% block title %}{{ title }} {% endblock %} diff --git a/source/screens/demo/examples/ui/form.njk b/source/screens/demo/examples/ui/form.njk index 29ab5bd..83ac65d 100644 --- a/source/screens/demo/examples/ui/form.njk +++ b/source/screens/demo/examples/ui/form.njk @@ -6,7 +6,7 @@ tags: {% set pageClass = "html_ui" %} {% set bodyClass = "body_ui" %} -{% extends "demo/_app.njk" %} +{% extends "hippie/_app.njk" %} {% block title %}{{ title }} {% endblock %} diff --git a/source/screens/demo/examples/ui/index.njk b/source/screens/demo/examples/ui/index.njk index 1712214..4bd84c1 100644 --- a/source/screens/demo/examples/ui/index.njk +++ b/source/screens/demo/examples/ui/index.njk @@ -7,7 +7,7 @@ tags: {% set pageClass = "html_ui" %} -{% extends "demo/_app.njk" %} +{% extends "hippie/_app.njk" %} {% import "hippie/macros/_placeholder.njk" as ph %} {% block title %} diff --git a/source/screens/demo/examples/ui/new.njk b/source/screens/demo/examples/ui/new.njk index ba2e4c0..4b5ae8f 100755 --- a/source/screens/demo/examples/ui/new.njk +++ b/source/screens/demo/examples/ui/new.njk @@ -7,7 +7,7 @@ tags: {% set pageClass = "h_full_view" %} {% set bodyClass = "body_new" %} -{% extends "demo/_app.njk" %} +{% extends "hippie/_app.njk" %} {% import "hippie/macros/_header.njk" as header %} {% block title %}{{ title }} diff --git a/source/style/modules/ui/_frame_module.scss b/source/style/modules/ui/_frame_module.scss new file mode 100755 index 0000000..c3ba4b4 --- /dev/null +++ b/source/style/modules/ui/_frame_module.scss @@ -0,0 +1,93 @@ +@mixin nav-spacer($name, $size, $orientation) { + .spacer.#{$name} { + width: $size; + } +} + +.body_frame { + @extend %flex-column; + @extend .body_ui; + + background-color: $color_back_basic; + + position: relative; + height: 100%; + + header, + aside, + footer { + border: 1px solid transparent; + } + + &>header { + background-color: rgba(0, 0, 0, .1); + } + + main { + @extend %flex-row; + + flex: 1; + + aside { + // background-color: rgba(255, 255, 255, .1); + } + + section { + + &>header, + &>footer { + background-color: transparentize($color_back_io, .5); + + &:hover { + background-color: $color_back_io; + } + } + } + + section, + section>div { + flex: 1; + } + + section { + @extend %flex-column; + gap: 0; + } + } +} + +#content { + background-color: $color_back_io; + + &>table { + width: 100%; + margin: 0; + border: 0; + + tr:hover td { + background-color: $color_highlight_basic; + } + + th { + border: 1px solid $color_border_io; + } + + td { + border-width: 0 1px; + border-style: solid; + border-color: $color_border_io; + } + } +} + +.io { + .spacer { + margin: 0; + border: $border_dotted; + padding: 0; + opacity: .25; + } + + @include nav-spacer('a', $space_double, false); + @include nav-spacer('b', $space_small, false); +} \ No newline at end of file diff --git a/source/style/modules/ui/_settings_module.scss b/source/style/modules/ui/_settings_module.scss deleted file mode 100755 index 9b41e4c..0000000 --- a/source/style/modules/ui/_settings_module.scss +++ /dev/null @@ -1,54 +0,0 @@ -@mixin nav-spacer($name, $size, $orientation) { - .spacer.#{$name} { - width: $size; - } -} - -.body_setting { - @extend .body_ui; - - background-color: $color_back_basic; -} - -#frame { - @extend %flex-column; - - position: relative; - height: 100%; - - header, - aside, - footer { - border: 1px solid transparent; - } - - &>header { - background-color: rgba(0, 0, 0, .1); - } - - main { - @extend %flex-row; - - flex: 1; - - aside { - background-color: rgba(255, 255, 255, .1); - } - - section { - flex: 1; - } - } -} - -.io { - .spacer { - margin: 0; - border: $border_dotted; - padding: 0; - opacity: .25; - } - - @include nav-spacer('a', $space_double, false); - @include nav-spacer('b', $space_small, false); -} \ No newline at end of file diff --git a/source/style/ui.scss b/source/style/ui.scss index efe343b..28d28cc 100644 --- a/source/style/ui.scss +++ b/source/style/ui.scss @@ -191,7 +191,7 @@ $color_gui_back: $color_dark; font-family: $family_text_mono; } +@import "modules/ui/frame_module"; @import "modules/ui/new_module"; -@import "modules/ui/settings_module"; @import "modules/ui/drag_module"; @import "modules/ui/form_module"; \ No newline at end of file diff --git a/source/templates/demo/_app.njk b/source/templates/hippie/_app.njk similarity index 89% rename from source/templates/demo/_app.njk rename to source/templates/hippie/_app.njk index 73a8dd0..d48d4bf 100755 --- a/source/templates/demo/_app.njk +++ b/source/templates/hippie/_app.njk @@ -1,4 +1,4 @@ - + @@ -9,7 +9,7 @@ {%- block title %}{% endblock %}{{ hippie.titlePostfix }} {% block meta %} - {% include "demo/partials/_meta.njk" %} + {% include "hippie/partials/_head_meta.njk" %} {% endblock %} From 07e2e8ff6d4ad0512dbc4117fc7269f71035d2ad Mon Sep 17 00:00:00 2001 From: sthag Date: Sun, 22 Jun 2025 17:42:35 +0200 Subject: [PATCH 232/372] feat: New ui content - New frame examples - Move first parts to macros --- source/screens/demo/examples/ui/cli.njk | 36 ++++ source/screens/demo/examples/ui/explorer.njk | 187 +++++++++++++++++++ source/screens/demo/examples/ui/settings.njk | 156 ---------------- source/screens/demo/examples/ui/tui.njk | 37 ++++ source/style/hippie-style | 2 +- source/templates/hippie/macros/_io.njk | 35 ++++ 6 files changed, 296 insertions(+), 157 deletions(-) create mode 100755 source/screens/demo/examples/ui/cli.njk create mode 100755 source/screens/demo/examples/ui/explorer.njk delete mode 100755 source/screens/demo/examples/ui/settings.njk create mode 100755 source/screens/demo/examples/ui/tui.njk create mode 100644 source/templates/hippie/macros/_io.njk diff --git a/source/screens/demo/examples/ui/cli.njk b/source/screens/demo/examples/ui/cli.njk new file mode 100755 index 0000000..88c59f4 --- /dev/null +++ b/source/screens/demo/examples/ui/cli.njk @@ -0,0 +1,36 @@ +--- +title: CLI +tags: + - ui +--- +{% set pageId = page.fileSlug %} +{% set pageClass = "h_full_view" %} +{% set bodyClass = "body_frame" %} + +{% extends "hippie/_app.njk" %} +{% import "hippie/macros/_io.njk" as io %} + +{% block title %}{{ title }} +{% endblock %} + +{% block links %} + {{ super() }} + + +{% endblock %} + +{% block head %} + {{ super() }} +{% endblock %} + +{% block body %} + {{ io.frameHeader('title-bar') }} +

      Previous return

      + +{% endblock %} + +{%- block script %} + {{ super() }} + + +{% endblock %} \ No newline at end of file diff --git a/source/screens/demo/examples/ui/explorer.njk b/source/screens/demo/examples/ui/explorer.njk new file mode 100755 index 0000000..6bdfc8c --- /dev/null +++ b/source/screens/demo/examples/ui/explorer.njk @@ -0,0 +1,187 @@ +--- +title: GUI explorer +tags: + - ui +--- +{% set pageId = page.fileSlug %} +{% set pageClass = "h_full_view" %} +{% set bodyClass = "body_frame" %} + +{% extends "hippie/_app.njk" %} +{% import "hippie/macros/_io.njk" as io %} + +{% block title %}{{ title }} +{% endblock %} + +{% block links %} + {{ super() }} + + +{% endblock %} + +{% block head %} + {{ super() }} +{% endblock %} + +{% block body %} + {{ io.frameHeader('title-bar') }} +
      + +
      +
      + + +
      +
      + +
      + + +
      +
      + + + + + + + + + + + + + + + + + + + + + + + +
      namedatetypesize
      folderYYYY-MM-DDfolder4KB
      fileYYYY-MM-DDfolder1B
      +
      +
      + + +
      +
      +
      +
      + + +
      +{% endblock %} + +{%- block script %} + {{ super() }} + + +{% endblock %} \ No newline at end of file diff --git a/source/screens/demo/examples/ui/settings.njk b/source/screens/demo/examples/ui/settings.njk deleted file mode 100755 index 924b613..0000000 --- a/source/screens/demo/examples/ui/settings.njk +++ /dev/null @@ -1,156 +0,0 @@ ---- -title: Settings -tags: - - ui ---- -{% set pageId = page.fileSlug %} -{% set pageClass = "h_full_view" %} -{% set bodyClass = "body_setting" %} - -{% extends "demo/_app.njk" %} - -{% block title %}{{ title }} -{% endblock %} - -{% block links %} - {{ super() }} - - -{% endblock %} - -{% block head %} - {{ super() }} -{% endblock %} - -{% block body %} -
      -
      - - -
      -
      - -
      -
      - - -
      -
      - -
      - - -
      - section
      -
      -
      - -
      -
      -{% endblock %} - -{%- block script %} - {{ super() }} - - -{% endblock %} \ No newline at end of file diff --git a/source/screens/demo/examples/ui/tui.njk b/source/screens/demo/examples/ui/tui.njk new file mode 100755 index 0000000..9ba3fe0 --- /dev/null +++ b/source/screens/demo/examples/ui/tui.njk @@ -0,0 +1,37 @@ +--- +title: TUI +tags: + - ui +--- +{% set pageId = page.fileSlug %} +{% set pageClass = "h_full_view" %} +{% set bodyClass = "body_frame" %} + +{% extends "hippie/_app.njk" %} +{% import "hippie/macros/_io.njk" as io %} + +{% block title %}{{ title }} +{% endblock %} + +{% block links %} + {{ super() }} + + +{% endblock %} + +{% block head %} + {{ super() }} +{% endblock %} + +{% block body %} + {{ io.frameHeader('title-bar') }} +
      +
      + {{ io.frameFooter('mode-bar') }} +{% endblock %} + +{%- block script %} + {{ super() }} + + +{% endblock %} \ No newline at end of file diff --git a/source/style/hippie-style b/source/style/hippie-style index 8ffc1b8..36919ca 160000 --- a/source/style/hippie-style +++ b/source/style/hippie-style @@ -1 +1 @@ -Subproject commit 8ffc1b8346977486044443e0c7dba0bead25b9d8 +Subproject commit 36919cae478551ac284fa05ebddf3c5b5e040154 diff --git a/source/templates/hippie/macros/_io.njk b/source/templates/hippie/macros/_io.njk new file mode 100644 index 0000000..36a3b9e --- /dev/null +++ b/source/templates/hippie/macros/_io.njk @@ -0,0 +1,35 @@ +{% macro frameHeader(title) %} +
      + + +
      +{% endmacro %} + +{% macro frameFooter(title) %} +
      + + +
      +{% endmacro %} \ No newline at end of file From 10d6fe7d8291101ad862d54d914a1f27b33865e9 Mon Sep 17 00:00:00 2001 From: sthag Date: Sun, 22 Jun 2025 18:17:42 +0200 Subject: [PATCH 233/372] feat: Add close event - Frame elements now can be closed - Event is added in template - Action leads back in history --- source/screens/demo/examples/ui/cli.njk | 2 -- source/screens/demo/examples/ui/explorer.njk | 2 -- source/screens/demo/examples/ui/new.njk | 2 -- source/screens/demo/examples/ui/tui.njk | 2 -- source/style/hippie-style | 2 +- source/templates/hippie/_app.njk | 24 +++++++++++++++++++- 6 files changed, 24 insertions(+), 10 deletions(-) diff --git a/source/screens/demo/examples/ui/cli.njk b/source/screens/demo/examples/ui/cli.njk index 88c59f4..1e59f33 100755 --- a/source/screens/demo/examples/ui/cli.njk +++ b/source/screens/demo/examples/ui/cli.njk @@ -31,6 +31,4 @@ tags: {%- block script %} {{ super() }} - - {% endblock %} \ No newline at end of file diff --git a/source/screens/demo/examples/ui/explorer.njk b/source/screens/demo/examples/ui/explorer.njk index 6bdfc8c..d277943 100755 --- a/source/screens/demo/examples/ui/explorer.njk +++ b/source/screens/demo/examples/ui/explorer.njk @@ -182,6 +182,4 @@ tags: {%- block script %} {{ super() }} - - {% endblock %} \ No newline at end of file diff --git a/source/screens/demo/examples/ui/new.njk b/source/screens/demo/examples/ui/new.njk index 4b5ae8f..8a898d6 100755 --- a/source/screens/demo/examples/ui/new.njk +++ b/source/screens/demo/examples/ui/new.njk @@ -48,8 +48,6 @@ tags: {%- block script %} {{ super() }} - - - {% endblock %} \ No newline at end of file diff --git a/source/style/hippie-style b/source/style/hippie-style index 36919ca..fb1bd80 160000 --- a/source/style/hippie-style +++ b/source/style/hippie-style @@ -1 +1 @@ -Subproject commit 36919cae478551ac284fa05ebddf3c5b5e040154 +Subproject commit fb1bd808a0eac6b1031d1bf9f68487eb257053ff diff --git a/source/templates/hippie/_app.njk b/source/templates/hippie/_app.njk index d48d4bf..f467956 100755 --- a/source/templates/hippie/_app.njk +++ b/source/templates/hippie/_app.njk @@ -9,7 +9,7 @@ {%- block title %}{% endblock %}{{ hippie.titlePostfix }} {% block meta %} - {% include "hippie/partials/_head_meta.njk" %} + {% include "hippie/partials/_head_meta.njk" %} {% endblock %} @@ -24,6 +24,28 @@ {% block script %} + + + {% endblock %} \ No newline at end of file From e76f4578511f5eb1634e861492b6e6a1c352ab3c Mon Sep 17 00:00:00 2001 From: sthag Date: Mon, 23 Jun 2025 19:30:29 +0200 Subject: [PATCH 234/372] feat: Set pageClass in app template --- source/screens/demo/examples/intro.njk | 1 - source/screens/demo/examples/ui/drag.njk | 1 - source/screens/demo/examples/ui/explorer.njk | 3 +-- source/screens/demo/examples/ui/form.njk | 1 - source/screens/demo/examples/ui/index.njk | 3 --- source/screens/demo/examples/ui/new.njk | 1 - source/screens/demo/examples/ui/tui.njk | 1 - source/templates/hippie/_app.njk | 2 +- 8 files changed, 2 insertions(+), 11 deletions(-) diff --git a/source/screens/demo/examples/intro.njk b/source/screens/demo/examples/intro.njk index 9eb0ebd..44898cc 100644 --- a/source/screens/demo/examples/intro.njk +++ b/source/screens/demo/examples/intro.njk @@ -5,7 +5,6 @@ tags: --- {% set pageId = "init" %} -{% set pageClass = "html_ui" %} {% extends "hippie/_app.njk" %} {% import "hippie/macros/_placeholder.njk" as ph %} diff --git a/source/screens/demo/examples/ui/drag.njk b/source/screens/demo/examples/ui/drag.njk index 3d82a7b..adf6207 100755 --- a/source/screens/demo/examples/ui/drag.njk +++ b/source/screens/demo/examples/ui/drag.njk @@ -4,7 +4,6 @@ tags: - ui --- {% set pageId = page.fileSlug %} -{% set pageClass = "h_full_view" %} {% set bodyClass = "body_ui" %} {% extends "hippie/_app.njk" %} diff --git a/source/screens/demo/examples/ui/explorer.njk b/source/screens/demo/examples/ui/explorer.njk index d277943..628f658 100755 --- a/source/screens/demo/examples/ui/explorer.njk +++ b/source/screens/demo/examples/ui/explorer.njk @@ -4,7 +4,6 @@ tags: - ui --- {% set pageId = page.fileSlug %} -{% set pageClass = "h_full_view" %} {% set bodyClass = "body_frame" %} {% extends "hippie/_app.njk" %} @@ -180,6 +179,6 @@ tags: {% endblock %} -{%- block script %} +{% block script %} {{ super() }} {% endblock %} \ No newline at end of file diff --git a/source/screens/demo/examples/ui/form.njk b/source/screens/demo/examples/ui/form.njk index 83ac65d..cf6937d 100644 --- a/source/screens/demo/examples/ui/form.njk +++ b/source/screens/demo/examples/ui/form.njk @@ -3,7 +3,6 @@ title: Form tags: - ui --- -{% set pageClass = "html_ui" %} {% set bodyClass = "body_ui" %} {% extends "hippie/_app.njk" %} diff --git a/source/screens/demo/examples/ui/index.njk b/source/screens/demo/examples/ui/index.njk index 4bd84c1..ec107c2 100644 --- a/source/screens/demo/examples/ui/index.njk +++ b/source/screens/demo/examples/ui/index.njk @@ -4,9 +4,6 @@ tags: - demoExample - index --- - -{% set pageClass = "html_ui" %} - {% extends "hippie/_app.njk" %} {% import "hippie/macros/_placeholder.njk" as ph %} diff --git a/source/screens/demo/examples/ui/new.njk b/source/screens/demo/examples/ui/new.njk index 8a898d6..55921b3 100755 --- a/source/screens/demo/examples/ui/new.njk +++ b/source/screens/demo/examples/ui/new.njk @@ -4,7 +4,6 @@ tags: - ui --- {% set pageId = page.fileSlug %} -{% set pageClass = "h_full_view" %} {% set bodyClass = "body_new" %} {% extends "hippie/_app.njk" %} diff --git a/source/screens/demo/examples/ui/tui.njk b/source/screens/demo/examples/ui/tui.njk index d5bb824..89a3fdd 100755 --- a/source/screens/demo/examples/ui/tui.njk +++ b/source/screens/demo/examples/ui/tui.njk @@ -4,7 +4,6 @@ tags: - ui --- {% set pageId = page.fileSlug %} -{% set pageClass = "h_full_view" %} {% set bodyClass = "body_frame" %} {% extends "hippie/_app.njk" %} diff --git a/source/templates/hippie/_app.njk b/source/templates/hippie/_app.njk index f467956..dbee1a7 100755 --- a/source/templates/hippie/_app.njk +++ b/source/templates/hippie/_app.njk @@ -1,6 +1,6 @@ - + From c0c87771b644c0f00e92d48a8a25ed66fdb0bc84 Mon Sep 17 00:00:00 2001 From: sthag Date: Mon, 23 Jun 2025 19:33:35 +0200 Subject: [PATCH 235/372] feat: Change cli page - New styles and strcture - Add event listeners - Add function to resize prompt according to input - Append prompts to history element --- source/screens/demo/examples/ui/cli.njk | 47 ++++++++++++++++++++-- source/style/modules/ui/_frame_module.scss | 32 +++++++++++++++ 2 files changed, 76 insertions(+), 3 deletions(-) diff --git a/source/screens/demo/examples/ui/cli.njk b/source/screens/demo/examples/ui/cli.njk index 1e59f33..5106fac 100755 --- a/source/screens/demo/examples/ui/cli.njk +++ b/source/screens/demo/examples/ui/cli.njk @@ -4,7 +4,6 @@ tags: - ui --- {% set pageId = page.fileSlug %} -{% set pageClass = "h_full_view" %} {% set bodyClass = "body_frame" %} {% extends "hippie/_app.njk" %} @@ -25,10 +24,52 @@ tags: {% block body %} {{ io.frameHeader('title-bar') }} -

      Previous return

      - +
      +
      + 
      Previous prompt
      +
      +
      + + +
      +
      {% endblock %} {%- block script %} {{ super() }} + {% endblock %} \ No newline at end of file diff --git a/source/style/modules/ui/_frame_module.scss b/source/style/modules/ui/_frame_module.scss index c3ba4b4..ff3aab8 100755 --- a/source/style/modules/ui/_frame_module.scss +++ b/source/style/modules/ui/_frame_module.scss @@ -4,6 +4,38 @@ } } +#cli { + @extend %flex-column; + + background-color: black; + + #line { + @extend %flex-row; + } + + #prompt { + flex: 1; + } + + pre { + margin: .5em 0; + color: white; + } + + textarea { + resize: none; + max-height: 128px; + margin: $margin_io; + border: 0; + padding: $space_half; + // color: $color_text_io; + color: white; + // background-color: $color_back_io; + background-color: transparent; + line-height: 1.2; + } +} + .body_frame { @extend %flex-column; @extend .body_ui; From f1d17490e0d5d1ea4e0655b523d44c142a946eb8 Mon Sep 17 00:00:00 2001 From: sthag Date: Mon, 23 Jun 2025 20:11:06 +0200 Subject: [PATCH 236/372] fix: Remove body_ui class because it is not needed --- source/screens/demo/examples/ui/drag.njk | 1 - source/screens/demo/examples/ui/form.njk | 2 -- source/style/ui.scss | 5 ----- 3 files changed, 8 deletions(-) diff --git a/source/screens/demo/examples/ui/drag.njk b/source/screens/demo/examples/ui/drag.njk index adf6207..873a2ab 100755 --- a/source/screens/demo/examples/ui/drag.njk +++ b/source/screens/demo/examples/ui/drag.njk @@ -4,7 +4,6 @@ tags: - ui --- {% set pageId = page.fileSlug %} -{% set bodyClass = "body_ui" %} {% extends "hippie/_app.njk" %} diff --git a/source/screens/demo/examples/ui/form.njk b/source/screens/demo/examples/ui/form.njk index cf6937d..94275cd 100644 --- a/source/screens/demo/examples/ui/form.njk +++ b/source/screens/demo/examples/ui/form.njk @@ -3,8 +3,6 @@ title: Form tags: - ui --- -{% set bodyClass = "body_ui" %} - {% extends "hippie/_app.njk" %} {% block title %}{{ title }} diff --git a/source/style/ui.scss b/source/style/ui.scss index 28d28cc..5a4998b 100644 --- a/source/style/ui.scss +++ b/source/style/ui.scss @@ -22,11 +22,6 @@ $color_gui_back: $color_dark; } } -.body_ui { - height: 100vh; - background-color: $color_gui_back; -} - .step { @extend %full_parent; } From 0c37acf47fb8e9bb440ffe13ba01d944f733f5da Mon Sep 17 00:00:00 2001 From: sthag Date: Mon, 23 Jun 2025 20:12:47 +0200 Subject: [PATCH 237/372] feat: Restructure styles for cli and new pages - Remove header from cli - Add body_cli class - Remove unnecessary frame element --- source/screens/demo/examples/ui/cli.njk | 3 +- source/screens/demo/examples/ui/new.njk | 36 +++++------ source/style/modules/ui/_frame_module.scss | 75 ++++++++++++---------- source/style/modules/ui/_new_module.scss | 24 +------ 4 files changed, 63 insertions(+), 75 deletions(-) diff --git a/source/screens/demo/examples/ui/cli.njk b/source/screens/demo/examples/ui/cli.njk index 5106fac..3ba032d 100755 --- a/source/screens/demo/examples/ui/cli.njk +++ b/source/screens/demo/examples/ui/cli.njk @@ -4,7 +4,7 @@ tags: - ui --- {% set pageId = page.fileSlug %} -{% set bodyClass = "body_frame" %} +{% set bodyClass = "body_cli" %} {% extends "hippie/_app.njk" %} {% import "hippie/macros/_io.njk" as io %} @@ -23,7 +23,6 @@ tags: {% endblock %} {% block body %} - {{ io.frameHeader('title-bar') }} 
      Previous prompt
      diff --git a/source/screens/demo/examples/ui/new.njk b/source/screens/demo/examples/ui/new.njk index 55921b3..54ddd0b 100755 --- a/source/screens/demo/examples/ui/new.njk +++ b/source/screens/demo/examples/ui/new.njk @@ -23,25 +23,23 @@ tags: {% block body %} {{ header.status(hippie, new) }} -
      -
      - -
      -
      -
      1
      -
      2
      -
      3
      -
      4
      -
      +
      + +
      +
      +
      1
      +
      2
      +
      3
      +
      4
      {% endblock %} diff --git a/source/style/modules/ui/_frame_module.scss b/source/style/modules/ui/_frame_module.scss index ff3aab8..dc99b1c 100755 --- a/source/style/modules/ui/_frame_module.scss +++ b/source/style/modules/ui/_frame_module.scss @@ -4,41 +4,8 @@ } } -#cli { - @extend %flex-column; - - background-color: black; - - #line { - @extend %flex-row; - } - - #prompt { - flex: 1; - } - - pre { - margin: .5em 0; - color: white; - } - - textarea { - resize: none; - max-height: 128px; - margin: $margin_io; - border: 0; - padding: $space_half; - // color: $color_text_io; - color: white; - // background-color: $color_back_io; - background-color: transparent; - line-height: 1.2; - } -} - .body_frame { @extend %flex-column; - @extend .body_ui; background-color: $color_back_basic; @@ -88,6 +55,46 @@ } } +.body_cli { + @extend .body_frame; + + background-color: black; +} + +#cli { + @extend %flex-column; + + background-color: black; + + #line { + @extend %flex-row; + } + + #prompt { + flex: 1; + } + + pre { + margin: .5em 0; + color: white; + } + + textarea { + resize: none; + max-height: 128px; + margin: $margin_io; + border: 0; + padding: $space_half; + // color: $color_text_io; + color: white; + // background-color: $color_back_io; + background-color: transparent; + line-height: 1.2; + } +} + + + #content { background-color: $color_back_io; @@ -112,6 +119,8 @@ } } + + .io { .spacer { margin: 0; diff --git a/source/style/modules/ui/_new_module.scss b/source/style/modules/ui/_new_module.scss index db795cd..42946e2 100755 --- a/source/style/modules/ui/_new_module.scss +++ b/source/style/modules/ui/_new_module.scss @@ -2,23 +2,11 @@ $module_top_height: 32px; $body_top_space: $module_top_height + $space_basic; .body_new { - @extend .body_ui; - + @extend %flex-column; padding: $body_top_space $space_basic $space_basic; } -#frame { - display: grid; - height: 100%; - // margin: $space_basic; - // grid-template-columns: repeat(3, 1fr); - grid-template-rows: auto 1fr; - gap: $space_basic; -} - .area { - width: 100%; - height: 100%; transition: $transition_best; &:hover { @@ -26,15 +14,9 @@ $body_top_space: $module_top_height + $space_basic; } } -.menu, -#top { - nav ul { - margin: 0; - } -} - .grid { display: grid; + flex: 1; // grid-template-rows: repeat(2, 1fr); // grid-template-columns: repeat(2, 1fr); grid-template-areas: "a a"; @@ -92,7 +74,7 @@ $body_top_space: $module_top_height + $space_basic; nav ul { display: flex; - margin-left: 16px; + margin: 0 0 0 16px; } .brand { From e572f642595e2686fa2d36579d516296a5998837 Mon Sep 17 00:00:00 2001 From: sthag Date: Mon, 23 Jun 2025 22:08:31 +0200 Subject: [PATCH 238/372] feat: Add app frame template - All frame pages use app frame template - Add form page to frames and add header --- source/screens/demo/examples/ui/cli.njk | 24 +++++--------------- source/screens/demo/examples/ui/explorer.njk | 21 +---------------- source/screens/demo/examples/ui/form.njk | 14 ++---------- source/screens/demo/examples/ui/tui.njk | 21 ++--------------- source/templates/hippie/_app.njk | 2 +- source/templates/hippie/_app_frame.njk | 17 ++++++++++++++ 6 files changed, 29 insertions(+), 70 deletions(-) create mode 100755 source/templates/hippie/_app_frame.njk diff --git a/source/screens/demo/examples/ui/cli.njk b/source/screens/demo/examples/ui/cli.njk index 3ba032d..dc0800f 100755 --- a/source/screens/demo/examples/ui/cli.njk +++ b/source/screens/demo/examples/ui/cli.njk @@ -6,21 +6,7 @@ tags: {% set pageId = page.fileSlug %} {% set bodyClass = "body_cli" %} -{% extends "hippie/_app.njk" %} -{% import "hippie/macros/_io.njk" as io %} - -{% block title %}{{ title }} -{% endblock %} - -{% block links %} - {{ super() }} - - -{% endblock %} - -{% block head %} - {{ super() }} -{% endblock %} +{% extends "hippie/_app_frame.njk" %} {% block body %}
      @@ -47,9 +33,11 @@ tags: const textarea = document.getElementById('prompt'); - document.body.addEventListener('click', () => { - textarea.focus(); - }); + document + .body + .addEventListener('click', () => { + textarea.focus(); + }); textarea.addEventListener('input', () => { resizeTextArea(textarea); diff --git a/source/screens/demo/examples/ui/explorer.njk b/source/screens/demo/examples/ui/explorer.njk index 628f658..869bcf8 100755 --- a/source/screens/demo/examples/ui/explorer.njk +++ b/source/screens/demo/examples/ui/explorer.njk @@ -4,23 +4,8 @@ tags: - ui --- {% set pageId = page.fileSlug %} -{% set bodyClass = "body_frame" %} -{% extends "hippie/_app.njk" %} -{% import "hippie/macros/_io.njk" as io %} - -{% block title %}{{ title }} -{% endblock %} - -{% block links %} - {{ super() }} - - -{% endblock %} - -{% block head %} - {{ super() }} -{% endblock %} +{% extends "hippie/_app_frame.njk" %} {% block body %} {{ io.frameHeader('title-bar') }} @@ -177,8 +162,4 @@ tags: -{% endblock %} - -{% block script %} - {{ super() }} {% endblock %} \ No newline at end of file diff --git a/source/screens/demo/examples/ui/form.njk b/source/screens/demo/examples/ui/form.njk index 94275cd..2e6c088 100644 --- a/source/screens/demo/examples/ui/form.njk +++ b/source/screens/demo/examples/ui/form.njk @@ -3,20 +3,10 @@ title: Form tags: - ui --- -{% extends "hippie/_app.njk" %} - -{% block title %}{{ title }} -{% endblock %} - -{% block links %} - -{% endblock %} - -{% block head %} - {{ super() }} -{% endblock %} +{% extends "hippie/_app_frame.njk" %} {% block body %} + {{ io.frameHeader('title-bar') }}

      Formulare

      diff --git a/source/screens/demo/examples/ui/tui.njk b/source/screens/demo/examples/ui/tui.njk index 89a3fdd..8f22162 100755 --- a/source/screens/demo/examples/ui/tui.njk +++ b/source/screens/demo/examples/ui/tui.njk @@ -4,31 +4,14 @@ tags: - ui --- {% set pageId = page.fileSlug %} -{% set bodyClass = "body_frame" %} -{% extends "hippie/_app.njk" %} -{% import "hippie/macros/_io.njk" as io %} +{% extends "hippie/_app_frame.njk" %} {% block title %}{{ title }} {% endblock %} -{% block links %} - {{ super() }} - - -{% endblock %} - -{% block head %} - {{ super() }} -{% endblock %} - {% block body %} {{ io.frameHeader('title-bar') }} -
      -
      +
      {{ io.frameFooter('mode-bar') }} -{% endblock %} - -{%- block script %} - {{ super() }} {% endblock %} \ No newline at end of file diff --git a/source/templates/hippie/_app.njk b/source/templates/hippie/_app.njk index dbee1a7..3dcc729 100755 --- a/source/templates/hippie/_app.njk +++ b/source/templates/hippie/_app.njk @@ -18,7 +18,7 @@ {% endblock %} - + {% block body %}{% endblock %} {% block script %} diff --git a/source/templates/hippie/_app_frame.njk b/source/templates/hippie/_app_frame.njk new file mode 100755 index 0000000..19a7504 --- /dev/null +++ b/source/templates/hippie/_app_frame.njk @@ -0,0 +1,17 @@ + +{% extends "hippie/_app.njk" %} +{% import "hippie/macros/_io.njk" as io %} + +{% block head %} + {{ super() }} +{% endblock %} + +{% block links %} + {{ super() }} + + +{% endblock %} + +{% block script %} + {{ super() }} +{% endblock %} \ No newline at end of file From 1ddba29d9c044d22a39c90c3458727f6c3605d22 Mon Sep 17 00:00:00 2001 From: sthag Date: Mon, 23 Jun 2025 22:31:18 +0200 Subject: [PATCH 239/372] feat: Update drag page and other small things - Add parameter to NewDiv class - Add instance with content to drag page - Drag page now also uses frame template - Use macro for footer in explorer --- source/code/_ui.js | 18 ++++++++++-- source/screens/demo/examples/ui/drag.njk | 30 +++++++++++--------- source/screens/demo/examples/ui/explorer.njk | 11 +------ source/style/modules/ui/_drag_module.scss | 4 +++ source/style/modules/ui/_frame_module.scss | 6 ++-- 5 files changed, 40 insertions(+), 29 deletions(-) diff --git a/source/code/_ui.js b/source/code/_ui.js index 24e034a..01a489a 100644 --- a/source/code/_ui.js +++ b/source/code/_ui.js @@ -1,17 +1,18 @@ // Creates a div element which is draggable class NewDiv { - constructor(x, y, width, height, backgroundColor) { + constructor(x, y, width, height, backgroundColor, content) { this.x = x; this.y = y; this.width = width; this.height = height; this.backgroundColor = backgroundColor; this.element = null; + this.content = content; } // Create the div element createDiv() { - this.element = document.createElement('div'); + this.element = this._content; this.element.style.position = 'absolute'; this.element.style.left = `${this.x}px`; this.element.style.top = `${this.y}px`; @@ -93,6 +94,19 @@ class NewDiv { loadData(); } + // FIXME: this.element wird von appendToFrame() verwendet + get content() { + return this._content = this.content; + } + + set content(value) { + if (!value) { + value = document.createElement('div'); + } + + this._content = value; + } + // Append the div to the space appendToFrame(space) { this.element.id = `newDiv${space.children.length}`; diff --git a/source/screens/demo/examples/ui/drag.njk b/source/screens/demo/examples/ui/drag.njk index 873a2ab..ecd3001 100755 --- a/source/screens/demo/examples/ui/drag.njk +++ b/source/screens/demo/examples/ui/drag.njk @@ -5,25 +5,22 @@ tags: --- {% set pageId = page.fileSlug %} -{% extends "hippie/_app.njk" %} - -{% block title %}{{ title }} -{% endblock %} - -{% block links %} - {{ super() }} - -{% endblock %} - -{% block head %} - {{ super() }} -{% endblock %} +{% extends "hippie/_app_frame.njk" %} {% block body %}
      +
      +
      +
      + {{ io.frameHeader('title-bar') }} +
      + {{ io.frameFooter('mode-bar') }} +
      +
      +
      {% endblock %} {%- block script %} @@ -32,6 +29,7 @@ tags: // Get the space element const space = document.getElementById('space'); const add = document.querySelector('[data-action=add]'); + const test = document.getElementById('test'); // Add event listener to the add space button add.addEventListener('click', () => { @@ -41,8 +39,12 @@ tags: }); // Create a new NewDiv instance - const newDiv = new NewDiv(100, 100, 800, 600, '#000'); + const newDiv = new NewDiv(100, 100, 200, 200, '#000'); newDiv.createDiv(); newDiv.appendToFrame(space); + + const explorer = new NewDiv(256, 128, 800, 600, '#fff', test); + explorer.createDiv(); + explorer.appendToFrame(space); {% endblock %} \ No newline at end of file diff --git a/source/screens/demo/examples/ui/explorer.njk b/source/screens/demo/examples/ui/explorer.njk index 869bcf8..72de77a 100755 --- a/source/screens/demo/examples/ui/explorer.njk +++ b/source/screens/demo/examples/ui/explorer.njk @@ -152,14 +152,5 @@ tags: -
      - - -
      + {{ io.frameFooter('mode-bar') }} {% endblock %} \ No newline at end of file diff --git a/source/style/modules/ui/_drag_module.scss b/source/style/modules/ui/_drag_module.scss index a345922..83f1abb 100644 --- a/source/style/modules/ui/_drag_module.scss +++ b/source/style/modules/ui/_drag_module.scss @@ -1,4 +1,8 @@ #space { position: relative; height: 100%; + + .body_frame { + background-color: white; + } } \ No newline at end of file diff --git a/source/style/modules/ui/_frame_module.scss b/source/style/modules/ui/_frame_module.scss index dc99b1c..a8e804d 100755 --- a/source/style/modules/ui/_frame_module.scss +++ b/source/style/modules/ui/_frame_module.scss @@ -27,9 +27,9 @@ flex: 1; - aside { - // background-color: rgba(255, 255, 255, .1); - } + // aside { + // background-color: rgba(255, 255, 255, .1); + // } section { From a3656b86feccdcb27fdb5cf6f37ced81d58a3fd5 Mon Sep 17 00:00:00 2001 From: sthag Date: Fri, 27 Jun 2025 21:55:36 +0200 Subject: [PATCH 240/372] feat: Update gitignore - Add .idea directory - Remove duplicates --- .gitignore | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 5e89ea2..a4481ea 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,9 @@ reports/** source/art/sprites/ source/art/images/sprite.* +# IDE +.idea/ + # https://gist.github.com/octocat/9257657 ################### ################### @@ -44,8 +47,6 @@ source/art/images/sprite.* ._* .Spotlight-V100 .Trashes -ehthumbs.db -Thumbs.db # https://github.com/github/gitignore ################### @@ -86,15 +87,10 @@ $RECYCLE.BIN/ # Icon must end with two \r Icon -# Thumbnails -._* - # Files that might appear in the root of a volume .DocumentRevisions-V100 .fseventsd -.Spotlight-V100 .TemporaryItems -.Trashes .VolumeIcon.icns .com.apple.timemachine.donotpresent @@ -125,7 +121,6 @@ https://github.com/github/gitignore/blob/master/Global/Linux.gitignore ################### # Logs logs -*.log npm-debug.log* yarn-debug.log* yarn-error.log* From 8ace5526bf0e738e7b99a83aa2a7051fe80ac539 Mon Sep 17 00:00:00 2001 From: sthag Date: Fri, 10 Oct 2025 18:22:11 +0200 Subject: [PATCH 241/372] feat: Add editorconfig Single format defined for all file types. --- .editorconfig | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..1151840 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +indent_size = 4 +indent_style = tab +insert_final_newline = false +max_line_length = 120 From 7c83a33920de8ea5d9761f3de57130c3c84e2517 Mon Sep 17 00:00:00 2001 From: sthag Date: Fri, 10 Oct 2025 18:27:54 +0200 Subject: [PATCH 242/372] feat: Update hippie-style --- source/style/hippie-style | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/style/hippie-style b/source/style/hippie-style index fb1bd80..54f1de5 160000 --- a/source/style/hippie-style +++ b/source/style/hippie-style @@ -1 +1 @@ -Subproject commit fb1bd808a0eac6b1031d1bf9f68487eb257053ff +Subproject commit 54f1de579c3709db1f785997884a2e3e9861e0bc From 9c821fed90e2258972685b9919eb9acc7d40ed8c Mon Sep 17 00:00:00 2001 From: sthag Date: Fri, 10 Oct 2025 18:29:04 +0200 Subject: [PATCH 243/372] feat: New component example for hgroup --- source/screens/demo/components.njk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/screens/demo/components.njk b/source/screens/demo/components.njk index 55c9596..a6c1bfc 100644 --- a/source/screens/demo/components.njk +++ b/source/screens/demo/components.njk @@ -80,6 +80,10 @@ tags:
      Überschrift 6

      Mit Absatz innerhalb von <hgroup>.

      +
      +

      Überschrift 1 oder 2

      +

      Mit Absatz innerhalb von <hgroup>.

      +

      <header>

      Kopfbereich
      header.header_page
      From 5f54ab6bbe8f3b02a1c6fda93f25a0874d64bf41 Mon Sep 17 00:00:00 2001 From: sthag Date: Fri, 17 Oct 2025 23:04:31 +0200 Subject: [PATCH 244/372] build: Update Sass dependency to 1.93.x --- package-lock.json | 372 ++++++++++++++++++++++++++++++++++++++++++++-- package.json | 2 +- 2 files changed, 363 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 62279d6..73baa18 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,8 +11,10 @@ "dependencies": { "@11ty/eleventy": "^2.0.1", "bootstrap-icons": "^1.13.1", - "normalize.css": "^8.0.1", - "sass": "^1.69.4" + "sass": "^1.93.0" + }, + "devDependencies": { + "normalize.css": "^8.0.1" } }, "node_modules/@11ty/dependency-tree": { @@ -207,6 +209,302 @@ "node": ">= 8" } }, + "node_modules/@parcel/watcher": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz", + "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==", + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "dependencies": { + "detect-libc": "^1.0.3", + "is-glob": "^4.0.3", + "micromatch": "^4.0.5", + "node-addon-api": "^7.0.0" + }, + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + }, + "optionalDependencies": { + "@parcel/watcher-android-arm64": "2.5.1", + "@parcel/watcher-darwin-arm64": "2.5.1", + "@parcel/watcher-darwin-x64": "2.5.1", + "@parcel/watcher-freebsd-x64": "2.5.1", + "@parcel/watcher-linux-arm-glibc": "2.5.1", + "@parcel/watcher-linux-arm-musl": "2.5.1", + "@parcel/watcher-linux-arm64-glibc": "2.5.1", + "@parcel/watcher-linux-arm64-musl": "2.5.1", + "@parcel/watcher-linux-x64-glibc": "2.5.1", + "@parcel/watcher-linux-x64-musl": "2.5.1", + "@parcel/watcher-win32-arm64": "2.5.1", + "@parcel/watcher-win32-ia32": "2.5.1", + "@parcel/watcher-win32-x64": "2.5.1" + } + }, + "node_modules/@parcel/watcher-android-arm64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz", + "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-darwin-arm64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz", + "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-darwin-x64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz", + "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-freebsd-x64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz", + "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm-glibc": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz", + "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==", + "cpu": [ + "arm" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm-musl": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz", + "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==", + "cpu": [ + "arm" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm64-glibc": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz", + "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm64-musl": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz", + "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-x64-glibc": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz", + "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-x64-musl": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz", + "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-win32-arm64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz", + "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-win32-ia32": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz", + "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==", + "cpu": [ + "ia32" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-win32-x64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz", + "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, "node_modules/@sindresorhus/slugify": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@sindresorhus/slugify/-/slugify-1.1.2.tgz", @@ -606,6 +904,19 @@ "node": ">= 0.6.0" } }, + "node_modules/detect-libc": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==", + "license": "Apache-2.0", + "optional": true, + "bin": { + "detect-libc": "bin/detect-libc.js" + }, + "engines": { + "node": ">=0.10" + } + }, "node_modules/dev-ip": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/dev-ip/-/dev-ip-1.0.1.tgz", @@ -1101,9 +1412,10 @@ } }, "node_modules/immutable": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.5.tgz", - "integrity": "sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==" + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.4.tgz", + "integrity": "sha512-p6u1bG3YSnINT5RQmx/yRZBpenIl30kVxkTLDyHLIMk0gict704Q9n+thfDI7lTRm9vXdDYutVzXhzcThxTnXA==", + "license": "MIT" }, "node_modules/inflight": { "version": "1.0.6", @@ -1561,6 +1873,13 @@ "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" }, + "node_modules/node-addon-api": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz", + "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==", + "license": "MIT", + "optional": true + }, "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -1573,6 +1892,7 @@ "version": "8.0.1", "resolved": "https://registry.npmjs.org/normalize.css/-/normalize.css-8.0.1.tgz", "integrity": "sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==", + "dev": true, "license": "MIT" }, "node_modules/nunjucks": { @@ -1986,12 +2306,13 @@ } }, "node_modules/sass": { - "version": "1.72.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.72.0.tgz", - "integrity": "sha512-Gpczt3WA56Ly0Mn8Sl21Vj94s1axi9hDIzDFn9Ph9x3C3p4nNyvsqJoQyVXKou6cBlfFWEgRW4rT8Tb4i3XnVA==", + "version": "1.93.2", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.93.2.tgz", + "integrity": "sha512-t+YPtOQHpGW1QWsh1CHQ5cPIr9lbbGZLZnbihP/D/qZj/yuV68m8qarcV17nvkOX81BCrvzAlq2klCQFZghyTg==", + "license": "MIT", "dependencies": { - "chokidar": ">=3.0.0 <4.0.0", - "immutable": "^4.0.0", + "chokidar": "^4.0.0", + "immutable": "^5.0.2", "source-map-js": ">=0.6.2 <2.0.0" }, "bin": { @@ -1999,6 +2320,37 @@ }, "engines": { "node": ">=14.0.0" + }, + "optionalDependencies": { + "@parcel/watcher": "^2.4.1" + } + }, + "node_modules/sass/node_modules/chokidar": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", + "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==", + "license": "MIT", + "dependencies": { + "readdirp": "^4.0.1" + }, + "engines": { + "node": ">= 14.16.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/sass/node_modules/readdirp": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz", + "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==", + "license": "MIT", + "engines": { + "node": ">= 14.18.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" } }, "node_modules/section-matter": { diff --git a/package.json b/package.json index 33ebec2..d2759a8 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,6 @@ "dependencies": { "@11ty/eleventy": "^2.0.1", "bootstrap-icons": "^1.13.1", - "sass": "^1.69.4" + "sass": "^1.93.0" } } \ No newline at end of file From 41c5757790eb199617f979d5d97ff4731a1bf582 Mon Sep 17 00:00:00 2001 From: sthag Date: Mon, 20 Oct 2025 19:27:23 +0200 Subject: [PATCH 245/372] feat: Change label styles and update layouts - Update styles - Update layouts screen and rearrange other examples --- source/screens/demo/layouts.njk | 30 +++++++++++++++++------------- source/style/hippie-style | 2 +- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/source/screens/demo/layouts.njk b/source/screens/demo/layouts.njk index dcf77dc..2aeeeb1 100644 --- a/source/screens/demo/layouts.njk +++ b/source/screens/demo/layouts.njk @@ -22,7 +22,7 @@ tags:

      Die Elemente werden fortlaufend komplexer

      -

      Bereiche

      +

      Bereiche (sections)

      section

      section.overflow>div.float_space_left>img^p+p>br+a.lineLink
      @@ -30,12 +30,7 @@ tags:

      {{ ph.name() }}
      {{ ph.address() }}

      {{ ph.phone() }}
      {{ ph.email('lineLink') }}

      - 
      div.space_left_fourth>(hr+p+hr)
      -
      -
      -

      Eingerückter Inhalt

      -
      -
      +

      nav

      div.overflow>(nav.float_space_left>ul>(li>a.a_button{punkt $})*4+nav>ul>(li>a.a_button_border{stufe $})*4)
      +

      header

      header.header_page>h1+p+nav.nav_separate_right>ul>(li>a.a_button{nav $})*4^+nav.nav_right>ul>(li>a.a_button{nav $})*4

      Aufmacher

      @@ -175,6 +171,9 @@ tags:
      + +

      Interaktiv (interactive)

      +

      input

      @@ -182,10 +181,9 @@ tags:
      - +

      form

      -

      - Show me a +

      Show me a

      -
      - - -
      + {{ io.statusBar() }} {{ io.frameFooter('mode-bar') }} diff --git a/source/templates/hippie/macros/_io.njk b/source/templates/hippie/macros/_io.njk index 36a3b9e..f9a7300 100644 --- a/source/templates/hippie/macros/_io.njk +++ b/source/templates/hippie/macros/_io.njk @@ -32,4 +32,18 @@ +{% endmacro %} + +{% macro statusBar(title) %} +
      + + +
      {% endmacro %} \ No newline at end of file From c77bcd8bdccdcd224247c96ac60b1d04ff56ac82 Mon Sep 17 00:00:00 2001 From: sthag Date: Mon, 27 Oct 2025 20:51:17 +0100 Subject: [PATCH 255/372] feat: Replace ui drag screen with liquid template - Recreate io macros as liquid partials - Add app template based on default - Drag screen uses app.liquid layout instead of _app_frame.njk --- source/screens/demo/examples/ui/drag.liquid | 48 ++++++++++++++++++ source/screens/demo/examples/ui/drag.njk | 50 ------------------- source/templates/hippie/app.liquid | 40 +++++++++++++++ .../hippie/partials/frame-header.liquid | 20 ++++++++ .../hippie/partials/frame-mode.liquid | 10 ++++ .../hippie/partials/frame-status.liquid | 11 ++++ 6 files changed, 129 insertions(+), 50 deletions(-) create mode 100755 source/screens/demo/examples/ui/drag.liquid delete mode 100755 source/screens/demo/examples/ui/drag.njk create mode 100644 source/templates/hippie/app.liquid create mode 100644 source/templates/hippie/partials/frame-header.liquid create mode 100644 source/templates/hippie/partials/frame-mode.liquid create mode 100644 source/templates/hippie/partials/frame-status.liquid diff --git a/source/screens/demo/examples/ui/drag.liquid b/source/screens/demo/examples/ui/drag.liquid new file mode 100755 index 0000000..aeceed7 --- /dev/null +++ b/source/screens/demo/examples/ui/drag.liquid @@ -0,0 +1,48 @@ +--- +title: Drag +tags: +- ui +--- +{% layout "hippie/app.liquid" %} + +{% block body %} +
      + +
      +
      +
      +
      +
      + {% render 'hippie/partials/frame-header.liquid' %} +
      + {% render 'hippie/partials/frame-mode.liquid' %} +
      +
      +
      +{% endblock %} + +{%- block script %} + + +{% endblock %} \ No newline at end of file diff --git a/source/screens/demo/examples/ui/drag.njk b/source/screens/demo/examples/ui/drag.njk deleted file mode 100755 index ecd3001..0000000 --- a/source/screens/demo/examples/ui/drag.njk +++ /dev/null @@ -1,50 +0,0 @@ ---- -title: Drag -tags: - - ui ---- -{% set pageId = page.fileSlug %} - -{% extends "hippie/_app_frame.njk" %} - -{% block body %} -
      - -
      -
      -
      -
      -
      - {{ io.frameHeader('title-bar') }} -
      - {{ io.frameFooter('mode-bar') }} -
      -
      -
      -{% endblock %} - -{%- block script %} - - -{% endblock %} \ No newline at end of file diff --git a/source/templates/hippie/app.liquid b/source/templates/hippie/app.liquid new file mode 100644 index 0000000..58ca863 --- /dev/null +++ b/source/templates/hippie/app.liquid @@ -0,0 +1,40 @@ +{% assign pageBase = "../../../" -%} +{% assign pageId = page.fileSlug -%} +{% assign pageClass = "html_ui" -%} +{%- layout "hippie/default.liquid" %} + +{% block title %}{{ title }}{% endblock %} + +{% block links %} +{{ block.super -}} + + +{% endblock %} + +{% block script %} +{{ block.super -}} + + + + + +{% endblock %} \ No newline at end of file diff --git a/source/templates/hippie/partials/frame-header.liquid b/source/templates/hippie/partials/frame-header.liquid new file mode 100644 index 0000000..14d04bc --- /dev/null +++ b/source/templates/hippie/partials/frame-header.liquid @@ -0,0 +1,20 @@ +
      + + +
      \ No newline at end of file diff --git a/source/templates/hippie/partials/frame-mode.liquid b/source/templates/hippie/partials/frame-mode.liquid new file mode 100644 index 0000000..4e87985 --- /dev/null +++ b/source/templates/hippie/partials/frame-mode.liquid @@ -0,0 +1,10 @@ +
      + + +
      \ No newline at end of file diff --git a/source/templates/hippie/partials/frame-status.liquid b/source/templates/hippie/partials/frame-status.liquid new file mode 100644 index 0000000..98c94f9 --- /dev/null +++ b/source/templates/hippie/partials/frame-status.liquid @@ -0,0 +1,11 @@ +
      + + +
      \ No newline at end of file From ff5d4bd3eba5393e43fa9e79674817e944bf53a5 Mon Sep 17 00:00:00 2001 From: sthag Date: Mon, 27 Oct 2025 21:15:32 +0100 Subject: [PATCH 256/372] feat: Add jquery dependency - Add jquery version 3.7.1 - Remove external script resource from app template - Add eleventy passthrough to build/vendor --- .eleventy.js | 4 ++++ package-lock.json | 7 +++++++ package.json | 3 ++- source/templates/hippie/app.liquid | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.eleventy.js b/.eleventy.js index 3da1568..00dded1 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -40,6 +40,10 @@ module.exports = function (eleventyConfig) { eleventyConfig.addPassthroughCopy("vendor"); eleventyConfig.addPassthroughCopy({"node_modules/bootstrap-icons": "vendor/bootstrap-icons"}); + eleventyConfig.addPassthroughCopy({ + "node_modules/jquery/dist/jquery.min.js": "vendor", + "node_modules/jquery/dist/jquery.min.map": "vendor" + }); // eleventyConfig.addPassthroughCopy({"node_modules/normalize.css/normalize.css": "vendor/normalize.css"}); eleventyConfig.addWatchTarget("./source/style/"); diff --git a/package-lock.json b/package-lock.json index 73baa18..1fc8cd0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "dependencies": { "@11ty/eleventy": "^2.0.1", "bootstrap-icons": "^1.13.1", + "jquery": "^3.7.1", "sass": "^1.93.0" }, "devDependencies": { @@ -1583,6 +1584,12 @@ "node": ">=10" } }, + "node_modules/jquery": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", + "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==", + "license": "MIT" + }, "node_modules/js-stringify": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz", diff --git a/package.json b/package.json index d2759a8..3dc6f91 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "dependencies": { "@11ty/eleventy": "^2.0.1", "bootstrap-icons": "^1.13.1", + "jquery": "^3.7.1", "sass": "^1.93.0" } -} \ No newline at end of file +} diff --git a/source/templates/hippie/app.liquid b/source/templates/hippie/app.liquid index 58ca863..2456f20 100644 --- a/source/templates/hippie/app.liquid +++ b/source/templates/hippie/app.liquid @@ -13,7 +13,7 @@ {% block script %} {{ block.super -}} - + From e21b9d36b5b430890df6aea8ef833da43d84ce27 Mon Sep 17 00:00:00 2001 From: sthag Date: Mon, 27 Oct 2025 21:16:41 +0100 Subject: [PATCH 257/372] feat: Replace form screen with liquid version --- source/screens/demo/examples/ui/form.liquid | 56 +++++++++++++++++++++ source/screens/demo/examples/ui/form.njk | 55 -------------------- 2 files changed, 56 insertions(+), 55 deletions(-) create mode 100644 source/screens/demo/examples/ui/form.liquid delete mode 100644 source/screens/demo/examples/ui/form.njk diff --git a/source/screens/demo/examples/ui/form.liquid b/source/screens/demo/examples/ui/form.liquid new file mode 100644 index 0000000..492e191 --- /dev/null +++ b/source/screens/demo/examples/ui/form.liquid @@ -0,0 +1,56 @@ +--- +title: Form +tags: +- ui +--- +{% assign bodyClass = "body_frame" -%} +{% layout "hippie/app.liquid" %} + +{% block body %} +{% render 'hippie/partials/frame-header.liquid' %} +
      +

      Formulare

      + + +
      +
      + +
      +
      a
      +
      b
      +
      c
      +
      + +{% endblock %} + +{%- block script %} +{{ block.super -}} + +{% endblock %} \ No newline at end of file diff --git a/source/screens/demo/examples/ui/form.njk b/source/screens/demo/examples/ui/form.njk deleted file mode 100644 index 2e6c088..0000000 --- a/source/screens/demo/examples/ui/form.njk +++ /dev/null @@ -1,55 +0,0 @@ ---- -title: Form -tags: - - ui ---- -{% extends "hippie/_app_frame.njk" %} - -{% block body %} - {{ io.frameHeader('title-bar') }} -
      -

      Formulare

      - - -
      -
      -
      -
      -
      a
      -
      b
      -
      c
      -
      -
      -{% endblock %} - -{%- block script %} - {{ super() }} - -{% endblock %} \ No newline at end of file From 3c9c438b254eada678a98bc5b16a1f1679a5f4f8 Mon Sep 17 00:00:00 2001 From: sthag Date: Mon, 27 Oct 2025 21:23:26 +0100 Subject: [PATCH 258/372] feat: Add game and gallery screens --- source/screens/demo/examples/game.liquid | 25 ++++++ .../screens/demo/examples/ui/gallery.liquid | 77 +++++++++++++++++++ source/style/modules/ui/_gallery_module.scss | 18 +++++ source/style/modules/ui/_game_module.scss | 3 + 4 files changed, 123 insertions(+) create mode 100644 source/screens/demo/examples/game.liquid create mode 100755 source/screens/demo/examples/ui/gallery.liquid create mode 100644 source/style/modules/ui/_gallery_module.scss create mode 100644 source/style/modules/ui/_game_module.scss diff --git a/source/screens/demo/examples/game.liquid b/source/screens/demo/examples/game.liquid new file mode 100644 index 0000000..a57b17f --- /dev/null +++ b/source/screens/demo/examples/game.liquid @@ -0,0 +1,25 @@ +--- +title: Game - TFW +tags: +- demoExample +- gameExample +--- +{% assign bodyClass = "body_game" -%} +{% layout "hippie/app.liquid" %} + +{% block body %} +
      + +
      +{% endblock %} \ No newline at end of file diff --git a/source/screens/demo/examples/ui/gallery.liquid b/source/screens/demo/examples/ui/gallery.liquid new file mode 100755 index 0000000..f29cae5 --- /dev/null +++ b/source/screens/demo/examples/ui/gallery.liquid @@ -0,0 +1,77 @@ +--- +title: Gallery +tags: +- ui +--- +{% assign bodyClass = "body_frame" -%} +{% layout "hippie/app.liquid" %} + +{% block body %} +{% render 'hippie/partials/frame-header.liquid' %} +
      +
      +
      + + +
      +
      +
      A
      +
      B
      +
      C
      +
      + {% render 'hippie/partials/frame-status.liquid' %} +
      +
      +{% render 'hippie/partials/frame-mode.liquid' %} +{% endblock %} + +{%- block script %} +{{ block.super -}} + +{% endblock %} \ No newline at end of file diff --git a/source/style/modules/ui/_gallery_module.scss b/source/style/modules/ui/_gallery_module.scss new file mode 100644 index 0000000..4f8a233 --- /dev/null +++ b/source/style/modules/ui/_gallery_module.scss @@ -0,0 +1,18 @@ +@use "../../hippie-style/hippie"; + +.gallery { + display: flex; + flex-wrap: wrap; + justify-content: left; + align-items: start; + gap: 10px; + background-color: hippie.$color_back_io; + + & > div { + background-color: hotpink; + aspect-ratio: 2 / 3; + width: 128px; + transition: width 0.3s ease; + } +} + diff --git a/source/style/modules/ui/_game_module.scss b/source/style/modules/ui/_game_module.scss new file mode 100644 index 0000000..7bb575e --- /dev/null +++ b/source/style/modules/ui/_game_module.scss @@ -0,0 +1,3 @@ +.body_game { + background-color: hotpink; +} \ No newline at end of file From e0cfcfac13552d2372d2f99233460e2f5b598a6e Mon Sep 17 00:00:00 2001 From: sthag Date: Mon, 27 Oct 2025 21:33:38 +0100 Subject: [PATCH 259/372] feat: Add and rename screens - Add windows screen - Add windows.js - Different variants of classes for drag and edge snap behaviour - Rename js files to better distinguish usage --- source/code/{_ui.js => drag.js} | 0 source/code/{_intro.js => intro.js} | 0 source/code/windows.js | 282 ++++++++++++++++++ source/screens/demo/examples/intro.njk | 2 +- source/screens/demo/examples/ui/drag.liquid | 2 +- .../screens/demo/examples/ui/windows.liquid | 30 ++ source/style/modules/ui/_windows_module.scss | 36 +++ source/style/ui.scss | 1 + 8 files changed, 351 insertions(+), 2 deletions(-) rename source/code/{_ui.js => drag.js} (100%) rename source/code/{_intro.js => intro.js} (100%) create mode 100644 source/code/windows.js create mode 100644 source/screens/demo/examples/ui/windows.liquid create mode 100644 source/style/modules/ui/_windows_module.scss diff --git a/source/code/_ui.js b/source/code/drag.js similarity index 100% rename from source/code/_ui.js rename to source/code/drag.js diff --git a/source/code/_intro.js b/source/code/intro.js similarity index 100% rename from source/code/_intro.js rename to source/code/intro.js diff --git a/source/code/windows.js b/source/code/windows.js new file mode 100644 index 0000000..6c68eec --- /dev/null +++ b/source/code/windows.js @@ -0,0 +1,282 @@ +class Draggable { + constructor(element) { + this.element = element; + this.offsetX = 0; + this.offsetY = 0; + this.isDragging = false; + this.barSize = ''; + + this.init(); + } + + init() { + this.element.addEventListener('mousedown', this.onMouseDown.bind(this)); + document.addEventListener('mousemove', this.onMouseMove.bind(this)); + document.addEventListener('mouseup', this.onMouseUp.bind(this)); + this.setPosition('bottom'); + } + + onMouseDown(event) { + this.isDragging = true; + this.offsetX = event.clientX - this.element.getBoundingClientRect().left; + this.offsetY = event.clientY - this.element.getBoundingClientRect().top; + + event.preventDefault(); + } + + onMouseMove(event) { + if (!this.isDragging) { + return; + } + + let x = event.clientX - this.offsetX; + let y = event.clientY - this.offsetY; + + // Update the position of the element + this.element.style.left = `${x}px`; + this.element.style.top = `${y}px`; + } + + onMouseUp() { + if (!this.isDragging) { + return; + } + this.isDragging = false; + + this.snapToEdges(); + } + + snapToEdges() { + const rect = this.element.getBoundingClientRect(); + const windowWidth = window.innerWidth; + const windowHeight = window.innerHeight; + + // Determine the closest edge + const distances = { + left: rect.left, + right: windowWidth - rect.right, + top: rect.top, + bottom: windowHeight - rect.bottom + }; + + const closestEdge = Object.keys(distances).reduce((a, b) => distances[a] < distances[b] ? a : b); + + this.setPosition(closestEdge, this.barSize); + } + + setPosition(side, barSize) { + switch (side) { + case 'left': + // this.element.style.top = `${rect.top}px`; // Optional: keep vertical position + this.element.style.top = '0px'; + this.element.style.right = ''; + this.element.style.bottom = '0px'; + this.element.style.left = '0px'; + this.element.style.width = barSize; + this.element.style.height = ''; + break; + case 'right': + // this.element.style.left = `${windowWidth - rect.width}px`; + // this.element.style.top = `${rect.top}px`; // Optional: keep vertical position + this.element.style.top = '0px'; + this.element.style.right = '0px'; + this.element.style.bottom = '0px'; + this.element.style.left = ''; + this.element.style.width = barSize; + this.element.style.height = ''; + break; + case 'top': + // this.element.style.top = '0px'; + // this.element.style.left = `${rect.left}px`; // Optional: keep horizontal position + this.element.style.top = '0px'; + this.element.style.right = '0px'; + this.element.style.bottom = ''; + this.element.style.left = '0px'; + this.element.style.width = ''; + this.element.style.height = barSize; + break; + case 'bottom': + // this.element.style.top = `${windowHeight - rect.height}px`; + // this.element.style.left = `${rect.left}px`; // Optional: keep horizontal position + this.element.style.top = ''; + this.element.style.right = '0px'; + this.element.style.bottom = '0px'; + this.element.style.left = '0px'; + this.element.style.width = ''; + this.element.style.height = barSize; + break; + } + } +} + +class DragAdv { + constructor(element, placeholder) { + this.element = element; + this.placeholder = placeholder; + this.offsetX = 0; + this.offsetY = 0; + this.isDragging = false; + this.barSize = ''; + + this.init(); + } + + init() { + this.element.addEventListener('mousedown', this.onMouseDown.bind(this)); + document.addEventListener('mousemove', this.onMouseMove.bind(this)); + document.addEventListener('mouseup', this.onMouseUp.bind(this)); + this.setPosition('bottom'); + } + + onMouseDown(event) { + this.isDragging = true; + // this.offsetX = event.clientX - this.element.getBoundingClientRect().left; + // this.offsetY = event.clientY - this.element.getBoundingClientRect().top; + this.offsetX = 0; + this.offsetY = 0; + this.element.style.display = 'none'; + + this.showPlaceholder(); + event.preventDefault(); + } + + onMouseMove(event) { + if (!this.isDragging) return; + + let x = event.clientX - this.offsetX; + let y = event.clientY - this.offsetY; + + // Update the position of the element + // this.element.style.left = `${x}px`; + // this.element.style.top = `${y}px`; + // this.element.style.display = 'none'; + + // Update placeholder position + this.placeholder.style.left = `${x}px`; + this.placeholder.style.top = `${y}px`; + // this.placeholder.style.display = 'block'; + } + + onMouseUp() { + if (!this.isDragging) return; + this.isDragging = false; + + this.element.style.display = 'block'; + + this.snapToEdges(); + this.hidePlaceholder(); + } + + showPlaceholder() { + this.placeholder.style.display = 'block'; + } + + hidePlaceholder() { + this.placeholder.style.display = 'none'; + } + + snapToEdges() { + const rect = this.placeholder.getBoundingClientRect(); + const windowWidth = window.innerWidth; + const windowHeight = window.innerHeight; + + const distances = { + left: rect.left, + right: windowWidth - rect.right, + top: rect.top, + bottom: windowHeight - rect.bottom + }; + + const closestEdge = Object.keys(distances).reduce((a, b) => distances[a] < distances[b] ? a : b); + + console.log(rect); + console.log(closestEdge); + this.setPosition(closestEdge, this.barSize); + /*switch (closestEdge) { + case 'left': + this.element.style.left = '0px'; + this.element.style.top = `${rect.top}px`; + break; + case 'right': + this.element.style.left = `${windowWidth - rect.width}px`; + this.element.style.top = `${rect.top}px`; + break; + case 'top': + this.element.style.top = '0px'; + this.element.style.left = `${rect.left}px`; + break; + case 'bottom': + this.element.style.top = `${windowHeight - rect.height}px`; + this.element.style.left = `${rect.left}px`; + break; + }*/ + } + + setPosition(side, barSize) { + switch (side) { + case 'left': + // this.element.style.top = `${rect.top}px`; // Optional: keep vertical position + this.element.style.top = '0px'; + this.element.style.right = ''; + this.element.style.bottom = '0px'; + this.element.style.left = '0px'; + this.element.style.width = barSize; + this.element.style.height = ''; + break; + case 'right': + // this.element.style.left = `${windowWidth - rect.width}px`; + // this.element.style.top = `${rect.top}px`; // Optional: keep vertical position + this.element.style.top = '0px'; + this.element.style.right = '0px'; + this.element.style.bottom = '0px'; + this.element.style.left = ''; + this.element.style.width = barSize; + this.element.style.height = ''; + break; + case 'top': + // this.element.style.top = '0px'; + // this.element.style.left = `${rect.left}px`; // Optional: keep horizontal position + this.element.style.top = '0px'; + this.element.style.right = '0px'; + this.element.style.bottom = ''; + this.element.style.left = '0px'; + this.element.style.width = ''; + this.element.style.height = barSize; + break; + case 'bottom': + // this.element.style.top = `${windowHeight - rect.height}px`; + // this.element.style.left = `${rect.left}px`; // Optional: keep horizontal position + this.element.style.top = ''; + this.element.style.right = '0px'; + this.element.style.bottom = '0px'; + this.element.style.left = '0px'; + this.element.style.width = ''; + this.element.style.height = barSize; + break; + } + } +} + +class BestDrag { + #element; + + constructor(element) { + this.#setElement(element); + } + + #setElement(value) { + if (!value) { + throw new Error('No element found'); + } + this.#element = value; + this.#element.style.background = "hotpink"; + } + + get element() { + return this.#element; + } + + set element(value) { + this.#setElement(value); + } +} \ No newline at end of file diff --git a/source/screens/demo/examples/intro.njk b/source/screens/demo/examples/intro.njk index 1358739..548cc3f 100644 --- a/source/screens/demo/examples/intro.njk +++ b/source/screens/demo/examples/intro.njk @@ -49,7 +49,7 @@ tags: {%- block script %} {{ super() }} - + + + +{% endblock %} \ No newline at end of file diff --git a/source/style/modules/ui/_windows_module.scss b/source/style/modules/ui/_windows_module.scss new file mode 100644 index 0000000..0f46b78 --- /dev/null +++ b/source/style/modules/ui/_windows_module.scss @@ -0,0 +1,36 @@ +@use "sass:map"; + +@use "../../hippie-style/hippie"; + +#task-bar { + @extend %flex-inline; + z-index: map.get(hippie.$z-indexes, "content-top"); + align-items: stretch; + position: fixed; + //right: 0; + //bottom: 0; + //left: 0; + border: 1px solid transparent; + padding: hippie.$space_basic; + background-color: rgba(0, 0, 0, .1); + + button { + @extend .button_io; + overflow: hidden; + } +} + +#screen-space { + position: relative; + height: 100%; +} + +#placeholder { + display: none; + z-index: map.get(hippie.$z-indexes, "content-top"); + position: fixed; + width: 100px; + height: 100px; + border: 2px dashed deeppink; + background-color: hotpink; +} \ No newline at end of file diff --git a/source/style/ui.scss b/source/style/ui.scss index 4a1e6c8..da6ecf7 100644 --- a/source/style/ui.scss +++ b/source/style/ui.scss @@ -9,6 +9,7 @@ @use "modules/ui/form_module"; @use "modules/ui/game_module"; @use "modules/ui/gallery_module"; +@use "modules/ui/windows_module"; $color_gui_back: hippie.$color_dark; $space_gui_half: hippie.$space_half; From 0996ace34f31c8e3d2bf2b0ec8a925cf3fdaa606 Mon Sep 17 00:00:00 2001 From: sthag Date: Mon, 27 Oct 2025 21:53:57 +0100 Subject: [PATCH 260/372] fix: Task bar drag behaviour - Placeholder is centered to mouse cursor - Placeholder is positioned on mouse down not only on move --- source/code/windows.js | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/source/code/windows.js b/source/code/windows.js index 6c68eec..c6e42b8 100644 --- a/source/code/windows.js +++ b/source/code/windows.js @@ -125,18 +125,24 @@ class DragAdv { this.element.addEventListener('mousedown', this.onMouseDown.bind(this)); document.addEventListener('mousemove', this.onMouseMove.bind(this)); document.addEventListener('mouseup', this.onMouseUp.bind(this)); - this.setPosition('bottom'); + this.setPosition('bottom', this.barSize); } onMouseDown(event) { this.isDragging = true; - // this.offsetX = event.clientX - this.element.getBoundingClientRect().left; - // this.offsetY = event.clientY - this.element.getBoundingClientRect().top; - this.offsetX = 0; - this.offsetY = 0; - this.element.style.display = 'none'; this.showPlaceholder(); + + this.offsetX = this.placeholder.getBoundingClientRect().width / 2; + this.offsetY = this.placeholder.getBoundingClientRect().height / 2; + this.element.style.display = 'none'; + + let x = event.clientX - this.offsetX; + let y = event.clientY - this.offsetY; + + this.placeholder.style.left = `${x}px`; + this.placeholder.style.top = `${y}px`; + event.preventDefault(); } @@ -146,15 +152,8 @@ class DragAdv { let x = event.clientX - this.offsetX; let y = event.clientY - this.offsetY; - // Update the position of the element - // this.element.style.left = `${x}px`; - // this.element.style.top = `${y}px`; - // this.element.style.display = 'none'; - - // Update placeholder position this.placeholder.style.left = `${x}px`; this.placeholder.style.top = `${y}px`; - // this.placeholder.style.display = 'block'; } onMouseUp() { From 1ada62f6eceae2a55a9c94466658e3ba384c2a40 Mon Sep 17 00:00:00 2001 From: sthag Date: Mon, 27 Oct 2025 23:24:02 +0100 Subject: [PATCH 261/372] feat: Optimize DragAdv class - Only use left mouse button - Handle element and placeholder together --- source/code/windows.js | 61 +++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/source/code/windows.js b/source/code/windows.js index c6e42b8..f282729 100644 --- a/source/code/windows.js +++ b/source/code/windows.js @@ -61,6 +61,24 @@ class Draggable { const closestEdge = Object.keys(distances).reduce((a, b) => distances[a] < distances[b] ? a : b); + /*switch (closestEdge) { + case 'left': + this.element.style.left = '0px'; + this.element.style.top = `${rect.top}px`; + break; + case 'right': + this.element.style.left = `${windowWidth - rect.width}px`; + this.element.style.top = `${rect.top}px`; + break; + case 'top': + this.element.style.top = '0px'; + this.element.style.left = `${rect.left}px`; + break; + case 'bottom': + this.element.style.top = `${windowHeight - rect.height}px`; + this.element.style.left = `${rect.left}px`; + break; + }*/ this.setPosition(closestEdge, this.barSize); } @@ -129,19 +147,20 @@ class DragAdv { } onMouseDown(event) { - this.isDragging = true; + if (event.button === 0) { + this.isDragging = true; - this.showPlaceholder(); + this.showPlaceholder(); - this.offsetX = this.placeholder.getBoundingClientRect().width / 2; - this.offsetY = this.placeholder.getBoundingClientRect().height / 2; - this.element.style.display = 'none'; + this.offsetX = this.placeholder.getBoundingClientRect().width / 2; + this.offsetY = this.placeholder.getBoundingClientRect().height / 2; - let x = event.clientX - this.offsetX; - let y = event.clientY - this.offsetY; + let x = event.clientX - this.offsetX; + let y = event.clientY - this.offsetY; - this.placeholder.style.left = `${x}px`; - this.placeholder.style.top = `${y}px`; + this.placeholder.style.left = `${x}px`; + this.placeholder.style.top = `${y}px`; + } event.preventDefault(); } @@ -160,18 +179,18 @@ class DragAdv { if (!this.isDragging) return; this.isDragging = false; - this.element.style.display = 'block'; - this.snapToEdges(); this.hidePlaceholder(); } showPlaceholder() { + this.element.style.display = 'none'; this.placeholder.style.display = 'block'; } hidePlaceholder() { this.placeholder.style.display = 'none'; + this.element.style.display = ''; } snapToEdges() { @@ -188,27 +207,7 @@ class DragAdv { const closestEdge = Object.keys(distances).reduce((a, b) => distances[a] < distances[b] ? a : b); - console.log(rect); - console.log(closestEdge); this.setPosition(closestEdge, this.barSize); - /*switch (closestEdge) { - case 'left': - this.element.style.left = '0px'; - this.element.style.top = `${rect.top}px`; - break; - case 'right': - this.element.style.left = `${windowWidth - rect.width}px`; - this.element.style.top = `${rect.top}px`; - break; - case 'top': - this.element.style.top = '0px'; - this.element.style.left = `${rect.left}px`; - break; - case 'bottom': - this.element.style.top = `${windowHeight - rect.height}px`; - this.element.style.left = `${rect.left}px`; - break; - }*/ } setPosition(side, barSize) { From 6098a1e62d2791e1c41e93cd3d855c80f12749f1 Mon Sep 17 00:00:00 2001 From: sthag Date: Mon, 27 Oct 2025 23:24:49 +0100 Subject: [PATCH 262/372] feat: Style and content for windows --- .../screens/demo/examples/ui/windows.liquid | 31 +++++++++- source/style/modules/ui/_windows_module.scss | 61 ++++++++++++++++++- 2 files changed, 86 insertions(+), 6 deletions(-) diff --git a/source/screens/demo/examples/ui/windows.liquid b/source/screens/demo/examples/ui/windows.liquid index 9dc321b..daacb66 100644 --- a/source/screens/demo/examples/ui/windows.liquid +++ b/source/screens/demo/examples/ui/windows.liquid @@ -7,9 +7,34 @@ tags: {% layout "hippie/app.liquid" %} {% block body %} - +
      + + + +
      + + + +
      +
      {% endblock %} diff --git a/source/style/modules/ui/_windows_module.scss b/source/style/modules/ui/_windows_module.scss index 0f46b78..c7a9846 100644 --- a/source/style/modules/ui/_windows_module.scss +++ b/source/style/modules/ui/_windows_module.scss @@ -2,10 +2,21 @@ @use "../../hippie-style/hippie"; -#task-bar { - @extend %flex-inline; - z-index: map.get(hippie.$z-indexes, "content-top"); +$padding_half: calc(#{hippie.$space_half} - 3px) hippie.$space_half; + +%flex-bar { + display: flex; + flex-direction: row; + flex-wrap: wrap; align-items: stretch; + align-content: center; + justify-content: flex-start; + gap: hippie.$space_half hippie.$space_basic; +} + +#task-bar { + @extend %flex-bar; + z-index: map.get(hippie.$z-indexes, "content-top"); position: fixed; //right: 0; //bottom: 0; @@ -14,10 +25,54 @@ padding: hippie.$space_basic; background-color: rgba(0, 0, 0, .1); + nav, + & > div { + @extend %flex-bar; + + &:last-child { + margin-left: auto; + } + } + button { @extend .button_io; overflow: hidden; } + + nav.small { + //font-size: .8em; + + button { + border: none; + padding: $padding_half; + + &:hover { + background-color: transparent; + } + } + } + + nav.big { + font-size: 1.5em; + + button { + border: none; + padding: 0; + + &:hover { + background-color: transparent; + } + } + } + + .clock { + text-align: end; + + &, + & > * { + line-height: 1; + } + } } #screen-space { From 6c252875fa97a114e73695925e0c8bbfcb1802a6 Mon Sep 17 00:00:00 2001 From: sthag Date: Tue, 28 Oct 2025 19:45:27 +0100 Subject: [PATCH 263/372] chore: Update jshint rules --- .jshintrc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.jshintrc b/.jshintrc index 7554aff..f7c493b 100644 --- a/.jshintrc +++ b/.jshintrc @@ -7,25 +7,25 @@ // Enforcing "bitwise" : true, // true: Prohibit bitwise operators (&, |, ^, etc.) "camelcase" : false, // true: Identifiers must be in camelCase - "curly" : true, // true: Require {} for every new block or scope + "curly" : false, // true: Require {} for every new block or scope "eqeqeq" : true, // true: Require triple equals (===) for comparison "forin" : true, // true: Require filtering for..in loops with obj.hasOwnProperty() "freeze" : true, // true: prohibits overwriting prototypes of native objects such as Array, Date etc. "immed" : false, // true: Require immediate invocations to be wrapped in parens e.g. `(function () { } ());` - "latedef" : false, // true: Require variables/functions to be defined before being used - "newcap" : false, // true: Require capitalization of all constructor functions e.g. `new F()` + "latedef" : true, // true: Require variables/functions to be defined before being used + "newcap" : true, // true: Require capitalization of all constructor functions e.g. `new F()` "noarg" : true, // true: Prohibit use of `arguments.caller` and `arguments.callee` "noempty" : true, // true: Prohibit use of empty blocks "nonbsp" : true, // true: Prohibit `non-breaking whitespace` characters. "nonew" : false, // true: Prohibit use of constructors for side-effects (without assignment) "plusplus" : false, // true: Prohibit use of `++` and `--` - "quotmark" : false, // Quotation mark consistency: + "quotmark" : true, // Quotation mark consistency: // false : do nothing (default) // true : ensure whatever is used is consistent // "single" : require single quotes // "double" : require double quotes "undef" : true, // true: Require all non-global variables to be declared (prevents global leaks) - "unused" : false, // Unused variables: + "unused" : true, // Unused variables: // true : all variables, last function parameter // "vars" : all variables only // "strict" : all variables, all function parameters From c259ead9a0d93f00960e48caae5b0e11ab0457dc Mon Sep 17 00:00:00 2001 From: sthag Date: Tue, 28 Oct 2025 19:51:59 +0100 Subject: [PATCH 264/372] feat: Replace new with start screen - Convert to liquid - Add old ongoing function for now - Add macros as partials - Rename data source to better reflect usage - Update app.js to fulfill jshint --- source/code/app.js | 27 +++++++---- source/data/{new.json => start.json} | 4 +- source/screens/demo/examples/ui/new.njk | 45 ------------------- source/screens/demo/examples/ui/start.liquid | 44 ++++++++++++++++++ .../hippie/partials/header-status.liquid | 21 +++++++++ .../hippie/partials/status-coord.liquid | 1 + .../hippie/partials/status-date.liquid | 6 +++ .../hippie/partials/status-time.liquid | 1 + 8 files changed, 94 insertions(+), 55 deletions(-) rename source/data/{new.json => start.json} (56%) delete mode 100755 source/screens/demo/examples/ui/new.njk create mode 100644 source/screens/demo/examples/ui/start.liquid create mode 100644 source/templates/hippie/partials/header-status.liquid create mode 100644 source/templates/hippie/partials/status-coord.liquid create mode 100644 source/templates/hippie/partials/status-date.liquid create mode 100644 source/templates/hippie/partials/status-time.liquid diff --git a/source/code/app.js b/source/code/app.js index 8632638..8a21b5f 100644 --- a/source/code/app.js +++ b/source/code/app.js @@ -1,25 +1,33 @@ //NEW function Clock(id) { - this.id = id; + 'use strict'; - var that = this; - setInterval(function () { that.updateClock(); }, 1000); + this.id = id; + const that = this; + + setInterval(function () { + that.updateClock(); + }, 1000); this.updateClock(); } Clock.prototype.updateClock = function () { - var date = new Date(); - var clock = document.getElementById(this.id); + 'use strict'; + + const date = new Date(); + const clock = document.getElementById(this.id); //console.log(this); - clock.innerHTML = this.formatDigits(date.getHours()) + ":" + this.formatDigits(date.getMinutes()) + ":" + this.formatDigits(date.getSeconds()); + clock.innerHTML = this.formatDigits(date.getHours()) + ':' + this.formatDigits(date.getMinutes()) + ":" + this.formatDigits(date.getSeconds()); }; Clock.prototype.formatDigits = function (val) { - if (val < 10) val = "0" + val; + 'use strict'; + + if (val < 10) val = '0' + val; return val; -} +}; //OLD @@ -121,6 +129,7 @@ function barwidth(size, G, W) { return newW; } + //String Element erweitern String.prototype.transform = function () { return parseFloat(this.replace(',', '.')); @@ -129,6 +138,7 @@ String.prototype.transform = function () { Array.prototype.arrayAdd = function () { return eval(this.join("+")); } + //Speicherplatz in Prozent berechnen function percentage(total, gigs, round) { var totalSpace = total; @@ -138,6 +148,7 @@ function percentage(total, gigs, round) { return p; } + //Speicherplatz in GB berechnen function gigabytes(percent, total, round) { var occupiedPercent = percent; diff --git a/source/data/new.json b/source/data/start.json similarity index 56% rename from source/data/new.json rename to source/data/start.json index 9d4a0a8..cc0da22 100644 --- a/source/data/new.json +++ b/source/data/start.json @@ -5,10 +5,10 @@ }, { "text": "Basics", - "href": "./demo/basics.html" + "href": "/demo/basics.html" }, { "text": "Drag", - "href": "./demo/examples/ui/drag.html" + "href": "/demo/examples/ui/drag.html" } ] \ No newline at end of file diff --git a/source/screens/demo/examples/ui/new.njk b/source/screens/demo/examples/ui/new.njk deleted file mode 100755 index df1f62a..0000000 --- a/source/screens/demo/examples/ui/new.njk +++ /dev/null @@ -1,45 +0,0 @@ ---- -title: New -tags: - - ui ---- -{% set pageId = page.fileSlug %} -{% set bodyClass = "body_new" %} - -{% extends "hippie/_app_frame.njk" %} -{% import "hippie/macros/_header.njk" as header %} - -{% block body %} - {{ header.status(hippie, new) }} -
      - -
      -
      -
      1
      -
      2
      -
      3
      -
      4
      -
      -{% endblock %} - -{%- block script %} - {{ super() }} - -{% endblock %} \ No newline at end of file diff --git a/source/screens/demo/examples/ui/start.liquid b/source/screens/demo/examples/ui/start.liquid new file mode 100644 index 0000000..8e13c85 --- /dev/null +++ b/source/screens/demo/examples/ui/start.liquid @@ -0,0 +1,44 @@ +--- +title: Start +tags: +- ui +--- +{% assign bodyClass = "body_new" -%} +{% layout "hippie/app.liquid" %} + +{% block body %} +{% render 'hippie/partials/header-status', hippie: hippie, links: start %} +
      + +
      +
      +
      1
      +
      2
      +
      3
      +
      4
      +
      +{% endblock %} + +{%- block script %} +{{ block.super -}} + +{% endblock %} \ No newline at end of file diff --git a/source/templates/hippie/partials/header-status.liquid b/source/templates/hippie/partials/header-status.liquid new file mode 100644 index 0000000..725e305 --- /dev/null +++ b/source/templates/hippie/partials/header-status.liquid @@ -0,0 +1,21 @@ +
      +

      + {{ hippie.brand | upcase }} +

      + +
      +

      {% render 'hippie/partials/status-coord', id: "log" %} + / + {% render 'hippie/partials/status-date', id: "date" %} + / + {% render 'hippie/partials/status-time', id: "time" %}

      +
      +
      diff --git a/source/templates/hippie/partials/status-coord.liquid b/source/templates/hippie/partials/status-coord.liquid new file mode 100644 index 0000000..29e592f --- /dev/null +++ b/source/templates/hippie/partials/status-coord.liquid @@ -0,0 +1 @@ +{{ text | default: 'X: #, Y: ##' }} diff --git a/source/templates/hippie/partials/status-date.liquid b/source/templates/hippie/partials/status-date.liquid new file mode 100644 index 0000000..296a866 --- /dev/null +++ b/source/templates/hippie/partials/status-date.liquid @@ -0,0 +1,6 @@ + + Wochentag, + ##. + Monat + #### + diff --git a/source/templates/hippie/partials/status-time.liquid b/source/templates/hippie/partials/status-time.liquid new file mode 100644 index 0000000..f981e80 --- /dev/null +++ b/source/templates/hippie/partials/status-time.liquid @@ -0,0 +1 @@ +{{ text | default: '00:00:00' }}{{ postfix | default: ' Uhr' }} From bac4b73c08151f09e482767edaa8a3bd7f4044e5 Mon Sep 17 00:00:00 2001 From: sthag Date: Fri, 31 Oct 2025 19:47:19 +0100 Subject: [PATCH 265/372] feat: Add time to task bar - Add app.js to windows screen - Add time display to task bar - Add new TimeDisplay class to app.js - Add play and pause buttons as example - Fix event handlers of task bar according to bubbling and propagation --- source/code/app.js | 57 +++++++++++++++++++ source/code/windows.js | 33 +++++++---- .../screens/demo/examples/ui/windows.liquid | 20 ++++++- source/style/modules/ui/_windows_module.scss | 4 ++ 4 files changed, 103 insertions(+), 11 deletions(-) diff --git a/source/code/app.js b/source/code/app.js index 8a21b5f..3f588fe 100644 --- a/source/code/app.js +++ b/source/code/app.js @@ -1,3 +1,53 @@ +// NEWER + +class TimeDisplay { + constructor(element, format = 'HH:mm:ss', interval = 1000) { + this.element = element; + this.format = format; + this.interval = interval; + this.isPaused = false; + this.locale = navigator.language || 'en-US'; + this.updateTime(); + } + + formatTime(date) { + const options = {hour: '2-digit', minute: '2-digit', hour12: false}; + + switch (this.format) { + case 'HH:mm': + return date.toLocaleTimeString(this.locale, options); + case 'HH:mm:ss': + return date.toLocaleTimeString(this.locale, {...options, second: '2-digit'}); + case 'hh:mm A': + return date.toLocaleTimeString(this.locale, {...options, hour12: true}); + case 'hh:mm:ss A': + return date.toLocaleTimeString(this.locale, {...options, second: '2-digit', hour12: true}); + } + + return date.toString(); + } + + async updateTime() { + while (true) { + if (!this.isPaused) { + const now = new Date(); + this.element.textContent = this.formatTime(now); + } + await new Promise(resolve => setTimeout(resolve, this.interval)); + } + } + + // Method to pause updates + pause() { + this.isPaused = true; + } + + // Method to resume updates + resume() { + this.isPaused = false; + } +} + //NEW function Clock(id) { @@ -158,3 +208,10 @@ function gigabytes(percent, total, round) { return g; } + +function checkButtonAndTarget(event, element, button = 0) { + return ( + event.button === button && + event.target === element + ); +} \ No newline at end of file diff --git a/source/code/windows.js b/source/code/windows.js index f282729..e928e97 100644 --- a/source/code/windows.js +++ b/source/code/windows.js @@ -139,6 +139,7 @@ class DragAdv { this.init(); } + // TODO: Ereignisse besser delegieren init() { this.element.addEventListener('mousedown', this.onMouseDown.bind(this)); document.addEventListener('mousemove', this.onMouseMove.bind(this)); @@ -147,9 +148,12 @@ class DragAdv { } onMouseDown(event) { - if (event.button === 0) { + if (checkButtonAndTarget(event, this.element, 0)) { + console.debug('Drag mode enabled'); + this.isDragging = true; + // TODO: Platzhalter anpassen je nach Ziel this.showPlaceholder(); this.offsetX = this.placeholder.getBoundingClientRect().width / 2; @@ -166,21 +170,29 @@ class DragAdv { } onMouseMove(event) { - if (!this.isDragging) return; + if (this.isDragging) { + if (!this.isDragging) return; - let x = event.clientX - this.offsetX; - let y = event.clientY - this.offsetY; + let x = event.clientX - this.offsetX; + let y = event.clientY - this.offsetY; - this.placeholder.style.left = `${x}px`; - this.placeholder.style.top = `${y}px`; + console.debug('Position: ', x, y); + + this.placeholder.style.left = `${x}px`; + this.placeholder.style.top = `${y}px`; + } } onMouseUp() { - if (!this.isDragging) return; - this.isDragging = false; + if (event.target === this.placeholder) { + console.debug('Drag mode disabled'); - this.snapToEdges(); - this.hidePlaceholder(); + if (!this.isDragging) return; + this.isDragging = false; + + this.snapToEdges(); + this.hidePlaceholder(); + } } showPlaceholder() { @@ -193,6 +205,7 @@ class DragAdv { this.element.style.display = ''; } + // TODO: Prüfung auf Ziel auslagern und schon bei Mausbewegung verfügbar machen snapToEdges() { const rect = this.placeholder.getBoundingClientRect(); const windowWidth = window.innerWidth; diff --git a/source/screens/demo/examples/ui/windows.liquid b/source/screens/demo/examples/ui/windows.liquid index daacb66..7521092 100644 --- a/source/screens/demo/examples/ui/windows.liquid +++ b/source/screens/demo/examples/ui/windows.liquid @@ -18,6 +18,8 @@ tags:
      - +
      + ##:## +
      +
      @@ -42,6 +43,7 @@ tags: {% endblock %} {%- block script %} + +{% comment %}{% endcomment %} + + diff --git a/source/templates/hippie/_main.njk b/source/templates/hippie/_main.njk index 7574dc9..3934cc1 100644 --- a/source/templates/hippie/_main.njk +++ b/source/templates/hippie/_main.njk @@ -43,6 +43,7 @@ {{ log.log('BODY :: Loading script assets...') }} {# #} + + From 5f8e048c84c414f5465de4ab096afe8fe9778ab8 Mon Sep 17 00:00:00 2001 From: sthag Date: Sat, 8 Nov 2025 21:58:23 +0100 Subject: [PATCH 287/372] feat: Replace status screens with liquid versions - maintenance.njk is now a single status.liquid - All status screens use liquid - Simplify structure --- source/screens/demo/pages/error/304.liquid | 20 +++++++++++ source/screens/demo/pages/error/304.njk | 26 -------------- source/screens/demo/pages/error/400.liquid | 17 +++++++++ source/screens/demo/pages/error/400.njk | 26 -------------- source/screens/demo/pages/error/401.liquid | 18 ++++++++++ source/screens/demo/pages/error/401.njk | 26 -------------- source/screens/demo/pages/error/403.liquid | 18 ++++++++++ source/screens/demo/pages/error/403.njk | 26 -------------- source/screens/demo/pages/error/404.liquid | 19 ++++++++++ source/screens/demo/pages/error/404.njk | 26 -------------- source/screens/demo/pages/error/408.liquid | 17 +++++++++ source/screens/demo/pages/error/408.njk | 26 -------------- source/screens/demo/pages/error/500.liquid | 17 +++++++++ source/screens/demo/pages/error/500.njk | 26 -------------- source/screens/demo/pages/error/503.liquid | 19 ++++++++++ source/screens/demo/pages/error/503.njk | 26 -------------- source/screens/demo/pages/maintenance.liquid | 13 +++++++ source/screens/demo/pages/maintenance.njk | 21 ----------- source/templates/demo/_maintenance.njk | 12 ------- source/templates/hippie/_maintenance.njk | 27 -------------- .../hippie/partials/footer-status.liquid | 9 +++++ source/templates/hippie/status.liquid | 36 +++++++++++++++++++ 22 files changed, 203 insertions(+), 268 deletions(-) create mode 100644 source/screens/demo/pages/error/304.liquid delete mode 100644 source/screens/demo/pages/error/304.njk create mode 100644 source/screens/demo/pages/error/400.liquid delete mode 100644 source/screens/demo/pages/error/400.njk create mode 100644 source/screens/demo/pages/error/401.liquid delete mode 100644 source/screens/demo/pages/error/401.njk create mode 100644 source/screens/demo/pages/error/403.liquid delete mode 100644 source/screens/demo/pages/error/403.njk create mode 100644 source/screens/demo/pages/error/404.liquid delete mode 100644 source/screens/demo/pages/error/404.njk create mode 100644 source/screens/demo/pages/error/408.liquid delete mode 100644 source/screens/demo/pages/error/408.njk create mode 100644 source/screens/demo/pages/error/500.liquid delete mode 100644 source/screens/demo/pages/error/500.njk create mode 100644 source/screens/demo/pages/error/503.liquid delete mode 100644 source/screens/demo/pages/error/503.njk create mode 100644 source/screens/demo/pages/maintenance.liquid delete mode 100644 source/screens/demo/pages/maintenance.njk delete mode 100644 source/templates/demo/_maintenance.njk delete mode 100644 source/templates/hippie/_maintenance.njk create mode 100644 source/templates/hippie/partials/footer-status.liquid create mode 100644 source/templates/hippie/status.liquid diff --git a/source/screens/demo/pages/error/304.liquid b/source/screens/demo/pages/error/304.liquid new file mode 100644 index 0000000..eb3b98c --- /dev/null +++ b/source/screens/demo/pages/error/304.liquid @@ -0,0 +1,20 @@ +--- +title: 304 +--- +{% assign pageBase = "../../../" -%} +{% assign bodyClass = "body_status" %} +{%- layout "hippie/status.liquid" %} + +{% block main %} +{{ block.super -}} +

      Umleitung

      +

      Unverändert Not Modified

      +
      +

      Der Inhalt der angeforderten Ressource hat sich seit der letzten Abfrage des Clients nicht verändert und wird + deshalb nicht übertragen. Zu den Einzelheiten siehe Browser-Cache-Versionsvergleich. +

      +

      Wikipedia

      +
      +{% endblock %} \ No newline at end of file diff --git a/source/screens/demo/pages/error/304.njk b/source/screens/demo/pages/error/304.njk deleted file mode 100644 index 1d47451..0000000 --- a/source/screens/demo/pages/error/304.njk +++ /dev/null @@ -1,26 +0,0 @@ ---- -title: 304 ---- -{% set pageBase = "../../" %} -{% set pageId = page.fileSlug %} -{% set bodyClass = "body_status" %} - -{% extends "demo/_maintenance.njk" %} - -{% block title %}{{ title }}{% endblock %} -{% block head %} -{{ super() }} -{% endblock %} - -{% block body %} -
      -

      {{ title }}

      -

      Umleitung

      -

      Unverändert Not Modified

      -
      -

      Der Inhalt der angeforderten Ressource hat sich seit der letzten Abfrage des Clients nicht verändert und wird deshalb nicht übertragen. Zu den Einzelheiten siehe Browser-Cache-Versionsvergleich.

      -

      Wikipedia

      -
      -
      -{{ super() }} -{% endblock %} diff --git a/source/screens/demo/pages/error/400.liquid b/source/screens/demo/pages/error/400.liquid new file mode 100644 index 0000000..6d480e8 --- /dev/null +++ b/source/screens/demo/pages/error/400.liquid @@ -0,0 +1,17 @@ +--- +title: 400 +--- +{% assign pageBase = "../../../" -%} +{% assign bodyClass = "body_status" %} +{%- layout "hippie/status.liquid" %} + +{% block main %} +{{ block.super -}} +

      Client-Fehler

      +

      Fehlerhafte Anfrage! Bad Request

      +
      +

      Die Anfrage-Nachricht war fehlerhaft aufgebaut.

      +

      Wikipedia +

      +
      +{% endblock %} \ No newline at end of file diff --git a/source/screens/demo/pages/error/400.njk b/source/screens/demo/pages/error/400.njk deleted file mode 100644 index 087b9a8..0000000 --- a/source/screens/demo/pages/error/400.njk +++ /dev/null @@ -1,26 +0,0 @@ ---- -title: 400 ---- -{% set pageBase = "../../" %} -{% set pageId = page.fileSlug %} -{% set bodyClass = "body_status" %} - -{% extends "demo/_maintenance.njk" %} - -{% block title %}{{ title }}{% endblock %} -{% block head %} -{{ super() }} -{% endblock %} - -{% block body %} -
      -

      {{ title }}

      -

      Client-Fehler

      -

      Fehlerhafte Anfrage! Bad Request

      -
      -

      Die Anfrage-Nachricht war fehlerhaft aufgebaut.

      -

      Wikipedia

      -
      -
      -{{ super() }} -{% endblock %} diff --git a/source/screens/demo/pages/error/401.liquid b/source/screens/demo/pages/error/401.liquid new file mode 100644 index 0000000..3bef772 --- /dev/null +++ b/source/screens/demo/pages/error/401.liquid @@ -0,0 +1,18 @@ +--- +title: 401 +--- +{% assign pageBase = "../../../" -%} +{% assign bodyClass = "body_status" %} +{%- layout "hippie/status.liquid" %} + +{% block main %} +{{ block.super -}} +

      Client-Fehler

      +

      Nicht autorisiert! Unauthorized

      +
      +

      Die Anfrage kann nicht ohne gültige Authentifizierung durchgeführt werden. Wie die Authentifizierung durchgeführt + werden soll, wird im „WWW-Authenticate“-Header-Feld der Antwort übermittelt.

      +

      Wikipedia +

      +
      +{% endblock %} \ No newline at end of file diff --git a/source/screens/demo/pages/error/401.njk b/source/screens/demo/pages/error/401.njk deleted file mode 100644 index f38c3f9..0000000 --- a/source/screens/demo/pages/error/401.njk +++ /dev/null @@ -1,26 +0,0 @@ ---- -title: 401 ---- -{% set pageBase = "../../" %} -{% set pageId = page.fileSlug %} -{% set bodyClass = "body_status" %} - -{% extends "demo/_maintenance.njk" %} - -{% block title %}{{ title }}{% endblock %} -{% block head %} -{{ super() }} -{% endblock %} - -{% block body %} -
      -

      {{ title }}

      -

      Client-Fehler

      -

      Nicht autorisiert! Unauthorized

      -
      -

      Die Anfrage kann nicht ohne gültige Authentifizierung durchgeführt werden. Wie die Authentifizierung durchgeführt werden soll, wird im „WWW-Authenticate“-Header-Feld der Antwort übermittelt.

      -

      Wikipedia

      -
      -
      -{{ super() }} -{% endblock %} diff --git a/source/screens/demo/pages/error/403.liquid b/source/screens/demo/pages/error/403.liquid new file mode 100644 index 0000000..94a245f --- /dev/null +++ b/source/screens/demo/pages/error/403.liquid @@ -0,0 +1,18 @@ +--- +title: 403 +--- +{% assign pageBase = "../../../" -%} +{% assign bodyClass = "body_status" %} +{%- layout "hippie/status.liquid" %} + +{% block main %} +{{ block.super -}} +

      Client-Fehler

      +

      Nicht erlaubt! Forbidden

      +
      +

      Die Anfrage wurde mangels Berechtigung des Clients nicht durchgeführt, bspw. weil der authentifizierte Benutzer + nicht berechtigt ist, oder eine als HTTPS konfigurierte URL nur mit HTTP aufgerufen wurde.

      +

      Wikipedia +

      +
      +{% endblock %} \ No newline at end of file diff --git a/source/screens/demo/pages/error/403.njk b/source/screens/demo/pages/error/403.njk deleted file mode 100644 index 03904e4..0000000 --- a/source/screens/demo/pages/error/403.njk +++ /dev/null @@ -1,26 +0,0 @@ ---- -title: 403 ---- -{% set pageBase = "../../" %} -{% set pageId = page.fileSlug %} -{% set bodyClass = "body_status" %} - -{% extends "demo/_maintenance.njk" %} - -{% block title %}{{ title }}{% endblock %} -{% block head %} -{{ super() }} -{% endblock %} - -{% block body %} -
      -

      {{ title }}

      -

      Client-Fehler

      -

      Nicht erlaubt! Forbidden

      -
      -

      Die Anfrage wurde mangels Berechtigung des Clients nicht durchgeführt, bspw. weil der authentifizierte Benutzer nicht berechtigt ist, oder eine als HTTPS konfigurierte URL nur mit HTTP aufgerufen wurde.

      -

      Wikipedia

      -
      -
      -{{ super() }} -{% endblock %} diff --git a/source/screens/demo/pages/error/404.liquid b/source/screens/demo/pages/error/404.liquid new file mode 100644 index 0000000..eadf7ee --- /dev/null +++ b/source/screens/demo/pages/error/404.liquid @@ -0,0 +1,19 @@ +--- +title: 404 +--- +{% assign pageBase = "../../../" -%} +{% assign bodyClass = "body_status" %} +{%- layout "hippie/status.liquid" %} + +{% block main %} +{{ block.super -}} +

      Client-Fehler

      +

      Hier ist nichts. Not Found

      +
      +

      Die angeforderte Ressource wurde nicht gefunden. Dieser Statuscode kann ebenfalls verwendet werden, um eine + Anfrage ohne näheren Grund abzuweisen. Links, welche auf solche Fehlerseiten verweisen, werden auch als Tote + Links bezeichnet.

      +

      Wikipedia +

      +
      +{% endblock %} \ No newline at end of file diff --git a/source/screens/demo/pages/error/404.njk b/source/screens/demo/pages/error/404.njk deleted file mode 100644 index bebd4f5..0000000 --- a/source/screens/demo/pages/error/404.njk +++ /dev/null @@ -1,26 +0,0 @@ ---- -title: 404 ---- -{% set pageBase = "../../" %} -{% set pageId = page.fileSlug %} -{% set bodyClass = "body_status" %} - -{% extends "demo/_maintenance.njk" %} - -{% block title %}{{ title }}{% endblock %} -{% block head %} -{{ super() }} -{% endblock %} - -{% block body %} -
      -

      {{ title }}

      -

      Client-Fehler

      -

      Hier ist nichts. Not Found

      -
      -

      Die angeforderte Ressource wurde nicht gefunden. Dieser Statuscode kann ebenfalls verwendet werden, um eine Anfrage ohne näheren Grund abzuweisen. Links, welche auf solche Fehlerseiten verweisen, werden auch als Tote Links bezeichnet.

      -

      Wikipedia

      -
      -
      -{{ super() }} -{% endblock %} diff --git a/source/screens/demo/pages/error/408.liquid b/source/screens/demo/pages/error/408.liquid new file mode 100644 index 0000000..0e50541 --- /dev/null +++ b/source/screens/demo/pages/error/408.liquid @@ -0,0 +1,17 @@ +--- +title: 408 +--- +{% assign pageBase = "../../../" -%} +{% assign bodyClass = "body_status" %} +{%- layout "hippie/status.liquid" %} + +{% block main %} +{{ block.super -}} +

      Client-Fehler

      +

      Zeitüberschreitung der Anforderung. Request Timeout

      +
      +

      Innerhalb der vom Server erlaubten Zeitspanne wurde keine vollständige Anfrage des Clients empfangen.

      +

      Wikipedia +

      +
      +{% endblock %} \ No newline at end of file diff --git a/source/screens/demo/pages/error/408.njk b/source/screens/demo/pages/error/408.njk deleted file mode 100644 index c5e10e0..0000000 --- a/source/screens/demo/pages/error/408.njk +++ /dev/null @@ -1,26 +0,0 @@ ---- -title: 408 ---- -{% set pageBase = "../../" %} -{% set pageId = page.fileSlug %} -{% set bodyClass = "body_status" %} - -{% extends "demo/_maintenance.njk" %} - -{% block title %}{{ title }}{% endblock %} -{% block head %} -{{ super() }} -{% endblock %} - -{% block body %} -
      -

      {{ title }}

      -

      Client-Fehler

      -

      Zeitüberschreitung der Anforderung. Request Timeout

      -
      -

      Innerhalb der vom Server erlaubten Zeitspanne wurde keine vollständige Anfrage des Clients empfangen.

      -

      Wikipedia

      -
      -
      -{{ super() }} -{% endblock %} diff --git a/source/screens/demo/pages/error/500.liquid b/source/screens/demo/pages/error/500.liquid new file mode 100644 index 0000000..96489d3 --- /dev/null +++ b/source/screens/demo/pages/error/500.liquid @@ -0,0 +1,17 @@ +--- +title: 500 +--- +{% assign pageBase = "../../../" -%} +{% assign bodyClass = "body_status" %} +{%- layout "hippie/status.liquid" %} + +{% block main %} +{{ block.super -}} +

      Server-Fehler

      +

      Allgemeiner Server Fehler!!! Internal Server Error

      +
      +

      Dies ist ein „Sammel-Statuscode“ für unerwartete Serverfehler.

      +

      Wikipedia +

      +
      +{% endblock %} \ No newline at end of file diff --git a/source/screens/demo/pages/error/500.njk b/source/screens/demo/pages/error/500.njk deleted file mode 100644 index d04c5c8..0000000 --- a/source/screens/demo/pages/error/500.njk +++ /dev/null @@ -1,26 +0,0 @@ ---- -title: 500 ---- -{% set pageBase = "../../" %} -{% set pageId = page.fileSlug %} -{% set bodyClass = "body_status" %} - -{% extends "demo/_maintenance.njk" %} - -{% block title %}{{ title }}{% endblock %} -{% block head %} -{{ super() }} -{% endblock %} - -{% block body %} -
      -

      {{ title }}

      -

      Server-Fehler

      -

      Allgemeiner Server Fehler!!! Internal Server Error

      -
      -

      Dies ist ein „Sammel-Statuscode“ für unerwartete Serverfehler.

      -

      Wikipedia

      -
      -
      -{{ super() }} -{% endblock %} diff --git a/source/screens/demo/pages/error/503.liquid b/source/screens/demo/pages/error/503.liquid new file mode 100644 index 0000000..46647d9 --- /dev/null +++ b/source/screens/demo/pages/error/503.liquid @@ -0,0 +1,19 @@ +--- +title: 503 +--- +{% assign pageBase = "../../../" -%} +{% assign bodyClass = "body_status" %} +{%- layout "hippie/status.liquid" %} + +{% block main %} +{{ block.super -}} +

      Server-Fehler

      +

      Dienst nicht verfügbar. Service Unavailable

      +
      +

      Der Server steht temporär nicht zur Verfügung, zum Beispiel wegen Überlastung oder Wartungsarbeiten. Ein + „Retry-After“-Header-Feld in der Antwort kann den Client auf einen Zeitpunkt hinweisen, zu dem die Anfrage + eventuell bearbeitet werden könnte.

      +

      Wikipedia +

      +
      +{% endblock %} \ No newline at end of file diff --git a/source/screens/demo/pages/error/503.njk b/source/screens/demo/pages/error/503.njk deleted file mode 100644 index f215a54..0000000 --- a/source/screens/demo/pages/error/503.njk +++ /dev/null @@ -1,26 +0,0 @@ ---- -title: 503 ---- -{% set pageBase = "../../" %} -{% set pageId = page.fileSlug %} -{% set bodyClass = "body_status" %} - -{% extends "demo/_maintenance.njk" %} - -{% block title %}{{ title }}{% endblock %} -{% block head %} -{{ super() }} -{% endblock %} - -{% block body %} -
      -

      {{ title }}

      -

      Server-Fehler

      -

      Dienst nicht verfügbar. Service Unavailable

      -
      -

      Der Server steht temporär nicht zur Verfügung, zum Beispiel wegen Überlastung oder Wartungsarbeiten. Ein „Retry-After“-Header-Feld in der Antwort kann den Client auf einen Zeitpunkt hinweisen, zu dem die Anfrage eventuell bearbeitet werden könnte.

      -

      Wikipedia

      -
      -
      -{{ super() }} -{% endblock %} diff --git a/source/screens/demo/pages/maintenance.liquid b/source/screens/demo/pages/maintenance.liquid new file mode 100644 index 0000000..d713f9e --- /dev/null +++ b/source/screens/demo/pages/maintenance.liquid @@ -0,0 +1,13 @@ +--- +title: Maintenance +--- +{% assign pageBase = "../../" -%} +{% assign pageClass = "h_full_view" %} +{%- layout "hippie/status.liquid" %} + +{% block body %} +
      +

      HIPPIE

      +

      Diese Seite wird gerade gewartet.

      +
      +{% endblock %} diff --git a/source/screens/demo/pages/maintenance.njk b/source/screens/demo/pages/maintenance.njk deleted file mode 100644 index b9cd3fe..0000000 --- a/source/screens/demo/pages/maintenance.njk +++ /dev/null @@ -1,21 +0,0 @@ ---- -title: Maintenance ---- -{% set pageBase = "../" %} -{% set pageId = page.fileSlug %} -{% set pageClass = "h_full_view" %} - -{% extends "demo/_maintenance.njk" %} - -{% block title %}{{ title }}{% endblock %} - -{% block head %} -{{ super() }} -{% endblock %} - -{% block body %} - -
      -

      HIPPIE

      -
      -{% endblock %} diff --git a/source/templates/demo/_maintenance.njk b/source/templates/demo/_maintenance.njk deleted file mode 100644 index da94505..0000000 --- a/source/templates/demo/_maintenance.njk +++ /dev/null @@ -1,12 +0,0 @@ - -{% extends "hippie/_maintenance.njk" %} - -{% block meta %} - {% include "demo/partials/_meta.njk" %} - -{% endblock %} - -{% block links %} - {{ super() }} - -{% endblock %} \ No newline at end of file diff --git a/source/templates/hippie/_maintenance.njk b/source/templates/hippie/_maintenance.njk deleted file mode 100644 index 0741534..0000000 --- a/source/templates/hippie/_maintenance.njk +++ /dev/null @@ -1,27 +0,0 @@ - -{% import "hippie/macros/_footer.njk" as footer %} - - - - - - {% block head %} - {{ hippie.titlePrefix }} - {%- block title %}{% endblock %}{{ hippie.titlePostfix }} - - {% block meta %} - {% include "hippie/partials/_head_meta.njk" %} - {% endblock %} - - {% block links %} - - {% endblock %} - {% endblock %} - - - - {% block body %} - {{ footer.status() }} - {% endblock %} - - \ No newline at end of file diff --git a/source/templates/hippie/partials/footer-status.liquid b/source/templates/hippie/partials/footer-status.liquid new file mode 100644 index 0000000..b46ecf2 --- /dev/null +++ b/source/templates/hippie/partials/footer-status.liquid @@ -0,0 +1,9 @@ +
      +
      Kontakt: + {{ email | default: 'admin@domain.tld' }} + · Server: + {{ app | default: 'Application' }}/{{ version | default: 'ver.s.ion' }} + ({{ system | default: 'System name' }}) · Domain: + {{ domain | default: 'domain.tld:port' }} +
      +
      \ No newline at end of file diff --git a/source/templates/hippie/status.liquid b/source/templates/hippie/status.liquid new file mode 100644 index 0000000..6189ca9 --- /dev/null +++ b/source/templates/hippie/status.liquid @@ -0,0 +1,36 @@ + +{% if pageClass %} + {%- capture classAttr %} class="{{ pageClass }}"{% endcapture -%} +{% endif -%} +{% if bodyClass %} + {%- capture bodyClassAttr %} class="{{ bodyClass }}"{% endcapture -%} +{% endif -%} + + + + {% block head %} + + {{- hippie.titlePrefix -}} + {% block title %}{{ title }}{% endblock -%} + {{ hippie.titlePostfix -}} + + {% block meta -%} + {% render "hippie/partials/meta.liquid" %} + {% endblock -%} + {% block links -%} + + + {% endblock -%} + {% endblock -%} + + + +{%- block body %} +
      +

      {{ title }}

      + {% block main %}{% endblock -%} +
      +{% render 'hippie/partials/footer-status' %} +{% endblock -%} + + \ No newline at end of file From 5663813ecfe7d53082a4622952c01ab9c4562724 Mon Sep 17 00:00:00 2001 From: sthag Date: Sun, 9 Nov 2025 12:58:41 +0100 Subject: [PATCH 288/372] feat: Replace index screen with liquid version - _default.njk is now a single full.liquid - Simplify structure - Add log partials as liquid --- source/screens/demo/index.liquid | 78 ++++++++++++ source/screens/demo/index.njk | 82 ------------- source/templates/hippie/full.liquid | 49 ++++++++ .../hippie/partials/log-assets.liquid | 3 + .../templates/hippie/partials/log-log.liquid | 3 + .../hippie/partials/log-setup.liquid | 6 + .../hippie/partials/log-start.liquid | 4 + .../hippie/partials/script-log.liquid | 113 ++++++++++++++++++ 8 files changed, 256 insertions(+), 82 deletions(-) create mode 100644 source/screens/demo/index.liquid delete mode 100644 source/screens/demo/index.njk create mode 100644 source/templates/hippie/full.liquid create mode 100644 source/templates/hippie/partials/log-assets.liquid create mode 100644 source/templates/hippie/partials/log-log.liquid create mode 100644 source/templates/hippie/partials/log-setup.liquid create mode 100644 source/templates/hippie/partials/log-start.liquid create mode 100644 source/templates/hippie/partials/script-log.liquid diff --git a/source/screens/demo/index.liquid b/source/screens/demo/index.liquid new file mode 100644 index 0000000..0b7c221 --- /dev/null +++ b/source/screens/demo/index.liquid @@ -0,0 +1,78 @@ +--- +permalink: "/" +title: Index +tags: +- demoIndex +--- +{% assign pageBase = hippie.pageBase -%} +{% assign pageId = page.fileSlug -%} +{% assign pageClass = "h_full_view" -%} +{%- layout "hippie/full.liquid" %} + +{% block title %}Index{% endblock %} + +{% block body %} +
      +
      +

      This is {{ hippie.brand | upcase }}

      +

      You can start using it by replacing this file with your own index page.

      +

      To do this you need to create a file + /index.njk + inside the + source/screens + folder. You can also create a + data.json + file inside the + source/templates + folder as a data source for your nunjucks files.

      +

      For a very basic start you can make a copy of the demo page + blank.njk. You can find it at + /source/screens/demo.

      +

      The + source/demo + folder contains an overview of all HTML elements and also examples for CSS style combinations and even whole + page layouts.
      Follow the white rabbit.

      +
      + 
        ()()
        (..)
      c(")(")
      +

      Overview

      +
      + +

      Page

      +
        + {% assign pagesByTitle = collections.demoPage | sort: 'data.title' %} + + {% for link in pagesByTitle %} +
      • + {{ link.data.title }} +
        • + {% endfor %} +
      +

      Example

      + +
      +
      +{% endblock %} + +{% block script %} +{{ block.super -}} +{% render 'hippie/partials/log-assets', state: true -%} +{% render 'hippie/partials/log-log', msg: 'BODY :: Assets loaded, running page specific script...', arg: true -%} + +{% render 'hippie/partials/log-log' with 'Application ready... or is it?' as msg -%} +{% endblock %} \ No newline at end of file diff --git a/source/screens/demo/index.njk b/source/screens/demo/index.njk deleted file mode 100644 index c50c516..0000000 --- a/source/screens/demo/index.njk +++ /dev/null @@ -1,82 +0,0 @@ ---- -permalink: "/" -title: Index -tags: - - demoIndex ---- -{% set pageBase = hippie.pageBase %} -{% set pageId = page.fileSlug %} -{% set pageClass = "h_full_view" %} - -{% extends "demo/_default.njk" %} - -{% block title %}Index{% endblock %} -{% block head %} - {{ super() }} -{% endblock %} - -{% block body %} - -
      -
      -

      This is - {{ hippie.brand | upper }}

      -

      You can start using it by replacing this file with your own index page.

      -

      To do this you need to create a file - /index.njk - inside the - source/screens - folder. You can also create a - data.json - file inside the - source/templates - folder as a data source for your nunjucks files.

      -

      For a very basic start you can make a copy of the demo page - blank.njk. You can find it at - /source/screens/demo.

      -

      The - source/demo - folder contains an overview of all HTML elements and also examples for CSS style combinations and even whole page layouts.
      Follow the white rabbit.

      -
      - 
        ()()
        (..)
      c(")(")
      -

      Overview

      -
      - -

      Page

      -
        - {% for link in collections.demoPage | sort(false, false, 'data.title') %} -
      • - {{ link.data.title }} -
        • - {% endfor %} -
      -

      Example

      - -
      -
      -{% endblock %} - -{% block script %} - {{ super() }} - -{% endblock %} \ No newline at end of file diff --git a/source/templates/hippie/full.liquid b/source/templates/hippie/full.liquid new file mode 100644 index 0000000..7167a5f --- /dev/null +++ b/source/templates/hippie/full.liquid @@ -0,0 +1,49 @@ + +{% if pageId %} +{%- capture idAttr %} id="{{ pageId }}"{% endcapture -%} +{% endif -%} +{% if pageClass %} + {%- capture classAttr %} class="{{ pageClass }}"{% endcapture -%} +{% endif -%} +{% if bodyClass %} + {%- capture bodyClassAttr %} class="{{ bodyClass }}"{% endcapture -%} +{% endif -%} + + + + {% block head %} + + {{- hippie.titlePrefix -}} + {% block title %}{% endblock -%} + {{ hippie.titlePostfix -}} + + {% block meta -%} + {% render "hippie/partials/meta.liquid" %} + {% comment %}{% endcomment %} + {% endblock -%} + {% render "hippie/partials/script-log.liquid" %} + {% render 'hippie/partials/log-setup', hippie: hippie, state: true -%} + {% render 'hippie/partials/log-start' -%} + {% block links -%} + {% render "hippie/partials/links.liquid" %} + {% comment %}{% endcomment %} + {% comment %}{% endcomment %} + + {% endblock -%} + {% render 'hippie/partials/log-log' with 'HEAD end :: Links parsed, starting to load.' as msg -%} + {% endblock -%} + + + +{% render 'hippie/partials/log-log' with 'BODY start' as msg -%} +{%- block body %}{% endblock -%} +{% block script -%} +{% render 'hippie/partials/log-log' with 'BODY :: Loading script assets...' as msg -%} + + +{% endblock -%} +{% render 'hippie/partials/log-log' with 'BODY end :: Page script might still be loading.' as msg -%} + + \ No newline at end of file diff --git a/source/templates/hippie/partials/log-assets.liquid b/source/templates/hippie/partials/log-assets.liquid new file mode 100644 index 0000000..a34b417 --- /dev/null +++ b/source/templates/hippie/partials/log-assets.liquid @@ -0,0 +1,3 @@ + diff --git a/source/templates/hippie/partials/log-log.liquid b/source/templates/hippie/partials/log-log.liquid new file mode 100644 index 0000000..ba21f2a --- /dev/null +++ b/source/templates/hippie/partials/log-log.liquid @@ -0,0 +1,3 @@ + diff --git a/source/templates/hippie/partials/log-setup.liquid b/source/templates/hippie/partials/log-setup.liquid new file mode 100644 index 0000000..04fd9b2 --- /dev/null +++ b/source/templates/hippie/partials/log-setup.liquid @@ -0,0 +1,6 @@ +{% comment %}{% assign hippie.debugMode = state %}{% endcomment %} + diff --git a/source/templates/hippie/partials/log-start.liquid b/source/templates/hippie/partials/log-start.liquid new file mode 100644 index 0000000..e137e33 --- /dev/null +++ b/source/templates/hippie/partials/log-start.liquid @@ -0,0 +1,4 @@ + diff --git a/source/templates/hippie/partials/script-log.liquid b/source/templates/hippie/partials/script-log.liquid new file mode 100644 index 0000000..7e270c7 --- /dev/null +++ b/source/templates/hippie/partials/script-log.liquid @@ -0,0 +1,113 @@ + \ No newline at end of file From 1b7e4f4888f48e6afbce84956a5abca42baafa58 Mon Sep 17 00:00:00 2001 From: sthag Date: Sun, 9 Nov 2025 14:33:44 +0100 Subject: [PATCH 289/372] feat: Replace blank screen with liquid version - Add title to full template - Remove unnecessary title from screens - Change CRLF to LF --- source/screens/demo/index.liquid | 2 -- source/screens/demo/pages/blank.liquid | 10 +++++++++ source/screens/demo/pages/blank.njk | 22 -------------------- source/screens/demo/pages/default.liquid | 2 +- source/screens/demo/pages/maintenance.liquid | 2 +- source/templates/hippie/full.liquid | 2 +- source/templates/hippie/status.liquid | 5 +++-- 7 files changed, 16 insertions(+), 29 deletions(-) create mode 100644 source/screens/demo/pages/blank.liquid delete mode 100644 source/screens/demo/pages/blank.njk diff --git a/source/screens/demo/index.liquid b/source/screens/demo/index.liquid index 0b7c221..1f19b26 100644 --- a/source/screens/demo/index.liquid +++ b/source/screens/demo/index.liquid @@ -9,8 +9,6 @@ tags: {% assign pageClass = "h_full_view" -%} {%- layout "hippie/full.liquid" %} -{% block title %}Index{% endblock %} - {% block body %}
      diff --git a/source/screens/demo/pages/blank.liquid b/source/screens/demo/pages/blank.liquid new file mode 100644 index 0000000..b6914e5 --- /dev/null +++ b/source/screens/demo/pages/blank.liquid @@ -0,0 +1,10 @@ +--- +title: Blank +--- +{% assign pageBase = "../../" -%} +{% assign pageId = page.fileSlug -%} +{%- layout "hippie/full.liquid" %} + +{% block body %} + +{% endblock %} diff --git a/source/screens/demo/pages/blank.njk b/source/screens/demo/pages/blank.njk deleted file mode 100644 index 3ff646f..0000000 --- a/source/screens/demo/pages/blank.njk +++ /dev/null @@ -1,22 +0,0 @@ ---- -title: Blank ---- -{% set pageBase = "../" %} -{% set pageId = page.fileSlug %} -{% set pageClass = "h_full_view" %} - -{% extends "demo/_default.njk" %} - -{% block title %}{{ title }}{% endblock %} - -{% block head %} -{{ super() }} -{% endblock %} - -{% block body %} - -{% endblock %} - -{% block script %} -{{ super() }} -{% endblock %} diff --git a/source/screens/demo/pages/default.liquid b/source/screens/demo/pages/default.liquid index 026c6da..5da6a7c 100644 --- a/source/screens/demo/pages/default.liquid +++ b/source/screens/demo/pages/default.liquid @@ -1,5 +1,5 @@ --- -title: "Default" +title: Default --- {% assign pageBase = "../" -%} {% assign pageId = page.fileSlug -%} diff --git a/source/screens/demo/pages/maintenance.liquid b/source/screens/demo/pages/maintenance.liquid index d713f9e..a4943f2 100644 --- a/source/screens/demo/pages/maintenance.liquid +++ b/source/screens/demo/pages/maintenance.liquid @@ -2,7 +2,7 @@ title: Maintenance --- {% assign pageBase = "../../" -%} -{% assign pageClass = "h_full_view" %} +{% assign pageClass = "h_full_view" -%} {%- layout "hippie/status.liquid" %} {% block body %} diff --git a/source/templates/hippie/full.liquid b/source/templates/hippie/full.liquid index 7167a5f..89ba267 100644 --- a/source/templates/hippie/full.liquid +++ b/source/templates/hippie/full.liquid @@ -14,7 +14,7 @@ {% block head %} {{- hippie.titlePrefix -}} - {% block title %}{% endblock -%} + {% block title %}{{ title }}{% endblock -%} {{ hippie.titlePostfix -}} {% block meta -%} diff --git a/source/templates/hippie/status.liquid b/source/templates/hippie/status.liquid index 6189ca9..f2e0ce1 100644 --- a/source/templates/hippie/status.liquid +++ b/source/templates/hippie/status.liquid @@ -1,6 +1,6 @@ {% if pageClass %} - {%- capture classAttr %} class="{{ pageClass }}"{% endcapture -%} +{%- capture classAttr %} class="{{ pageClass }}"{% endcapture -%} {% endif -%} {% if bodyClass %} {%- capture bodyClassAttr %} class="{{ bodyClass }}"{% endcapture -%} @@ -18,7 +18,8 @@ {% render "hippie/partials/meta.liquid" %} {% endblock -%} {% block links -%} - + {% endblock -%} {% endblock -%} From 432af47d2c086ae18d84c37ba1a20e497902dc25 Mon Sep 17 00:00:00 2001 From: sthag Date: Sun, 16 Nov 2025 12:13:57 +0100 Subject: [PATCH 290/372] feat: Add start screen - Rename existing ui start screen to tile - Add start screen - Search input for DuckDuckGo - Unfinished portal content --- source/screens/demo/examples/start.liquid | 84 +++++++++++++++++++ .../examples/ui/{start.liquid => tile.liquid} | 2 +- source/style/demo.scss | 1 + source/style/modules/_start.scss | 15 ++++ 4 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 source/screens/demo/examples/start.liquid rename source/screens/demo/examples/ui/{start.liquid => tile.liquid} (96%) create mode 100644 source/style/modules/_start.scss diff --git a/source/screens/demo/examples/start.liquid b/source/screens/demo/examples/start.liquid new file mode 100644 index 0000000..b4b1d98 --- /dev/null +++ b/source/screens/demo/examples/start.liquid @@ -0,0 +1,84 @@ +--- +title: Start +tags: +- demoExample +--- +{% assign pageBase = "../../" -%} +{% assign pageId = page.fileSlug -%} +{% assign bodyClass = "body_start" -%} +{% layout "hippie/full.liquid" %} + +{% block body %} +
      + +
      + + +
      +
      +{% endblock %} + +{% block script %} +{{ block.super -}} + +{% endblock %} \ No newline at end of file diff --git a/source/screens/demo/examples/ui/start.liquid b/source/screens/demo/examples/ui/tile.liquid similarity index 96% rename from source/screens/demo/examples/ui/start.liquid rename to source/screens/demo/examples/ui/tile.liquid index 261cb16..4bcd8c4 100644 --- a/source/screens/demo/examples/ui/start.liquid +++ b/source/screens/demo/examples/ui/tile.liquid @@ -1,5 +1,5 @@ --- -title: Start +title: Tile tags: - ui --- diff --git a/source/style/demo.scss b/source/style/demo.scss index 73e17c1..98e355e 100644 --- a/source/style/demo.scss +++ b/source/style/demo.scss @@ -13,4 +13,5 @@ @use "modules/portal/portal_module"; @use "modules/songbook/songbook_module"; @use "modules/demo/demo_module"; +@use "modules/start"; // @use "modules/YOUR-MODULE/YOUR-FILES"; diff --git a/source/style/modules/_start.scss b/source/style/modules/_start.scss new file mode 100644 index 0000000..7d790a3 --- /dev/null +++ b/source/style/modules/_start.scss @@ -0,0 +1,15 @@ +@use "../../hippie-style/hippie"; + +.body_start { + main { + @extend .sec_main_center; + } + + #www-search { + input[type="text"] { + flex: 1; + padding: hippie.$padding_basic; + line-height: hippie.$line_text_basic; + } + } +} \ No newline at end of file From fcdbfb41ef7bd5946d9c953f6752ddd6c0bec375 Mon Sep 17 00:00:00 2001 From: sthag Date: Sun, 16 Nov 2025 12:29:19 +0100 Subject: [PATCH 291/372] feat: Add clock screen - New screen for a ring clock - Add a canvas with the first ring - No functionality yet --- source/screens/demo/examples/clock.liquid | 34 +++++++++++++++++++++++ source/style/demo.scss | 1 + source/style/modules/_clock.scss | 9 ++++++ 3 files changed, 44 insertions(+) create mode 100644 source/screens/demo/examples/clock.liquid create mode 100644 source/style/modules/_clock.scss diff --git a/source/screens/demo/examples/clock.liquid b/source/screens/demo/examples/clock.liquid new file mode 100644 index 0000000..4541525 --- /dev/null +++ b/source/screens/demo/examples/clock.liquid @@ -0,0 +1,34 @@ +--- +title: Clock +tags: +- demoExample +--- +{% assign pageBase = "../../" -%} +{% assign bodyClass = "body_clock" -%} +{% layout "hippie/full.liquid" %} + +{% block body %} +
      + +
      +{% endblock %} + +{% block script %} +{{ block.super -}} + +{% endblock %} \ No newline at end of file diff --git a/source/style/demo.scss b/source/style/demo.scss index 98e355e..fe2b7e8 100644 --- a/source/style/demo.scss +++ b/source/style/demo.scss @@ -14,4 +14,5 @@ @use "modules/songbook/songbook_module"; @use "modules/demo/demo_module"; @use "modules/start"; +@use "modules/clock"; // @use "modules/YOUR-MODULE/YOUR-FILES"; diff --git a/source/style/modules/_clock.scss b/source/style/modules/_clock.scss new file mode 100644 index 0000000..74265da --- /dev/null +++ b/source/style/modules/_clock.scss @@ -0,0 +1,9 @@ +@use "../../hippie-style/hippie"; + +.body_clock { + main { + @extend .sec_main_center; + display: flex; + justify-content: center; + } +} \ No newline at end of file From dfa315310f011d499eb509a4cde8950bc048971a Mon Sep 17 00:00:00 2001 From: sthag Date: Sun, 16 Nov 2025 12:35:39 +0100 Subject: [PATCH 292/372] feat: Update clock - Change how the arc is drawn - Update the ring according to seconds --- source/screens/demo/examples/clock.liquid | 28 +++++++++++++++++------ 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/source/screens/demo/examples/clock.liquid b/source/screens/demo/examples/clock.liquid index 4541525..1ef49bc 100644 --- a/source/screens/demo/examples/clock.liquid +++ b/source/screens/demo/examples/clock.liquid @@ -20,15 +20,29 @@ tags: const canvas = document.getElementById('clock'); const ctx = canvas.getContext('2d'); - function drawRing(x, y, outerRadius, innerRadius, color) { + function drawRing(seconds) { + const centerX = canvas.width / 2; + const centerY = canvas.height / 2; + const radius = 128; + + ctx.clearRect(0, 0, canvas.width, canvas.height); + + const startAngle = -0.5 * Math.PI; // Start at the top + const endAngle = startAngle + (2 * Math.PI * (seconds / 60)); + ctx.beginPath(); - ctx.arc(x, y, outerRadius, 0, Math.PI * 2); - ctx.arc(x, y, innerRadius, 0, Math.PI * 2, true); - ctx.closePath(); - ctx.fillStyle = color; - ctx.fill(); + ctx.arc(centerX, centerY, radius, startAngle, endAngle, false); + ctx.lineWidth = 16; + ctx.strokeStyle = 'black'; + ctx.stroke(); } - drawRing(256, 256, 128, 96, 'black'); + function updateCircle() { + const currentSeconds = new Date().getSeconds(); + drawRing(currentSeconds); + } + + updateCircle(); + setInterval(updateCircle, 1000); {% endblock %} \ No newline at end of file From 1e874c4ac84af92439524e551fd6035d85fb80a1 Mon Sep 17 00:00:00 2001 From: sthag Date: Sun, 16 Nov 2025 12:43:10 +0100 Subject: [PATCH 293/372] feat: Add elements to clock Add rings for minutes and hours. --- source/screens/demo/examples/clock.liquid | 31 +++++++++++++++-------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/source/screens/demo/examples/clock.liquid b/source/screens/demo/examples/clock.liquid index 1ef49bc..054b628 100644 --- a/source/screens/demo/examples/clock.liquid +++ b/source/screens/demo/examples/clock.liquid @@ -20,26 +20,37 @@ tags: const canvas = document.getElementById('clock'); const ctx = canvas.getContext('2d'); - function drawRing(seconds) { + function drawCircle(seconds, minutes, hours) { const centerX = canvas.width / 2; const centerY = canvas.height / 2; const radius = 128; ctx.clearRect(0, 0, canvas.width, canvas.height); - const startAngle = -0.5 * Math.PI; // Start at the top - const endAngle = startAngle + (2 * Math.PI * (seconds / 60)); + function drawArc(value, maxValue, radius, strokeStyle) { + const startAngle = -0.5 * Math.PI; // Start at the top + const endAngle = startAngle + (2 * Math.PI * (value / maxValue)); - ctx.beginPath(); - ctx.arc(centerX, centerY, radius, startAngle, endAngle, false); - ctx.lineWidth = 16; - ctx.strokeStyle = 'black'; - ctx.stroke(); + ctx.beginPath(); + ctx.arc(centerX, centerY, radius, startAngle, endAngle, false); + ctx.lineWidth = 16; + ctx.strokeStyle = strokeStyle; + ctx.stroke(); + } + + drawArc(seconds, 60, radius, 'black'); + drawArc(minutes, 60, radius - 20, 'lightgrey'); + // drawArc(hours % 12, 12, radius - 40, 'white'); + drawArc(hours, 24, radius - 40, 'white'); } function updateCircle() { - const currentSeconds = new Date().getSeconds(); - drawRing(currentSeconds); + const currentDate = new Date(); + const currentSeconds = currentDate.getSeconds(); + const currentMinutes = currentDate.getMinutes(); + const currentHours = currentDate.getHours(); + + drawCircle(currentSeconds, currentMinutes, currentHours); } updateCircle(); From 847c4a9f6bad98445761846badd0635867730b6c Mon Sep 17 00:00:00 2001 From: sthag Date: Sun, 16 Nov 2025 12:57:43 +0100 Subject: [PATCH 294/372] feat: Update clock Add switch for 12/24-hour format. --- source/screens/demo/examples/clock.liquid | 17 +++++++++++++++-- source/style/modules/_clock.scss | 5 +++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/source/screens/demo/examples/clock.liquid b/source/screens/demo/examples/clock.liquid index 054b628..4e4c8de 100644 --- a/source/screens/demo/examples/clock.liquid +++ b/source/screens/demo/examples/clock.liquid @@ -10,6 +10,9 @@ tags: {% block body %}
      +

      + +

      {% endblock %} @@ -19,6 +22,12 @@ tags: // Page script const canvas = document.getElementById('clock'); const ctx = canvas.getContext('2d'); + let is24HourFormat = true; + + document.getElementById('toggleFormat').addEventListener('click', () => { + is24HourFormat = !is24HourFormat; + document.getElementById('toggleFormat').textContent = is24HourFormat ? '12-Stunden-Format' : '24-Stunden-Format'; + }); function drawCircle(seconds, minutes, hours) { const centerX = canvas.width / 2; @@ -40,8 +49,12 @@ tags: drawArc(seconds, 60, radius, 'black'); drawArc(minutes, 60, radius - 20, 'lightgrey'); - // drawArc(hours % 12, 12, radius - 40, 'white'); - drawArc(hours, 24, radius - 40, 'white'); + drawArc( + is24HourFormat ? hours : hours % 12, + is24HourFormat ? 24 : 12, + radius - 40, + 'white' + ); } function updateCircle() { diff --git a/source/style/modules/_clock.scss b/source/style/modules/_clock.scss index 74265da..537190f 100644 --- a/source/style/modules/_clock.scss +++ b/source/style/modules/_clock.scss @@ -4,6 +4,11 @@ main { @extend .sec_main_center; display: flex; + flex-flow: column nowrap; justify-content: center; } + + p { + text-align: center; + } } \ No newline at end of file From f257a44d890c3ba47c37f58c3b581b6cc6957ff2 Mon Sep 17 00:00:00 2001 From: sthag Date: Sun, 16 Nov 2025 13:05:25 +0100 Subject: [PATCH 295/372] feat: Add day of week and month to clock --- source/screens/demo/examples/clock.liquid | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/source/screens/demo/examples/clock.liquid b/source/screens/demo/examples/clock.liquid index 4e4c8de..b90b555 100644 --- a/source/screens/demo/examples/clock.liquid +++ b/source/screens/demo/examples/clock.liquid @@ -29,7 +29,7 @@ tags: document.getElementById('toggleFormat').textContent = is24HourFormat ? '12-Stunden-Format' : '24-Stunden-Format'; }); - function drawCircle(seconds, minutes, hours) { + function drawCircle(seconds, minutes, hours, dayOfWeek, month) { const centerX = canvas.width / 2; const centerY = canvas.height / 2; const radius = 128; @@ -55,6 +55,8 @@ tags: radius - 40, 'white' ); + drawArc(dayOfWeek, 7, radius - 60, '#fad803'); + drawArc(month, 12, radius - 80, '#d30a51'); } function updateCircle() { @@ -62,8 +64,10 @@ tags: const currentSeconds = currentDate.getSeconds(); const currentMinutes = currentDate.getMinutes(); const currentHours = currentDate.getHours(); + const currentDayOfWeek = currentDate.getDay(); // Get current day of the week (0-6, where 0 is Sunday) + const currentMonth = currentDate.getMonth() + 1; // Get current month (0-11) - drawCircle(currentSeconds, currentMinutes, currentHours); + drawCircle(currentSeconds, currentMinutes, currentHours, currentDayOfWeek, currentMonth); } updateCircle(); From 9e560d7e62e959a146175ae32316f78d060cab84 Mon Sep 17 00:00:00 2001 From: sthag Date: Sun, 16 Nov 2025 13:09:16 +0100 Subject: [PATCH 296/372] feat: More clock work Add function to change start of week. --- source/screens/demo/examples/clock.liquid | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/source/screens/demo/examples/clock.liquid b/source/screens/demo/examples/clock.liquid index b90b555..b0bccd8 100644 --- a/source/screens/demo/examples/clock.liquid +++ b/source/screens/demo/examples/clock.liquid @@ -64,12 +64,18 @@ tags: const currentSeconds = currentDate.getSeconds(); const currentMinutes = currentDate.getMinutes(); const currentHours = currentDate.getHours(); - const currentDayOfWeek = currentDate.getDay(); // Get current day of the week (0-6, where 0 is Sunday) + const currentDayOfWeek = getNumericWeekday(currentDate); const currentMonth = currentDate.getMonth() + 1; // Get current month (0-11) drawCircle(currentSeconds, currentMinutes, currentHours, currentDayOfWeek, currentMonth); } + // TODO: Parameter für Wochenstart ergänzen + function getNumericWeekday(date) { + const weekday = date.getDay(); // 0 (Sunday) to 6 (Saturday) + return (weekday === 0) ? 7 : weekday; + } + updateCircle(); setInterval(updateCircle, 1000); From 86fce27554b672e7f046615abf8601593f489ee2 Mon Sep 17 00:00:00 2001 From: sthag Date: Sun, 16 Nov 2025 13:21:25 +0100 Subject: [PATCH 297/372] feat: More elements for clock and style change - Add day of month - Clock uses maximum canvas size --- source/screens/demo/examples/clock.liquid | 33 +++++++++++++++++------ 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/source/screens/demo/examples/clock.liquid b/source/screens/demo/examples/clock.liquid index b0bccd8..ad98667 100644 --- a/source/screens/demo/examples/clock.liquid +++ b/source/screens/demo/examples/clock.liquid @@ -29,10 +29,12 @@ tags: document.getElementById('toggleFormat').textContent = is24HourFormat ? '12-Stunden-Format' : '24-Stunden-Format'; }); - function drawCircle(seconds, minutes, hours, dayOfWeek, month) { + function drawCircle(seconds, minutes, hours, dayOfWeek, dayOfMonth, month, daysInCurrentMonth) { const centerX = canvas.width / 2; const centerY = canvas.height / 2; - const radius = 128; + const lineWidth = 16; + const lineGap = 8; + const maxSize = canvas.width / 2 - lineWidth; ctx.clearRect(0, 0, canvas.width, canvas.height); @@ -47,16 +49,17 @@ tags: ctx.stroke(); } - drawArc(seconds, 60, radius, 'black'); - drawArc(minutes, 60, radius - 20, 'lightgrey'); + drawArc(seconds, 60, maxSize, 'black'); + drawArc(minutes, 60, maxSize - lineWidth - lineGap, 'lightgrey'); drawArc( is24HourFormat ? hours : hours % 12, is24HourFormat ? 24 : 12, - radius - 40, + maxSize - (lineWidth + lineGap) * 2, 'white' ); - drawArc(dayOfWeek, 7, radius - 60, '#fad803'); - drawArc(month, 12, radius - 80, '#d30a51'); + drawArc(dayOfWeek, 7, maxSize - (lineWidth + lineGap) * 3, '#fad803'); + drawArc(dayOfMonth, daysInCurrentMonth, maxSize - (lineWidth + lineGap) * 4, '#d30a51'); + drawArc(month, 12, maxSize - (lineWidth + lineGap) * 5, '#273f8b'); } function updateCircle() { @@ -65,9 +68,19 @@ tags: const currentMinutes = currentDate.getMinutes(); const currentHours = currentDate.getHours(); const currentDayOfWeek = getNumericWeekday(currentDate); + const currentDayOfMonth = currentDate.getDate(); const currentMonth = currentDate.getMonth() + 1; // Get current month (0-11) + const daysInCurrentMonth = daysInMonth(currentMonth, currentDate.getFullYear()); - drawCircle(currentSeconds, currentMinutes, currentHours, currentDayOfWeek, currentMonth); + drawCircle( + currentSeconds, + currentMinutes, + currentHours, + currentDayOfWeek, + currentDayOfMonth, + currentMonth, + daysInCurrentMonth + ); } // TODO: Parameter für Wochenstart ergänzen @@ -76,6 +89,10 @@ tags: return (weekday === 0) ? 7 : weekday; } + function daysInMonth(month, year) { + return new Date(year, month, 0).getDate(); + } + updateCircle(); setInterval(updateCircle, 1000); From 1a1badc78679657d61928fd87a939ea2ce1af8d5 Mon Sep 17 00:00:00 2001 From: sthag Date: Sun, 16 Nov 2025 13:27:46 +0100 Subject: [PATCH 298/372] feat: Update clock to use color from CSS --- source/screens/demo/examples/clock.liquid | 9 ++++++--- source/style/modules/_clock.scss | 12 ++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/source/screens/demo/examples/clock.liquid b/source/screens/demo/examples/clock.liquid index ad98667..3a36cbd 100644 --- a/source/screens/demo/examples/clock.liquid +++ b/source/screens/demo/examples/clock.liquid @@ -23,6 +23,9 @@ tags: const canvas = document.getElementById('clock'); const ctx = canvas.getContext('2d'); let is24HourFormat = true; + const colorDayOfWeek = getComputedStyle(document.documentElement).getPropertyValue('--clock-color-yellow').trim(); + const colorDayOfMonth = getComputedStyle(document.documentElement).getPropertyValue('--clock-color-orange').trim(); + const colorMonth = getComputedStyle(document.documentElement).getPropertyValue('--clock-color-pink').trim(); document.getElementById('toggleFormat').addEventListener('click', () => { is24HourFormat = !is24HourFormat; @@ -57,9 +60,9 @@ tags: maxSize - (lineWidth + lineGap) * 2, 'white' ); - drawArc(dayOfWeek, 7, maxSize - (lineWidth + lineGap) * 3, '#fad803'); - drawArc(dayOfMonth, daysInCurrentMonth, maxSize - (lineWidth + lineGap) * 4, '#d30a51'); - drawArc(month, 12, maxSize - (lineWidth + lineGap) * 5, '#273f8b'); + drawArc(dayOfWeek, 7, maxSize - (lineWidth + lineGap) * 3, colorDayOfWeek); + drawArc(dayOfMonth, daysInCurrentMonth, maxSize - (lineWidth + lineGap) * 4, colorDayOfMonth); + drawArc(month, 12, maxSize - (lineWidth + lineGap) * 5, colorMonth); } function updateCircle() { diff --git a/source/style/modules/_clock.scss b/source/style/modules/_clock.scss index 537190f..17a1f88 100644 --- a/source/style/modules/_clock.scss +++ b/source/style/modules/_clock.scss @@ -1,5 +1,17 @@ @use "../../hippie-style/hippie"; +:root { + --clock-color-yellow: rgb(250, 216, 3); + --clock-color-orange: rgb(242, 175, 19); + --clock-color-pink: rgb(211, 10, 81); + --clock-color-purple: rgb(142, 31, 104); + --clock-color-blue: rgb(39, 63, 139); + --clock-color-pblue: rgb(60, 87, 154); + --clock-color-lblue: rgb(183, 224, 240); + --clock-color-lcyan: rgb(107, 199, 217); + --clock-color-cyan: rgb(82, 190, 209); +} + .body_clock { main { @extend .sec_main_center; From 15bfbcc97bf4a11a554d20bb3b0f407f73fe42bd Mon Sep 17 00:00:00 2001 From: sthag Date: Sun, 23 Nov 2025 14:17:24 +0100 Subject: [PATCH 299/372] feat: Update clock Display full circle when seconds or minutes turn to 0. --- source/screens/demo/examples/clock.liquid | 24 ++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/source/screens/demo/examples/clock.liquid b/source/screens/demo/examples/clock.liquid index 3a36cbd..da8f5a4 100644 --- a/source/screens/demo/examples/clock.liquid +++ b/source/screens/demo/examples/clock.liquid @@ -32,7 +32,7 @@ tags: document.getElementById('toggleFormat').textContent = is24HourFormat ? '12-Stunden-Format' : '24-Stunden-Format'; }); - function drawCircle(seconds, minutes, hours, dayOfWeek, dayOfMonth, month, daysInCurrentMonth) { + function drawRings(seconds, minutes, hours, dayOfWeek, dayOfMonth, month, daysInCurrentMonth) { const centerX = canvas.width / 2; const centerY = canvas.height / 2; const lineWidth = 16; @@ -52,8 +52,18 @@ tags: ctx.stroke(); } - drawArc(seconds, 60, maxSize, 'black'); - drawArc(minutes, 60, maxSize - lineWidth - lineGap, 'lightgrey'); + drawArc( + (seconds === 0) ? 60 : seconds, + 60, + maxSize, + 'black' + ); + drawArc( + (minutes === 0) ? 60 : minutes, + 60, + maxSize - lineWidth - lineGap, + 'lightgrey' + ); drawArc( is24HourFormat ? hours : hours % 12, is24HourFormat ? 24 : 12, @@ -65,7 +75,7 @@ tags: drawArc(month, 12, maxSize - (lineWidth + lineGap) * 5, colorMonth); } - function updateCircle() { + function updateRings() { const currentDate = new Date(); const currentSeconds = currentDate.getSeconds(); const currentMinutes = currentDate.getMinutes(); @@ -75,7 +85,7 @@ tags: const currentMonth = currentDate.getMonth() + 1; // Get current month (0-11) const daysInCurrentMonth = daysInMonth(currentMonth, currentDate.getFullYear()); - drawCircle( + drawRings( currentSeconds, currentMinutes, currentHours, @@ -96,7 +106,7 @@ tags: return new Date(year, month, 0).getDate(); } - updateCircle(); - setInterval(updateCircle, 1000); + updateRings(); + setInterval(updateRings, 1000); {% endblock %} \ No newline at end of file From 29c705f272cb86d1bea9c52ecd8cdf004932fb3e Mon Sep 17 00:00:00 2001 From: sthag Date: Sun, 23 Nov 2025 14:17:46 +0100 Subject: [PATCH 300/372] feat: Add 10print screen --- source/screens/demo/examples/10print.liquid | 73 +++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 source/screens/demo/examples/10print.liquid diff --git a/source/screens/demo/examples/10print.liquid b/source/screens/demo/examples/10print.liquid new file mode 100644 index 0000000..9f2778b --- /dev/null +++ b/source/screens/demo/examples/10print.liquid @@ -0,0 +1,73 @@ +--- +title: 10print +tags: +- demoExample +--- +{% assign pageBase = "../../" -%} +{% layout "hippie/full.liquid" %} + +{% block head %} +{{ block.super -}} + +{% endblock %} + +{% block body %} + +{% endblock %} + +{% block script %} +{{ block.super -}} + +{% endblock %} \ No newline at end of file From 3168d6cb7eb1eb8959528c3d40aa88a5120e6992 Mon Sep 17 00:00:00 2001 From: sthag Date: Sun, 23 Nov 2025 14:18:20 +0100 Subject: [PATCH 301/372] feat: Add simple blog structure --- source/screens/demo/examples/blog.njk | 51 ++++++++++++++++++++ source/screens/demo/examples/blog/article.md | 11 +++++ 2 files changed, 62 insertions(+) create mode 100644 source/screens/demo/examples/blog.njk create mode 100644 source/screens/demo/examples/blog/article.md diff --git a/source/screens/demo/examples/blog.njk b/source/screens/demo/examples/blog.njk new file mode 100644 index 0000000..0ffe2e8 --- /dev/null +++ b/source/screens/demo/examples/blog.njk @@ -0,0 +1,51 @@ +--- +title: Blog +tags: + - demoExample +--- +{% set pageBase = "../" %} +{% set pageId = page.fileSlug %} + +{% extends "demo/_default.njk" %} +{% import "hippie/macros/_placeholder.njk" as ph %} +{% import "hippie/macros/_song.njk" as song %} + +{% block title %}{{ title }} +{% endblock %} + +{% block head %} + {{ super() }} +{% endblock %} + +{% block body %} + +
      +
      +

      Blog

      +
      + +

      Vorwort

      +

      Liederbuch für + Name.

      +

      Gibt es gebunden und hier + {{ ph.link() }}.
      + Bestellungen bitte an + {{ ph.name() }} + richten.

      +
      + {%- for post in collections.article -%} + {{ post.content }} + {%- endfor -%} +
      +
      {{ ph.name() }}
      +
      +{% endblock %} \ No newline at end of file diff --git a/source/screens/demo/examples/blog/article.md b/source/screens/demo/examples/blog/article.md new file mode 100644 index 0000000..0200c08 --- /dev/null +++ b/source/screens/demo/examples/blog/article.md @@ -0,0 +1,11 @@ +--- +tags: + - blog + - article +title: "Artikel" +releaseDate: JJJJ +description: Text +--- +# Titel + +Inhalt From eea7a08e3a6b183318e34cedaf226b61871c0680 Mon Sep 17 00:00:00 2001 From: sthag Date: Mon, 1 Dec 2025 17:10:58 +0100 Subject: [PATCH 302/372] chore: Repo maintenance - Change submodule hippie-style to development branch by default - Change hippie-script dependency to https instead of git, because of an error with npm install - Audit dependencies with npm audit fix --- .gitmodules | 2 +- package-lock.json | 127 +++++++++++++++++++++++++++------------------- package.json | 2 +- 3 files changed, 77 insertions(+), 54 deletions(-) diff --git a/.gitmodules b/.gitmodules index 75c5b90..068fd29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "source/style/hippie-style"] path = source/style/hippie-style url = https://quelltext.interaktionsweise.de/interaktionsweise/hippie-style.git - branch = main + branch = development diff --git a/package-lock.json b/package-lock.json index 620aac8..1cb917f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@11ty/eleventy": "^2.0.1", "bootstrap-icons": "^1.13.1", - "hippie-script": "git+ssh://sthag@quelltext.interaktionsweise.de/interaktionsweise/hippie-script.git", + "hippie-script": "git+https://quelltext.interaktionsweise.de/interaktionsweise/hippie-script.git", "jquery": "^3.7.1", "sass": "^1.93.0" }, @@ -643,9 +643,10 @@ "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==" }, "node_modules/assert-never": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/assert-never/-/assert-never-1.2.1.tgz", - "integrity": "sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==" + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/assert-never/-/assert-never-1.4.0.tgz", + "integrity": "sha512-5oJg84os6NMQNl27T9LnZkvvqzvAnHu03ShCnoj6bsJwS7L8AO4lf+C/XjK/nvzEqQB744moC6V128RucQd1jA==", + "license": "MIT" }, "node_modules/async": { "version": "3.2.5", @@ -656,6 +657,7 @@ "version": "3.0.0-canary-5", "resolved": "https://registry.npmjs.org/babel-walk/-/babel-walk-3.0.0-canary-5.tgz", "integrity": "sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw==", + "license": "MIT", "dependencies": { "@babel/types": "^7.9.6" }, @@ -732,20 +734,22 @@ "license": "MIT" }, "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "license": "MIT", "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -854,9 +858,10 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -933,7 +938,8 @@ "node_modules/doctypes": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz", - "integrity": "sha512-LLBi6pEqS6Do3EKQ3J0NqHWV5hhb78Pi8vvESYwyOy2c31ZEZVdtitdzsQsKb7878PEERhzUk0ftqGhG6Mz+pQ==" + "integrity": "sha512-LLBi6pEqS6Do3EKQ3J0NqHWV5hhb78Pi8vvESYwyOy2c31ZEZVdtitdzsQsKb7878PEERhzUk0ftqGhG6Mz+pQ==", + "license": "MIT" }, "node_modules/dom-serializer": { "version": "1.4.1", @@ -1000,9 +1006,10 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/ejs": { - "version": "3.1.9", - "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz", - "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==", + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz", + "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==", + "license": "Apache-2.0", "dependencies": { "jake": "^10.8.5" }, @@ -1133,9 +1140,10 @@ } }, "node_modules/filelist/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } @@ -1152,9 +1160,10 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -1389,7 +1398,7 @@ }, "node_modules/hippie-script": { "version": "1.2.1", - "resolved": "git+ssh://sthag@quelltext.interaktionsweise.de/interaktionsweise/hippie-script.git#dfc13e61586fbf466a7bbdb5667c5b02f41abd44", + "resolved": "git+https://quelltext.interaktionsweise.de/interaktionsweise/hippie-script.git#dfc13e61586fbf466a7bbdb5667c5b02f41abd44", "license": "MIT" }, "node_modules/htmlparser2": { @@ -1536,6 +1545,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "license": "MIT", "engines": { "node": ">=0.12.0" } @@ -1599,12 +1609,14 @@ "node_modules/js-stringify": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz", - "integrity": "sha512-rtS5ATOo2Q5k1G+DADISilDA6lv79zIiwFd6CcjuIxGKLFm5C+RLImRscVap9k55i+MOZwgliw+NejvkLuGD5g==" + "integrity": "sha512-rtS5ATOo2Q5k1G+DADISilDA6lv79zIiwFd6CcjuIxGKLFm5C+RLImRscVap9k55i+MOZwgliw+NejvkLuGD5g==", + "license": "MIT" }, "node_modules/js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "version": "3.14.2", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz", + "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==", + "license": "MIT", "dependencies": { "argparse": "^1.0.7", "esprima": "^4.0.0" @@ -1777,11 +1789,12 @@ } }, "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "license": "MIT", "dependencies": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" }, "engines": { @@ -2002,9 +2015,10 @@ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" }, "node_modules/path-to-regexp": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.1.tgz", - "integrity": "sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==" + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz", + "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==", + "license": "MIT" }, "node_modules/picomatch": { "version": "2.3.1", @@ -2103,11 +2117,12 @@ "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==" }, "node_modules/pug": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/pug/-/pug-3.0.2.tgz", - "integrity": "sha512-bp0I/hiK1D1vChHh6EfDxtndHji55XP/ZJKwsRqrz6lRia6ZC2OZbdAymlxdVFwd1L70ebrVJw4/eZ79skrIaw==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/pug/-/pug-3.0.3.tgz", + "integrity": "sha512-uBi6kmc9f3SZ3PXxqcHiUZLmIXgfgWooKWXcwSGwQd2Zi5Rb0bT14+8CJjJgI8AB+nndLaNgHGrcc6bPIB665g==", + "license": "MIT", "dependencies": { - "pug-code-gen": "^3.0.2", + "pug-code-gen": "^3.0.3", "pug-filters": "^4.0.0", "pug-lexer": "^5.0.1", "pug-linker": "^4.0.0", @@ -2121,6 +2136,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/pug-attrs/-/pug-attrs-3.0.0.tgz", "integrity": "sha512-azINV9dUtzPMFQktvTXciNAfAuVh/L/JCl0vtPCwvOA21uZrC08K/UnmrL+SXGEVc1FwzjW62+xw5S/uaLj6cA==", + "license": "MIT", "dependencies": { "constantinople": "^4.0.1", "js-stringify": "^1.0.2", @@ -2128,24 +2144,26 @@ } }, "node_modules/pug-code-gen": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-3.0.2.tgz", - "integrity": "sha512-nJMhW16MbiGRiyR4miDTQMRWDgKplnHyeLvioEJYbk1RsPI3FuA3saEP8uwnTb2nTJEKBU90NFVWJBk4OU5qyg==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-3.0.3.tgz", + "integrity": "sha512-cYQg0JW0w32Ux+XTeZnBEeuWrAY7/HNE6TWnhiHGnnRYlCgyAUPoyh9KzCMa9WhcJlJ1AtQqpEYHc+vbCzA+Aw==", + "license": "MIT", "dependencies": { "constantinople": "^4.0.1", "doctypes": "^1.1.0", "js-stringify": "^1.0.2", "pug-attrs": "^3.0.0", - "pug-error": "^2.0.0", - "pug-runtime": "^3.0.0", + "pug-error": "^2.1.0", + "pug-runtime": "^3.0.1", "void-elements": "^3.1.0", "with": "^7.0.0" } }, "node_modules/pug-error": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pug-error/-/pug-error-2.0.0.tgz", - "integrity": "sha512-sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/pug-error/-/pug-error-2.1.0.tgz", + "integrity": "sha512-lv7sU9e5Jk8IeUheHata6/UThZ7RK2jnaaNztxfPYUY+VxZyk/ePVaNZ/vwmH8WqGvDz3LrNYt/+gA55NDg6Pg==", + "license": "MIT" }, "node_modules/pug-filters": { "version": "4.0.0", @@ -2199,7 +2217,8 @@ "node_modules/pug-runtime": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/pug-runtime/-/pug-runtime-3.0.1.tgz", - "integrity": "sha512-L50zbvrQ35TkpHwv0G6aLSuueDRwc/97XdY8kL3tOT0FmhgG7UypU3VztfV/LATAvmUfYi4wNxSajhSAeNN+Kg==" + "integrity": "sha512-L50zbvrQ35TkpHwv0G6aLSuueDRwc/97XdY8kL3tOT0FmhgG7UypU3VztfV/LATAvmUfYi4wNxSajhSAeNN+Kg==", + "license": "MIT" }, "node_modules/pug-strip-comments": { "version": "2.0.0", @@ -2530,6 +2549,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "license": "MIT", "dependencies": { "is-number": "^7.0.0" }, @@ -2571,6 +2591,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz", "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==", + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -2593,6 +2614,7 @@ "version": "7.0.2", "resolved": "https://registry.npmjs.org/with/-/with-7.0.2.tgz", "integrity": "sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w==", + "license": "MIT", "dependencies": { "@babel/parser": "^7.9.6", "@babel/types": "^7.9.6", @@ -2614,9 +2636,10 @@ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, "node_modules/ws": { - "version": "8.16.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", - "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==", + "version": "8.18.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz", + "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==", + "license": "MIT", "engines": { "node": ">=10.0.0" }, diff --git a/package.json b/package.json index 3da5d70..49351cc 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "dependencies": { "@11ty/eleventy": "^2.0.1", "bootstrap-icons": "^1.13.1", - "hippie-script": "git+ssh://sthag@quelltext.interaktionsweise.de/interaktionsweise/hippie-script.git", + "hippie-script": "git+https://quelltext.interaktionsweise.de/interaktionsweise/hippie-script.git", "jquery": "^3.7.1", "sass": "^1.93.0" } From fe8008c5b535166cbbb91a8772a52cea02b6e551 Mon Sep 17 00:00:00 2001 From: sthag Date: Mon, 1 Dec 2025 17:12:05 +0100 Subject: [PATCH 303/372] fix: Path to hippie-style --- source/style/modules/_clock.scss | 2 +- source/style/modules/_start.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/style/modules/_clock.scss b/source/style/modules/_clock.scss index 17a1f88..fe361b7 100644 --- a/source/style/modules/_clock.scss +++ b/source/style/modules/_clock.scss @@ -1,4 +1,4 @@ -@use "../../hippie-style/hippie"; +@use "../hippie-style/hippie"; :root { --clock-color-yellow: rgb(250, 216, 3); diff --git a/source/style/modules/_start.scss b/source/style/modules/_start.scss index 7d790a3..031f7f7 100644 --- a/source/style/modules/_start.scss +++ b/source/style/modules/_start.scss @@ -1,4 +1,4 @@ -@use "../../hippie-style/hippie"; +@use "../hippie-style/hippie"; .body_start { main { From 9696442a9159a4231c986f51d3805cf692a869fd Mon Sep 17 00:00:00 2001 From: sthag Date: Mon, 9 Feb 2026 19:09:02 +0100 Subject: [PATCH 304/372] feat: Remove cases that cannot happen Optimize HippieTaskBar by removing cases that cannot happen. --- source/code/windows.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/source/code/windows.js b/source/code/windows.js index c7ab166..32a3484 100644 --- a/source/code/windows.js +++ b/source/code/windows.js @@ -49,8 +49,6 @@ class HippieTaskBar { onMouseMove(event) { if (this.isDragging) { - if (!this.isDragging) return; - const closestEdge = getClosestEdge(this.placeholder); const borderRadius = '4px'; const attributes = { @@ -121,7 +119,6 @@ class HippieTaskBar { if (event.target === this.placeholder) { console.debug('Drag mode disabled'); - if (!this.isDragging) return; this.isDragging = false; this.snapToEdges(); From 7912b002a26347a20a28fb322d13d4ddccda8d6d Mon Sep 17 00:00:00 2001 From: sthag Date: Mon, 9 Feb 2026 21:08:30 +0100 Subject: [PATCH 305/372] feat: Change edge detection for HippieTaskBar - Add position to options - New function for edge detection according to mouse position - set and use options.position --- .jshintrc | 3 ++- source/code/hippie/app.js | 27 ++++++++++++++++++++++----- source/code/windows.js | 12 +++++------- 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/.jshintrc b/.jshintrc index cfc5480..98b8bf3 100644 --- a/.jshintrc +++ b/.jshintrc @@ -95,7 +95,8 @@ "TimeDisplay": true, "DateDisplay": true, "checkButtonAndTarget": true, - "getClosestEdge": true, + "getClosestEdgeToElement": true, + "getClosestEdgeToMouse": true, "centerElementUnderCursor": true, "setAttributesAccordingToPosition": true, "HippieTaskBar": true diff --git a/source/code/hippie/app.js b/source/code/hippie/app.js index 05b09b3..c93aa7a 100644 --- a/source/code/hippie/app.js +++ b/source/code/hippie/app.js @@ -346,20 +346,37 @@ function checkButtonAndTarget(event, element, button = 0) { ); } -function getClosestEdge(element) { +function getClosestEdgeToElement(element) { + 'use strict'; + const rect = element.getBoundingClientRect(); - const windowWidth = window.innerWidth; - const windowHeight = window.innerHeight; const distances = { top: rect.top, - right: windowWidth - rect.right, - bottom: windowHeight - rect.bottom, + right: window.innerWidth - rect.right, + bottom: window.innerHeight - rect.bottom, left: rect.left }; return Object.keys(distances).reduce((a, b) => distances[a] < distances[b] ? a : b); } +function getClosestEdgeToMouse(event) { + 'use strict'; + + const mouseX = event.clientX; + const mouseY = event.clientY; + const distances = { + left: mouseX, + right: window.innerWidth - mouseX, + top: mouseY, + bottom: window.innerHeight - mouseY + }; + + return Object.keys(distances).reduce((a, b) => + distances[a] < distances[b] ? a : b + ); +} + function centerElementUnderCursor(event, element) { const offsetX = element.getBoundingClientRect().width / 2; const offsetY = element.getBoundingClientRect().height / 2; diff --git a/source/code/windows.js b/source/code/windows.js index 32a3484..8a115a9 100644 --- a/source/code/windows.js +++ b/source/code/windows.js @@ -8,6 +8,7 @@ class HippieTaskBar { // TODO: Erweitern auf allgemeine Möglichkeiten und dann aus JSON-Datei laden this.options = options || { direction: 0, + position: 'bottom', date: { year: 'numeric', month: '2-digit', @@ -30,7 +31,7 @@ class HippieTaskBar { this.element.querySelector('.clock').appendChild(dateElement); this.date = new DateDisplay(dateElement, this.options.date); - this.setOptions('bottom'); + this.setOptions(this.options.position); } onMouseDown(event) { @@ -49,7 +50,7 @@ class HippieTaskBar { onMouseMove(event) { if (this.isDragging) { - const closestEdge = getClosestEdge(this.placeholder); + this.options.position = getClosestEdgeToMouse(event); const borderRadius = '4px'; const attributes = { top: { @@ -110,7 +111,7 @@ class HippieTaskBar { } }; - setAttributesAccordingToPosition(this.placeholder, closestEdge, attributes); + setAttributesAccordingToPosition(this.placeholder, this.options.position, attributes); centerElementUnderCursor(event, this.placeholder); } } @@ -136,11 +137,8 @@ class HippieTaskBar { this.element.style.display = ''; } - // TODO: Prüfung auf Ziel auslagern und schon bei Mausbewegung verfügbar machen snapToEdges() { - const closestEdge = getClosestEdge(this.placeholder); - - this.setOptions(closestEdge); + this.setOptions(this.options.position); this.date.changeFormat(this.options.date, this.options.direction); } From 9ce027285cf62c184332038e9ca543867b0f990b Mon Sep 17 00:00:00 2001 From: sthag Date: Mon, 9 Feb 2026 21:17:53 +0100 Subject: [PATCH 306/372] chore: Reformat jshint stuff - Remove comments from jshint - Replace " with ' - Replace var with const --- .jshintrc | 161 +++++++++++++++++--------------------- source/code/hippie/app.js | 67 ++++++++-------- 2 files changed, 106 insertions(+), 122 deletions(-) diff --git a/.jshintrc b/.jshintrc index 98b8bf3..7fe438c 100644 --- a/.jshintrc +++ b/.jshintrc @@ -1,93 +1,74 @@ { - // JSHint Default Configuration File (as on JSHint website) - // See http://jshint.com/docs/ for more details - - "maxerr" : 50, // {int} Maximum error before stopping - - // Enforcing - "bitwise" : true, // true: Prohibit bitwise operators (&, |, ^, etc.) - "camelcase" : false, // true: Identifiers must be in camelCase - "curly" : false, // true: Require {} for every new block or scope - "eqeqeq" : true, // true: Require triple equals (===) for comparison - "forin" : true, // true: Require filtering for..in loops with obj.hasOwnProperty() - "freeze" : true, // true: prohibits overwriting prototypes of native objects such as Array, Date etc. - "immed" : false, // true: Require immediate invocations to be wrapped in parens e.g. `(function () { } ());` - "latedef" : true, // true: Require variables/functions to be defined before being used - "newcap" : true, // true: Require capitalization of all constructor functions e.g. `new F()` - "noarg" : true, // true: Prohibit use of `arguments.caller` and `arguments.callee` - "noempty" : true, // true: Prohibit use of empty blocks - "nonbsp" : true, // true: Prohibit `non-breaking whitespace` characters. - "nonew" : false, // true: Prohibit use of constructors for side-effects (without assignment) - "plusplus" : false, // true: Prohibit use of `++` and `--` - "quotmark" : true, // Quotation mark consistency: - // false : do nothing (default) - // true : ensure whatever is used is consistent - // "single" : require single quotes - // "double" : require double quotes - "undef" : true, // true: Require all non-global variables to be declared (prevents global leaks) - "unused" : true, // Unused variables: - // true : all variables, last function parameter - // "vars" : all variables only - // "strict" : all variables, all function parameters - "strict" : true, // true: Requires all functions run in ES5 Strict Mode - "maxparams" : false, // {int} Max number of formal params allowed per function - "maxdepth" : false, // {int} Max depth of nested blocks (within functions) - "maxstatements" : false, // {int} Max number statements per function - "maxcomplexity" : false, // {int} Max cyclomatic complexity per function - "maxlen" : false, // {int} Max number of characters per line - "varstmt" : false, // true: Disallow any var statements. Only `let` and `const` are allowed. - - // Relaxing - "asi" : false, // true: Tolerate Automatic Semicolon Insertion (no semicolons) - "boss" : false, // true: Tolerate assignments where comparisons would be expected - "debug" : false, // true: Allow debugger statements e.g. browser breakpoints. - "eqnull" : false, // true: Tolerate use of `== null` - "esversion" : 9, // {int} Specify the ECMAScript version to which the code must adhere. - "moz" : false, // true: Allow Mozilla specific syntax (extends and overrides esnext features) - // (ex: `for each`, multiple try/catch, function expression…) - "evil" : false, // true: Tolerate use of `eval` and `new Function()` - "expr" : false, // true: Tolerate `ExpressionStatement` as Programs - "funcscope" : false, // true: Tolerate defining variables inside control statements - "globalstrict" : false, // true: Allow global "use strict" (also enables 'strict') - "iterator" : false, // true: Tolerate using the `__iterator__` property - "lastsemic" : false, // true: Tolerate omitting a semicolon for the last statement of a 1-line block - "laxbreak" : false, // true: Tolerate possibly unsafe line breakings - "laxcomma" : false, // true: Tolerate comma-first style coding - "loopfunc" : false, // true: Tolerate functions being defined in loops - "multistr" : false, // true: Tolerate multi-line strings - "noyield" : false, // true: Tolerate generator functions with no yield statement in them. - "notypeof" : false, // true: Tolerate invalid typeof operator values - "proto" : false, // true: Tolerate using the `__proto__` property - "scripturl" : false, // true: Tolerate script-targeted URLs - "shadow" : false, // true: Allows re-define variables later in code e.g. `var x=1; x=2;` - "sub" : false, // true: Tolerate using `[]` notation when it can still be expressed in dot notation - "supernew" : false, // true: Tolerate `new function () { ... };` and `new Object;` - "validthis" : false, // true: Tolerate using this in a non-constructor function - - // Environments - "browser" : true, // Web Browser (window, document, etc) - "browserify" : false, // Browserify (node.js code in the browser) - "couch" : false, // CouchDB - "devel" : true, // Development/debugging (alert, confirm, etc) - "dojo" : false, // Dojo Toolkit - "jasmine" : false, // Jasmine - "jquery" : true, // jQuery - "mocha" : true, // Mocha - "mootools" : false, // MooTools - "node" : false, // Node.js - "nonstandard" : false, // Widely adopted globals (escape, unescape, etc) - "phantom" : false, // PhantomJS - "prototypejs" : false, // Prototype and Scriptaculous - "qunit" : false, // QUnit - "rhino" : false, // Rhino - "shelljs" : false, // ShellJS - "typed" : false, // Globals for typed array constructions - "worker" : false, // Web Workers - "wsh" : false, // Windows Scripting Host - "yui" : false, // Yahoo User Interface - - // Custom globals - "globals" : { // additional predefined global variables + "maxerr": 50, + "bitwise": true, + "camelcase": false, + "curly": false, + "eqeqeq": true, + "forin": true, + "freeze": true, + "immed": false, + "latedef": true, + "newcap": true, + "noarg": true, + "noempty": true, + "nonbsp": true, + "nonew": false, + "plusplus": false, + "quotmark": true, + "undef": true, + "unused": true, + "strict": true, + "maxparams": false, + "maxdepth": false, + "maxstatements": false, + "maxcomplexity": false, + "maxlen": false, + "varstmt": false, + "asi": false, + "boss": false, + "debug": false, + "eqnull": false, + "esversion": 9, + "moz": false, + "evil": false, + "expr": false, + "funcscope": false, + "globalstrict": false, + "iterator": false, + "lastsemic": false, + "laxbreak": false, + "laxcomma": false, + "loopfunc": false, + "multistr": false, + "noyield": false, + "notypeof": false, + "proto": false, + "scripturl": false, + "shadow": false, + "sub": false, + "supernew": false, + "validthis": false, + "browser": true, + "browserify": false, + "couch": false, + "devel": true, + "dojo": false, + "jasmine": false, + "jquery": true, + "mocha": true, + "mootools": false, + "node": false, + "nonstandard": false, + "phantom": false, + "prototypejs": false, + "qunit": false, + "rhino": false, + "shelljs": false, + "typed": false, + "worker": false, + "wsh": false, + "yui": false, + "globals": { "debugOn": true, "hippie": true, "viewHover": true, @@ -100,5 +81,5 @@ "centerElementUnderCursor": true, "setAttributesAccordingToPosition": true, "HippieTaskBar": true - } + } } diff --git a/source/code/hippie/app.js b/source/code/hippie/app.js index c93aa7a..e1b1634 100644 --- a/source/code/hippie/app.js +++ b/source/code/hippie/app.js @@ -1,5 +1,5 @@ // TODO: Inhalte angleichen nach Zusammenfassung von app.js und function.js. -// Bennung und Beschreibungen verbessern. +// Benennung und Beschreibungen verbessern. // This is called everytime function setup() { @@ -56,7 +56,7 @@ function HippieScroll($tp, $dn) { }); $dn.click(function (event) { event.preventDefault(); - var pos = Math.max(hippie.screen.dh, hippie.body.h) - hippie.screen.vh; + const pos = Math.max(hippie.screen.dh, hippie.body.h) - hippie.screen.vh; $('html').scrollTop(pos); // document.documentElement.scrollTop = pos; console.info('Scrolled down to', pos); @@ -91,7 +91,7 @@ function HippieMeta($ma, $pp) { let metaOn = false; $ma.click(function () { - var $wrap, $pop; + const $wrap, $pop; // if (metaOn !== true) { if (!metaOn) { @@ -162,23 +162,25 @@ function HippieMeta($ma, $pp) { // Sets the href attribute to mailto: with given information function composeMail(tag, name, prov, suffix, text, topic) { - let trigger = tag.indexOf("."); + 'use strict'; + + let trigger = tag.indexOf('.'); let mailString = name + '@' + prov + '.' + suffix; - let textString = mailString.replace(/@/g, "(at)"); - let descString = "Nachricht an " + mailString; + let textString = mailString.replace(/@/g, '(at)'); + let descString = 'Nachricht an ' + mailString; if (!text) { text = mailString; - } else if (text === "at") { + } else if (text === 'at') { text = textString; - } else if (text === "to") { + } else if (text === 'to') { text = descString; } if (topic) { - topic = "?subject=" + topic; + topic = '?subject=' + topic; } else { - topic = ""; + topic = ''; } if (trigger === -1) { @@ -186,7 +188,7 @@ function composeMail(tag, name, prov, suffix, text, topic) { const elContent = el.innerHTML; el.innerHTML = elContent + text; - el.setAttribute("href", "mailto:" + mailString + topic); + el.setAttribute('href', 'mailto:' + mailString + topic); } else { const els = document.getElementsByClassName(tag.slice(1)); @@ -194,7 +196,7 @@ function composeMail(tag, name, prov, suffix, text, topic) { const elContent = el.innerHTML; el.innerHTML = elContent + text; - el.setAttribute("href", "mailto:" + mailString + topic); + el.setAttribute('href', 'mailto:' + mailString + topic); } } } @@ -378,6 +380,8 @@ function getClosestEdgeToMouse(event) { } function centerElementUnderCursor(event, element) { + 'use strict'; + const offsetX = element.getBoundingClientRect().width / 2; const offsetY = element.getBoundingClientRect().height / 2; const x = event.clientX - offsetX; @@ -388,6 +392,8 @@ function centerElementUnderCursor(event, element) { } function setAttributesAccordingToPosition(element, position, attributes) { + 'use strict'; + element.classList.remove(...Object.values(attributes).map(pos => pos.className)); Object.keys(attributes[position].styles).forEach(key => { element.style[key] = ''; @@ -457,17 +463,15 @@ Clock.prototype.formatDigits = function (val) { return val; }; -var floor = Math.floor; - function ongoing() { var now = new Date(); var w = Math.floor(now.getDay()); - var D = new Array("Sonntag", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag"); + var D = ['Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag']; var DNumb = Math.floor(now.getDate()); var MNumb = Math.floor(now.getMonth()); - var M = new Array("Januar", "Februar", "März", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember"); + var M = ['Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'MaiOktober', 'November', 'Dezember']; var y = Math.floor(now.getYear()); if (y < 999) y += 1900; @@ -518,23 +522,22 @@ function ongoing() { var moonPosX = 0; var moonPosY = 0; - var sun = $("#sun").css({ - "left": (s / 60) * travelWidth, - "top": (m / 60) * travelHeight + var sun = $('#sun').css({ + 'left': (s / 60) * travelWidth, + 'top': (m / 60) * travelHeight }); - $("#day").text(D[w]); - $("#dayNumb").text(DNumb); - $("#month").text(M[MNumb]); - $("#year").text(y); - $("#time").text('' + zeroFill(h, 2) + ':' + zeroFill(m, 2) + ':' + zeroFill(s, 2)); - - $("#julian").text(jd.toFixed(6)); - //$("#star").text(stH + ':' + stM + ':' + stS); - $("#star").text(stH + ':' + stM); - $("#star1").text(stGMT); - $("#star2").text(stGMT2); + $('#day').text(D[w]); + $('#dayNumb').text(DNumb); + $('#month').text(M[MNumb]); + $('#year').text(y); + $('#time').text('' + zeroFill(h, 2) + ':' + zeroFill(m, 2) + ':' + zeroFill(s, 2)); + $('#julian').text(jd.toFixed(6)); + //$('#star').text(stH + ':' + stM + ':' + stS); + $('#star').text(stH + ':' + stM); + $('#star1').text(stGMT); + $('#star2').text(stGMT2); } function zeroFill(number, width) { @@ -542,7 +545,7 @@ function zeroFill(number, width) { if (width > 0) { return new Array(width + (/\./.test(number) ? 2 : 1)).join('0') + number; } - return number + ""; // always return a string + return number + ''; // always return a string } //Länge der Balken im Diagram berechnen @@ -562,7 +565,7 @@ String.prototype.transform = function () { } //Array Element erweitern Array.prototype.arrayAdd = function () { - return eval(this.join("+")); + return eval(this.join('+')); } //Speicherplatz in Prozent berechnen From d6827e6dfd1e3f0c068ec4958b495614dc05fbed Mon Sep 17 00:00:00 2001 From: sthag Date: Mon, 9 Feb 2026 21:29:00 +0100 Subject: [PATCH 307/372] fix: const to let --- source/code/hippie/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/code/hippie/app.js b/source/code/hippie/app.js index e1b1634..e5a26b8 100644 --- a/source/code/hippie/app.js +++ b/source/code/hippie/app.js @@ -91,7 +91,7 @@ function HippieMeta($ma, $pp) { let metaOn = false; $ma.click(function () { - const $wrap, $pop; + let $wrap, $pop; // if (metaOn !== true) { if (!metaOn) { From 148f4e0a21cb6e5576ecafaa3d381ed5021e5855 Mon Sep 17 00:00:00 2001 From: sthag Date: Thu, 12 Feb 2026 18:36:06 +0100 Subject: [PATCH 308/372] chore: Update jshint Remove unused options and environments. --- .jshintrc | 73 ++++++++----------------------------------------------- 1 file changed, 10 insertions(+), 63 deletions(-) diff --git a/.jshintrc b/.jshintrc index 7fe438c..29388b2 100644 --- a/.jshintrc +++ b/.jshintrc @@ -1,78 +1,25 @@ { - "maxerr": 50, "bitwise": true, - "camelcase": false, - "curly": false, + "browser": true, + "curly": true, + "devel": true, "eqeqeq": true, + "esversion": 9, "forin": true, "freeze": true, - "immed": false, - "latedef": true, - "newcap": true, + "jquery": true, + "maxerr": 50, "noarg": true, "noempty": true, - "nonbsp": true, - "nonew": false, - "plusplus": false, - "quotmark": true, - "undef": true, - "unused": true, "strict": true, - "maxparams": false, - "maxdepth": false, - "maxstatements": false, - "maxcomplexity": false, - "maxlen": false, - "varstmt": false, - "asi": false, - "boss": false, - "debug": false, - "eqnull": false, - "esversion": 9, - "moz": false, - "evil": false, - "expr": false, - "funcscope": false, - "globalstrict": false, - "iterator": false, - "lastsemic": false, - "laxbreak": false, - "laxcomma": false, - "loopfunc": false, - "multistr": false, - "noyield": false, - "notypeof": false, - "proto": false, - "scripturl": false, - "shadow": false, - "sub": false, - "supernew": false, - "validthis": false, - "browser": true, - "browserify": false, - "couch": false, - "devel": true, - "dojo": false, - "jasmine": false, - "jquery": true, - "mocha": true, - "mootools": false, - "node": false, - "nonstandard": false, - "phantom": false, - "prototypejs": false, - "qunit": false, - "rhino": false, - "shelljs": false, - "typed": false, - "worker": false, - "wsh": false, - "yui": false, + "undef": true, + "unused": false, "globals": { - "debugOn": true, + "HIPPIE": false, "hippie": true, "viewHover": true, "basicEase": true, + "debugOn": true, "TimeDisplay": true, "DateDisplay": true, "checkButtonAndTarget": true, From ddbd406fc875c39db6711fb0aded668216864d8e Mon Sep 17 00:00:00 2001 From: sthag Date: Fri, 13 Feb 2026 11:27:44 +0100 Subject: [PATCH 309/372] feat: Move function to app scope - Move randomIntFrom() to app.js - Add global entry to jshint configuration --- .jshintrc | 2 ++ source/code/hippie/app.js | 18 ++++++++++++++++++ source/code/intro.js | 18 ------------------ 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/.jshintrc b/.jshintrc index 29388b2..cd80937 100644 --- a/.jshintrc +++ b/.jshintrc @@ -27,6 +27,8 @@ "getClosestEdgeToMouse": true, "centerElementUnderCursor": true, "setAttributesAccordingToPosition": true, + "randomIntFrom": false, + "replaceLineBreaks": false, "HippieTaskBar": true } } diff --git a/source/code/hippie/app.js b/source/code/hippie/app.js index e5a26b8..9fa1e9d 100644 --- a/source/code/hippie/app.js +++ b/source/code/hippie/app.js @@ -405,6 +405,24 @@ function setAttributesAccordingToPosition(element, position, attributes) { }); } +/** + * Gibt eine Zahl zwischen und aus. + * Die Werte und sind dabei mit eingeschlossen. + * Mit kann der Exponent für eine 10er-Teilung angegeben werden. + * + * @param {number} min + * @param {number} max + * @param {number} pos + * @returns {number} + */ +function randomIntFrom(min, max, pos = 0) { + pos = Math.pow(10, pos); + min = Math.ceil(min); + max = Math.floor(max); + + return Math.floor((Math.random() * (max - min + 1) + min) / pos) * pos; +} + // CONCEPTS // NOTE: Benutzt private Zuweisungen diff --git a/source/code/intro.js b/source/code/intro.js index 341df5e..bff5a87 100644 --- a/source/code/intro.js +++ b/source/code/intro.js @@ -272,24 +272,6 @@ function loadCore() { }); } -/** - * Gibt eine Zahl zwischen und aus. - * Die Werte und sind dabei mit eingeschlossen. - * Mit kann der Exponent für eine 10er-Teilung angegeben werden. - * - * @param {number} min - * @param {number} max - * @param {number} pos - * @returns {number} - */ -function randomIntFrom(min, max, pos = 0) { - pos = Math.pow(10, pos); - min = Math.ceil(min); - max = Math.floor(max); - - return Math.floor((Math.random() * (max - min + 1) + min) / pos) * pos; -} - /** * Erstellt Kontext für hint-Objekt und ermöglicht das Entfernen des Ereignis. */ From 1b3a320b17dcfca3510681246d01735d58651032 Mon Sep 17 00:00:00 2001 From: sthag Date: Fri, 13 Feb 2026 11:39:52 +0100 Subject: [PATCH 310/372] feat: New table screen for ui - Add table screen to ui examples - Display table with placeholder content - Add global function replaceLineBreaks() --- source/code/hippie/app.js | 14 +++ source/screens/demo/examples/ui/table.liquid | 101 +++++++++++++++++++ source/style/modules/ui/_table_module.scss | 17 ++++ source/style/ui.scss | 1 + 4 files changed, 133 insertions(+) create mode 100755 source/screens/demo/examples/ui/table.liquid create mode 100644 source/style/modules/ui/_table_module.scss diff --git a/source/code/hippie/app.js b/source/code/hippie/app.js index 9fa1e9d..2e69574 100644 --- a/source/code/hippie/app.js +++ b/source/code/hippie/app.js @@ -423,6 +423,20 @@ function randomIntFrom(min, max, pos = 0) { return Math.floor((Math.random() * (max - min + 1) + min) / pos) * pos; } +/** + * Ersetzt \n durch
      . + * + * @param {string} text + * @returns {string} + */ +function replaceLineBreaks(text) { + if (text === '' || !text.includes('\n')) { + return text; + } + + return text.split('\n').join('
      '); +} + // CONCEPTS // NOTE: Benutzt private Zuweisungen diff --git a/source/screens/demo/examples/ui/table.liquid b/source/screens/demo/examples/ui/table.liquid new file mode 100755 index 0000000..654a865 --- /dev/null +++ b/source/screens/demo/examples/ui/table.liquid @@ -0,0 +1,101 @@ +--- +title: Table +tags: +- ui +--- +{% assign bodyClass = "body_frame" -%} +{% layout "hippie/app.liquid" %} + +{% block body %} +{% render 'hippie/partials/frame-header.liquid' %} +
      +
      +
      + + +
      + + + + + + + + + + + +
      #namerandomdescription
      + {% render 'hippie/partials/frame-status.liquid' %} +
      +
      + +{% render 'hippie/partials/frame-mode.liquid' %} +{% endblock %} + +{%- block script %} +{{ block.super -}} + +{% endblock %} \ No newline at end of file diff --git a/source/style/modules/ui/_table_module.scss b/source/style/modules/ui/_table_module.scss new file mode 100644 index 0000000..51896f4 --- /dev/null +++ b/source/style/modules/ui/_table_module.scss @@ -0,0 +1,17 @@ +@use "../../hippie-style/hippie"; + +main.io section > table { + table-layout: auto; + width: 100%; + margin: 0; + background-color: hippie.$color_back_io; + + thead > tr > th:first-child { + width: 1%; + } + + tr > th:first-child { + text-align: center; + } +} + diff --git a/source/style/ui.scss b/source/style/ui.scss index da6ecf7..861adf8 100644 --- a/source/style/ui.scss +++ b/source/style/ui.scss @@ -10,6 +10,7 @@ @use "modules/ui/game_module"; @use "modules/ui/gallery_module"; @use "modules/ui/windows_module"; +@use "modules/ui/table_module"; $color_gui_back: hippie.$color_dark; $space_gui_half: hippie.$space_half; From 57837110804ea49bd7a56b92450e63494f101e2c Mon Sep 17 00:00:00 2001 From: sthag Date: Fri, 13 Feb 2026 11:40:16 +0100 Subject: [PATCH 311/372] chore: Change jshint configuration --- .jshintrc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.jshintrc b/.jshintrc index cd80937..134e601 100644 --- a/.jshintrc +++ b/.jshintrc @@ -1,6 +1,5 @@ { "bitwise": true, - "browser": true, "curly": true, "devel": true, "eqeqeq": true, @@ -8,12 +7,12 @@ "forin": true, "freeze": true, "jquery": true, - "maxerr": 50, "noarg": true, "noempty": true, "strict": true, "undef": true, "unused": false, + "browser": true, "globals": { "HIPPIE": false, "hippie": true, @@ -22,11 +21,11 @@ "debugOn": true, "TimeDisplay": true, "DateDisplay": true, - "checkButtonAndTarget": true, - "getClosestEdgeToElement": true, - "getClosestEdgeToMouse": true, - "centerElementUnderCursor": true, - "setAttributesAccordingToPosition": true, + "checkButtonAndTarget": false, + "getClosestEdgeToElement": false, + "getClosestEdgeToMouse": false, + "centerElementUnderCursor": false, + "setAttributesAccordingToPosition": false, "randomIntFrom": false, "replaceLineBreaks": false, "HippieTaskBar": true From 0dfba8e6eecaab1fb4a84a40faadef8a2250d805 Mon Sep 17 00:00:00 2001 From: sthag Date: Fri, 13 Feb 2026 11:41:00 +0100 Subject: [PATCH 312/372] feat: Improve CSS declaration for gallery --- source/style/modules/ui/_gallery_module.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/style/modules/ui/_gallery_module.scss b/source/style/modules/ui/_gallery_module.scss index 4f8a233..06803fb 100644 --- a/source/style/modules/ui/_gallery_module.scss +++ b/source/style/modules/ui/_gallery_module.scss @@ -1,6 +1,6 @@ @use "../../hippie-style/hippie"; -.gallery { +main.io section > .gallery { display: flex; flex-wrap: wrap; justify-content: left; From f83b5aa258520549c07b1956433720158feba065 Mon Sep 17 00:00:00 2001 From: sthag Date: Fri, 13 Feb 2026 17:35:09 +0100 Subject: [PATCH 313/372] feat: Move and add functions - Add global function randomFloatFrom() - Move getRandomColor() to app --- source/code/drag.js | 12 ----------- source/code/hippie/app.js | 22 +++++++++++++++++++++ source/screens/demo/examples/ui/drag.liquid | 1 + 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/source/code/drag.js b/source/code/drag.js index 01a489a..7bdd8e9 100644 --- a/source/code/drag.js +++ b/source/code/drag.js @@ -113,15 +113,3 @@ class NewDiv { space.appendChild(this.element); } } - -// Function to generate a random color -function getRandomColor() { - const letters = '0123456789ABCDEF'; - let color = '#'; - - for (let i = 0; i < 6; i++) { - color += letters[Math.floor(Math.random() * 16)]; - } - - return color; -} diff --git a/source/code/hippie/app.js b/source/code/hippie/app.js index 2e69574..f00f364 100644 --- a/source/code/hippie/app.js +++ b/source/code/hippie/app.js @@ -423,6 +423,12 @@ function randomIntFrom(min, max, pos = 0) { return Math.floor((Math.random() * (max - min + 1) + min) / pos) * pos; } +function randomFloatFrom(min, max, dec = 0) { + dec = Math.pow(10, dec); + + return Math.round((Math.random() * (max - min + 1) + min) * dec) / dec; +} + /** * Ersetzt \n durch
      . * @@ -437,6 +443,22 @@ function replaceLineBreaks(text) { return text.split('\n').join('
      '); } +/** + * Gibt eine zufällige Farbe als HEX-Wert aus. + * + * @returns {string} + */ +function getRandomColor() { + const letters = '0123456789ABCDEF'; + let color = '#'; + + for (let i = 0; i < 6; i++) { + color += letters[Math.floor(Math.random() * 16)]; + } + + return color; +} + // CONCEPTS // NOTE: Benutzt private Zuweisungen diff --git a/source/screens/demo/examples/ui/drag.liquid b/source/screens/demo/examples/ui/drag.liquid index fe8ef43..7b46674 100755 --- a/source/screens/demo/examples/ui/drag.liquid +++ b/source/screens/demo/examples/ui/drag.liquid @@ -22,6 +22,7 @@ tags: {% endblock %} {%- block script %} + +{% endblock %} \ No newline at end of file diff --git a/source/screens/demo/examples/ui/cli.njk b/source/screens/demo/examples/ui/cli.njk deleted file mode 100755 index dc0800f..0000000 --- a/source/screens/demo/examples/ui/cli.njk +++ /dev/null @@ -1,62 +0,0 @@ ---- -title: CLI -tags: - - ui ---- -{% set pageId = page.fileSlug %} -{% set bodyClass = "body_cli" %} - -{% extends "hippie/_app_frame.njk" %} - -{% block body %} -
      -
      - 
      Previous prompt
      -
      -
      - - -
      -
      -{% endblock %} - -{%- block script %} - {{ super() }} - -{% endblock %} \ No newline at end of file diff --git a/source/screens/demo/examples/ui/tui.liquid b/source/screens/demo/examples/ui/tui.liquid new file mode 100644 index 0000000..cb2434f --- /dev/null +++ b/source/screens/demo/examples/ui/tui.liquid @@ -0,0 +1,13 @@ +--- +title: TUI +tags: +- ui +--- +{% assign bodyClass = "body_frame" -%} +{% layout "hippie/app.liquid" %} + +{% block body %} +{% render 'hippie/partials/frame-header.liquid' %} +
      +{% render 'hippie/partials/frame-mode.liquid' %} +{% endblock %} \ No newline at end of file diff --git a/source/screens/demo/examples/ui/tui.njk b/source/screens/demo/examples/ui/tui.njk deleted file mode 100755 index 8fc0e31..0000000 --- a/source/screens/demo/examples/ui/tui.njk +++ /dev/null @@ -1,14 +0,0 @@ ---- -title: TUI -tags: - - ui ---- -{% set pageId = page.fileSlug %} - -{% extends "hippie/_app_frame.njk" %} - -{% block body %} - {{ io.frameHeader('title-bar') }} -
      - {{ io.frameFooter('mode-bar') }} -{% endblock %} \ No newline at end of file From 0a5bc191d3d88ac379ace5a72899eba5bf2f413d Mon Sep 17 00:00:00 2001 From: sthag Date: Sat, 14 Feb 2026 12:15:18 +0100 Subject: [PATCH 317/372] chore: Set 11 as ECMAScript version in jshint --- .jshintrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.jshintrc b/.jshintrc index 134e601..c62bd70 100644 --- a/.jshintrc +++ b/.jshintrc @@ -3,7 +3,7 @@ "curly": true, "devel": true, "eqeqeq": true, - "esversion": 9, + "esversion": 11, "forin": true, "freeze": true, "jquery": true, From 759283fd9f50b1b58b4adeffa341a65510eed1d8 Mon Sep 17 00:00:00 2001 From: sthag Date: Sat, 14 Feb 2026 12:16:55 +0100 Subject: [PATCH 318/372] docs: Update README and TODO - Better structure for TODOs - Add information about JavaScript to README --- README.md | 16 +++- TODO.md | 236 ++++++++++++++++++++++++++++-------------------------- 2 files changed, 136 insertions(+), 116 deletions(-) diff --git a/README.md b/README.md index 7430cb6..5ec206a 100644 --- a/README.md +++ b/README.md @@ -44,9 +44,23 @@ Everything has its default style. CSS classes follow a naming scheme of `_`. -- *Object* usually is the name of the HTML element. If it is not a elemtn directly it is the thing which receives the styling +- *Object* usually is the name of the HTML element. If it is not a element directly it is the thing which receives the styling - *Description* is a name of the style e.g. what it does, how it looks +### JavaScript (JS) + +The codebase uses ECMAScript 2023 Language Specification (14th edition). +However, currently the JSHint configuration only allows 11 as highest version. + +ID values are written in *camelCase*. The scheme further uses parts for specific contexts. + +If the ID is for an interactive element the first part is an abbreviation of the action. + +- `qry` - Query +- `set` - Set +- `slt` - Select +- `tgl` - Toggle + ## Versioning This project uses [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://quelltext.interaktionsweise.de/interaktionsweise/hippie/tags). diff --git a/TODO.md b/TODO.md index 1fea50d..6704e8e 100644 --- a/TODO.md +++ b/TODO.md @@ -11,120 +11,126 @@ - Add build process for normalize.css from github.com/necolas/normalize.css - Add build process for bourbon from https://github.com/thoughtbot/bourbon +# CSS + +- Check style for every basic element +- Uniform spelling of classes and identifiers + # Content -- Complete *Intro* with description for all basic elements, according to [HTML Standard - The elements of HTML](https://html.spec.whatwg.org/multipage/semantics.html#semantics) - - Sections - - [x] body - - [x] article - - [x] section - - [x] nav - - [x] aside - - [x] h1-h6 - - [x] hgroup - - [x] header - - [x] footer - - [x] address (put to grouping content) - - Grouping content - - [x] p - - [x] hr - - [x] pre - - [x] blockquote - - [x] ol - - [x] ul - - [ ] menu (new) - - [x] li - - [x] dl - - [x] dt - - [x] dd - - [x] figure - - [x] figcaption - - [x] main - - [ ] search (new) - - [x] div - - Text-level semantics - - [x] a - - [x] em - - [x] strong - - [x] small - - [x] s - - [x] cite - - [x] q - - [x] dfn - - [x] abbr - - [x] ruby - - [x] rb (deprecated) - - [x] rt - - [x] rtc (deprecated) - - [x] rp - - [x] data - - [x] time - - [x] code - - [x] var - - [x] samp - - [x] kbd - - [x] sub - - [x] sup - - [x] i - - [x] b - - [x] u - - [x] mark - - [x] bdi - - [x] bdo - - [x] span - - [x] br (mentioned in grouping content) - - [x] wbr - - Edits - - [x] ins - - [x] del - - Embedded content - - [x] picture - - [x] source - - [x] img - - [ ] iframe - - [ ] embed - - [ ] object - - [ ] param (deprecated) - - [ ] video - - [ ] audio - - [ ] track - - [ ] map - - [ ] area - - Tabular data - - [ ] table - - [ ] caption - - [ ] colgroup - - [ ] col - - [ ] tbody - - [ ] thead - - [ ] tfoot - - [ ] tr - - [ ] td - - [ ] th - - Forms - - [x] form - - [x] label - - [x] input - - [x] button - - [ ] select - - [ ] datalist - - [ ] optgroup - - [ ] option - - [ ] textarea - - [ ] output - - [ ] progress - - [ ] meter (new) - - [x] fieldset - - [x] legend - - Interactive elements - - [ ] details - - [ ] summary - - [ ] dialog - - Scripting - - [ ] script - - [ ] noscript - - [ ] template - - [ ] slot - - [ ] canvas -- Check style for every basic element -- Uniform spelling of classes and identifiers \ No newline at end of file +- *Intro* + - Complete with description for all basic elements, according to [HTML Standard - The elements of HTML](https://html.spec.whatwg.org/multipage/semantics.html#semantics) + - Sections + - [x] body + - [x] article + - [x] section + - [x] nav + - [x] aside + - [x] h1-h6 + - [x] hgroup + - [x] header + - [x] footer + - [x] address (put to grouping content) + - Grouping content + - [x] p + - [x] hr + - [x] pre + - [x] blockquote + - [x] ol + - [x] ul + - [ ] menu (new) + - [x] li + - [x] dl + - [x] dt + - [x] dd + - [x] figure + - [x] figcaption + - [x] main + - [ ] search (new) + - [x] div + - Text-level semantics + - [x] a + - [x] em + - [x] strong + - [x] small + - [x] s + - [x] cite + - [x] q + - [x] dfn + - [x] abbr + - [x] ruby + - [x] rb (deprecated) + - [x] rt + - [x] rtc (deprecated) + - [x] rp + - [x] data + - [x] time + - [x] code + - [x] var + - [x] samp + - [x] kbd + - [x] sub + - [x] sup + - [x] i + - [x] b + - [x] u + - [x] mark + - [x] bdi + - [x] bdo + - [x] span + - [x] br (mentioned in grouping content) + - [x] wbr + - Edits + - [x] ins + - [x] del + - Embedded content + - [x] picture + - [x] source + - [x] img + - [ ] iframe + - [ ] embed + - [ ] object + - [ ] param (deprecated) + - [ ] video + - [ ] audio + - [ ] track + - [ ] map + - [ ] area + - Tabular data + - [ ] table + - [ ] caption + - [ ] colgroup + - [ ] col + - [ ] tbody + - [ ] thead + - [ ] tfoot + - [ ] tr + - [ ] td + - [ ] th + - Forms + - [x] form + - [x] label + - [x] input + - [x] button + - [ ] select + - [ ] datalist + - [ ] optgroup + - [ ] option + - [ ] textarea + - [ ] output + - [ ] progress + - [ ] meter (new) + - [x] fieldset + - [x] legend + - Interactive elements + - [ ] details + - [ ] summary + - [ ] dialog + - Scripting + - [ ] script + - [ ] noscript + - [ ] template + - [ ] slot + - [ ] canvas +- *Clock* + - Add overlays to better distinguish day, week and year \ No newline at end of file From b1c7f4100e8ef5d76786113a82526c72d4c6d0ad Mon Sep 17 00:00:00 2001 From: sthag Date: Sat, 14 Feb 2026 12:18:07 +0100 Subject: [PATCH 319/372] feat: Unify format for IDs --- source/screens/demo/examples/clock.liquid | 6 +++--- source/screens/demo/examples/start.liquid | 4 ++-- source/screens/demo/examples/ui/gallery.liquid | 8 ++++---- source/screens/demo/examples/ui/windows.liquid | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/source/screens/demo/examples/clock.liquid b/source/screens/demo/examples/clock.liquid index da8f5a4..34fb1d5 100644 --- a/source/screens/demo/examples/clock.liquid +++ b/source/screens/demo/examples/clock.liquid @@ -11,7 +11,7 @@ tags:

      - +

      {% endblock %} @@ -27,9 +27,9 @@ tags: const colorDayOfMonth = getComputedStyle(document.documentElement).getPropertyValue('--clock-color-orange').trim(); const colorMonth = getComputedStyle(document.documentElement).getPropertyValue('--clock-color-pink').trim(); - document.getElementById('toggleFormat').addEventListener('click', () => { + document.getElementById('tglFormat').addEventListener('click', () => { is24HourFormat = !is24HourFormat; - document.getElementById('toggleFormat').textContent = is24HourFormat ? '12-Stunden-Format' : '24-Stunden-Format'; + document.getElementById('tglFormat').textContent = is24HourFormat ? '12-Stunden-Format' : '24-Stunden-Format'; }); function drawRings(seconds, minutes, hours, dayOfWeek, dayOfMonth, month, daysInCurrentMonth) { diff --git a/source/screens/demo/examples/start.liquid b/source/screens/demo/examples/start.liquid index b4b1d98..3155921 100644 --- a/source/screens/demo/examples/start.liquid +++ b/source/screens/demo/examples/start.liquid @@ -11,7 +11,7 @@ tags: {% block body %}
      @@ -69,7 +69,7 @@ tags: document.getElementById('www-search').addEventListener('submit', function (e) { e.preventDefault(); - const query = document.getElementById('query').value.trim(); + const query = document.getElementById('qrySearch').value.trim(); if (!query) return; diff --git a/source/screens/demo/examples/ui/gallery.liquid b/source/screens/demo/examples/ui/gallery.liquid index c548374..8128023 100755 --- a/source/screens/demo/examples/ui/gallery.liquid +++ b/source/screens/demo/examples/ui/gallery.liquid @@ -12,9 +12,9 @@ tags:
      - +
      @@ -43,12 +47,12 @@ tags: - +
      #
      {% render 'hippie/partials/frame-status.liquid' %}
      -