aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/files/css/files.css81
-rw-r--r--apps/files/css/mobile.css22
-rw-r--r--apps/files/img/delete.pngbin209 -> 243 bytes
-rw-r--r--apps/files/img/delete.svg2
-rw-r--r--apps/files/img/external.pngbin369 -> 392 bytes
-rw-r--r--apps/files/img/external.svg2
-rw-r--r--apps/files/img/folder.pngbin160 -> 303 bytes
-rw-r--r--apps/files/img/folder.svg4
-rw-r--r--apps/files/img/public.pngbin297 -> 307 bytes
-rw-r--r--apps/files/img/public.svg6
-rw-r--r--apps/files/img/share.pngbin365 -> 264 bytes
-rw-r--r--apps/files/img/share.svg2
-rw-r--r--apps/files/img/star.pngbin373 -> 490 bytes
-rw-r--r--apps/files/img/star.svg4
-rw-r--r--apps/files_sharing/tests/js/shareSpec.js16
-rw-r--r--core/css/apps.css80
-rw-r--r--core/css/header.css2
-rw-r--r--core/css/mobile.css23
-rw-r--r--core/css/styles.css21
-rw-r--r--core/js/share.js4
-rw-r--r--core/js/tests/specs/shareSpec.js4
21 files changed, 134 insertions, 139 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 026713569a1..4a56490fe0f 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -96,7 +96,10 @@
min-width: 688px; /* 768 (mobile break) - 80 (nav width) */
}
-#filestable tbody tr { background-color:#fff; height:51px; }
+#filestable tbody tr {
+ background-color: #fff;
+ height: 51px;
+}
/* fit app list view heights */
.app-files #app-content>.viewcontainer {
@@ -133,27 +136,27 @@
position: fixed !important;
bottom: 44px;
width: inherit !important;
- background-color: #f5f5f5;
+ background-color: #fff;
}
/* double padding to account for Deleted files entry, issue with Firefox */
.app-files #app-navigation > ul li:nth-last-child(2) {
margin-bottom: 44px;
}
-#filestable tbody tr { background-color:#fff; height:40px; }
+#filestable tbody tr {
+ background-color: #fff;
+ height: 40px;
+}
#filestable tbody tr:hover,
#filestable tbody tr:focus,
#filestable tbody .name:focus,
-#filestable tbody tr:active {
- background-color: rgb(240,240,240);
-}
+#filestable tbody tr:active,
#filestable tbody tr.highlighted,
#filestable tbody tr.highlighted .name:focus,
-#filestable tbody tr.selected {
- background-color: rgb(230,230,230);
-}
-#filestable tbody tr.searchresult {
- background-color: rgb(240,240,240);
+#filestable tbody tr.selected,
+#filestable tbody tr.searchresult,
+table tr.mouseOver td {
+ background-color: #f8f8f8;
}
tbody a { color:#000; }
@@ -178,9 +181,6 @@ tr:focus span.extension {
color: #777;
}
-table tr.mouseOver td {
- background-color: #eee;
-}
table th, table th a {
color: #999;
}
@@ -275,7 +275,7 @@ table thead th {
background-color: #fff;
}
table.multiselect thead th {
- background-color: rgba(220,220,220,.8);
+ background-color: rgba(248,248,248,.8); /* #f8f8f8 like other hover style */
color: #000;
font-weight: bold;
border-bottom: 0;
@@ -499,7 +499,6 @@ table td.filename .uploadtext {
.fileactions {
position: absolute;
right: 0;
- font-size: 11px;
}
.busy .fileactions, .busy .action {
@@ -573,6 +572,13 @@ a.action > img {
opacity: 0;
display:none;
}
+#fileList a.action.action-share,
+#fileList a.action.action-menu {
+ padding: 17px 14px;
+}
+#fileList .fileActionsMenu {
+ margin-right: 21px;
+}
.ie8 #fileList a.action img,
#fileList tr:hover a.action,
@@ -588,9 +594,9 @@ a.action > img {
#fileList tr:focus a.action.disabled:focus,
#fileList .name:focus a.action.disabled:focus,
#fileList a.action.disabled img {
- -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
- filter: alpha(opacity=50);
- opacity: .5;
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
+ filter: alpha(opacity=30);
+ opacity: .3;
display:inline;
}
.ie8 #fileList a.action:hover img,
@@ -600,15 +606,44 @@ a.action > img {
#fileList tr:hover a.action:hover,
#fileList tr:focus a.action:focus,
#fileList .name:focus a.action:focus {
- -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
- filter: alpha(opacity=100);
- opacity: 1;
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
+ filter: alpha(opacity=70);
+ opacity: 7;
display:inline;
}
#fileList tr a.action.disabled {
background: none;
}
+/* show share action of shared items darker to distinguish from non-shared */
+#fileList a.action.permanent.shared-style {
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)" !important;
+ filter: alpha(opacity=70) !important;
+ opacity: .7 !important;
+}
+/* always show actions on mobile, not only on hover */
+#fileList a.action,
+#fileList a.action.action-menu.permanent {
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)" !important;
+ filter: alpha(opacity=30) !important;
+ opacity: .3 !important;
+ display: inline !important;
+}
+
+/* properly display actions in the popover menu */
+#fileList .fileActionsMenu .action {
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)" !important;
+ filter: alpha(opacity=50) !important;
+ opacity: .5 !important;
+}
+#fileList .fileActionsMenu .action:hover,
+#fileList .fileActionsMenu .action:focus {
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)" !important;
+ filter: alpha(opacity=100) !important;
+ opacity: 1 !important;
+}
+
+
#selectedActionsList a.download.disabled,
#fileList tr a.action.action-download.disabled {
color: #000000;
@@ -671,7 +706,7 @@ table.dragshadow td.size {
left: 0;
right: 0;
bottom: 0;
- background-color: white;
+ background-color: #fff;
background-repeat: no-repeat no-repeat;
background-position: 50%;
opacity: 0.7;
diff --git a/apps/files/css/mobile.css b/apps/files/css/mobile.css
index 635c24c4168..c5507a1e268 100644
--- a/apps/files/css/mobile.css
+++ b/apps/files/css/mobile.css
@@ -32,30 +32,12 @@ table td.filename .nametext {
width: 100%;
}
-/* show share action of shared items darker to distinguish from non-shared */
-#fileList a.action.permanent.shared-style {
- -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)" !important;
- filter: alpha(opacity=70) !important;
- opacity: .7 !important;
-}
-/* always show actions on mobile, not only on hover */
-#fileList a.action,
-#fileList a.action.action-menu.permanent {
- -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=20)" !important;
- filter: alpha(opacity=20) !important;
- opacity: .2 !important;
- display: inline !important;
-}
#fileList a.action.action-menu img {
- padding-left: 2px;
+ padding-left: 0;
}
#fileList .fileActionsMenu {
- margin-right: 5px;
-}
-/* some padding for better clickability */
-#fileList a.action img {
- padding: 0 6px 0 12px;
+ margin-right: 6px;
}
/* hide text of the share action on mobile */
#fileList a.action-share span {
diff --git a/apps/files/img/delete.png b/apps/files/img/delete.png
index b2ab8c5efef..e891b370cca 100644
--- a/apps/files/img/delete.png
+++ b/apps/files/img/delete.png
Binary files differ
diff --git a/apps/files/img/delete.svg b/apps/files/img/delete.svg
index b6dc2cc4173..f0a3cd4db88 100644
--- a/apps/files/img/delete.svg
+++ b/apps/files/img/delete.svg
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <path opacity=".5" d="m6.5 1-0.5 1h-3c-0.554 0-1 0.446-1 1v1h12v-1c0-0.554-0.446-1-1-1h-3l-0.5-1zm-3.5 4 0.875 9c0.061 0.549 0.5729 1 1.125 1h6c0.55232 0 1.064-0.45102 1.125-1l0.875-9z" fill-rule="evenodd"/>
+ <path d="m6.5 1-0.5 1h-3c-0.554 0-1 0.446-1 1v1h12v-1c0-0.554-0.446-1-1-1h-3l-0.5-1zm-3.5 4 0.875 9c0.061 0.549 0.5729 1 1.125 1h6c0.55232 0 1.064-0.45102 1.125-1l0.875-9z" fill-rule="evenodd"/>
</svg>
diff --git a/apps/files/img/external.png b/apps/files/img/external.png
index 2ac5e9344c3..af03dbf3e05 100644
--- a/apps/files/img/external.png
+++ b/apps/files/img/external.png
Binary files differ
diff --git a/apps/files/img/external.svg b/apps/files/img/external.svg
index d1940f2f1b3..80eba5b9960 100644
--- a/apps/files/img/external.svg
+++ b/apps/files/img/external.svg
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <path opacity=".5" d="m7.4515 1.6186 2.3806 2.2573-3.5709 3.386 2.3806 2.2573 3.5709-3.386 2.3806 2.2573v-6.7725h-7.1422zm-4.7612 1.1286c-0.65945 0-1.1903 0.5034-1.1903 1.1286v9.029c0 0.6253 0.53085 1.1286 1.1903 1.1286h9.522c0.6594 0 1.1903-0.5034 1.1903-1.1286v-3.386l-1.19-1.1287v4.5146h-9.5217v-9.029h4.761l-1.1905-1.1287h-3.5707z"/>
+ <path d="m7.4515 1.6186 2.3806 2.2573-3.5709 3.386 2.3806 2.2573 3.5709-3.386 2.3806 2.2573v-6.7725h-7.1422zm-4.7612 1.1286c-0.65945 0-1.1903 0.5034-1.1903 1.1286v9.029c0 0.6253 0.53085 1.1286 1.1903 1.1286h9.522c0.6594 0 1.1903-0.5034 1.1903-1.1286v-3.386l-1.19-1.1287v4.5146h-9.5217v-9.029h4.761l-1.1905-1.1287h-3.5707z"/>
</svg>
diff --git a/apps/files/img/folder.png b/apps/files/img/folder.png
index ada4c4c2f88..4a8861f25ca 100644
--- a/apps/files/img/folder.png
+++ b/apps/files/img/folder.png
Binary files differ
diff --git a/apps/files/img/folder.svg b/apps/files/img/folder.svg
index 1a97808443d..4411b065c1c 100644
--- a/apps/files/img/folder.svg
+++ b/apps/files/img/folder.svg
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g opacity=".5" fill-rule="evenodd" transform="matrix(.86667 0 0 .86667 -172.04 -864.43)">
- <path d="m200.2 998.57c-0.28913 0-0.53125 0.24212-0.53125 0.53125v13.938c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53125-0.2327 0.53125-0.5312l0.0004-8.1661c0-0.289-0.24212-0.5338-0.53125-0.5338h-12.161l-0.0004 6.349c0 0.2771-0.30237 0.5638-0.57937 0.5638s-0.57447-0.2867-0.57447-0.5638l0.0004-7.0055c0-0.2771 0.23357-0.4974 0.51057-0.4974h2.6507l8.3774 0.0003-0.0004-1.7029c0-0.3272-0.24549-0.6047-0.57258-0.6047h-7.5043v-1.7764c0-0.28915-0.23415-0.53125-0.52328-0.53125z" fill-rule="evenodd"/>
+ <g transform="matrix(.86667 0 0 .86667 -172.04 -864.43)" fill-rule="evenodd">
+ <path style="" d="m200.2 998.57c-0.28913 0-0.53125 0.24212-0.53125 0.53125v13.938c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53125-0.2327 0.53125-0.5312l0.0004-8.1661c0-0.289-0.24212-0.5338-0.53125-0.5338h-12.161l-0.0004 6.349c0 0.2771-0.30237 0.5638-0.57937 0.5638s-0.57447-0.2867-0.57447-0.5638l0.0004-7.0055c0-0.2771 0.23357-0.4974 0.51057-0.4974h2.6507l8.3774 0.0003-0.0004-1.7029c0-0.3272-0.24549-0.6047-0.57258-0.6047h-7.5043v-1.7764c0-0.28915-0.23415-0.53125-0.52328-0.53125z" fill-rule="evenodd"/>
</g>
</svg>
diff --git a/apps/files/img/public.png b/apps/files/img/public.png
index f49c5fb1ee5..772838ad205 100644
--- a/apps/files/img/public.png
+++ b/apps/files/img/public.png
Binary files differ
diff --git a/apps/files/img/public.svg b/apps/files/img/public.svg
index 23ac51d8367..99a71c6cb5b 100644
--- a/apps/files/img/public.svg
+++ b/apps/files/img/public.svg
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g opacity=".5" transform="matrix(.67042 -.67042 .67042 .67042 .62542 93.143)">
- <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m69.5-61.5c-1.9217 0-3.5 1.5783-3.5 3.5 0 0.17425 0.0062 0.33232 0.03125 0.5h2.0625c-0.053-0.156-0.094-0.323-0.094-0.5 0-0.8483 0.6517-1.5 1.5-1.5h5c0.8483 0 1.5 0.6517 1.5 1.5s-0.6517 1.5-1.5 1.5h-1.6875c-0.28733 0.79501-0.78612 1.4793-1.4375 2h3.125c1.9217 0 3.5-1.5783 3.5-3.5s-1.5783-3.5-3.5-3.5h-5z"/>
- <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m68.5-54.5c1.9217 0 3.5-1.5783 3.5-3.5 0-0.17425-0.0062-0.33232-0.03125-0.5h-2.0625c0.053 0.156 0.094 0.323 0.094 0.5 0 0.8483-0.6517 1.5-1.5 1.5h-5c-0.8483 0-1.5-0.6517-1.5-1.5s0.6517-1.5 1.5-1.5h1.6875c0.28733-0.79501 0.78612-1.4793 1.4375-2h-3.125c-1.9217 0-3.5 1.5783-3.5 3.5s1.5783 3.5 3.5 3.5h5z"/>
+ <g transform="matrix(.67042 -.67042 .67042 .67042 .62542 93.143)">
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m69.5-61.5c-1.9217 0-3.5 1.5783-3.5 3.5 0 0.17425 0.0062 0.33232 0.03125 0.5h2.0625c-0.053-0.156-0.094-0.323-0.094-0.5 0-0.8483 0.6517-1.5 1.5-1.5h5c0.8483 0 1.5 0.6517 1.5 1.5s-0.6517 1.5-1.5 1.5h-1.6875c-0.28733 0.79501-0.78612 1.4793-1.4375 2h3.125c1.9217 0 3.5-1.5783 3.5-3.5s-1.5783-3.5-3.5-3.5h-5z"/>
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m68.5-54.5c1.9217 0 3.5-1.5783 3.5-3.5 0-0.17425-0.0062-0.33232-0.03125-0.5h-2.0625c0.053 0.156 0.094 0.323 0.094 0.5 0 0.8483-0.6517 1.5-1.5 1.5h-5c-0.8483 0-1.5-0.6517-1.5-1.5s0.6517-1.5 1.5-1.5h1.6875c0.28733-0.79501 0.78612-1.4793 1.4375-2h-3.125c-1.9217 0-3.5 1.5783-3.5 3.5s1.5783 3.5 3.5 3.5h5z"/>
</g>
</svg>
diff --git a/apps/files/img/share.png b/apps/files/img/share.png
index 61c87e78b6c..fdacbbabebc 100644
--- a/apps/files/img/share.png
+++ b/apps/files/img/share.png
Binary files differ
diff --git a/apps/files/img/share.svg b/apps/files/img/share.svg
index 97f52f2e783..d67d35c6e56 100644
--- a/apps/files/img/share.svg
+++ b/apps/files/img/share.svg
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g opacity=".5" transform="translate(0 -1036.4)">
+ <g transform="translate(0 -1036.4)">
<path d="m12.228 1037.4c-1.3565 0-2.4592 1.0977-2.4592 2.4542 0 0.075 0.0084 0.1504 0.0149 0.2236l-4.7346 2.4145c-0.4291-0.3667-0.98611-0.5863-1.5947-0.5863-1.3565 0-2.4542 1.0977-2.4542 2.4543 0 1.3565 1.0977 2.4542 2.4542 2.4542 0.54607 0 1.0528-0.1755 1.4606-0.477l4.8637 2.4741c-0.0024 0.044-0.0099 0.089-0.0099 0.1342 0 1.3565 1.1027 2.4542 2.4592 2.4542s2.4542-1.0977 2.4542-2.4542-1.0977-2.4592-2.4542-2.4592c-0.63653 0-1.218 0.2437-1.6544 0.6409l-4.6953-2.4c0.01892-0.1228 0.03478-0.2494 0.03478-0.3775 0-0.072-0.0089-0.1437-0.0149-0.2137l4.7395-2.4145c0.42802 0.3627 0.98488 0.5813 1.5898 0.5813 1.3565 0 2.4542-1.1027 2.4542-2.4592s-1.0977-2.4542-2.4542-2.4542z"/>
</g>
</svg>
diff --git a/apps/files/img/star.png b/apps/files/img/star.png
index 6b0ec67ec1c..3c66c49a8c4 100644
--- a/apps/files/img/star.png
+++ b/apps/files/img/star.png
Binary files differ
diff --git a/apps/files/img/star.svg b/apps/files/img/star.svg
index fb3eef1e452..3207f6f9a46 100644
--- a/apps/files/img/star.svg
+++ b/apps/files/img/star.svg
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g opacity=".5" transform="matrix(.049689 0 0 .049689 -7.3558 -36.792)">
- <path d="m330.36 858.43 43.111 108.06 117.64 9.2572-89.445 74.392 27.55 114.75-98.391-62.079-100.62 61.66 28.637-112.76-89.734-76.638 116.09-7.6094z" transform="translate(-21.071,-112.5)"/>
+ <g transform="matrix(.049689 0 0 .049689 -7.3558 -36.792)">
+ <path style="" d="m330.36 858.43 43.111 108.06 117.64 9.2572-89.445 74.392 27.55 114.75-98.391-62.079-100.62 61.66 28.637-112.76-89.734-76.638 116.09-7.6094z" transform="translate(-21.071,-112.5)"/>
</g>
</svg>
diff --git a/apps/files_sharing/tests/js/shareSpec.js b/apps/files_sharing/tests/js/shareSpec.js
index 581e15caf93..b6368b901ee 100644
--- a/apps/files_sharing/tests/js/shareSpec.js
+++ b/apps/files_sharing/tests/js/shareSpec.js
@@ -117,7 +117,7 @@ describe('OCA.Sharing.Util tests', function() {
$tr = fileList.$el.find('tbody tr:first');
$action = $tr.find('.action-share');
expect($action.hasClass('permanent')).toEqual(true);
- expect($action.find('>span').text()).toEqual('Shared');
+ expect($action.find('>span').text().trim()).toEqual('Shared');
expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-shared.svg');
expect($action.find('img').length).toEqual(1);
@@ -138,7 +138,7 @@ describe('OCA.Sharing.Util tests', function() {
$tr = fileList.$el.find('tbody tr:first');
$action = $tr.find('.action-share');
expect($action.hasClass('permanent')).toEqual(true);
- expect($action.find('>span').text()).toEqual('Shared');
+ expect($action.find('>span').text().trim()).toEqual('Shared');
expect(OC.basename($action.find('img').attr('src'))).toEqual('public.svg');
expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-public.svg');
expect($action.find('img').length).toEqual(1);
@@ -159,7 +159,7 @@ describe('OCA.Sharing.Util tests', function() {
$tr = fileList.$el.find('tbody tr:first');
$action = $tr.find('.action-share');
expect($action.hasClass('permanent')).toEqual(true);
- expect($action.find('>span').text()).toEqual('User One');
+ expect($action.find('>span').text().trim()).toEqual('User One');
expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-shared.svg');
});
@@ -179,7 +179,7 @@ describe('OCA.Sharing.Util tests', function() {
$tr = fileList.$el.find('tbody tr:first');
$action = $tr.find('.action-share');
expect($action.hasClass('permanent')).toEqual(true);
- expect($action.find('>span').text()).toEqual('Shared with User One, User Two');
+ expect($action.find('>span').text().trim()).toEqual('Shared with User One, User Two');
expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-shared.svg');
expect($action.find('img').length).toEqual(1);
@@ -275,7 +275,7 @@ describe('OCA.Sharing.Util tests', function() {
OC.Share.updateIcon('file', 1);
expect($action.hasClass('permanent')).toEqual(true);
- expect($action.find('>span').text()).toEqual('Shared with Group One, Group Two, User One, User Two');
+ expect($action.find('>span').text().trim()).toEqual('Shared with Group One, Group Two, User One, User Two');
expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
});
it('updates share icon after updating shares of a file', function() {
@@ -311,7 +311,7 @@ describe('OCA.Sharing.Util tests', function() {
OC.Share.updateIcon('file', 1);
expect($action.hasClass('permanent')).toEqual(true);
- expect($action.find('>span').text()).toEqual('Shared with User One, User Three, User Two');
+ expect($action.find('>span').text().trim()).toEqual('Shared with User One, User Three, User Two');
expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
});
it('removes share icon after removing all shares from a file', function() {
@@ -380,7 +380,7 @@ describe('OCA.Sharing.Util tests', function() {
OC.Share.updateIcon('file', 1);
expect($action.hasClass('permanent')).toEqual(true);
- expect($action.find('>span').text()).toEqual('User One');
+ expect($action.find('>span').text().trim()).toEqual('User One');
expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
});
it('keep share text after unsharing reshare', function() {
@@ -416,7 +416,7 @@ describe('OCA.Sharing.Util tests', function() {
OC.Share.updateIcon('file', 1);
expect($action.hasClass('permanent')).toEqual(true);
- expect($action.find('>span').text()).toEqual('User One');
+ expect($action.find('>span').text().trim()).toEqual('User One');
expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
});
});
diff --git a/core/css/apps.css b/core/css/apps.css
index 620c3013829..846eba8e4bf 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -22,7 +22,7 @@
height: 100%;
float: left;
-moz-box-sizing: border-box; box-sizing: border-box;
- background-color: #f5f5f5;
+ background-color: #fff;
padding-bottom: 44px;
-webkit-user-select: none;
-moz-user-select: none;
@@ -42,10 +42,6 @@
width: 100%;
-moz-box-sizing: border-box; box-sizing: border-box;
}
-#app-navigation .active,
-#app-navigation .active a {
- background-color: #ddd;
-}
#app-navigation .active.with-menu > a,
#app-navigation .with-counter > a {
@@ -56,14 +52,6 @@
padding-right: 90px;
}
-#app-navigation li:hover > a,
-#app-navigation li:focus > a,
-#app-navigation a:focus,
-#app-navigation .selected,
-#app-navigation .selected a {
- background-color: #ddd;
-}
-
#app-navigation .with-icon a,
#app-navigation .app-navigation-entry-loading a {
padding-left: 44px;
@@ -82,7 +70,17 @@
-moz-box-sizing: border-box; box-sizing: border-box;
white-space: nowrap;
text-overflow: ellipsis;
- color: #333;
+ color: #000;
+ opacity: .5;
+}
+#app-navigation .active,
+#app-navigation .active a,
+#app-navigation li:hover > a,
+#app-navigation li:focus > a,
+#app-navigation a:focus,
+#app-navigation .selected,
+#app-navigation .selected a {
+ opacity: 1;
}
#app-navigation .collapse {
@@ -292,37 +290,26 @@
list-style-type: none;
}
+/* menu bubble / popover */
.bubble,
#app-navigation .app-navigation-entry-menu {
position: absolute;
- background-color: #eee;
+ background-color: #fff;
color: #333;
border-radius: 3px;
border-top-right-radius: 0;
z-index: 110;
margin: -5px 14px 5px 10px;
right: 0;
- border: 1px solid #bbb;
-webkit-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
-moz-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
-ms-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
-o-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
}
-
-#app-navigation .app-navigation-entry-menu {
- display: none;
-}
-
-#app-navigation .app-navigation-entry-menu.open {
- display: block;
-}
-
/* miraculous border arrow stuff */
.bubble:after,
-.bubble:before,
-#app-navigation .app-navigation-entry-menu:after,
-#app-navigation .app-navigation-entry-menu:before {
+#app-navigation .app-navigation-entry-menu:after {
bottom: 100%;
right: 0; /* change this to adjust the arrow position */
border: solid transparent;
@@ -332,21 +319,31 @@
position: absolute;
pointer-events: none;
}
-
.bubble:after,
#app-navigation .app-navigation-entry-menu:after {
border-color: rgba(238, 238, 238, 0);
- border-bottom-color: #eee;
+ border-bottom-color: #fff;
border-width: 10px;
margin-left: -10px;
}
+.bubble .action {
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)" !important;
+ filter: alpha(opacity=50) !important;
+ opacity: .5 !important;
+}
+.bubble .action:hover,
+.bubble .action:focus {
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)" !important;
+ filter: alpha(opacity=100) !important;
+ opacity: 1 !important;
+}
+
+#app-navigation .app-navigation-entry-menu {
+ display: none;
+}
-.bubble:before,
-#app-navigation .app-navigation-entry-menu:before {
- border-color: rgba(187, 187, 187, 0);
- border-bottom-color: #bbb;
- border-width: 11px;
- margin-left: -11px;
+#app-navigation .app-navigation-entry-menu.open {
+ display: block;
}
/* list of options for an entry */
@@ -474,13 +471,10 @@
#app-settings.opened #app-settings-content {
display: block;
}
-#app-settings-header {
- background-color: #eee;
-}
#app-settings-content {
display: none;
padding: 10px;
- background-color: #eee;
+ background-color: #fff;
}
#app-settings.open #app-settings-content {
display: block;
@@ -500,7 +494,7 @@
width: 100%;
padding: 0;
margin: 0;
- background-color: transparent;
+ background-color: #fff;
background-image: url('../img/actions/settings.svg');
background-position: 14px center;
background-repeat: no-repeat;
@@ -513,11 +507,11 @@
}
.settings-button:hover,
.settings-button:focus {
- background-color: #ddd;
+ background-color: #fff;
}
.settings-button.opened:hover,
.settings-button.opened:focus {
- background-color: transparent;
+ background-color: #fff;
}
/* buttons */
diff --git a/core/css/header.css b/core/css/header.css
index 466022e9f76..5630f96953f 100644
--- a/core/css/header.css
+++ b/core/css/header.css
@@ -294,7 +294,7 @@
}
#expand {
display: block;
- padding: 7px 30px 6px 22px;
+ padding: 7px 30px 6px 10px;
cursor: pointer;
}
#expand * {
diff --git a/core/css/mobile.css b/core/css/mobile.css
index 9008e39b89c..29507a0faa9 100644
--- a/core/css/mobile.css
+++ b/core/css/mobile.css
@@ -26,35 +26,12 @@
display: none;
}
-/* compress search box on mobile, expand when focused */
-.searchbox input[type="search"] {
- width: 0;
- cursor: pointer;
- background-color: transparent;
- -webkit-transition: all 100ms;
- -moz-transition: all 100ms;
- -o-transition: all 100ms;
- transition: all 100ms;
- -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
- opacity: .7;
-}
-.searchbox input[type="search"]:focus,
-.searchbox input[type="search"]:active {
- width: 155px;
- max-width: 50%;
- cursor: text;
- background-color: #112;
- -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
- opacity: 1;
-}
-
/* do not show display name on mobile when profile picture is present */
#header .avatardiv.avatardiv-shown + #expandDisplayName {
display: none;
}
#header #expand {
display: block;
- padding: 7px 30px 6px 7px;
}
/* do not show update notification on mobile */
diff --git a/core/css/styles.css b/core/css/styles.css
index b196b4f1b3f..cad407b52ea 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -186,7 +186,7 @@ input img, button img, .button img {
background-color: transparent;
}
::-webkit-scrollbar-thumb {
- background: #ccc;
+ background: #ddd;
}
@@ -258,21 +258,28 @@ input:disabled+label, input:disabled:hover+label, input:disabled:focus+label {
font-size: 1.2em;
padding: 3px;
padding-left: 25px;
- background: #112 url('../img/actions/search-white.svg') no-repeat 6px center;
+ background: transparent url('../img/actions/search-white.svg') no-repeat 6px center;
color: #fff;
border: 0;
border-radius: 3px;
- -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
- opacity: .3;
margin-top: 9px;
float: right;
+ width: 0;
+ cursor: pointer;
+ -webkit-transition: all 100ms;
+ -moz-transition: all 100ms;
+ -o-transition: all 100ms;
+ transition: all 100ms;
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
+ opacity: .7;
}
-.searchbox input[type="search"]:hover,
.searchbox input[type="search"]:focus,
.searchbox input[type="search"]:active {
- -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
- opacity: .7;
color: #fff;
+ width: 155px;
+ max-width: 50%;
+ cursor: text;
+ background-color: #112;
}
input[type="submit"].enabled {
diff --git a/core/js/share.js b/core/js/share.js
index 7e0d0b7a2d3..cd4a614e9d1 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -127,7 +127,7 @@ OC.Share={
if (img.attr('src') !== OC.imagePath('core', 'actions/public')) {
img.attr('src', image);
$(actions[i]).addClass('permanent');
- $(actions[i]).html(' <span>'+t('core', 'Shared')+'</span>').prepend(img);
+ $(actions[i]).html('<span> '+t('core', 'Shared')+'</span>').prepend(img);
}
}
for(i = 0; i < files.length; i++) {
@@ -276,7 +276,7 @@ OC.Share={
else if (recipients) {
message = t('core', 'Shared with {recipients}', {recipients: this._formatShareList(recipients.split(", ")).join(", ")}, 0, {escape: false});
}
- action.html(' <span>' + message + '</span>').prepend(img);
+ action.html('<span> ' + message + '</span>').prepend(img);
if (owner || recipients) {
action.find('.remoteAddress').tipsy({gravity: 's'});
}
diff --git a/core/js/tests/specs/shareSpec.js b/core/js/tests/specs/shareSpec.js
index 3dc25134f59..5a59a117d77 100644
--- a/core/js/tests/specs/shareSpec.js
+++ b/core/js/tests/specs/shareSpec.js
@@ -1132,7 +1132,7 @@ describe('OC.Share tests', function() {
OC.Share.markFileAsShared($file);
$action = $file.find('.action-share>span');
- expect($action.text()).toEqual(output);
+ expect($action.text().trim()).toEqual(output);
if (_.isString(title)) {
expect($action.find('.remoteAddress').attr('title')).toEqual(title);
} else {
@@ -1236,7 +1236,7 @@ describe('OC.Share tests', function() {
OC.Share.markFileAsShared($file, true);
$action = $file.find('.action-share>span');
- expect($action.text()).toEqual(output);
+ expect($action.text().trim()).toEqual(output);
if (_.isString(title)) {
expect($action.find('.remoteAddress').attr('title')).toEqual(title);
} else if (_.isArray(title)) {
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-01 15:02:25 +0000