From cf84154ee09d9bc706a0343d03600f6ebfbde7a1 Mon Sep 17 00:00:00 2001 From: raghunayyar Date: Sun, 6 Oct 2013 23:38:24 +0530 Subject: [PATCH 1/6] Cleans up Core apps for relative(em) to absolute(px) styles. --- apps/files_external/css/settings.css | 4 ++-- apps/files_sharing/css/public.css | 28 ++++++++++++++-------------- apps/files_versions/css/versions.css | 2 +- apps/user_ldap/css/settings.css | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css index f2f40247b2..4a32ac4153 100644 --- a/apps/files_external/css/settings.css +++ b/apps/files_external/css/settings.css @@ -16,8 +16,8 @@ span.waiting { background: none; } -td.mountPoint, td.backend { width:10em; } -td.remove>img { visibility:hidden; padding-top:0.8em; } +td.mountPoint, td.backend { width:160px; } +td.remove>img { visibility:hidden; padding-top:13px; } tr:hover>td.remove>img { visibility:visible; cursor:pointer; } #addMountPoint>td { border:none; } #addMountPoint>td.applicable { visibility:hidden; } diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css index 3aa4a48304..70345c3577 100644 --- a/apps/files_sharing/css/public.css +++ b/apps/files_sharing/css/public.css @@ -4,14 +4,14 @@ body { #header { background: #1d2d44 url('%webroot%/core/img/noise.png') repeat; - height:2.5em; + height:40px; left:0; - line-height:2.5em; + line-height:40px; position:fixed; right:0; top:0; z-index:100; - padding:.5em; + padding:8px; } #details { @@ -22,7 +22,7 @@ body { #public_upload, #download { font-weight:700; - margin: 0 0.4em 0 0; + margin: 0 6px 0 0; padding: 0 5px; height: 27px; float: left; @@ -30,38 +30,38 @@ body { } .header-right #details { - margin-right: 2em; + margin-right: 32px; } #public_upload { - margin-left: 0.3em; + margin-left: 5px; } #public_upload img, #download img { - padding-left:.1em; - padding-right:.3em; + padding-left:2px; + padding-right:5px; vertical-align:text-bottom; } #preview { background:#eee; border-bottom:1px solid #f8f8f8; - min-height:30em; + min-height:480px; text-align:center; margin:45px auto; } #noPreview { display:none; - padding-top:5em; + padding-top:90px; } p.info { color:#777; text-align:center; - width:22em; - margin:2em auto; + width:352px; + margin:32px auto; } p.info a { @@ -71,8 +71,8 @@ p.info a { #imgframe { height:75%; - padding-bottom:2em; - padding-top:2em; + padding-bottom:32px; + padding-top:32px; width:80%; margin:0 auto; } diff --git a/apps/files_versions/css/versions.css b/apps/files_versions/css/versions.css index c53935711c..8838ea8484 100644 --- a/apps/files_versions/css/versions.css +++ b/apps/files_versions/css/versions.css @@ -1,5 +1,5 @@ #dropdown.drop-versions { - width:24em; + width:384em; } #found_versions li { diff --git a/apps/user_ldap/css/settings.css b/apps/user_ldap/css/settings.css index 6086c7b74e..55ca503adf 100644 --- a/apps/user_ldap/css/settings.css +++ b/apps/user_ldap/css/settings.css @@ -22,6 +22,6 @@ } .ldapwarning { - margin-left: 1.4em; + margin-left: 22px; color: #FF3B3B; } From 4687d2dd0bde3f689eb57c90d0c4341cd00991bd Mon Sep 17 00:00:00 2001 From: raghunayyar Date: Mon, 7 Oct 2013 00:01:29 +0530 Subject: [PATCH 2/6] All Core Styles from em->px, apart from styles.css --- core/css/auth.css | 12 ++++++------ core/css/jquery.multiselect.css | 2 +- core/css/multiselect.css | 20 ++++++++++---------- core/css/share.css | 20 ++++++++++---------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/core/css/auth.css b/core/css/auth.css index 0adc10c77d..70df9f0ae0 100644 --- a/core/css/auth.css +++ b/core/css/auth.css @@ -1,7 +1,7 @@ h2 { - font-size:2em; + font-size:32px; font-weight:700; - margin-bottom:1em; + margin-bottom:16px; white-space:nowrap; } @@ -18,8 +18,8 @@ h2 img { } #oauth { - width:20em; - margin:4em auto 2em; + width:320px; + margin:64px auto 32px; } #allow-auth { @@ -33,7 +33,7 @@ h2 img { background:none; border:0; box-shadow:0 0 0 #fff, 0 0 0 #fff inset; - font-size:1.2em; - margin:.7em; + font-size:19px; + margin:11px; padding:0; } diff --git a/core/css/jquery.multiselect.css b/core/css/jquery.multiselect.css index 898786a615..6b3ae47d6e 100644 --- a/core/css/jquery.multiselect.css +++ b/core/css/jquery.multiselect.css @@ -4,7 +4,7 @@ .ui-multiselect-single .ui-multiselect-checkboxes label { padding:5px !important } .ui-multiselect-header { margin-bottom:3px; padding:3px 0 3px 4px } -.ui-multiselect-header ul { font-size:0.9em } +.ui-multiselect-header ul { font-size:15px } .ui-multiselect-header ul li { float:left; padding:0 10px 0 0 } .ui-multiselect-header a { text-decoration:none } .ui-multiselect-header a:hover { text-decoration:underline } diff --git a/core/css/multiselect.css b/core/css/multiselect.css index c25446808e..a8ec6e88fd 100644 --- a/core/css/multiselect.css +++ b/core/css/multiselect.css @@ -7,7 +7,7 @@ ul.multiselectoptions { border: 1px solid #ddd; border-top: none; box-shadow: 0 1px 1px #ddd; - padding-top: .5em; + padding-top: 8px; position: absolute; max-height: 20em; overflow-y: auto; @@ -15,8 +15,8 @@ ul.multiselectoptions { } ul.multiselectoptions.down { - border-bottom-left-radius: .5em; - border-bottom-right-radius: .5em; + border-bottom-left-radius: 8px; + border-bottom-right-radius: 8px; width: 100%; /* do not cut off group names */ -webkit-box-shadow: 0px 0px 20px rgba(29,45,68,.4); -moz-box-shadow: 0px 0px 20px rgba(29,45,68,.4); @@ -24,8 +24,8 @@ ul.multiselectoptions.down { } ul.multiselectoptions.up { - border-top-left-radius: .5em; - border-top-right-radius: .5em; + border-top-left-radius: 8px; + border-top-right-radius: 8px; } ul.multiselectoptions>li { @@ -52,7 +52,7 @@ div.multiselect { display: inline-block; max-width: 400px; min-width: 150px; - padding-right: .6em; + padding-right: 10px; position: relative; vertical-align: bottom; } @@ -77,7 +77,7 @@ div.multiselect.down { div.multiselect>span:first-child { float: left; - margin-right: 2em; + margin-right: 32px; overflow: hidden; text-overflow: ellipsis; width: 90%; @@ -85,12 +85,12 @@ div.multiselect>span:first-child { div.multiselect>span:last-child { position: absolute; - right: .8em; + right: 13px; } ul.multiselectoptions input.new { - padding-bottom: .2em; - padding-top: .2em; + padding-bottom: 3px; + padding-top: 3px; margin: 0; } diff --git a/core/css/share.css b/core/css/share.css index 2a21dc6edf..ded68349dc 100644 --- a/core/css/share.css +++ b/core/css/share.css @@ -8,21 +8,21 @@ border-bottom-right-radius: 5px; box-shadow:0 1px 1px #777; display:block; - margin-right:7em; + margin-right:112px; position:absolute; right:0; - width:25em; + width:400px; z-index:500; - padding:1em; + padding:16px; } #shareWithList { list-style-type:none; - padding:.5em; + padding:8px; } #shareWithList li { - padding-top:.1em; + padding-top:2px; } #shareWithList li:first-child { @@ -42,7 +42,7 @@ } #dropdown input[type="checkbox"] { - margin:0 .2em 0 .5em; + margin:0 3px 0 8px; } a.showCruds { @@ -54,13 +54,13 @@ a.unshare { display:inline; float:right; opacity:.5; - padding:.3em 0 0 .3em !important; + padding:5px 0 0 5px !important; margin-top:-5px; } #link { border-top:1px solid #ddd; - padding-top:.5em; + padding-top:8px; } #dropdown input[type="text"],#dropdown input[type="password"] { @@ -78,12 +78,12 @@ a.unshare { } #link #showPassword img { - padding-left:.3em; + padding-left:5px; width:12px; } .reshare,#link label,#expiration label { - padding-left:.5em; + padding-left:8px; } a.showCruds:hover,a.unshare:hover { From fd49d3c5c5932bef4674a76f259ea5612f3130b4 Mon Sep 17 00:00:00 2001 From: raghunayyar Date: Thu, 16 Jan 2014 14:45:23 +0530 Subject: [PATCH 3/6] Fixes typo in versions.css --- apps/files_versions/css/versions.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_versions/css/versions.css b/apps/files_versions/css/versions.css index 8838ea8484..80fa196b72 100644 --- a/apps/files_versions/css/versions.css +++ b/apps/files_versions/css/versions.css @@ -1,5 +1,5 @@ #dropdown.drop-versions { - width:384em; + width:384px; } #found_versions li { From 12e5d0f68d2ba8c780482a4e808c4aeec5ec17d9 Mon Sep 17 00:00:00 2001 From: raghunayyar Date: Thu, 16 Jan 2014 21:06:14 +0530 Subject: [PATCH 4/6] Fixes typos, adds ; wherever not present. --- apps/files_sharing/css/public.css | 2 +- core/css/jquery.multiselect.css | 36 +++++++++++++++---------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css index e948811c03..bf0a5f60a8 100644 --- a/apps/files_sharing/css/public.css +++ b/apps/files_sharing/css/public.css @@ -61,7 +61,7 @@ body { #noPreview { display:none; - padding-top:90px; + padding-top:80px; } footer { diff --git a/core/css/jquery.multiselect.css b/core/css/jquery.multiselect.css index 6b3ae47d6e..9b81c3bdcf 100644 --- a/core/css/jquery.multiselect.css +++ b/core/css/jquery.multiselect.css @@ -1,23 +1,23 @@ -.ui-multiselect { padding:2px 0 2px 4px; text-align:left } -.ui-multiselect span.ui-icon { float:right } +.ui-multiselect { padding:2px 0 2px 4px; text-align:left; } +.ui-multiselect span.ui-icon { float:right; } .ui-multiselect-single .ui-multiselect-checkboxes input { position:absolute !important; top: auto !important; left:-9999px; } -.ui-multiselect-single .ui-multiselect-checkboxes label { padding:5px !important } +.ui-multiselect-single .ui-multiselect-checkboxes label { padding:5px !important; } -.ui-multiselect-header { margin-bottom:3px; padding:3px 0 3px 4px } -.ui-multiselect-header ul { font-size:15px } -.ui-multiselect-header ul li { float:left; padding:0 10px 0 0 } -.ui-multiselect-header a { text-decoration:none } -.ui-multiselect-header a:hover { text-decoration:underline } -.ui-multiselect-header span.ui-icon { float:left } -.ui-multiselect-header li.ui-multiselect-close { float:right; text-align:right; padding-right:0 } +.ui-multiselect-header { margin-bottom:3px; padding:3px 0 3px 4px; } +.ui-multiselect-header ul { font-size:14px; } +.ui-multiselect-header ul li { float:left; padding:0 10px 0 0; } +.ui-multiselect-header a { text-decoration:none; } +.ui-multiselect-header a:hover { text-decoration:underline; } +.ui-multiselect-header span.ui-icon { float:left;} +.ui-multiselect-header li.ui-multiselect-close { float:right; text-align:right; padding-right:0; } -.ui-multiselect-menu { display:none; padding:3px; position:absolute; z-index:10000; text-align: left } -.ui-multiselect-checkboxes { position:relative /* fixes bug in IE6/7 */; overflow-y:scroll } -.ui-multiselect-checkboxes label { cursor:default; display:block; border:1px solid transparent; padding:3px 1px } -.ui-multiselect-checkboxes label input { position:relative; top:1px } -.ui-multiselect-checkboxes li { clear:both; font-size:0.9em; padding-right:3px } -.ui-multiselect-checkboxes li.ui-multiselect-optgroup-label { text-align:center; font-weight:bold; border-bottom:1px solid } -.ui-multiselect-checkboxes li.ui-multiselect-optgroup-label a { display:block; padding:3px; margin:1px 0; text-decoration:none } +.ui-multiselect-menu { display:none; padding:3px; position:absolute; z-index:10000; text-align: left; } +.ui-multiselect-checkboxes { position:relative /* fixes bug in IE6/7 */; overflow-y:scroll; } +.ui-multiselect-checkboxes label { cursor:default; display:block; border:1px solid transparent; padding:3px 1px; } +.ui-multiselect-checkboxes label input { position:relative; top:1px; } +.ui-multiselect-checkboxes li { clear:both; font-size:14px; padding-right:3px; } +.ui-multiselect-checkboxes li.ui-multiselect-optgroup-label { text-align:center; font-weight:bold; border-bottom:1px solid; } +.ui-multiselect-checkboxes li.ui-multiselect-optgroup-label a { display:block; padding:3px; margin:1px 0; text-decoration:none; } /* remove label borders in IE6 because IE6 does not support transparency */ -* html .ui-multiselect-checkboxes label { border:none } +* html .ui-multiselect-checkboxes label { border:none; } From 932e8f9f58cb9ce515c07b218b126d453bc3f46a Mon Sep 17 00:00:00 2001 From: raghunayyar Date: Sun, 26 Jan 2014 02:59:28 +0530 Subject: [PATCH 5/6] Fixes width of the dropdown menus as per computed styles. --- apps/files_versions/css/versions.css | 2 +- core/css/share.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/files_versions/css/versions.css b/apps/files_versions/css/versions.css index 80fa196b72..16755f35a7 100644 --- a/apps/files_versions/css/versions.css +++ b/apps/files_versions/css/versions.css @@ -1,5 +1,5 @@ #dropdown.drop-versions { - width:384px; + width:320px; } #found_versions li { diff --git a/core/css/share.css b/core/css/share.css index 938afabafe..4ae3b77757 100644 --- a/core/css/share.css +++ b/core/css/share.css @@ -11,7 +11,7 @@ margin-right:112px; position:absolute; right:0; - width:400px; + width:320px; z-index:500; padding:16px; } From 2a0e8329f9f35df33f3e379a6ec99eaf4e1ee973 Mon Sep 17 00:00:00 2001 From: raghunayyar Date: Sun, 26 Jan 2014 03:02:52 +0530 Subject: [PATCH 6/6] Fixes settings.css and converts more styles. --- apps/user_ldap/css/settings.css | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/apps/user_ldap/css/settings.css b/apps/user_ldap/css/settings.css index 44d74926b3..e09c377a90 100644 --- a/apps/user_ldap/css/settings.css +++ b/apps/user_ldap/css/settings.css @@ -33,9 +33,9 @@ width: 100% !important; height: 50px; background-color: lightyellow; - border-radius: 0.5em; - padding: 0.6em 0.5em 0.4em !important; - margin-bottom: 0.3em; + border-radius: 8px; + padding: 10px 8px 6px !important; + margin-bottom: 5px; } #ldapWizard1 .hostPortCombinator { @@ -68,17 +68,17 @@ } .ldapwarning { - margin-left: 1.4em; + margin-left: 22px; color: #FF3B3B; } .wizSpinner { height: 15px; - margin: 0.3em; + margin: 5px; } .ldapSettingControls { - margin-top: 3ex; + margin-top: 3px; } #ldap fieldset p label { @@ -110,10 +110,6 @@ select[multiple=multiple] + button { max-width: 40%; } -.ldapwarning { - margin-left: 22px; - color: #FF3B3B; -} .ldap_config_state_indicator_sign { display: inline-block; height: 16px;