From ae577ae108e6c01be1ef6d318e4065aab3cb0b87 Mon Sep 17 00:00:00 2001 From: TJ VanToll Date: Wed, 22 Oct 2014 22:21:58 -0400 Subject: [PATCH 1/3] Tests: Adding missing dependency --- tests/visual/compound/datepicker_dialog.html | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/visual/compound/datepicker_dialog.html b/tests/visual/compound/datepicker_dialog.html index e6a25a2e8df..52c91a0835b 100644 --- a/tests/visual/compound/datepicker_dialog.html +++ b/tests/visual/compound/datepicker_dialog.html @@ -12,6 +12,7 @@ + - - - - - - - - - - - - - - - - - - - - - - -
- - -

Accordion

-
-
-
-

First

-
Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet.
-
-
-

Second

-
Phasellus mattis tincidunt nibh.
-
-
-

Third

-
Nam dui erat, auctor a, dignissim quis.
-
-
-
-
-
-
-

First no icons

-
Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet.
-
-
-

Second no icons

-
Phasellus mattis tincidunt nibh.
-
-
-

Third no icons

-
Nam dui erat, auctor a, dignissim quis.
-
-
-
- - - -

Tabs

-
- -
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
-
Phasellus mattis tincidunt nibh. Cras orci urna, blandit id, pretium vel, aliquet ornare, felis. Maecenas scelerisque sem non nisl. Fusce sed lorem in enim dictum bibendum.
-
Nam dui erat, auctor a, dignissim quis, sollicitudin eu, felis. Pellentesque nisi urna, interdum eget, sagittis et, consequat vestibulum, lacus. Mauris porttitor ullamcorper augue.
-
- - -

Dialog

-

Open Dialog

- -
Inline Dialogclose
-

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

-
- - -

Overlay and Shadow Classes (not currently used in UI widgets)

-
-

Lorem ipsum dolor sit amet, Nulla nec tortor. Donec id elit quis purus consectetur consequat.

Nam congue semper tellus. Sed erat dolor, dapibus sit amet, venenatis ornare, ultrices ut, nisi. Aliquam ante. Suspendisse scelerisque dui nec velit. Duis augue augue, gravida euismod, vulputate ac, facilisis id, sem. Morbi in orci.

Nulla purus lacus, pulvinar vel, malesuada ac, mattis nec, quam. Nam molestie scelerisque quam. Nullam feugiat cursus lacus.orem ipsum dolor sit amet, consectetur adipiscing elit. Donec libero risus, commodo vitae, pharetra mollis, posuere eu, pede. Nulla nec tortor. Donec id elit quis purus consectetur consequat.

Nam congue semper tellus. Sed erat dolor, dapibus sit amet, venenatis ornare, ultrices ut, nisi. Aliquam ante. Suspendisse scelerisque dui nec velit. Duis augue augue, gravida euismod, vulputate ac, facilisis id, sem. Morbi in orci. Nulla purus lacus, pulvinar vel, malesuada ac, mattis nec, quam. Nam molestie scelerisque quam.

Nullam feugiat cursus lacus.orem ipsum dolor sit amet, consectetur adipiscing elit. Donec libero risus, commodo vitae, pharetra mollis, posuere eu, pede. Nulla nec tortor. Donec id elit quis purus consectetur consequat. Nam congue semper tellus. Sed erat dolor, dapibus sit amet, venenatis ornare, ultrices ut, nisi. Aliquam ante.

Suspendisse scelerisque dui nec velit. Duis augue augue, gravida euismod, vulputate ac, facilisis id, sem. Morbi in orci. Nulla purus lacus, pulvinar vel, malesuada ac, mattis nec, quam. Nam molestie scelerisque quam. Nullam feugiat cursus lacus.orem ipsum dolor sit amet, consectetur adipiscing elit. Donec libero risus, commodo vitae, pharetra mollis, posuere eu, pede. Nulla nec tortor. Donec id elit quis purus consectetur consequat. Nam congue semper tellus. Sed erat dolor, dapibus sit amet, venenatis ornare, ultrices ut, nisi.

- - -
-
-
-

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

-
-
- -
- - - -
-

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

-
- - - -

Framework Icons (content color preview)

- - - - -

Slider

-
-
-
-
-
- 88 - 77 - 55 - 33 - 40 - 45 - 70 -
-
- - - -

Datepicker

-
-
-
-
-
-
- - - -

Progressbar

-
- - -

Highlight / Error

-
-
-

- Hey! Sample ui-state-highlight style.

-
-
-
-
-
-

- Alert: Sample ui-state-error style.

-
-
- -

Button

- -
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - From 3002d460de2b854243d99634e69d394dfca78886 Mon Sep 17 00:00:00 2001 From: TJ VanToll Date: Fri, 24 Oct 2014 07:18:50 -0700 Subject: [PATCH 3/3] Theme: Change default widget font-size to 1em Fixes #10131 Closes gh-1374 --- demos/demos.css | 3 --- demos/dialog/modal-form.html | 1 - tests/index.css | 3 --- tests/visual/dialog/complex-dialogs.html | 5 ----- tests/visual/dialog/stacking.html | 5 ----- tests/visual/menu/menu.html | 4 +--- tests/visual/selectmenu/selectmenu.html | 1 - tests/visual/visual.css | 1 - themes/base/theme.css | 2 +- 9 files changed, 2 insertions(+), 23 deletions(-) diff --git a/demos/demos.css b/demos/demos.css index da9ad833afa..555352e3583 100644 --- a/demos/demos.css +++ b/demos/demos.css @@ -1,5 +1,4 @@ body { - font-size: 62.5%; font-family: "Trebuchet MS", "Arial", "Helvetica", "Verdana", "sans-serif"; } @@ -10,8 +9,6 @@ table { .demo-description { clear: both; padding: 12px; - font-size: 1.3em; - line-height: 1.4em; } .ui-draggable, .ui-droppable { diff --git a/demos/dialog/modal-form.html b/demos/dialog/modal-form.html index 6e36bb9d645..b09f4e91e8f 100644 --- a/demos/dialog/modal-form.html +++ b/demos/dialog/modal-form.html @@ -16,7 +16,6 @@ - - body { font-size:62.5%; } - .ui-menu { width: 200px; margin-bottom: 2em; } - .menu2-container { width: 220px; } + .ui-menu { width: 250px; margin-bottom: 2em; } .menu4 { height: 225px; overflow-y: auto; overflow-x: hidden; } .address-item { border-bottom: 1px solid #999; } .address-header { display: block; margin-bottom: .2em; font-weight: bold; } diff --git a/tests/visual/selectmenu/selectmenu.html b/tests/visual/selectmenu/selectmenu.html index 6558c4a8a39..5ccfc8f63df 100644 --- a/tests/visual/selectmenu/selectmenu.html +++ b/tests/visual/selectmenu/selectmenu.html @@ -122,7 +122,6 @@ }); - body { font-size:62.5%; } fieldset { border: 0; } label { display: block; } select { width: 200px; } diff --git a/tests/visual/visual.css b/tests/visual/visual.css index b61fc0e9dbf..dffbdd2fcd9 100644 --- a/tests/visual/visual.css +++ b/tests/visual/visual.css @@ -1,3 +1,2 @@ -body { font-size: 62.5%; } #draggable, #resizable { width: 100px; height: 100px; background: #abc; } #droppable { width: 100px; height: 100px; background: #cde; } diff --git a/themes/base/theme.css b/themes/base/theme.css index 510d6fc5b33..cda87011a61 100644 --- a/themes/base/theme.css +++ b/themes/base/theme.css @@ -16,7 +16,7 @@ ----------------------------------*/ .ui-widget { font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; - font-size: 1.1em/*{fsDefault}*/; + font-size: 1em/*{fsDefault}*/; } .ui-widget .ui-widget { font-size: 1em;