From 99238a5a42b0745876ed3917c420f85bc5bfc5a6 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 1 Sep 2015 11:41:42 +0200 Subject: [PATCH 1/7] custom checkbox style --- core/img/actions/checkbox-checked.png | Bin 0 -> 265 bytes core/img/actions/checkbox-checked.svg | 4 ++++ core/img/actions/checkbox-mixed.png | Bin 0 -> 135 bytes core/img/actions/checkbox-mixed.svg | 4 ++++ core/img/actions/checkbox.png | Bin 0 -> 130 bytes core/img/actions/checkbox.svg | 4 ++++ 6 files changed, 12 insertions(+) create mode 100644 core/img/actions/checkbox-checked.png create mode 100644 core/img/actions/checkbox-checked.svg create mode 100644 core/img/actions/checkbox-mixed.png create mode 100644 core/img/actions/checkbox-mixed.svg create mode 100644 core/img/actions/checkbox.png create mode 100644 core/img/actions/checkbox.svg diff --git a/core/img/actions/checkbox-checked.png b/core/img/actions/checkbox-checked.png new file mode 100644 index 0000000000000000000000000000000000000000..309069226b815130f8cd503a6b759f777c2b1ac8 GIT binary patch literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!cYsfbE0CrZc$Q#Q0yImaB*-tA zfr*(_xW2KuwX1u=y!i_jE?R#0$k8+R-uwTU#|cyu>gnPbQgN%d&r_&DfrsU|#*XGL z?|=V;v{_x3?76W0<(d@_pZGK!koQWg(d4;h-IYBp$8qK3mj*`PCtW__C!sds^3rVP pmFbFVX?r*2{I?HbIm@n9!Fci)*TaZSvQI!B@^tlcS?83{1OWY}MpFO) literal 0 HcmV?d00001 diff --git a/core/img/actions/checkbox-checked.svg b/core/img/actions/checkbox-checked.svg new file mode 100644 index 0000000000..9797244085 --- /dev/null +++ b/core/img/actions/checkbox-checked.svg @@ -0,0 +1,4 @@ + + + + diff --git a/core/img/actions/checkbox-mixed.png b/core/img/actions/checkbox-mixed.png new file mode 100644 index 0000000000000000000000000000000000000000..8bc34b43b363c85a4d694a3c5667b00fd423f1c1 GIT binary patch literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJe}GSjE09J8{(R4Sfqa&dAirRS z!$*#$Jj(h8 + + + diff --git a/core/img/actions/checkbox.png b/core/img/actions/checkbox.png new file mode 100644 index 0000000000000000000000000000000000000000..4539c8930c5967e49ce0cbb39caeec4d3f3c537d GIT binary patch literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJe}GSjE09J8{(R4Sfqa&dAirRS z!$*#$Jj(h8kI+Ebd_VP8KT7)Rx(B`&HFVdQ&MBb@0IkX#MF0Q* literal 0 HcmV?d00001 diff --git a/core/img/actions/checkbox.svg b/core/img/actions/checkbox.svg new file mode 100644 index 0000000000..872df995cc --- /dev/null +++ b/core/img/actions/checkbox.svg @@ -0,0 +1,4 @@ + + + + From 7be8984fd9a6c6c3292f01d4bdbf24d80e4c0079 Mon Sep 17 00:00:00 2001 From: Raghu Nayyar Date: Sat, 5 Sep 2015 14:41:54 +0530 Subject: [PATCH 2/7] Adds background image for checkboxes --- core/css/styles.css | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/core/css/styles.css b/core/css/styles.css index 9219068dc3..570e5019dc 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -158,7 +158,24 @@ textarea:hover, textarea:focus, textarea:active { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; opacity: 1; } -input[type="checkbox"] { margin:0; padding:0; height:auto; width:auto; } +input[type="checkbox"] { + margin:0; + padding:0; + height:auto; + width:auto; + display: none; +} + +input[type="checkbox"] + label { + background: url('../img/actions/checkbox.svg') bottom right no-repeat; + opacity: 0.5; +} + +input[type="checkbox"]:checked + label { + background: url('../img/actions/checkbox-checked.svg') bottom right no-repeat; + opacity: 0.5; +} + input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:#111 !important; } input[type="time"] { width: initial; From a7b27433ef5d10309ee88dcd0634e6f76b980faa Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Fri, 11 Sep 2015 17:16:33 +0200 Subject: [PATCH 3/7] add white versions of custom checkboxes --- core/img/actions/checkbox-checked-white.png | Bin 0 -> 267 bytes core/img/actions/checkbox-checked-white.svg | 4 ++++ core/img/actions/checkbox-mixed-white.png | Bin 0 -> 135 bytes core/img/actions/checkbox-mixed-white.svg | 4 ++++ core/img/actions/checkbox-white.png | Bin 0 -> 130 bytes core/img/actions/checkbox-white.svg | 4 ++++ 6 files changed, 12 insertions(+) create mode 100644 core/img/actions/checkbox-checked-white.png create mode 100644 core/img/actions/checkbox-checked-white.svg create mode 100644 core/img/actions/checkbox-mixed-white.png create mode 100644 core/img/actions/checkbox-mixed-white.svg create mode 100644 core/img/actions/checkbox-white.png create mode 100644 core/img/actions/checkbox-white.svg diff --git a/core/img/actions/checkbox-checked-white.png b/core/img/actions/checkbox-checked-white.png new file mode 100644 index 0000000000000000000000000000000000000000..ed8e3d3d5579d4ab5bf504002ba674e34d9b1f4a GIT binary patch literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!cYsfbE0F$ACD1&Rn;mGJL`jfe zFar}at8hb8OKVs6#Ch`1boFyt=akR{0FAnfU;qFB literal 0 HcmV?d00001 diff --git a/core/img/actions/checkbox-checked-white.svg b/core/img/actions/checkbox-checked-white.svg new file mode 100644 index 0000000000..388e5588a0 --- /dev/null +++ b/core/img/actions/checkbox-checked-white.svg @@ -0,0 +1,4 @@ + + + + diff --git a/core/img/actions/checkbox-mixed-white.png b/core/img/actions/checkbox-mixed-white.png new file mode 100644 index 0000000000000000000000000000000000000000..0b81f998fc599b02e08aad5adbd533e047b286ea GIT binary patch literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJe}GSjE0F$=1p1xsWdMa(N`m}? z84e#gn(`>?8<4N;>Eakt!I-STX0Z7Hqi{q6E9V4#24lJH3{STiDE{amU6cK;;acu6{1-oD!M + + + diff --git a/core/img/actions/checkbox-white.png b/core/img/actions/checkbox-white.png new file mode 100644 index 0000000000000000000000000000000000000000..f0f903c77c6fac730541d2c2dd392e79e44e93cd GIT binary patch literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJe}GSjE0F$=1p1xsWdMa(N`m}? z84e#gn(`>?8;~#O>Eakt!I-STX0Z7Hqi{q6tKxB^9jr41{L)p9t!9W8V_3-;u{Z~) OlEKr}&t;ucLK6Ul$tZsS literal 0 HcmV?d00001 diff --git a/core/img/actions/checkbox-white.svg b/core/img/actions/checkbox-white.svg new file mode 100644 index 0000000000..3c5f6090f6 --- /dev/null +++ b/core/img/actions/checkbox-white.svg @@ -0,0 +1,4 @@ + + + + From 7ccd02ec952193fe61505e9ceafe5b96649e26fb Mon Sep 17 00:00:00 2001 From: Raghu Nayyar Date: Sat, 12 Sep 2015 20:01:00 +0530 Subject: [PATCH 4/7] Fixes white and black checkboxes in core, files will be next. --- apps/files/css/files.css | 1 + core/css/styles.css | 26 +++++++++++++++++++++----- core/templates/login.php | 2 +- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 05033dc2fe..b3652c128b 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -446,6 +446,7 @@ table td.filename .uploadtext { /* Use label to have bigger clickable size for checkbox */ #fileList tr td.filename>.selectCheckBox + label, .select-all + label { + background-position: 30px 30px; height: 50px; position: absolute; width: 50px; diff --git a/core/css/styles.css b/core/css/styles.css index 570e5019dc..2d1a4517f0 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -167,13 +167,29 @@ input[type="checkbox"] { } input[type="checkbox"] + label { - background: url('../img/actions/checkbox.svg') bottom right no-repeat; - opacity: 0.5; + background: url('../img/actions/checkbox.svg') no-repeat; + opacity: 0.7; +} + +input[type="checkbox"] + label.white { + background: url('../img/actions/checkbox-white.svg') no-repeat; } input[type="checkbox"]:checked + label { - background: url('../img/actions/checkbox-checked.svg') bottom right no-repeat; - opacity: 0.5; + background: url('../img/actions/checkbox-checked.svg') no-repeat; + opacity: 0.7; +} + +input[type="checkbox"]:checked + label.white { + background: url('../img/actions/checkbox-checked-white.svg') no-repeat; +} + +input[type="checkbox"] + label, +input[type="checkbox"] + label.white, +input[type="checkbox"]:checked + label, +input[type="checkbox"]:checked + label.white { + background-position: left; + padding-left: 20px; } input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:#111 !important; } @@ -631,7 +647,6 @@ label.infield { margin: 0; padding: 14px; padding-left: 28px; - margin-left: -28px; vertical-align: middle; } #body-login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; } @@ -831,6 +846,7 @@ label.infield { opacity: .7; } #body-login .remember-login-container { + margin-top: 10px; text-align: center; } diff --git a/core/templates/login.php b/core/templates/login.php index 513988876e..69d0b033e9 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -67,7 +67,7 @@ script('core', [ From 88bc4780557124c4cef62a72688b2f972a0d8c42 Mon Sep 17 00:00:00 2001 From: Hendrik Leppelsack Date: Tue, 15 Sep 2015 20:26:24 +0200 Subject: [PATCH 5/7] use label:before instead of label --- core/css/styles.css | 40 ++++++++++++++++++++++------------------ core/templates/login.php | 4 ++-- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index 2d1a4517f0..2ec5129a1c 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -166,33 +166,34 @@ input[type="checkbox"] { display: none; } -input[type="checkbox"] + label { - background: url('../img/actions/checkbox.svg') no-repeat; - opacity: 0.7; -} +input[type="checkbox"] + label:before { + content: ""; + display: inline-block; -input[type="checkbox"] + label.white { - background: url('../img/actions/checkbox-white.svg') no-repeat; -} + height: 20px; + width: 20px; + vertical-align: middle; -input[type="checkbox"]:checked + label { - background: url('../img/actions/checkbox-checked.svg') no-repeat; + background: url('../img/actions/checkbox.svg') left center no-repeat; opacity: 0.7; } -input[type="checkbox"]:checked + label.white { - background: url('../img/actions/checkbox-checked-white.svg') no-repeat; +input[type="checkbox"].white + label:before { + background-image: url('../img/actions/checkbox-white.svg'); } -input[type="checkbox"] + label, -input[type="checkbox"] + label.white, -input[type="checkbox"]:checked + label, -input[type="checkbox"]:checked + label.white { - background-position: left; - padding-left: 20px; +input[type="checkbox"]:checked + label:before { + background-image: url('../img/actions/checkbox-checked.svg'); +} + +input[type="checkbox"].white:checked + label:before { + background-image: url('../img/actions/checkbox-checked-white.svg'); +} + +input[type="checkbox"]:hover+label:before, input[type="checkbox"]:focus+label:before { + color:#111 !important; } -input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:#111 !important; } input[type="time"] { width: initial; height: 31px; @@ -705,6 +706,9 @@ label.infield { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; opacity: .3; } +#show + label:before, #dbpassword + label:before, #personal-show + label:before { + display: none; +} #pass2, input[name="personal-password-clone"] { padding: .6em 2.5em .4em .4em; width: 8em; diff --git a/core/templates/login.php b/core/templates/login.php index 69d0b033e9..08c7768a43 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -66,8 +66,8 @@ script('core', [ From 0ce3b19e11bdf9ac71a4992f2de6169e148754fb Mon Sep 17 00:00:00 2001 From: Hendrik Leppelsack Date: Tue, 15 Sep 2015 20:26:53 +0200 Subject: [PATCH 6/7] fix filelist checkboxes --- apps/files/css/files.css | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index b3652c128b..446848a7a6 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -420,25 +420,20 @@ table td.filename .uploadtext { } /* File checkboxes */ -#fileList tr td.filename>.selectCheckBox { - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; - filter: alpha(opacity=0); +#fileList tr td.filename>.selectCheckBox + label:before { opacity: 0; - float: left; - top: 0; - margin: 32px 0 4px 32px; /* bigger clickable area doesn’t work in FF width:2.8em; height:2.4em;*/ + position: absolute; + bottom: 4px; + right: 0; + z-index: 10; } + /* Show checkbox when hovering, checked, or selected */ -#fileList tr:hover td.filename>.selectCheckBox, -#fileList tr:focus td.filename>.selectCheckBox, -#fileList tr td.filename>.selectCheckBox:checked, -#fileList tr.selected td.filename>.selectCheckBox { +#fileList tr:hover td.filename>.selectCheckBox + label:before, +#fileList tr:focus td.filename>.selectCheckBox + label:before, +#fileList tr td.filename>.selectCheckBox:checked + label:before, +#fileList tr.selected td.filename>.selectCheckBox + label:before { opacity: 1; -} -.lte9 #fileList tr:hover td.filename>.selectCheckBox, -.lte9 #fileList tr:focus td.filename>.selectCheckBox, -.lte9 #fileList tr td.filename>.selectCheckBox[checked=checked], -.lte9 #fileList tr.selected td.filename>.selectCheckBox { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter: alpha(opacity=100); } @@ -461,7 +456,7 @@ table td.filename .uploadtext { .select-all + label { top: 0; } -.select-all { +.select-all + label:before { position: absolute; top: 18px; left: 18px; From d2d4cbc23e98bd5a4cd2b340927aec485ba74684 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 15 Sep 2015 23:22:42 +0200 Subject: [PATCH 7/7] fix checkbox images --- core/img/actions/checkbox-checked-white.svg | 2 +- core/img/actions/checkbox-checked.png | Bin 265 -> 254 bytes core/img/actions/checkbox-checked.svg | 3 ++- core/img/actions/checkbox-mixed-white.svg | 2 +- core/img/actions/checkbox-mixed.png | Bin 135 -> 138 bytes core/img/actions/checkbox-mixed.svg | 3 ++- core/img/actions/checkbox-white.svg | 2 +- core/img/actions/checkbox.png | Bin 130 -> 134 bytes core/img/actions/checkbox.svg | 3 ++- 9 files changed, 9 insertions(+), 6 deletions(-) diff --git a/core/img/actions/checkbox-checked-white.svg b/core/img/actions/checkbox-checked-white.svg index 388e5588a0..17bfdfbe4a 100644 --- a/core/img/actions/checkbox-checked-white.svg +++ b/core/img/actions/checkbox-checked-white.svg @@ -1,4 +1,4 @@ - + diff --git a/core/img/actions/checkbox-checked.png b/core/img/actions/checkbox-checked.png index 309069226b815130f8cd503a6b759f777c2b1ac8..a8a07193ab700714b87d1459717462b77da4f164 100644 GIT binary patch delta 226 zcmV<803H8{0{#JzB!5m&OjJbx003cqqG5cYVSS-teW6=;omF$1caN@+qrH-*zLTcE zl&8OysKAz}z@D$hqO-`Ov&g2l%BQ!>sJP6kxy)ijMrV>HohPRv7 zW?EH3O%eSF`j886bK!9|L3Fd^9Xy1M_P|24fz8{|Ggb$-sdT&`^C-ly&CgEe|3?x! cgnPbQgN%d&r_&DfrsU|#*XGL z?|=V;v{_x3?76W0<(d@_pZGK!koQWg(d4;h-IYBp$8qK3mj*`PCtW__C!sds^3rVP pmFbFVX?r*2{I?HbIm@n9!Fci)*TaZSvQI!B@^tlcS?83{1OWY}MpFO) diff --git a/core/img/actions/checkbox-checked.svg b/core/img/actions/checkbox-checked.svg index 9797244085..c5aa3cd73b 100644 --- a/core/img/actions/checkbox-checked.svg +++ b/core/img/actions/checkbox-checked.svg @@ -1,4 +1,5 @@ - + + diff --git a/core/img/actions/checkbox-mixed-white.svg b/core/img/actions/checkbox-mixed-white.svg index 45e56a0729..faae0820c8 100644 --- a/core/img/actions/checkbox-mixed-white.svg +++ b/core/img/actions/checkbox-mixed-white.svg @@ -1,4 +1,4 @@ - + diff --git a/core/img/actions/checkbox-mixed.png b/core/img/actions/checkbox-mixed.png index 8bc34b43b363c85a4d694a3c5667b00fd423f1c1..cc27ec651eaf25f0d186772adcd63e8ce3b1c399 100644 GIT binary patch delta 89 zcmZo?>|>qAe8Q6XMFiz%Xy#yt#Ad0?BF9rv3l_e`e1$C7>uvNswPK!==kt#7x<* sPV|vbKETDggH>aDE9b#?+eCi}Wd>up?F>)187Thf bIZ`3Yz`K<3C+i>m9U#q~u6{1-oD!M - + + diff --git a/core/img/actions/checkbox-white.svg b/core/img/actions/checkbox-white.svg index 3c5f6090f6..4325f9fb1e 100644 --- a/core/img/actions/checkbox-white.svg +++ b/core/img/actions/checkbox-white.svg @@ -1,4 +1,4 @@ - + diff --git a/core/img/actions/checkbox.png b/core/img/actions/checkbox.png index 4539c8930c5967e49ce0cbb39caeec4d3f3c537d..770b7ef82037fcc3b3ab6a628fbdb0762846013f 100644 GIT binary patch delta 105 zcmZo-Y-60Dk|Y%16XMFiz%Xy#yt#Ad0?BF9rv3l_e`e1$C7>uvNswPK!==kt#7x<* z0{QZuE{-7;jL8aY2AdBs3P&`wit?8;~#O>Eakt!I-STX0Z7H pqi{q6tKxB^9jr41{L)p9t!9W8V_3-;u{Z~0mZz(q%Q~loCIG@%8lnII diff --git a/core/img/actions/checkbox.svg b/core/img/actions/checkbox.svg index 872df995cc..fe8f727b89 100644 --- a/core/img/actions/checkbox.svg +++ b/core/img/actions/checkbox.svg @@ -1,4 +1,5 @@ - + +