diff options
| -rw-r--r-- | apps/files/css/files.css | 39 | ||||
| -rw-r--r-- | core/css/fixes.css | 4 | ||||
| -rw-r--r-- | core/css/styles.css | 12 | ||||
| -rw-r--r-- | lib/private/helper.php | 4 | ||||
| -rw-r--r-- | lib/private/l10n.php | 19 |
5 files changed, 45 insertions, 33 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 1d4d0774482..2ba1f774d49 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -330,10 +330,6 @@ table td.filename .nametext { max-width: 800px; height: 100%; } -/* IE8 text-overflow: ellipsis support */ -.ie8 table td.filename .nametext { - min-width: 50%; -} .has-favorites #fileList td.filename a.name { left: 50px; margin-right: 50px; @@ -346,13 +342,6 @@ table td.filename .nametext .innernametext { display: inline-block; vertical-align: top; } -/* IE8 text-overflow: ellipsis support */ -.ie8 table td.filename .nametext .innernametext { - white-space: nowrap; - word-wrap: normal; - -ms-text-overflow: ellipsis; - max-width: 47%; -} @media only screen and (min-width: 1500px) { table td.filename .nametext .innernametext { @@ -422,20 +411,37 @@ table td.filename .uploadtext { } /* File checkboxes */ -#fileList tr td.filename>.selectCheckBox + label:before { +html:not(.ie8) #fileList tr td.filename>.selectCheckBox + label:before { opacity: 0; position: absolute; bottom: 4px; right: 0; z-index: 10; } +html.ie8 #fileList tr td.filename>.selectCheckBox { + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; + filter: alpha(opacity=0); + 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;*/ +} /* Show checkbox when hovering, checked, or selected */ -#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 { +html.ie8 #fileList tr:hover td.filename>.selectCheckBox, +html.ie8 #fileList tr:focus td.filename>.selectCheckBox, +html.ie8 #fileList tr td.filename>.selectCheckBox:checked, +html.ie8 #fileList tr.selected td.filename>.selectCheckBox, +html:not(.ie8) #fileList tr:hover td.filename>.selectCheckBox + label:before, +html:not(.ie8) #fileList tr:focus td.filename>.selectCheckBox + label:before, +html:not(.ie8) #fileList tr td.filename>.selectCheckBox:checked + label:before, +html:not(.ie8) #fileList tr.selected td.filename>.selectCheckBox + label:before { opacity: 1; +} +html.ie8 #fileList tr:hover td.filename>.selectCheckBox, +html.ie8 #fileList tr:focus td.filename>.selectCheckBox, +html.ie8 #fileList tr td.filename>.selectCheckBox[checked=checked], +html.ie8 #fileList tr.selected td.filename>.selectCheckBox { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter: alpha(opacity=100); } @@ -458,6 +464,7 @@ table td.filename .uploadtext { .select-all + label { top: 0; } +.ie8 .select-all, .select-all + label:before { position: absolute; top: 18px; diff --git a/core/css/fixes.css b/core/css/fixes.css index 54852eb9beb..5f917dbbe81 100644 --- a/core/css/fixes.css +++ b/core/css/fixes.css @@ -24,6 +24,10 @@ select { background-image: url('../img/actions/checkmark.png'); } +.ie8 .icon-close { + background-image: url('../img/actions/close.png'); +} + .lte9 .icon-triangle-e { background-image: url('../img/actions/triangle-e.png'); } diff --git a/core/css/styles.css b/core/css/styles.css index c0da29b71ca..df533aab318 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -159,6 +159,9 @@ textarea:hover, textarea:focus, textarea:active { opacity: 1; } +.ie8 input[type="checkbox"] { margin:0; padding:0; height:auto; width:auto; } +.ie8 input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:#111 !important; } + /* ie8 doesn't support :checked */ html:not(.ie8) input[type="checkbox"].checkbox { margin:0; @@ -657,6 +660,14 @@ label.infield { padding-left: 28px; vertical-align: middle; } +html.ie8 #body-login form input[type="checkbox"]+label { + margin-left: -28px; + margin-top: -3px; + vertical-align: auto; +} +html.ie8 #body-login form input[type="checkbox"] { + margin-top: 5px; +} #body-login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; } #body-login .success { background:#d7fed7; border:1px solid #0f0; width: 35%; margin: 30px auto; padding:1em; text-align: center;} @@ -852,7 +863,6 @@ label.infield { } #remember_login { margin: 18px 5px 0 16px !important; - vertical-align: text-bottom; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; opacity: .7; } diff --git a/lib/private/helper.php b/lib/private/helper.php index dcd263daa24..ba1240a5218 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -274,7 +274,7 @@ class OC_Helper { /** * Make a computer file size * @param string $str file size in human readable format - * @return int a file size in bytes + * @return float a file size in bytes * * Makes 2kB to 2048. * @@ -283,7 +283,7 @@ class OC_Helper { public static function computerFileSize($str) { $str = strtolower($str); if (is_numeric($str)) { - return $str; + return floatval($str); } $bytes_array = array( diff --git a/lib/private/l10n.php b/lib/private/l10n.php index ad02ba88526..89ce2bc8d72 100644 --- a/lib/private/l10n.php +++ b/lib/private/l10n.php @@ -102,16 +102,11 @@ class OC_L10N implements \OCP\IL10N { } /** - * @param $app * @return string */ - public static function setLanguageFromRequest($app = null) { + public static function setLanguageFromRequest() { if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { - if (is_array($app)) { - $available = $app; - } else { - $available = self::findAvailableLanguages($app); - } + $available = self::findAvailableLanguages(); // E.g. make sure that 'de' is before 'de_DE'. sort($available); @@ -122,17 +117,13 @@ class OC_L10N implements \OCP\IL10N { $preferred_language = str_replace('-', '_', $preferred_language); foreach ($available as $available_language) { if ($preferred_language === strtolower($available_language)) { - if (!is_array($app)) { - self::$language = $available_language; - } + self::$language = $available_language; return $available_language; } } foreach ($available as $available_language) { if (substr($preferred_language, 0, 2) === $available_language) { - if (!is_array($app)) { - self::$language = $available_language; - } + self::$language = $available_language; return $available_language; } } @@ -469,7 +460,7 @@ class OC_L10N implements \OCP\IL10N { return $default_language; } - $lang = self::setLanguageFromRequest($app); + $lang = self::setLanguageFromRequest(); if($userId && !$config->getUserValue($userId, 'core', 'lang')) { $config->setUserValue($userId, 'core', 'lang', $lang); } |