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 @@