From fc70d3966d7072837c275728e9cd2cdc4640d75d Mon Sep 17 00:00:00 2001 From: thirtyone Date: Thu, 22 Feb 2024 00:14:45 +0530 Subject: [PATCH 1/6] Add border as drawable --- examples/border.rb | 11 ++++++++ lacci/lib/shoes.rb | 1 - lacci/lib/shoes/drawables.rb | 1 + lacci/lib/shoes/drawables/border.rb | 26 +++++++++++++++++++ lacci/lib/shoes/drawables/flow.rb | 1 - lacci/lib/shoes/drawables/stack.rb | 1 - lacci/lib/shoes/drawables/widget.rb | 1 - lib/scarpe/wv.rb | 1 + lib/scarpe/wv/border.rb | 15 +++++++++++ .../lib/scarpe/components/calzini/border.rb | 23 ++++++++++++++++ 10 files changed, 77 insertions(+), 4 deletions(-) create mode 100644 examples/border.rb create mode 100644 lacci/lib/shoes/drawables/border.rb create mode 100644 lib/scarpe/wv/border.rb create mode 100644 scarpe-components/lib/scarpe/components/calzini/border.rb diff --git a/examples/border.rb b/examples/border.rb new file mode 100644 index 000000000..b187e950c --- /dev/null +++ b/examples/border.rb @@ -0,0 +1,11 @@ +Shoes.app(width: 300, height: 50) do + stack height: 50 do + para "Border is on top of text" + border yellow, strokewidth: 4 + end + + stack do + para "This border is also on top of text" + border blue, strokewidth: 4 + end +end \ No newline at end of file diff --git a/lacci/lib/shoes.rb b/lacci/lib/shoes.rb index 1736cc9d4..0de3e50e2 100644 --- a/lacci/lib/shoes.rb +++ b/lacci/lib/shoes.rb @@ -37,7 +37,6 @@ class Shoes::Widget < Shoes::Slot; end require_relative "shoes/builtins" require_relative "shoes/background" -require_relative "shoes/border" require_relative "shoes/drawable" require_relative "shoes/app" diff --git a/lacci/lib/shoes/drawables.rb b/lacci/lib/shoes/drawables.rb index 951dc8195..dda60ea16 100644 --- a/lacci/lib/shoes/drawables.rb +++ b/lacci/lib/shoes/drawables.rb @@ -29,3 +29,4 @@ require "shoes/drawables/radio" require "shoes/drawables/video" require "shoes/drawables/progress" +require "shoes/drawables/border" diff --git a/lacci/lib/shoes/drawables/border.rb b/lacci/lib/shoes/drawables/border.rb new file mode 100644 index 000000000..06f35ef00 --- /dev/null +++ b/lacci/lib/shoes/drawables/border.rb @@ -0,0 +1,26 @@ +# frozen_string_literal: true + +class Shoes + class Border < Shoes::Drawable + # Shoes style with verification or value mapping: + # shoes_style(:left) { |val| convert_to_integer(val, "left") } + + shoes_styles :stroke, :strokewidth # Write your shoes styles here + + shoes_style(:strokewidth) { |val| convert_to_integer(val, "strokewidth") } + + Shoes::Drawable.drawable_default_styles[Shoes::Border][:stroke] = :black + Shoes::Drawable.drawable_default_styles[Shoes::Border][:strokewidth] = 1 + + opt_init_args :stroke, :strokewidth + def initialize(*args, **kwargs) + super + @draw_context = Shoes::App.instance.current_draw_context + + create_display_drawable + end + + private + + end +end diff --git a/lacci/lib/shoes/drawables/flow.rb b/lacci/lib/shoes/drawables/flow.rb index 6a747a7a7..96fd5635c 100644 --- a/lacci/lib/shoes/drawables/flow.rb +++ b/lacci/lib/shoes/drawables/flow.rb @@ -3,7 +3,6 @@ class Shoes class Flow < Shoes::Slot include Shoes::Background - include Shoes::Border Shoes::Drawable.drawable_default_styles[Shoes::Flow][:width] = "100%" diff --git a/lacci/lib/shoes/drawables/stack.rb b/lacci/lib/shoes/drawables/stack.rb index 137ff97b1..22758c121 100644 --- a/lacci/lib/shoes/drawables/stack.rb +++ b/lacci/lib/shoes/drawables/stack.rb @@ -3,7 +3,6 @@ class Shoes class Stack < Shoes::Slot include Shoes::Background - include Shoes::Border shoes_styles :scroll diff --git a/lacci/lib/shoes/drawables/widget.rb b/lacci/lib/shoes/drawables/widget.rb index 3a49314ec..2c3284671 100644 --- a/lacci/lib/shoes/drawables/widget.rb +++ b/lacci/lib/shoes/drawables/widget.rb @@ -37,7 +37,6 @@ class Shoes::Widget < Shoes::Slot include Shoes::Background - include Shoes::Border shoes_events diff --git a/lib/scarpe/wv.rb b/lib/scarpe/wv.rb index 834b3e2b5..4beb8209d 100644 --- a/lib/scarpe/wv.rb +++ b/lib/scarpe/wv.rb @@ -105,3 +105,4 @@ class Scarpe::Webview::Drawable < Shoes::Linkable require_relative "wv/scarpe_extensions" require_relative "assets" +require_relative "wv/border" diff --git a/lib/scarpe/wv/border.rb b/lib/scarpe/wv/border.rb new file mode 100644 index 000000000..5513742d8 --- /dev/null +++ b/lib/scarpe/wv/border.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +module Scarpe::Webview + class Border < Drawable + + def initialize(properties) + super(properties) + end + + # If the drawable is intended to be overridable, add element and style to Calzini instead + def element + render('border') + end + end +end diff --git a/scarpe-components/lib/scarpe/components/calzini/border.rb b/scarpe-components/lib/scarpe/components/calzini/border.rb new file mode 100644 index 000000000..8fe95a928 --- /dev/null +++ b/scarpe-components/lib/scarpe/components/calzini/border.rb @@ -0,0 +1,23 @@ +module Scarpe::Components::Calzini + def border_element(props) + HTML.render do |h| + h.div(id: html_id, style: style(props)) + end + end + + private + + def style(props) + styles = { + border: "#{props['strokewidth']}px solid #{Shoes::Colors.const_get('COLORS').key(props['stroke'][0..-2])}", + height: :inherit, + width: :inherit, + position: :absolute, + top: 0, + left: 0, + 'box-sizing': 'border-box' + } + + styles.compact + end +end \ No newline at end of file From 332c09a516fb0f258341be4f325b91257f8b4b35 Mon Sep 17 00:00:00 2001 From: thirtyone Date: Sun, 25 Feb 2024 21:48:14 +0530 Subject: [PATCH 2/6] Add support for gradient and curve --- lacci/lib/shoes/drawables/border.rb | 6 ++++-- .../lib/scarpe/components/calzini/border.rb | 17 ++++++++++++++++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/lacci/lib/shoes/drawables/border.rb b/lacci/lib/shoes/drawables/border.rb index 06f35ef00..e30af32e1 100644 --- a/lacci/lib/shoes/drawables/border.rb +++ b/lacci/lib/shoes/drawables/border.rb @@ -8,11 +8,13 @@ class Border < Shoes::Drawable shoes_styles :stroke, :strokewidth # Write your shoes styles here shoes_style(:strokewidth) { |val| convert_to_integer(val, "strokewidth") } + shoes_style(:curve) { |val| convert_to_integer(val, "curve") } Shoes::Drawable.drawable_default_styles[Shoes::Border][:stroke] = :black Shoes::Drawable.drawable_default_styles[Shoes::Border][:strokewidth] = 1 - - opt_init_args :stroke, :strokewidth + Shoes::Drawable.drawable_default_styles[Shoes::Border][:curve] = 0 + + opt_init_args :stroke, :strokewidth, :curve def initialize(*args, **kwargs) super @draw_context = Shoes::App.instance.current_draw_context diff --git a/scarpe-components/lib/scarpe/components/calzini/border.rb b/scarpe-components/lib/scarpe/components/calzini/border.rb index 8fe95a928..2986bc708 100644 --- a/scarpe-components/lib/scarpe/components/calzini/border.rb +++ b/scarpe-components/lib/scarpe/components/calzini/border.rb @@ -9,7 +9,6 @@ def border_element(props) def style(props) styles = { - border: "#{props['strokewidth']}px solid #{Shoes::Colors.const_get('COLORS').key(props['stroke'][0..-2])}", height: :inherit, width: :inherit, position: :absolute, @@ -18,6 +17,22 @@ def style(props) 'box-sizing': 'border-box' } + bc = props["stroke"] + + border_style_hash = case bc + when Range + { "border-image": "linear-gradient(45deg, #{bc.first}, #{bc.last})" } + when Array + { "border-color": "rgba(#{bc.join(", ")})" } + else + { "border-color": bc } + end + styles = styles.merge( + "border-style": "solid", + "border-width": "#{props["strokewidth"]}px", + "border-radius": "#{props["curve"]}px", + ).merge(border_style_hash) + styles.compact end end \ No newline at end of file From 9211b5b13b536648a96a4369c8660ec5e02d8220 Mon Sep 17 00:00:00 2001 From: thirtyone Date: Mon, 4 Mar 2024 00:10:19 +0530 Subject: [PATCH 3/6] Regenerate html fixtures --- .../html_fixtures/background_with_image.html | 10 ++++++---- test/wv/html_fixtures/border.html | 18 ++++++++++++++++++ test/wv/html_fixtures/simple_slides.html | 16 ++++++++++------ 3 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 test/wv/html_fixtures/border.html diff --git a/test/wv/html_fixtures/background_with_image.html b/test/wv/html_fixtures/background_with_image.html index 1e9e2a824..09ee57c70 100644 --- a/test/wv/html_fixtures/background_with_image.html +++ b/test/wv/html_fixtures/background_with_image.html @@ -1,12 +1,14 @@
-
-
+
+
+
+
-
+
-
+
diff --git a/test/wv/html_fixtures/border.html b/test/wv/html_fixtures/border.html new file mode 100644 index 000000000..c5aa65056 --- /dev/null +++ b/test/wv/html_fixtures/border.html @@ -0,0 +1,18 @@ +
+
+
+
+

Border is on top of text

+
+
+
+
+
+

This border is also on top of text

+
+
+
+
+
+
+
\ No newline at end of file diff --git a/test/wv/html_fixtures/simple_slides.html b/test/wv/html_fixtures/simple_slides.html index d2987bfcf..219c52ce7 100644 --- a/test/wv/html_fixtures/simple_slides.html +++ b/test/wv/html_fixtures/simple_slides.html @@ -1,11 +1,15 @@
-
-
+
+
+
+
+
+
- -

Slide 1: Welcome to Shoes!

-

Ah, yeah, Shoes!
+ +

Slide 1: Welcome to Shoes!

+

Ah, yeah, Shoes!
Who said nobody knows Shoes? Well, let me introduce you to a feline expert in the art of Ruby Desktop GUI Libs.

Meet Professor Whiskers the renowned programmer cat! Not only does he know Shoes, but he's also a master of all things Ruby and desktop GUI!
@@ -16,7 +20,7 @@
Meow! join the discord server for more meows!

- +
From 4eeb5b7902ec6c58b99a2d4b370848703ca94e99 Mon Sep 17 00:00:00 2001 From: thirtyone Date: Tue, 26 Mar 2024 00:35:49 +0530 Subject: [PATCH 4/6] Convert background as style to background as drawable --- examples/stack/background.rb | 6 +- lacci/lib/shoes/background.rb | 22 +++---- lacci/lib/shoes/drawables.rb | 2 + lacci/lib/shoes/drawables/background.rb | 24 ++++++++ lacci/lib/shoes/drawables/flow.rb | 3 - lacci/lib/shoes/drawables/stack.rb | 3 - lacci/lib/shoes/drawables/widget.rb | 3 - lib/scarpe/wv.rb | 2 + lib/scarpe/wv/background.rb | 17 ++++++ .../scarpe/components/calzini/background.rb | 58 +++++++++++++++++++ .../lib/scarpe/components/calzini/slots.rb | 19 ------ 11 files changed, 117 insertions(+), 42 deletions(-) create mode 100644 lacci/lib/shoes/drawables/background.rb create mode 100644 lib/scarpe/wv/background.rb create mode 100644 scarpe-components/lib/scarpe/components/calzini/background.rb diff --git a/examples/stack/background.rb b/examples/stack/background.rb index 66a3f490f..e62b2cde1 100644 --- a/examples/stack/background.rb +++ b/examples/stack/background.rb @@ -1,10 +1,10 @@ Shoes.app do stack width: 0.33 do - background "purple" + background "purple", :curve => 15 button "a button" end - stack width: 0.33 do - background "red".."green" + stack width: 0.33, :height => 20 do + background "red".."green", :curve => 20, :margin => 20 para "Red to green gradient" end stack width: 0.33 do diff --git a/lacci/lib/shoes/background.rb b/lacci/lib/shoes/background.rb index ce27276e8..ccd7e96dd 100644 --- a/lacci/lib/shoes/background.rb +++ b/lacci/lib/shoes/background.rb @@ -1,14 +1,14 @@ # frozen_string_literal: true -class Shoes - module Background - def self.included(includer) - includer.shoes_style(:background_color) - end +# class Shoes +# module Background +# def self.included(includer) +# includer.shoes_style(:background_color) +# end - # NOTE: this needs to be passed through in order for the styling to work - def background(color, options = {}) - self.background_color = color - end - end -end +# # NOTE: this needs to be passed through in order for the styling to work +# def background(color, options = {}) +# self.background_color = color +# end +# end +# end diff --git a/lacci/lib/shoes/drawables.rb b/lacci/lib/shoes/drawables.rb index 951dc8195..db9020c17 100644 --- a/lacci/lib/shoes/drawables.rb +++ b/lacci/lib/shoes/drawables.rb @@ -29,3 +29,5 @@ require "shoes/drawables/radio" require "shoes/drawables/video" require "shoes/drawables/progress" +require "shoes/drawables/border" +require "shoes/drawables/background" diff --git a/lacci/lib/shoes/drawables/background.rb b/lacci/lib/shoes/drawables/background.rb new file mode 100644 index 000000000..3a118e64d --- /dev/null +++ b/lacci/lib/shoes/drawables/background.rb @@ -0,0 +1,24 @@ +# class_template.erb +# frozen_string_literal: true + +class Shoes + class Background < Shoes::Drawable + + shoes_styles :fill + + shoes_style(:curve) { |val| convert_to_integer(val, "curve") } + + Shoes::Drawable.drawable_default_styles[Shoes::Border][:curve] = 0 + + init_args :fill + opt_init_args :curve + def initialize(*args, **kwargs) + + super + @draw_context = Shoes::App.instance.current_draw_context + + create_display_drawable + end + + end +end diff --git a/lacci/lib/shoes/drawables/flow.rb b/lacci/lib/shoes/drawables/flow.rb index 6a747a7a7..f47829dd1 100644 --- a/lacci/lib/shoes/drawables/flow.rb +++ b/lacci/lib/shoes/drawables/flow.rb @@ -2,9 +2,6 @@ class Shoes class Flow < Shoes::Slot - include Shoes::Background - include Shoes::Border - Shoes::Drawable.drawable_default_styles[Shoes::Flow][:width] = "100%" shoes_events diff --git a/lacci/lib/shoes/drawables/stack.rb b/lacci/lib/shoes/drawables/stack.rb index 137ff97b1..8917aa678 100644 --- a/lacci/lib/shoes/drawables/stack.rb +++ b/lacci/lib/shoes/drawables/stack.rb @@ -2,9 +2,6 @@ class Shoes class Stack < Shoes::Slot - include Shoes::Background - include Shoes::Border - shoes_styles :scroll shoes_events # No Stack-specific events diff --git a/lacci/lib/shoes/drawables/widget.rb b/lacci/lib/shoes/drawables/widget.rb index 3a49314ec..a412e9766 100644 --- a/lacci/lib/shoes/drawables/widget.rb +++ b/lacci/lib/shoes/drawables/widget.rb @@ -36,9 +36,6 @@ # widget propertly, sets the linkable_id, etc. class Shoes::Widget < Shoes::Slot - include Shoes::Background - include Shoes::Border - shoes_events def self.inherited(subclass) diff --git a/lib/scarpe/wv.rb b/lib/scarpe/wv.rb index 834b3e2b5..b00b474e1 100644 --- a/lib/scarpe/wv.rb +++ b/lib/scarpe/wv.rb @@ -105,3 +105,5 @@ class Scarpe::Webview::Drawable < Shoes::Linkable require_relative "wv/scarpe_extensions" require_relative "assets" +require_relative "wv/border" +require_relative "wv/background" diff --git a/lib/scarpe/wv/background.rb b/lib/scarpe/wv/background.rb new file mode 100644 index 000000000..40ad4f9f8 --- /dev/null +++ b/lib/scarpe/wv/background.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +module Scarpe::Webview + class Background < Drawable + + def initialize(properties) + super + end + + # If the drawable is intended to be overridable, add element and style to Calzini instead + def element + render("background") + end + + private + end +end diff --git a/scarpe-components/lib/scarpe/components/calzini/background.rb b/scarpe-components/lib/scarpe/components/calzini/background.rb new file mode 100644 index 000000000..1e74fc215 --- /dev/null +++ b/scarpe-components/lib/scarpe/components/calzini/background.rb @@ -0,0 +1,58 @@ +module Scarpe::Components::Calzini + def background_element(props) + HTML.render do |h| + h.div(id: html_id, style: background_style(props)) + end + end + + private + + def background_style(props) + styles = { + height: :inherit, + width: :inherit, + position: :absolute, + top: 0, + left: 0, + 'z-index': -99, + 'box-sizing': 'border-box', + } + + styles = drawable_style(props).merge(styles) + + bc = props["fill"] + return styles unless bc + + variable_styles = case bc + when Array + { + background: "rgba(#{bc.join(", ")})", + 'border-color': "rgba(#{bc.join(", ")})", + 'border-width': '1px', + 'border-radius': "#{props['curve']}px", + } + when Range + { + background: "linear-gradient(45deg, #{bc.first}, #{bc.last})", + 'border-color': "linear-gradient(45deg, #{bc.first}, #{bc.last})", + 'border-width': '1px', + 'border-radius': "#{props['curve']}px", + } + when ->(value) { File.exist?(value) } + { + background: "url(data:image/png;base64,#{encode_file_to_base64(bc)})" + } + else + { + background: bc, + 'border-color': bc, + 'border-width': '1px', + 'border-radius': "#{props['curve']}px", + } + end + + # binding.irb + + styles.merge(variable_styles) + end + end \ No newline at end of file diff --git a/scarpe-components/lib/scarpe/components/calzini/slots.rb b/scarpe-components/lib/scarpe/components/calzini/slots.rb index 4ea58d047..fb5e0db82 100644 --- a/scarpe-components/lib/scarpe/components/calzini/slots.rb +++ b/scarpe-components/lib/scarpe/components/calzini/slots.rb @@ -33,7 +33,6 @@ def documentroot_element(props, &block) def slot_style(props) styles = drawable_style(props) - styles = background_style(props, styles) styles = border_style(props, styles) styles[:width] = dimensions_length(props["width"]) if props["width"] @@ -88,22 +87,4 @@ def border_style(props, styles) "border-radius": "#{opts["curve"] || 0}px", ).merge(border_style_hash) end - - def background_style(props, styles) - bc = props["background_color"] - return styles unless bc - - color = case bc - when Array - "rgba(#{bc.join(", ")})" - when Range - "linear-gradient(45deg, #{bc.first}, #{bc.last})" - when ->(value) { File.exist?(value) } - "url(data:image/png;base64,#{encode_file_to_base64(bc)})" - else - bc - end - - styles.merge(background: color) - end end From b662140d65448d20e9e00b76b79269238689360e Mon Sep 17 00:00:00 2001 From: thirtyone Date: Fri, 31 May 2024 23:50:15 +0530 Subject: [PATCH 5/6] fix --- scarpe-components/lib/scarpe/components/calzini.rb | 2 +- scarpe-components/lib/scarpe/components/calzini/background.rb | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/scarpe-components/lib/scarpe/components/calzini.rb b/scarpe-components/lib/scarpe/components/calzini.rb index f2c0a18c0..96737add9 100644 --- a/scarpe-components/lib/scarpe/components/calzini.rb +++ b/scarpe-components/lib/scarpe/components/calzini.rb @@ -110,7 +110,7 @@ def dimensions_length(value) end def drawable_style(props) - styles = {} + styles = { :isolation => "isolate" } if props["hidden"] styles[:display] = "none" end diff --git a/scarpe-components/lib/scarpe/components/calzini/background.rb b/scarpe-components/lib/scarpe/components/calzini/background.rb index 1e74fc215..b1c9cb82e 100644 --- a/scarpe-components/lib/scarpe/components/calzini/background.rb +++ b/scarpe-components/lib/scarpe/components/calzini/background.rb @@ -14,7 +14,6 @@ def background_style(props) position: :absolute, top: 0, left: 0, - 'z-index': -99, 'box-sizing': 'border-box', } From b32c4286d04bdd062e1d4fdb0ca1e676278fb3bf Mon Sep 17 00:00:00 2001 From: thirtyone Date: Fri, 31 May 2024 23:56:48 +0530 Subject: [PATCH 6/6] regenerate html fixtures --- test/wv/html_fixtures/Edit_box_Styles.html | 8 +-- test/wv/html_fixtures/Kerning.html | 6 +- test/wv/html_fixtures/animate.html | 16 +++--- test/wv/html_fixtures/arrow.html | 10 ++-- .../html_fixtures/background_with_image.html | 19 ++++--- test/wv/html_fixtures/border.html | 10 ++-- test/wv/html_fixtures/btn_tooltip.html | 6 +- test/wv/html_fixtures/button.html | 6 +- test/wv/html_fixtures/button_alert.html | 4 +- test/wv/html_fixtures/button_go_away.html | 4 +- .../html_fixtures/button_style_changed.html | 6 +- .../html_fixtures/button_styles_default.html | 8 +-- .../button_with_position_and_size.html | 6 +- test/wv/html_fixtures/check.html | 34 +++++------ test/wv/html_fixtures/clear_and_append.html | 10 ++-- test/wv/html_fixtures/coffee.html | 6 +- test/wv/html_fixtures/download.html | 4 +- test/wv/html_fixtures/edit_box.html | 8 +-- test/wv/html_fixtures/edit_line.html | 8 +-- test/wv/html_fixtures/flow.html | 36 ++++++------ test/wv/html_fixtures/font_family.html | 16 +++--- test/wv/html_fixtures/font_shorthand.html | 8 +-- test/wv/html_fixtures/fonts.html | 8 +-- test/wv/html_fixtures/get_headers.html | 8 +-- test/wv/html_fixtures/hello_world.html | 4 +- test/wv/html_fixtures/highlander.html | 12 ++-- test/wv/html_fixtures/info.html | 2 +- test/wv/html_fixtures/line.html | 8 +-- test/wv/html_fixtures/link.html | 4 +- test/wv/html_fixtures/list_box.html | 10 ++-- test/wv/html_fixtures/list_box_choose.html | 6 +- test/wv/html_fixtures/local_images.html | 4 +- test/wv/html_fixtures/margin.html | 12 ++-- test/wv/html_fixtures/margin_check.html | 27 ++++++--- test/wv/html_fixtures/motion_events.html | 12 ++-- test/wv/html_fixtures/oval-with-kwargs.html | 4 +- test/wv/html_fixtures/oval.html | 20 +++---- test/wv/html_fixtures/para_font_styles.html | 14 ++--- test/wv/html_fixtures/para_font_variant.html | 6 +- test/wv/html_fixtures/para_fontweight.html | 12 ++-- test/wv/html_fixtures/para_text_widgets.html | 6 +- test/wv/html_fixtures/progress.html | 26 ++++----- test/wv/html_fixtures/raw_flow.html | 36 ++++++------ test/wv/html_fixtures/rect.html | 6 +- test/wv/html_fixtures/rotate_shapes.html | 16 +++--- test/wv/html_fixtures/ruby_racer.html | 22 +++---- test/wv/html_fixtures/scarpe_ext.html | 4 +- test/wv/html_fixtures/selfitude.html | 6 +- test/wv/html_fixtures/shoes_school.html | 26 ++++----- test/wv/html_fixtures/shoes_splorer.html | 20 +++---- test/wv/html_fixtures/show_hide.html | 4 +- test/wv/html_fixtures/simple_slides.html | 12 ++-- test/wv/html_fixtures/simpler-menu.html | 30 +++++----- test/wv/html_fixtures/sleepless.html | 6 +- test/wv/html_fixtures/slots.html | 10 ++-- test/wv/html_fixtures/spacing.html | 22 ++++--- test/wv/html_fixtures/span.html | 10 ++-- test/wv/html_fixtures/text_change.html | 4 +- test/wv/html_fixtures/text_sizes.html | 16 +++--- test/wv/html_fixtures/timmy.html | 57 ++++++++++--------- test/wv/html_fixtures/title_and_resize.html | 4 +- test/wv/html_fixtures/video.html | 14 ++--- 62 files changed, 398 insertions(+), 371 deletions(-) diff --git a/test/wv/html_fixtures/Edit_box_Styles.html b/test/wv/html_fixtures/Edit_box_Styles.html index 41a35ddec..b5048bb87 100644 --- a/test/wv/html_fixtures/Edit_box_Styles.html +++ b/test/wv/html_fixtures/Edit_box_Styles.html @@ -1,8 +1,8 @@ -
+
-

Anything:

- -

141 characters

+

Anything:

+ +

141 characters

diff --git a/test/wv/html_fixtures/Kerning.html b/test/wv/html_fixtures/Kerning.html index d75b2a15a..0201f3a96 100644 --- a/test/wv/html_fixtures/Kerning.html +++ b/test/wv/html_fixtures/Kerning.html @@ -1,7 +1,7 @@ -
+
-

This text have kerning applied to it

-

This is normal text for reference

+

This text have kerning applied to it

+

This is normal text for reference

diff --git a/test/wv/html_fixtures/animate.html b/test/wv/html_fixtures/animate.html index 36aff6dc2..22c099bb4 100644 --- a/test/wv/html_fixtures/animate.html +++ b/test/wv/html_fixtures/animate.html @@ -1,13 +1,13 @@ -
+
-
+
-

10 fps

-

-

-

20 fps

-

-

-

3spf

-

-

+

10 fps

+

-

+

20 fps

+

-

+

3spf

+

-

diff --git a/test/wv/html_fixtures/arrow.html b/test/wv/html_fixtures/arrow.html index 203f0858d..10bb146b4 100644 --- a/test/wv/html_fixtures/arrow.html +++ b/test/wv/html_fixtures/arrow.html @@ -1,9 +1,9 @@ -
+
-
-
-
-
+
+
+
+
diff --git a/test/wv/html_fixtures/background_with_image.html b/test/wv/html_fixtures/background_with_image.html index 09ee57c70..6ab15250f 100644 --- a/test/wv/html_fixtures/background_with_image.html +++ b/test/wv/html_fixtures/background_with_image.html @@ -1,15 +1,20 @@ -
+
-
+
-
+
+
-
-
+
+
+
+
-
-
+
+
+
+
diff --git a/test/wv/html_fixtures/border.html b/test/wv/html_fixtures/border.html index c5aa65056..9b78ec48c 100644 --- a/test/wv/html_fixtures/border.html +++ b/test/wv/html_fixtures/border.html @@ -1,14 +1,14 @@ -
+
-
+
-

Border is on top of text

+

Border is on top of text

-
+
-

This border is also on top of text

+

This border is also on top of text

diff --git a/test/wv/html_fixtures/btn_tooltip.html b/test/wv/html_fixtures/btn_tooltip.html index 4fab8ded2..1e4fdb7ce 100644 --- a/test/wv/html_fixtures/btn_tooltip.html +++ b/test/wv/html_fixtures/btn_tooltip.html @@ -1,6 +1,6 @@ -
-
-

i am a button

+
+
+

i am a button

diff --git a/test/wv/html_fixtures/button.html b/test/wv/html_fixtures/button.html index c22686944..e862a8213 100644 --- a/test/wv/html_fixtures/button.html +++ b/test/wv/html_fixtures/button.html @@ -1,6 +1,6 @@ -
-
-

Nothing pushed so far

+
+
+

Nothing pushed so far

diff --git a/test/wv/html_fixtures/button_alert.html b/test/wv/html_fixtures/button_alert.html index 0e430ffc0..d81091dbb 100644 --- a/test/wv/html_fixtures/button_alert.html +++ b/test/wv/html_fixtures/button_alert.html @@ -1,5 +1,5 @@ -
-
+
+
diff --git a/test/wv/html_fixtures/button_go_away.html b/test/wv/html_fixtures/button_go_away.html index 1e8a27a6f..16f4eb3f8 100644 --- a/test/wv/html_fixtures/button_go_away.html +++ b/test/wv/html_fixtures/button_go_away.html @@ -1,5 +1,5 @@ -
-
+
+
diff --git a/test/wv/html_fixtures/button_style_changed.html b/test/wv/html_fixtures/button_style_changed.html index 43f3724e1..a1babef75 100644 --- a/test/wv/html_fixtures/button_style_changed.html +++ b/test/wv/html_fixtures/button_style_changed.html @@ -1,8 +1,8 @@ -
+
-

This text will start red
+

This text will start red

- +
diff --git a/test/wv/html_fixtures/button_styles_default.html b/test/wv/html_fixtures/button_styles_default.html index fcd557481..951ae6bba 100644 --- a/test/wv/html_fixtures/button_styles_default.html +++ b/test/wv/html_fixtures/button_styles_default.html @@ -1,10 +1,10 @@ -
+
-

This text should be red
+

This text should be red

-

But this text should be green
+

But this text should be green

- +
diff --git a/test/wv/html_fixtures/button_with_position_and_size.html b/test/wv/html_fixtures/button_with_position_and_size.html index 4ceb89b2d..30000aa83 100644 --- a/test/wv/html_fixtures/button_with_position_and_size.html +++ b/test/wv/html_fixtures/button_with_position_and_size.html @@ -1,6 +1,6 @@ -
-
-

Nothing pushed so far

+
+
+

Nothing pushed so far

diff --git a/test/wv/html_fixtures/check.html b/test/wv/html_fixtures/check.html index d9d2a7503..80f223471 100644 --- a/test/wv/html_fixtures/check.html +++ b/test/wv/html_fixtures/check.html @@ -1,28 +1,28 @@ -
+
-
+
-

Among these films, which do you prefer?

-
-
-

The Taste of Tea by Katsuhito Ishii

+

Among these films, which do you prefer?

+
+
+

The Taste of Tea by Katsuhito Ishii

-
-
-

Kin-Dza-Dza by Georgi Danelia

+
+
+

Kin-Dza-Dza by Georgi Danelia

-
-
-

Children of Heaven by Majid Majidi

+
+
+

Children of Heaven by Majid Majidi

- -

The White Balloon by Jafar Panahi

-

-
-
+ +

The White Balloon by Jafar Panahi

+

+
+
diff --git a/test/wv/html_fixtures/clear_and_append.html b/test/wv/html_fixtures/clear_and_append.html index a213fcb51..a2978ed48 100644 --- a/test/wv/html_fixtures/clear_and_append.html +++ b/test/wv/html_fixtures/clear_and_append.html @@ -1,10 +1,10 @@ -
+
-
-
-
+
+
+
-

Good Morning

+

Good Morning

diff --git a/test/wv/html_fixtures/coffee.html b/test/wv/html_fixtures/coffee.html index 33a82721a..24f573776 100644 --- a/test/wv/html_fixtures/coffee.html +++ b/test/wv/html_fixtures/coffee.html @@ -1,6 +1,6 @@ -
-
-

😪

+
+
+

😪

diff --git a/test/wv/html_fixtures/download.html b/test/wv/html_fixtures/download.html index 6b7464fe3..2a3627a6e 100644 --- a/test/wv/html_fixtures/download.html +++ b/test/wv/html_fixtures/download.html @@ -1,6 +1,6 @@ -
+
-

check console maybe takes 10 secs to load

+

check console maybe takes 10 secs to load

diff --git a/test/wv/html_fixtures/edit_box.html b/test/wv/html_fixtures/edit_box.html index 696878aa0..a152e0d23 100644 --- a/test/wv/html_fixtures/edit_box.html +++ b/test/wv/html_fixtures/edit_box.html @@ -1,8 +1,8 @@ -
+
-

Manuscript:

- -

141 characters

+

Manuscript:

+ +

141 characters

diff --git a/test/wv/html_fixtures/edit_line.html b/test/wv/html_fixtures/edit_line.html index 93c2dff66..9c32e54ee 100644 --- a/test/wv/html_fixtures/edit_line.html +++ b/test/wv/html_fixtures/edit_line.html @@ -1,8 +1,8 @@ -
+
-

Name:

- -

Hello John!

+

Name:

+ +

Hello John!

diff --git a/test/wv/html_fixtures/flow.html b/test/wv/html_fixtures/flow.html index 5a88cef54..8d28534fd 100644 --- a/test/wv/html_fixtures/flow.html +++ b/test/wv/html_fixtures/flow.html @@ -1,45 +1,45 @@ -
+
-
+
-
+
-

One

+

One

-
+
-

Two

+

Two

-
+
-

Three

+

Three

-
+
-

Four

+

Four

-
+
-

Five

+

Five

-
+
-

Six

+

Six

-
+
-

Seven

+

Seven

-
+
-

Eight

+

Eight

diff --git a/test/wv/html_fixtures/font_family.html b/test/wv/html_fixtures/font_family.html index 9969e6d55..01be10f39 100644 --- a/test/wv/html_fixtures/font_family.html +++ b/test/wv/html_fixtures/font_family.html @@ -1,12 +1,12 @@ -
+
-

This is arial

-

This is time new roman

-

this is cursive

-

this is pacifico

-

this is pacifico with quotes which is same

-

This is helvetica

-

This is 'Trebuchet MS'

+

This is arial

+

This is time new roman

+

this is cursive

+

this is pacifico

+

this is pacifico with quotes which is same

+

This is helvetica

+

This is 'Trebuchet MS'

diff --git a/test/wv/html_fixtures/font_shorthand.html b/test/wv/html_fixtures/font_shorthand.html index f336a656f..9ccb4d3b1 100644 --- a/test/wv/html_fixtures/font_shorthand.html +++ b/test/wv/html_fixtures/font_shorthand.html @@ -1,8 +1,8 @@ -
+
-

The family is not in font so it will change but size won't

-

because only things things who aren't present in font

-

will be used as their specific property

+

The family is not in font so it will change but size won't

+

because only things things who aren't present in font

+

will be used as their specific property

diff --git a/test/wv/html_fixtures/fonts.html b/test/wv/html_fixtures/fonts.html index 05b42cc26..dd50458c0 100644 --- a/test/wv/html_fixtures/fonts.html +++ b/test/wv/html_fixtures/fonts.html @@ -1,8 +1,8 @@ -
+
-

Hello, world!

-

Hello, world!

-

Hello, world!

+

Hello, world!

+

Hello, world!

+

Hello, world!

diff --git a/test/wv/html_fixtures/get_headers.html b/test/wv/html_fixtures/get_headers.html index f219f9406..ddef26f72 100644 --- a/test/wv/html_fixtures/get_headers.html +++ b/test/wv/html_fixtures/get_headers.html @@ -1,9 +1,9 @@ -
+
-
+
-

Searching

-

One moment...

+

Searching

+

One moment...

diff --git a/test/wv/html_fixtures/hello_world.html b/test/wv/html_fixtures/hello_world.html index 4c9c2bdef..2e1c6e5b4 100644 --- a/test/wv/html_fixtures/hello_world.html +++ b/test/wv/html_fixtures/hello_world.html @@ -1,6 +1,6 @@ -
+
-

Hello World

+

Hello World

diff --git a/test/wv/html_fixtures/highlander.html b/test/wv/html_fixtures/highlander.html index 2e868aae0..fd5162701 100644 --- a/test/wv/html_fixtures/highlander.html +++ b/test/wv/html_fixtures/highlander.html @@ -1,11 +1,11 @@ -
+
-
+
-

Found 0 likely duplicates.

- -

(Click on a list item for details)

-
+

Found 0 likely duplicates.

+ +

(Click on a list item for details)

+
diff --git a/test/wv/html_fixtures/info.html b/test/wv/html_fixtures/info.html index 102c4a522..25142c88e 100644 --- a/test/wv/html_fixtures/info.html +++ b/test/wv/html_fixtures/info.html @@ -1,4 +1,4 @@ -
+
diff --git a/test/wv/html_fixtures/line.html b/test/wv/html_fixtures/line.html index 077951e69..0b82a640e 100644 --- a/test/wv/html_fixtures/line.html +++ b/test/wv/html_fixtures/line.html @@ -1,8 +1,8 @@ -
+
-
-
-
+
+
+
diff --git a/test/wv/html_fixtures/link.html b/test/wv/html_fixtures/link.html index 1970aa125..59b95484b 100644 --- a/test/wv/html_fixtures/link.html +++ b/test/wv/html_fixtures/link.html @@ -1,6 +1,6 @@ -
+
-

'Scarpe' means shoes in Italian. 'Scarpe' also means Shoes in...(show more)

+

'Scarpe' means shoes in Italian. 'Scarpe' also means Shoes in...(show more)

diff --git a/test/wv/html_fixtures/list_box.html b/test/wv/html_fixtures/list_box.html index e155b6a07..a6ea866ed 100644 --- a/test/wv/html_fixtures/list_box.html +++ b/test/wv/html_fixtures/list_box.html @@ -1,11 +1,11 @@ -
+
-
+
-
+
-

Name

-
+

Name

+
diff --git a/test/wv/html_fixtures/list_box_choose.html b/test/wv/html_fixtures/list_box_choose.html index 1f8629bb7..2d11575e1 100644 --- a/test/wv/html_fixtures/list_box_choose.html +++ b/test/wv/html_fixtures/list_box_choose.html @@ -1,7 +1,7 @@ -
+
-

Guess the secret word:

- +

Guess the secret word:

+
diff --git a/test/wv/html_fixtures/local_images.html b/test/wv/html_fixtures/local_images.html index de670fa32..b29b3c3fc 100644 --- a/test/wv/html_fixtures/local_images.html +++ b/test/wv/html_fixtures/local_images.html @@ -1,5 +1,5 @@ -
-
+
+
diff --git a/test/wv/html_fixtures/margin.html b/test/wv/html_fixtures/margin.html index 6e2c98bec..1c0fa3bff 100644 --- a/test/wv/html_fixtures/margin.html +++ b/test/wv/html_fixtures/margin.html @@ -1,10 +1,10 @@ -
+
-

All margins with array input

-

All margins with string input

-

One Number to set all margins

-

Specific property can overwrite shorthand

-

margins using a hash input

+

All margins with array input

+

All margins with string input

+

One Number to set all margins

+

Specific property can overwrite shorthand

+

margins using a hash input

diff --git a/test/wv/html_fixtures/margin_check.html b/test/wv/html_fixtures/margin_check.html index da59cc58f..13713a057 100644 --- a/test/wv/html_fixtures/margin_check.html +++ b/test/wv/html_fixtures/margin_check.html @@ -1,16 +1,25 @@ -
+
-
-
+
+
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
-
-
+
+
+
+
diff --git a/test/wv/html_fixtures/motion_events.html b/test/wv/html_fixtures/motion_events.html index e5a5fa3cc..a2f89def2 100644 --- a/test/wv/html_fixtures/motion_events.html +++ b/test/wv/html_fixtures/motion_events.html @@ -1,12 +1,12 @@ -
+
-
+
-

Events and Menus

-
-
+

Events and Menus

+
+
- +
diff --git a/test/wv/html_fixtures/oval-with-kwargs.html b/test/wv/html_fixtures/oval-with-kwargs.html index 8cbc8b177..95ebfc4bc 100644 --- a/test/wv/html_fixtures/oval-with-kwargs.html +++ b/test/wv/html_fixtures/oval-with-kwargs.html @@ -1,6 +1,6 @@ -
+
-
+
diff --git a/test/wv/html_fixtures/oval.html b/test/wv/html_fixtures/oval.html index 7b79ccbaa..720efc54f 100644 --- a/test/wv/html_fixtures/oval.html +++ b/test/wv/html_fixtures/oval.html @@ -1,21 +1,21 @@ -
+
-
+
-

Positional arguments:

-
+

Positional arguments:

+
-
+
-

As a circle

-
+

As a circle

+
-
+
-

Keyword arguments:

-
+

Keyword arguments:

+
diff --git a/test/wv/html_fixtures/para_font_styles.html b/test/wv/html_fixtures/para_font_styles.html index 2567276bb..f8fc4efbf 100644 --- a/test/wv/html_fixtures/para_font_styles.html +++ b/test/wv/html_fixtures/para_font_styles.html @@ -1,11 +1,11 @@ -
+
-

this text is in normal styl

-

this text is in italic style

-

this text is in oblique style

-

Text in Helvetica

-

And in Lucida

-

From an example

+

this text is in normal styl

+

this text is in italic style

+

this text is in oblique style

+

Text in Helvetica

+

And in Lucida

+

From an example

diff --git a/test/wv/html_fixtures/para_font_variant.html b/test/wv/html_fixtures/para_font_variant.html index 8e03252d6..defb68aad 100644 --- a/test/wv/html_fixtures/para_font_variant.html +++ b/test/wv/html_fixtures/para_font_variant.html @@ -1,7 +1,7 @@ -
+
-

This is Normal Variant

-

This is Small Caps Variant

+

This is Normal Variant

+

This is Small Caps Variant

diff --git a/test/wv/html_fixtures/para_fontweight.html b/test/wv/html_fixtures/para_fontweight.html index 5a2f9721a..ebb53b013 100644 --- a/test/wv/html_fixtures/para_fontweight.html +++ b/test/wv/html_fixtures/para_fontweight.html @@ -1,10 +1,10 @@ -
+
-

This is normal

-

This is bolder

-

This is a little less bold

-

This is bolder than the last one

-

Close to normal

+

This is normal

+

This is bolder

+

This is a little less bold

+

This is bolder than the last one

+

Close to normal

diff --git a/test/wv/html_fixtures/para_text_widgets.html b/test/wv/html_fixtures/para_text_widgets.html index 49fb4e43a..531f456e5 100644 --- a/test/wv/html_fixtures/para_text_widgets.html +++ b/test/wv/html_fixtures/para_text_widgets.html @@ -1,7 +1,7 @@ -
+
-

This is simple.

-

This has emphasis and great strength and coolness.

+

This is simple.

+

This has emphasis and great strength and coolness.

diff --git a/test/wv/html_fixtures/progress.html b/test/wv/html_fixtures/progress.html index 1f249c48c..65bba1d6d 100644 --- a/test/wv/html_fixtures/progress.html +++ b/test/wv/html_fixtures/progress.html @@ -1,20 +1,20 @@ -
+
-
+
-
+
-

this is initally at 30%

- -

this is initally at 60%

- -

this is initally at 80%

- -

this is a normal progress bar with no initial value

-
+

this is initally at 30%

+ +

this is initally at 60%

+ +

this is initally at 80%

+ +

this is a normal progress bar with no initial value

+
-
-
+
+
diff --git a/test/wv/html_fixtures/raw_flow.html b/test/wv/html_fixtures/raw_flow.html index 8d1f3af81..768d9a8fc 100644 --- a/test/wv/html_fixtures/raw_flow.html +++ b/test/wv/html_fixtures/raw_flow.html @@ -1,45 +1,45 @@ -
+
-
+
-
+
-

One

+

One

-
+
-

Two

+

Two

-
+
-

Three

+

Three

-
+
-

Four

+

Four

-
+
-

Five

+

Five

-
+
-

Six

+

Six

-
+
-

Seven

+

Seven

-
+
-

Eight

+

Eight

diff --git a/test/wv/html_fixtures/rect.html b/test/wv/html_fixtures/rect.html index d105c2e62..b7e3d89a1 100644 --- a/test/wv/html_fixtures/rect.html +++ b/test/wv/html_fixtures/rect.html @@ -1,7 +1,7 @@ -
+
-

Behold, the mighty rectangle!

-
+

Behold, the mighty rectangle!

+
diff --git a/test/wv/html_fixtures/rotate_shapes.html b/test/wv/html_fixtures/rotate_shapes.html index b4d2430aa..b2cc14b81 100644 --- a/test/wv/html_fixtures/rotate_shapes.html +++ b/test/wv/html_fixtures/rotate_shapes.html @@ -1,12 +1,12 @@ -
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/test/wv/html_fixtures/ruby_racer.html b/test/wv/html_fixtures/ruby_racer.html index 569c8bba1..f87a22311 100644 --- a/test/wv/html_fixtures/ruby_racer.html +++ b/test/wv/html_fixtures/ruby_racer.html @@ -1,24 +1,24 @@ -
+
-
+
-
+
-

Racer 1

- +

Racer 1

+
-
+
-

Racer 2

- +

Racer 2

+
-
-
-

+
+
+

diff --git a/test/wv/html_fixtures/scarpe_ext.html b/test/wv/html_fixtures/scarpe_ext.html index 6db4653e4..8ecd9a30b 100644 --- a/test/wv/html_fixtures/scarpe_ext.html +++ b/test/wv/html_fixtures/scarpe_ext.html @@ -1,5 +1,5 @@ -
-
+
+
diff --git a/test/wv/html_fixtures/selfitude.html b/test/wv/html_fixtures/selfitude.html index 1135ac450..ccedc3f8a 100644 --- a/test/wv/html_fixtures/selfitude.html +++ b/test/wv/html_fixtures/selfitude.html @@ -1,9 +1,9 @@ -
+
-
+
- +
diff --git a/test/wv/html_fixtures/shoes_school.html b/test/wv/html_fixtures/shoes_school.html index 508081fcd..1110bb3a1 100644 --- a/test/wv/html_fixtures/shoes_school.html +++ b/test/wv/html_fixtures/shoes_school.html @@ -1,20 +1,20 @@ -
+
-
+
-

Shoes School!

+

Shoes School!

-
+
-
+
- +
-
+
-


+


Welcome! To the wide, wild, wonderful world of Shoes. I am your Shoes School instructor, Professor Flopsicle. Shoes lets you
write nifty desktop apps. In pure Ruby! Don't believe me? Here's one right here!
Click "run" to run it. You can even play with the code a bit if you want!
@@ -23,13 +23,13 @@

-
+
-
-
+
+
-
-
+
+
diff --git a/test/wv/html_fixtures/shoes_splorer.html b/test/wv/html_fixtures/shoes_splorer.html index 929240fad..2d84ff136 100644 --- a/test/wv/html_fixtures/shoes_splorer.html +++ b/test/wv/html_fixtures/shoes_splorer.html @@ -1,14 +1,14 @@ -
+
-

What Shoes methods are available?

-

animate[Woot!]

-

oarrow oarc oline ooval orect ostar oshape xmask

-

element[Woot!]

-

xmouse omotion xresize ohover oleave okeypress xkeyrelease xappend xvisit xscroll_top xclipboard odownload xgutter

-

oimage ovideo xsound

-

xxxsetupxxx

-

ostyle ofill ostroke xcap orotate ostrokewidth xtransform xtranslate onostroke onofill

-

obanner otitle osubtitle otagline ocaption opara oinscription ocode odel oem oins osub osup ostrong xfg xbg olink ospan

+

What Shoes methods are available?

+

animate[Woot!]

+

oarrow oarc oline ooval orect ostar oshape xmask

+

element[Woot!]

+

xmouse omotion xresize ohover oleave okeypress xkeyrelease xappend xvisit xscroll_top xclipboard odownload xgutter

+

oimage ovideo xsound

+

xxxsetupxxx

+

ostyle ofill ostroke xcap orotate ostrokewidth xtransform xtranslate onostroke onofill

+

obanner otitle osubtitle otagline ocaption opara oinscription ocode odel oem oins osub osup ostrong xfg xbg olink ospan

diff --git a/test/wv/html_fixtures/show_hide.html b/test/wv/html_fixtures/show_hide.html index 3d03bb567..4abe1a50b 100644 --- a/test/wv/html_fixtures/show_hide.html +++ b/test/wv/html_fixtures/show_hide.html @@ -1,5 +1,5 @@ -
-
+
+
diff --git a/test/wv/html_fixtures/simple_slides.html b/test/wv/html_fixtures/simple_slides.html index 219c52ce7..131887fe6 100644 --- a/test/wv/html_fixtures/simple_slides.html +++ b/test/wv/html_fixtures/simple_slides.html @@ -1,15 +1,15 @@ -
+
-
+
- -

Slide 1: Welcome to Shoes!

-

Ah, yeah, Shoes!
+ +

Slide 1: Welcome to Shoes!

+

Ah, yeah, Shoes!
Who said nobody knows Shoes? Well, let me introduce you to a feline expert in the art of Ruby Desktop GUI Libs.

Meet Professor Whiskers the renowned programmer cat! Not only does he know Shoes, but he's also a master of all things Ruby and desktop GUI!
@@ -20,7 +20,7 @@
Meow! join the discord server for more meows!

- +
diff --git a/test/wv/html_fixtures/simpler-menu.html b/test/wv/html_fixtures/simpler-menu.html index de3a926e5..92180dcd7 100644 --- a/test/wv/html_fixtures/simpler-menu.html +++ b/test/wv/html_fixtures/simpler-menu.html @@ -1,30 +1,34 @@ -
+
-
+
-
-

Box 1

+
+
+

Box 1

-
+
-
-

Box 2

+
+
+

Box 2

-
+
-
-

Box 3

+
+
+

Box 3

-
+
-
-

Box 4

+
+
+

Box 4

diff --git a/test/wv/html_fixtures/sleepless.html b/test/wv/html_fixtures/sleepless.html index 33a82721a..24f573776 100644 --- a/test/wv/html_fixtures/sleepless.html +++ b/test/wv/html_fixtures/sleepless.html @@ -1,6 +1,6 @@ -
-
-

😪

+
+
+

😪

diff --git a/test/wv/html_fixtures/slots.html b/test/wv/html_fixtures/slots.html index 63b4d51e6..2796d4b1e 100644 --- a/test/wv/html_fixtures/slots.html +++ b/test/wv/html_fixtures/slots.html @@ -1,10 +1,10 @@ -
+
-
-
+
+
-
-
+
+
diff --git a/test/wv/html_fixtures/spacing.html b/test/wv/html_fixtures/spacing.html index b75434ef7..7effaf2ba 100644 --- a/test/wv/html_fixtures/spacing.html +++ b/test/wv/html_fixtures/spacing.html @@ -1,23 +1,27 @@ -
+
-
+
-

with 50px margin

+
+

with 50px margin

-
+
-

with 10px margin-left and margin-right, and 20px margin-bottom

+
+

with 10px margin-left and margin-right, and 20px margin-bottom

-
+
-

with 15px margin-left and margin-right, and 40px margin-bottom

+
+

with 15px margin-left and margin-right, and 40px margin-bottom

-
+
-

with 20px margin-left, 30px margin-right, and 10px margin-bottom

+
+

with 20px margin-left, 30px margin-right, and 10px margin-bottom

diff --git a/test/wv/html_fixtures/span.html b/test/wv/html_fixtures/span.html index 7e92011ac..2e32ad8d8 100644 --- a/test/wv/html_fixtures/span.html +++ b/test/wv/html_fixtures/span.html @@ -1,13 +1,13 @@ -
+
-
+
-

TEXT EDITOR * USE ALT-Q TO QUIT

+

TEXT EDITOR * USE ALT-Q TO QUIT

-

Various text in various styles can be hard to read...
+

Various text in various styles can be hard to read...

-

A wide variety of underlines

+

A wide variety of underlines

diff --git a/test/wv/html_fixtures/text_change.html b/test/wv/html_fixtures/text_change.html index 4568dde16..e2971a2a9 100644 --- a/test/wv/html_fixtures/text_change.html +++ b/test/wv/html_fixtures/text_change.html @@ -1,6 +1,6 @@ -
+
-

Goodbye

+

Goodbye

diff --git a/test/wv/html_fixtures/text_sizes.html b/test/wv/html_fixtures/text_sizes.html index ba38de8f1..2a9c758cf 100644 --- a/test/wv/html_fixtures/text_sizes.html +++ b/test/wv/html_fixtures/text_sizes.html @@ -1,12 +1,12 @@ -
+
-

Banner

-

Title

-

Subtitle

-

Tagline

-

Caption

-

Para

-

Inscription

+

Banner

+

Title

+

Subtitle

+

Tagline

+

Caption

+

Para

+

Inscription

diff --git a/test/wv/html_fixtures/timmy.html b/test/wv/html_fixtures/timmy.html index b51e2d1ac..91e717bfe 100644 --- a/test/wv/html_fixtures/timmy.html +++ b/test/wv/html_fixtures/timmy.html @@ -1,59 +1,64 @@ -
+
-
-

You've downloaded a virus!

+
+
+

You've downloaded a virus!

-
+
-
+
-
-

You thought this was a recipe for cookies, but it was me, your arch nemesis!
+

+
+

You thought this was a recipe for cookies, but it was me, your arch nemesis!

-
-

I have taken over your computer and will not give it back until you pay me $1,000,000.

+
+

I have taken over your computer and will not give it back until you pay me $1,000,000.

-
+
-
+
-
+
+
-
+
-
-

Pay me now or I will delete all your files!
+

+
+

Pay me now or I will delete all your files!
Courtesy, the Pirates of the Highlands 🏴‍☠️

-
-

💰

+
+

💰

-
+
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/test/wv/html_fixtures/title_and_resize.html b/test/wv/html_fixtures/title_and_resize.html index cf02203de..26d532fa5 100644 --- a/test/wv/html_fixtures/title_and_resize.html +++ b/test/wv/html_fixtures/title_and_resize.html @@ -1,6 +1,6 @@ -
+
-

Boy howdy! Now we're talking!

+

Boy howdy! Now we're talking!

diff --git a/test/wv/html_fixtures/video.html b/test/wv/html_fixtures/video.html index 63705fdc4..ab8dd4880 100644 --- a/test/wv/html_fixtures/video.html +++ b/test/wv/html_fixtures/video.html @@ -1,15 +1,15 @@ -
+
-
+
-

Video

- +

Video

+
-
+
-

Video 2

- +

Video 2

+