diff options
author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-01-27 02:29:47 -0800 |
---|---|---|
committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-01-27 02:29:47 -0800 |
commit | 46745895ae6db0efac52461497853d037230bcae (patch) | |
tree | bd6b6222a43f1fe17142d69cb05cfa84c3ea8241 /core | |
parent | 6fbc73e673206609eebd1c66181036ddd142f4f9 (diff) | |
parent | 2a0e8329f9f35df33f3e379a6ec99eaf4e1ee973 (diff) | |
download | nextcloud-server-46745895ae6db0efac52461497853d037230bcae.tar.gz nextcloud-server-46745895ae6db0efac52461497853d037230bcae.zip |
Merge pull request #5153 from owncloud/core-em-to-px
Cleans up Core apps for relative(em) to absolute(px) styles.
Diffstat (limited to 'core')
-rw-r--r-- | core/css/auth.css | 12 | ||||
-rw-r--r-- | core/css/jquery.multiselect.css | 36 | ||||
-rw-r--r-- | core/css/multiselect.css | 20 | ||||
-rw-r--r-- | core/css/share.css | 77 |
4 files changed, 72 insertions, 73 deletions
diff --git a/core/css/auth.css b/core/css/auth.css index 0adc10c77d9..70df9f0ae0f 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 898786a6157..9b81c3bdcfb 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:0.9em } -.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; } diff --git a/core/css/multiselect.css b/core/css/multiselect.css index e2a35ac3633..60f2f47e698 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,8 +52,8 @@ div.multiselect { display: inline-block; max-width: 400px; min-width: 150px; + padding-right: 10px; min-height: 20px; - padding-right: .6em; position: relative; vertical-align: bottom; } @@ -78,7 +78,7 @@ div.multiselect.down { div.multiselect>span:first-child { float: left; - margin-right: 2em; + margin-right: 32px; overflow: hidden; text-overflow: ellipsis; width: 90%; @@ -86,12 +86,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 d8140242e06..4ae3b77757e 100644 --- a/core/css/share.css +++ b/core/css/share.css @@ -8,54 +8,53 @@ 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:320px; z-index:500; - padding:1em; + padding:16px; } #shareWithList { list-style-type:none; - padding:.5em; -} - - #shareWithList li { - padding-top: 10px; - padding-bottom: 10px; - font-weight: bold; - line-height: 21px; - white-space: normal; - } - - #shareWithList .unshare img, #shareWithList .showCruds img { - vertical-align:text-bottom; /* properly align icons */ - } - - #shareWithList label input[type=checkbox]{ - margin-left: 0; - } - #shareWithList .username{ - padding-right: .5em; - white-space: nowrap; - text-overflow: ellipsis; - max-width: 254px; - display: inline-block; - overflow: hidden; - vertical-align: middle; - } - #shareWithList li label{ - margin-right: .5em; - } + padding:8px; +} + +#shareWithList li { + padding-top: 10px; + padding-bottom: 10px; + font-weight: bold; + line-height: 21px; + white-space: normal; +} + +#shareWithList .unshare img, #shareWithList .showCruds img { + vertical-align:text-bottom; /* properly align icons */ +} + +#shareWithList label input[type=checkbox]{ + margin-left: 0; +} +#shareWithList .username{ + padding-right: 8px; + white-space: nowrap; + text-overflow: ellipsis; + max-width: 254px; + display: inline-block; + overflow: hidden; + vertical-align: middle; +} +#shareWithList li label{ + margin-right: 8px; +} #dropdown label { font-weight:400; white-space: nowrap; } #dropdown input[type="checkbox"] { - margin:0 .2em 0 .5em; - vertical-align: middle; + margin:0 3px 0 8px; } a.showCruds { @@ -67,13 +66,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"] { @@ -91,12 +90,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 { |