wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5153 from owncloud/core-em-to-px

Browse source 
Cleans up Core apps for relative(em) to absolute(px) styles.
This commit is contained in:
Jan-Christoph Borchardt 2014-01-27 02:29:47 -08:00
commit 46745895ae
8 changed files with 86 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/files_external/css/settings.css
View file

@ -12,8 +12,8 @@ span.error {
background: #ce3702;
}
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; }

16
apps/files_sharing/css/public.css
View file

@ -22,7 +22,7 @@ body {
#public_upload,
#download {
font-weight:700;
margin: 0 0 0 .4em;
margin: 0 0 0 6px;
padding: 0 5px;
height: 32px;
float: left;
@ -39,13 +39,13 @@ body {
}
#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;
}
@ -61,7 +61,7 @@ body {
#noPreview {
display:none;
padding-top:5em;
padding-top:80px;
}
footer {
@ -71,7 +71,7 @@ footer {
p.info {
color: #777;
text-align: center;
width: 22em;
width: 352px;
margin: 0 auto;
padding: 20px;
}
@ -83,8 +83,8 @@ p.info a {
#imgframe {
height:75%;
padding-bottom:2em;
padding-top:2em;
padding-bottom:32px;
padding-top:32px;
width:80%;
margin:0 auto;
}

2
apps/files_versions/css/versions.css
View file

@ -1,5 +1,5 @@
#dropdown.drop-versions {
width:24em;
width:320px;
}
#found_versions li {

14
apps/user_ldap/css/settings.css
View file

@ -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 {
@ -126,4 +126,4 @@ select[multiple=multiple] + button {
.ldap_grey {
color: #777;
}
}

12
core/css/auth.css
View file

@ -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;
}

36
core/css/jquery.multiselect.css
View file

@ -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; }

20
core/css/multiselect.css
View file

@ -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;
}

69
core/css/share.css
View file

@ -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;
padding:8px;
}
#shareWithList li {
padding-top: 10px;
padding-bottom: 10px;
font-weight: bold;
line-height: 21px;
white-space: normal;
}
#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 .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;
}
#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 {