summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlessandro Cosentino <cosenal@gmail.com>2012-08-19 13:57:34 -0400
committerAlessandro Cosentino <cosenal@gmail.com>2012-08-19 13:57:34 -0400
commit608b3c7f8aefbb8c7f11d3c0dd548e5a04b4b0b0 (patch)
tree904870ffb6aa4ad619992d2a50129714a54a2756
parent4fada56a4ccfd1bdc714113b61baa394af77f927 (diff)
parente9b86ca4ae9960d995a5d052ea0bad519d6b4555 (diff)
Merge commit 'refs/merge-requests/21' of git://gitorious.org/owncloud/apps into merge-requests/21
-rw-r--r--css/news.css9
1 files changed, 7 insertions, 2 deletions
diff --git a/css/news.css b/css/news.css
index 8a2b540dd..659633862 100644
--- a/css/news.css
+++ b/css/news.css
@@ -371,6 +371,10 @@ div.add_parentfolder {
margin: .15em 0 0 .15em;
}
+ #feed_settings button img {
+ border: none;
+ }
+
#feed_settings .controls > li:last-child button {
margin-right: .3em;
}
@@ -445,6 +449,7 @@ div.add_parentfolder {
box-sizing: border-box;
-moz-box-sizing: border-box;
left: 34.1em;
+ overflow: hidden;
}
/**
@@ -578,7 +583,7 @@ div.add_parentfolder {
* Body of the feed item
*/
.feed_item div.body {
- overflow-y: hidden;
+ overflow: hidden;
padding: .5em 3em 0 3em;
max-width: 55em;
font-size: 1.1em;
@@ -643,7 +648,7 @@ div.add_parentfolder {
background-image: -moz-linear-gradient(top, rgb(215,215,215) 0%, rgb(220,220,220) 100%);
background-image: -webkit-linear-gradient(top, rgb(215,215,215) 0%, rgb(220,220,220) 100%);
background-image: -ms-linear-gradient(top, rgb(215,215,215) 0%, rgb(220,220,220) 100%);
- overflow: auto;
+ overflow-y: auto;
}
.feed_item div.body pre code {