Converts em to px values for styles in Files.

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index e26c1a89b789ebb2a8c318e3b7d98bd418592c9e..546451806ebf75e3ff117b850e6c5b5799d52c87 100644 (file)
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -3,7 +3,7 @@
  See the COPYING-README file. */
 
 /* FILE MENU */
-.actions { padding:.3em; height:2em; width: 100%; }
+.actions { padding:5px; height:32px; width: 100%; }
 .actions input, .actions button, .actions .button { margin:0; float:left; }
 .actions .button a { color: #555; }
 .actions .button a:hover, .actions .button a:active { color: #333; }
@@ -30,9 +30,9 @@
 #new>ul {
        display: none;
        position: fixed;
-       min-width: 7em;
+       min-width: 112px;
        z-index: 10;
-       padding: .5em;
+       padding: 8px;
        padding-bottom: 0;
        margin-top: 14px;
        margin-left: -1px;
@@ -43,7 +43,7 @@
        border-top-left-radius: 0;
        box-shadow:0 2px 7px rgba(170,170,170,.4);
 }
-#new>ul>li { height:36px; margin:.3em; padding-left:3em; padding-bottom:0.1em;
+#new>ul>li { height:36px; margin:5px; padding-left:48px; padding-bottom:2px;
                background-repeat:no-repeat; cursor:pointer; }
 #new>ul>li>p { cursor:pointer; padding-top: 7px; padding-bottom: 7px;}
 
@@ -56,7 +56,7 @@
        top: 44px;
        width: 100%;
 }
-#filestable tbody tr { background-color:#fff; height:2.5em; }
+#filestable tbody tr { background-color:#fff; height:40px; }
 #filestable tbody tr:hover, tbody tr:active {
        background-color: rgb(240,240,240);
 }
@@ -71,7 +71,7 @@ span.extension, span.uploading, td.date { color:#999; }
 span.extension { text-transform:lowercase; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70); opacity:.7; -webkit-transition:opacity 300ms; -moz-transition:opacity 300ms; -o-transition:opacity 300ms; transition:opacity 300ms; }
 tr:hover span.extension { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; color:#777; }
 table tr.mouseOver td { background-color:#eee; }
-table th { height:2em; padding:0 .5em; color:#999; }
+table th { height:24px; padding:0 8px; color:#999; }
 table th .name {
        position: absolute;
        left: 55px;
@@ -94,15 +94,15 @@ table th#headerName {
        height: 50px;
 }
 table th#headerSize, table td.filesize {
-       min-width: 3em;
-       padding: 0 1em;
+       min-width: 48px;
+       padding: 0 16px;
        text-align: right;
 }
 table th#headerDate, table td.date {
        -moz-box-sizing: border-box;
        box-sizing: border-box;
        position: relative;
-       min-width: 11em;
+       min-width: 176px;
        display: block;
        height: 51px;
 }
@@ -173,8 +173,8 @@ table td.filename .nametext {
        text-overflow: ellipsis;
        max-width: 800px;
 }
-table td.filename .uploadtext { font-weight:normal; margin-left:.5em; }
-table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; }
+table td.filename .uploadtext { font-weight:normal; margin-left:8px; }
+table td.filename form { font-size:.85em; margin-left:48px; margin-right:48px; }
 
 
 /* File checkboxes */
@@ -247,7 +247,7 @@ table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; }
        box-shadow: -5px 0 7px rgba(230,230,230,.9);
 }
 
-#fileList img.move2trash { display:inline; margin:-.5em 0; padding:1em .5em 1em .5em !important; float:right; }
+#fileList img.move2trash { display:inline; margin:-.5em 0; padding:16px 8px 16px 8px !important; float:right; }
 #fileList a.action.delete {
        position: absolute;
        right: 0;
@@ -271,13 +271,13 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
 }
 .selectedActions a img {
        position:relative;
-       top:.3em;
+       top:5px;
 }
 
 
 #fileList a.action {
        display: inline;
-       margin: -.5em 0;
+       margin: -8px 0;
        padding: 18px 8px !important;
        -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
        filter: alpha(opacity=0);

diff --git a/apps/files/css/upload.css b/apps/files/css/upload.css
index ef0435690945e0f9878f085f8024d6ac7c30c981..ddd2a67b812cdf5491a657fd2c58bafcebe69fd7 100644 (file)
--- a/apps/files/css/upload.css
+++ b/apps/files/css/upload.css
@@ -5,7 +5,7 @@
        height: 36px;
        width: 39px;
        padding: 0 !important; /* override default control bar button padding */
-       margin-left: .2em;
+       margin-left: 3px;
        overflow: hidden;
        vertical-align: top;
 }
@@ -33,7 +33,7 @@
        height: 44px;
        margin: -5px -3px;
        padding: 0;
-       font-size: 1em;
+       font-size: 16px;
        -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0;
        z-index: 20;
        cursor: pointer;