From 5bf13783e2c1d39bae9303c9fb2d7b3ea9c7c483 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Fri, 23 May 2014 17:43:20 +0200 Subject: [PATCH 1/6] darken scrollbar to distinguish from selected sidebar items --- core/css/styles.css | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index d21e6bc690..975f0160b1 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -205,9 +205,15 @@ input img, button img, .button img { /* SCROLLING */ -::-webkit-scrollbar { width:8px; } -::-webkit-scrollbar-track-piece { background-color:transparent; } -::-webkit-scrollbar-thumb { background:#ddd; } +::-webkit-scrollbar { + width: 8px; +} +::-webkit-scrollbar-track-piece { + background-color: transparent; +} +::-webkit-scrollbar-thumb { + background: #ccc; +} /* BUTTONS */ From 574e4f057918b318bfa39ce10c89e65987a15899 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Fri, 23 May 2014 17:57:29 +0200 Subject: [PATCH 2/6] use user-select: none; on header, navigation and user menu --- core/css/styles.css | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index 975f0160b1..1ca90439de 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -204,6 +204,16 @@ input img, button img, .button img { } +/* prevent ugly selection effect on accidental selection */ +#header, +#navigation, +#expanddiv { + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; +} + + /* SCROLLING */ ::-webkit-scrollbar { width: 8px; @@ -709,8 +719,6 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } overflow-y: auto; overflow-x: hidden; -moz-box-sizing:border-box; box-sizing:border-box; - /* prevent ugly selection effect on accidental selection */ - -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none; } #apps { height: 100%; @@ -801,8 +809,6 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } border-bottom-left-radius:7px; border-bottom:1px #333 solid; border-left:1px #333 solid; box-shadow:0 0 7px rgb(29,45,68); -moz-box-sizing: border-box; box-sizing: border-box; - /* prevent ugly selection effect on accidental selection */ - -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none; } #expanddiv a { display: block; From 0977911c826ffade34b89d08a697993e5de3bc41 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Fri, 23 May 2014 18:03:01 +0200 Subject: [PATCH 3/6] fix height of select boxes for OS X --- core/css/fixes.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/css/fixes.css b/core/css/fixes.css index 1563595074..91267c276a 100644 --- a/core/css/fixes.css +++ b/core/css/fixes.css @@ -5,6 +5,11 @@ border: 0; } +/* fix height of select boxes for OS X */ +select { + min-height: 29px; +} + .lte8 .delete-icon { background-image: url('../img/actions/delete.png'); } .lte8 .delete-icon:hover, .delete-icon:focus { background-image: url('../img/actions/delete-hover.png'); From b1ccfcde9ef0ca4b846d3cf734d3b5ba8606eeb9 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Fri, 23 May 2014 18:07:25 +0200 Subject: [PATCH 4/6] fix border-radius in settings to 3px --- settings/css/settings.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/settings/css/settings.css b/settings/css/settings.css index d0e44e721b..be6cfe1e9b 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -103,8 +103,8 @@ select.quota.active { background: #fff; } #app-navigation.appwarning:hover { background: #fbb; } -small.externalapp { color:#FFF; background-color:#BBB; font-weight:bold; font-size: 0.6em; margin: 0; padding: 0.1em 0.2em; border-radius: 4px;} -small.recommendedapp { color:#FFF; background-color:#888; font-weight:bold; font-size: 0.6em; margin: 0; padding: 0.1em 0.2em; border-radius: 4px;} +small.externalapp { color:#FFF; background-color:#BBB; font-weight:bold; font-size: 0.6em; margin: 0; padding: 0.1em 0.2em; border-radius: 3px;} +small.recommendedapp { color:#FFF; background-color:#888; font-weight:bold; font-size: 0.6em; margin: 0; padding: 0.1em 0.2em; border-radius: 3px;} small.externalapp.list, small.recommendedapp.list { position: absolute; right: 10px; top: 12px; } span.version { margin-left:1em; margin-right:1em; color:#555; } @@ -169,7 +169,7 @@ table.shareAPI .indent { padding-left: 2em; } span.success { background: #37ce02; - border-radius: 8px; + border-radius: 3px; } span.error { From c6c4bb62e1ed317caa5e0997f867b99e3287f422 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Fri, 23 May 2014 18:09:45 +0200 Subject: [PATCH 5/6] move saved notification for mail server, so it's smaller --- settings/templates/admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings/templates/admin.php b/settings/templates/admin.php index a4a3698d3b..668ddf1cd6 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -323,9 +323,9 @@ if (!$_['internetconnectionworking']) {
-

t('Email Server'));?>

+

t('Email Server'));?>

-

t('This is used for sending out notifications.')); ?>

+

t('This is used for sending out notifications.')); ?>

From dc83b17f49b7b2cf9aec4610c43c9260c7efdbe2 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 28 May 2014 11:50:55 +0200 Subject: [PATCH 6/6] Fix double "saved" message when changing email settings --- settings/js/admin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/js/admin.js b/settings/js/admin.js index 249131464a..bc95c6a3dc 100644 --- a/settings/js/admin.js +++ b/settings/js/admin.js @@ -118,7 +118,7 @@ $(document).ready(function(){ OC.msg.startSaving('#mail_settings_msg'); var post = $( "#mail_settings" ).serialize(); $.post(OC.generateUrl('/settings/admin/mailsettings'), post, function(data){ - OC.msg.finishedSaving('#mail_settings .msg', data); + OC.msg.finishedSaving('#mail_settings_msg', data); }); });