aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJohannes S <johannes@schlichenmaier.info>2017-10-31 01:34:46 +0100
committerGitHub <noreply@github.com>2017-10-31 01:34:46 +0100
commit936486413d22646a71d6e1504df9589b9eeec4e8 (patch)
tree41572ecf430943cc77357992359af28cda6848a1 /core
parent84cc13f57b795abe1bf1cffbfcaeefed54b8fa2a (diff)
parentc258cb5557507b3966990872669567af073f10f4 (diff)
downloadnextcloud-server-936486413d22646a71d6e1504df9589b9eeec4e8.tar.gz
nextcloud-server-936486413d22646a71d6e1504df9589b9eeec4e8.zip
Merge branch 'master' into master
Diffstat (limited to 'core')
-rw-r--r--core/css/apps.scss6
-rw-r--r--core/css/icons.scss4
2 files changed, 10 insertions, 0 deletions
diff --git a/core/css/apps.scss b/core/css/apps.scss
index 4f17c91764e..159982e0bf1 100644
--- a/core/css/apps.scss
+++ b/core/css/apps.scss
@@ -864,6 +864,12 @@ kbd {
width: 16px;
padding: 0 10px;
}
+ > input.checkbox + label {
+ padding: 0 !important;
+ &::before {
+ margin: -2px 12px 0;
+ }
+ }
}
[class^='icon-'],
[class*=' icon-']{
diff --git a/core/css/icons.scss b/core/css/icons.scss
index 6d855381fae..c8f61c1422e 100644
--- a/core/css/icons.scss
+++ b/core/css/icons.scss
@@ -348,6 +348,10 @@ img, object, video, button, textarea, input, select {
background-image: url('../img/actions/star.svg?v=1');
}
+.icon-star-dark {
+ background-image: url('../img/actions/star-dark.svg?v=1');
+}
+
.icon-starred {
&:hover, &:focus {
background-image: url('../img/actions/star.svg?v=1');