summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMorris Jobke <morris.jobke@gmail.com>2013-10-04 14:56:09 -0700
committerMorris Jobke <morris.jobke@gmail.com>2013-10-04 14:56:09 -0700
commitcc1e69c1902a9cf6c6c68cdaa3f1eead09ca7a5c (patch)
tree4ec411b2fb13c73efb3a18c260d05abe750d7a3f /core
parenta927c145bed8c435af63469742bed58a7b657380 (diff)
parent1cae6661dfe7b4d4753c9665a056c7ebc2ad133f (diff)
downloadnextcloud-server-cc1e69c1902a9cf6c6c68cdaa3f1eead09ca7a5c.tar.gz
nextcloud-server-cc1e69c1902a9cf6c6c68cdaa3f1eead09ca7a5c.zip
Merge pull request #5136 from owncloud/design-fixes
Design fixes
Diffstat (limited to 'core')
-rw-r--r--core/css/apps.css7
-rw-r--r--core/css/styles.css2
-rw-r--r--core/img/actions/checkmark.pngbin0 -> 303 bytes
-rw-r--r--core/img/actions/checkmark.svg4
-rw-r--r--core/img/actions/star.pngbin0 -> 640 bytes
-rw-r--r--core/img/actions/star.svg14
-rw-r--r--core/img/actions/starred.pngbin0 -> 566 bytes
-rw-r--r--core/img/actions/starred.svg14
8 files changed, 39 insertions, 2 deletions
diff --git a/core/css/apps.css b/core/css/apps.css
index 80989af6bd6..49fb189f384 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -201,9 +201,14 @@
border: 0;
border-radius: 0;
}
-.settings-button:hover {
+.settings-button:hover,
+.settings-button:focus {
background-color: #ddd;
}
+.settings-button.opened:hover,
+.settings-button.opened:focus {
+ background-color: transparent;
+}
/* icons */
.folder-icon, .delete-icon, .edit-icon, .progress-icon {
diff --git a/core/css/styles.css b/core/css/styles.css
index 28ae23f97c9..505e4dc03e8 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -118,7 +118,7 @@ input:disabled, input:disabled:hover, input:disabled:focus,
button:disabled, button:disabled:hover, button:disabled:focus,
.button:disabled, .button:disabled:hover, .button:disabled:focus,
a.disabled, a.disabled:hover, a.disabled:focus {
- background: rgba(230,230,230,.9);
+ background-color: rgba(230,230,230,.9);
color: #999;
cursor: default;
}
diff --git a/core/img/actions/checkmark.png b/core/img/actions/checkmark.png
new file mode 100644
index 00000000000..99a4019c69e
--- /dev/null
+++ b/core/img/actions/checkmark.png
Binary files differ
diff --git a/core/img/actions/checkmark.svg b/core/img/actions/checkmark.svg
new file mode 100644
index 00000000000..f70a407c2ed
--- /dev/null
+++ b/core/img/actions/checkmark.svg
@@ -0,0 +1,4 @@
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xml:space="preserve" height="16px" viewBox="-0.5 -0.5 16 16" width="16px" enable-background="new -0.5 -0.5 16 16" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" overflow="visible"><metadata><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata><defs>
+</defs>
+<path fill="#000" d="M12.438,3.6875c-0.363,0-0.726,0.1314-1,0.4063l-4.5005,4.5-1.9687-2c-0.5498-0.5484-1.4489-0.5498-2,0l-0.5,0.5c-0.5512,0.5496-0.5512,1.4502,0,2l2.9687,2.9682c0.0063,0.007-0.0065,0.025,0,0.032l0.5,0.5c0.5497,0.55,1.4503,0.55,2,0l0.5-0.5,0.1875-0.219,5.313-5.2812c0.549-0.5498,0.549-1.4503,0-2l-0.5-0.5c-0.275-0.2749-0.638-0.4063-1-0.4063z" transform="translate(-0.5,-0.5)"/>
+</svg>
diff --git a/core/img/actions/star.png b/core/img/actions/star.png
new file mode 100644
index 00000000000..124ce495af6
--- /dev/null
+++ b/core/img/actions/star.png
Binary files differ
diff --git a/core/img/actions/star.svg b/core/img/actions/star.svg
new file mode 100644
index 00000000000..7bcd8dc0598
--- /dev/null
+++ b/core/img/actions/star.svg
@@ -0,0 +1,14 @@
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="22" width="22" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata>
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ <dc:title/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g transform="matrix(0.06832234,0,0,0.06832234,-10.114234,-50.901693)">
+ <path fill="#CCC" transform="translate(-21.071,-112.5)" 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"/>
+ </g>
+</svg>
diff --git a/core/img/actions/starred.png b/core/img/actions/starred.png
new file mode 100644
index 00000000000..5185d0f5381
--- /dev/null
+++ b/core/img/actions/starred.png
Binary files differ
diff --git a/core/img/actions/starred.svg b/core/img/actions/starred.svg
new file mode 100644
index 00000000000..c7a5a7dac12
--- /dev/null
+++ b/core/img/actions/starred.svg
@@ -0,0 +1,14 @@
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="22" width="22" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata>
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ <dc:title/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g transform="matrix(0.06832234,0,0,0.06832234,-10.114235,-50.901693)">
+ <path fill="#FC0" transform="translate(-21.071,-112.5)" 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"/>
+ </g>
+</svg>