From 53e4cb3af926bf52c06bf3a2faee75346ae270b7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Oct 2015 17:21:38 +0200
Subject: [PATCH] Several fix in CSS
---
htdocs/theme/eldy/img/sort_asc.png | Bin 256 -> 248 bytes
htdocs/theme/eldy/img/sort_desc.png | Bin 264 -> 260 bytes
htdocs/theme/eldy/style.css.php | 10 +-
htdocs/theme/md/style.css.php | 150 ++++++++++++++++++++++------
4 files changed, 123 insertions(+), 37 deletions(-)
diff --git a/htdocs/theme/eldy/img/sort_asc.png b/htdocs/theme/eldy/img/sort_asc.png
index aca0f6eb77aa8b601a073daa9a94bfa9bd5cc7e8..82b250c72bd73cedf7196138285647383a216300 100644
GIT binary patch
delta 177
zcmV;i08ama0{8)tB#|*Le+mf>G6?Z8qBsBm0EJ0JK~y-)?b4wQ!cY{3(Q^@ykT3;~
z88D22M5EaQ24D{qiy-j`3@PSfsA(Er+SHKrPd@kVQ7<ynP@5QVMJyub5pj%&X;I6}
zpW%Qv_QkgaXoWixH!OQ$2%NuA-3ieL+u+f_o>+Inu)wte)m<>_CxY!z;nh-wZQEV^
f@24HH5gTA1#Wet2_%IXM00000NkvXXu0mjf_YO-w
delta 183
zcmV;o07(D%0e}LKBnkm@Qb$4nuFf3kks&dE1p^K=E9l_^c>n+afJsC_R5;7+(lHJ}
zK@fo9Sp|v2DRj=DaSWwe?H<no+(YFeO1(lOPxC2g$R=xfjpY5wG@F^P+Jxw;L3G$B
z*f=7Zh!_?(QJM{ISeJH7&<rP!j+lOnCG5PmeZE&?3!LAu3+A=h1PA%{7}a1aw76y>
lro}RMm;U<G_E?Yo+8uFJciV*yXmJ1l002ovPDHLkV1jhJP|yGX
diff --git a/htdocs/theme/eldy/img/sort_desc.png b/htdocs/theme/eldy/img/sort_desc.png
index 57c1ad0fcb41a2dac762e6d46dc4556590002172..a5aa5f4e506530874aa5814fa5aa354c5b8f4f72 100644
GIT binary patch
delta 189
zcmV;u07CzW0)zsPB#|*Le+mf>G8zJi({KO)0Fg;VK~y-)?bIO-gFq04;r}7pgoIPn
z^$ayV2C}-Ed(Z>)9#vcfiAU5BFoRh|rwdI;ieQpwcHew*WM-^22`kQy?bzQiNx7t6
zQs<<XbaOQ``v`CZUVu5NfXv<V9s_s*-V>+=u3vW|n1IIwdjk3yGYjAer~}jh=V(9n
r8NfR*0L5%~0d@dNAf4-Kv&V4+V3ZPE5OdhM00000NkvXXu0mjf9C=JO
delta 191
zcmV;w06_nQ0*C^TBnkm@Qb$4nuFf3kks&dE1p^K>AJ9(5jQ{`uh)G02R5;7+)G-bL
zQ5Xc^Sp|v2DRj=DaSWwe?H(M!Jyb5D)GIWynoqNpJeFh=ik;+dUS_`XRY+GEq{H-B
zkNpx`CaII$3Rfpt6;~+T2nXdHF)8g{VZj{NC+LF3tIa#C!tM#%H}79#!4#(kI%D=K
tuHS|QYuvGE>wba_vBkKpTm9|l_yFr5ciURC7Lxz~002ovPDHLkV1mzcQkDP!
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 2eddc0eba23..62707beec64 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -537,7 +537,7 @@ td.showDragHandle {
float: none;
vertical-align: top;
}
-#id-right { /* This must stay id-right ant not be replaced with echo $right */
+#id-right { /* This must stay id-right and not be replaced with echo $right */
width: 100%;
}
#id-left {
@@ -1894,7 +1894,7 @@ tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd
table.border, table.dataTable, .table-border, .table-border-col, .table-key-border-col, .table-val-border-col, div.border {
border: 1px solid #E0E0E0;
- border-collapse: collapse;
+ border-collapse: collapse !important;
padding: 1px 2px 1px 3px; /* t r b l */
}
@@ -3362,7 +3362,7 @@ table.dataTable tr.odd td.sorting_1, table.dataTable tr.even td.sorting_1 {
background-color: #FFF !important;
border-radius: inherit !important;
}
-.paging_full_numbers a.paginate_button_disabled:hover {
+.paging_full_numbers a.paginate_button_disabled:hover, .paging_full_numbers a.disabled:hover {
background-color: #FFF !important;
}
.paginate_button, .paginate_active {
@@ -3390,7 +3390,9 @@ div.dataTables_length {
div.dataTables_length select {
background: #fff;
}
-
+.dataTables_wrapper .dataTables_paginate {
+ padding-top: 0px !important;
+}
/* ============================================================================== */
/* Select2 */
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 0db79b5470a..336505215b5 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -456,6 +456,10 @@ textarea.centpercent {
div.divsearchfield {
float: <?php print $left; ?>;
margin-<?php print $right; ?>: 12px;
+ margin-<?php print $left; ?>: 2px;
+ margin-top: 3px;
+ margin-bottom: 3px;
+ padding-left: 2px;
}
div.confirmmessage {
padding-top: 6px;
@@ -1788,7 +1792,7 @@ tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd
table.border, table.dataTable, .table-border, .table-border-col, .table-key-border-col, .table-val-border-col, div.border {
border: 1px solid #f4f4f4;
- border-collapse: collapse;
+ border-collapse: collapse !important;
padding: 1px 2px 1px 3px; /* t r b l */
}
@@ -1822,7 +1826,7 @@ td.border, div.tagtable div div.border {
/* Main boxes */
-table.noborder, table.formdoc, div.noborder {
+table.liste, table.noborder, table.formdoc, div.noborder {
width: 100%;
border-collapse: separate !important;
@@ -1856,6 +1860,9 @@ table.noborder tr, div.noborder form {
height: 26px;
}
+table.liste th, table.noborder th {
+ padding: 5px 2px 5px 3px; /* t r b l */
+}
table.noborder th, table.noborder td, div.noborder form, div.noborder form div {
padding: 1px 2px 1px 3px; /* t r b l */
}
@@ -1883,35 +1890,9 @@ td.borderright {
border-right-style: solid !important;
}
-/* For lists */
-
-table.liste {
- width: 100%;
- border-collapse: collapse;
- border-top-color: #FEFEFE;
-
- border-right-width: 1px;
- border-right-color: #CCC;
- border-right-style: solid;
-
-/*
- border-bottom-width: 1px;
- border-bottom-color: #BBBBBB;
- border-bottom-style: solid;
-*/
- border-left-width: 1px;
- border-left-color: #CCC;
- border-left-style: solid;
-
- margin-bottom: 2px;
- margin-top: 0px;
-
- -moz-box-shadow: 0px 3px 4px #CCC;
- -webkit-box-shadow: 0px 3px 4px #CC;
- box-shadow: 0px 3px 4px #CCC;
-}
-table.liste td {
- padding-right: 2px;
+/* For table with no filter before */
+table.listwithfilterbefore {
+ border-top: none !important;
}
.tagtable, .table-border { display: table; }
@@ -2050,6 +2031,9 @@ div.pagination li.pagination .active {
div.pagination li.paginationafterarrows {
margin-left: 10px;
}
+.paginationatbottom {
+ margin-top: 9px;
+}
/* Prepare to remove class pair - impair
.noborder > tbody > tr:nth-child(even) td {
@@ -2139,6 +2123,29 @@ div.liste_titre .tagtd {
}
div.liste_titre {
min-height: 26px !important; /* We cant use height because it's a div and it should be higher if content is more. but min-height doe not work either for div */
+
+ padding-top: 2px;
+ padding-bottom: 2px;
+
+ border-right-width: 1px;
+ border-right-color: #BBB;
+ border-right-style: solid;
+
+ border-left-width: 1px;
+ border-left-color: #BBB;
+ border-left-style: solid;
+
+ border-top-width: 1px;
+ border-top-color: #BBB;
+ border-top-style: solid;
+}
+div.liste_titre_bydiv {
+ box-shadow: none;
+ border-collapse: collapse;
+ display: table;
+ padding: 2px 0px 2px 0;
+ box-shadow: 2px 2px 4px #CCC;
+ width: calc(100% - 1px); /* 1px more, i don't know why */
}
tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable.tr
{
@@ -2425,7 +2432,12 @@ td.legendLabel { padding: 2px 2px 2px 0 !important; }
margin-bottom: 2px;
margin-top: 2px;
}
-.photointooltip {
+.photowithmargin {
+/* -webkit-box-shadow: 0px 0px 3px #777;
+ -moz-box-shadow: 0px 0px 3px #777;
+ box-shadow: 0px 0px 3px #777;*/
+}
+.photointoolitp {
margin-top: 8px;
float: left;
/*text-align: center; */
@@ -3221,7 +3233,7 @@ table.dataTable tr.odd td.sorting_1, table.dataTable tr.even td.sorting_1 {
background-color: #FFF !important;
border-radius: inherit !important;
}
-.paging_full_numbers a.paginate_button_disabled:hover {
+.paging_full_numbers a.paginate_button_disabled:hover, .paging_full_numbers a.disabled:hover {
background-color: #FFF !important;
}
.paginate_button, .paginate_active {
@@ -3242,10 +3254,26 @@ table.dataTable tr.odd td.sorting_1, table.dataTable tr.even td.sorting_1 {
background-image: none;
}
+div.dataTables_length {
+ float: right !important;
+ padding-left: 8px;
+}
+div.dataTables_length select {
+ background: #fff;
+}
+.dataTables_wrapper .dataTables_paginate {
+ padding-top: 0px !important;
+}
+
+
/* ============================================================================== */
/* Select2 */
/* ============================================================================== */
+.selectoptiondisabledwhite {
+ background: #FFFFFF !important;
+}
+
.select2-choice,
.select2-drop.select2-drop-above.select2-drop-active,
.select2-container-active .select2-choice,
@@ -3333,6 +3361,62 @@ a span.select2-chosen
}
+/* ============================================================================== */
+/* Multiselect with checkbox */
+/* ============================================================================== */
+
+dl.dropdown {
+ margin:0px;
+ padding:0px;
+}
+.dropdown dd, .dropdown dt {
+ margin:0px;
+ padding:0px;
+}
+.dropdown ul {
+ margin: -1px 0 0 0;
+ text-align: left;
+}
+.dropdown dd {
+ position:relative;
+}
+.dropdown dt a {
+ display:block;
+ overflow: hidden;
+ border:0;
+}
+.dropdown dt a span, .multiSel span {
+ cursor:pointer;
+ display:inline-block;
+ padding: 0 3px 2px 0;
+}
+.dropdown dd ul {
+ background-color: #FFF;
+ border: 1px solid #888;
+ display:none;
+ right:0px; /* pop is align on right */
+ padding: 2px 15px 2px 5px;
+ position:absolute;
+ top:2px;
+ list-style:none;
+ max-height: 200px;
+ overflow: auto;
+}
+.dropdown span.value {
+ display:none;
+}
+.dropdown dd ul li {
+ white-space: nowrap;
+}
+.dropdown dd ul li a {
+ padding:5px;
+ display:block;
+}
+.dropdown dd ul li a:hover {
+ background-color:#fff;
+}
+
+
/* ============================================================================== */
/* JMobile */
/* ============================================================================== */
--
GitLab