diff --git a/htdocs/product/composition/fiche.php b/htdocs/product/composition/fiche.php index 8e6eb637dac..b56f3ce6227 100644 --- a/htdocs/product/composition/fiche.php +++ b/htdocs/product/composition/fiche.php @@ -360,9 +360,6 @@ if ($id > 0 || ! empty($ref)) print_fiche_titre($langs->trans("ProductToAddSearch"),'',''); print '
'; print '
'; - print ''; - - print ''; @@ -378,9 +375,7 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; } - print '
'; print ''; print $langs->trans("KeywordFilter").'   '; print '
'.$langs->trans("CategoryFilter").'   '.$form->select_all_categories(0, $parent).'
'; - print '
'; print '
'; } diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php index a3041911b01..7229c0cda9d 100644 --- a/htdocs/public/test/test_arrays.php +++ b/htdocs/public/test/test_arrays.php @@ -69,6 +69,24 @@ Example 1 : Table using tags: div.tagtable+form+div or div.tagtable+div.tagtr+di
+
+
line3
+
dfsdf
+
ffdsfsd
+
aaaa
+
+
+
line4
+
dfsdf
+
+
bbbb
+
+
+
line5
+
dfsdf
+
+
bbbb
+
-
-
line3
-
dfsdf
-
ffdsfsd
-
aaaa
-
-
-
line4
-
dfsdf
-
-
bbbb
-
diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php index 85deb2039f6..3fe179ad34f 100644 --- a/htdocs/theme/amarok/style.css.php +++ b/htdocs/theme/amarok/style.css.php @@ -1159,14 +1159,14 @@ table.notopnoleftnoright { margin:0px; } -table.border, table.dataTable, .table-border, .table-border-col, .table-key-border-col, .table-val-border-col { +table.border, table.dataTable, .table-border, .table-border-col, .table-key-border-col, .table-val-border-col, div.border { border:1px solid #dddddd; border-collapse:collapse; padding:1px 0px; padding-left:2px; } -table.border td { +table.border td, div.border div div.tagtd { padding:1px 0px; border:1px solid #dddddd; border-collapse:collapse; @@ -2226,6 +2226,9 @@ ul.ulmenu { .ui-mobile fieldset { border-bottom: none !important; } +.ui-body-c, .ui-btn-up-c, .ui-btn-hover-c { + border: none !important; +} /* Style for first level menu with jmobile */ .ui-bar-b { diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index f32449c5d0a..9dcae0fd305 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -1245,19 +1245,19 @@ margin: 0px 0px 0px 0px; } -table.border, table.dataTable, .table-border, .table-border-col, .table-key-border-col, .table-val-border-col { +table.border, table.dataTable, .table-border, .table-border-col, .table-key-border-col, .table-val-border-col, div.border { border: 1px solid #9CACBB; border-collapse: collapse; padding: 1px 2px 2px 1px; /* t r b l */ } -table.border td { +table.border td, div.border div div.tagtd { padding: 1px 2px; border: 1px solid #9CACBB; border-collapse: collapse; } -td.border { +td.border, div.tagtable div div.border { border-top: 1px solid #000000; border-right: 1px solid #000000; border-bottom: 1px solid #000000; @@ -2398,6 +2398,9 @@ ul.ulmenu { .ui-mobile fieldset { border-bottom: none !important; } +.ui-body-c, .ui-btn-up-c, .ui-btn-hover-c { + border: none !important; +} /* Style for first level menu with jmobile */ .ui-bar-b, .lilevel0 { diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index 3929686a2e1..24ad3f941e7 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -1369,7 +1369,7 @@ margin: 0px 0px 0px 0px; } -table.border, table.dataTable, .table-border, .table-border-col, .table-key-border-col, .table-val-border-col { +table.border, table.dataTable, .table-border, .table-border-col, .table-key-border-col, .table-val-border-col, div.border { border-collapse: collapse; padding: 10px; border-spacing: 2px; @@ -1391,7 +1391,7 @@ table.border.formdoc td { border: none; } -table.border td { +table.border td, div.border div div.tagtd { padding: 4px; border: 1px solid #EFEFEF; border-spacing: 0px; @@ -1403,7 +1403,7 @@ table.border table td { border: none; } -td.border { +td.border, div.tagtable div div.border { border-top: 1px solid #000000; border-right: 1px solid #000000; border-bottom: 1px solid #000000; @@ -2561,6 +2561,9 @@ ul.ulmenu { border-radius: 0; -webkit-border-radius: 0; } +.ui-body-c, .ui-btn-up-c, .ui-btn-hover-c { + border: none !important; +} /* Style for first level menu with jmobile */ .ui-bar-b, .lilevel0 { diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php index 629730da160..23854bec688 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -1402,19 +1402,19 @@ margin: 0px 0px 0px 0px; } -table.border, table.dataTable, .table-border, .table-border-col, .table-key-border-col, .table-val-border-col { +table.border, table.dataTable, .table-border, .table-border-col, .table-key-border-col, .table-val-border-col, div.border { border: 1px solid #9CACBB; border-collapse: collapse; padding: 1px 2px; } -table.border td { +table.border td, div.border div div.tagtd { padding: 1px 2px; border: 1px solid #9CACBB; border-collapse: collapse; } -td.border { +td.border, div.tagtable div div.border { border-top: 1px solid #000000; border-right: 1px solid #000000; border-bottom: 1px solid #000000; @@ -2482,6 +2482,9 @@ ul.ulmenu { color: # !important; } +.ui-body-c, .ui-btn-up-c, .ui-btn-hover-c { + border: none !important; +} .alilevel0 { color: # !important; text-shadow: 1px 0px 1px #; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index b59384c41f8..0adafcccc0a 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1605,19 +1605,19 @@ span.butAction, span.butActionDelete { } -table.border, table.dataTable, .table-border, .table-border-col, .table-key-border-col, .table-val-border-col { +table.border, table.dataTable, .table-border, .table-border-col, .table-key-border-col, .table-val-border-col, div.border { border: 1px solid #D0D0D0; border-collapse: collapse; padding: 1px 2px 1px 3px; /* t r b l */ } -table.border td { +table.border td, div.border div div.tagtd { padding: 1px 2px 1px 2px; border: 1px solid #D0D0D0; border-collapse: collapse; } -td.border { +td.border, div.tagtable div div.border { border-top: 1px solid #000000; border-right: 1px solid #000000; border-bottom: 1px solid #000000; @@ -2831,6 +2831,9 @@ ul.ulmenu { color: # !important; text-shadow: 1px 0px 1px #; } +.ui-body-c, .ui-btn-up-c, .ui-btn-hover-c { + border: none !important; +} .ui-btn-up-c .vsmenudisabled { color: # !important; text-shadow: none !important; @@ -2855,7 +2858,14 @@ ul.ulmenu { background-image: -o-linear-gradient( #ccc,#c1c1c1 ) !important; background-image: linear-gradient( #ccc,#c1c1c1 ) !important; } - + +.overflowwithjm200 +{ + max-width: 200px; + overflow: hidden; + white-space: nowrap; +} + close();