summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/files/css/files.css3
-rw-r--r--apps/files_sharing/css/public.css1
-rw-r--r--apps/files_sharing/templates/public.php2
-rw-r--r--core/css/mobile.css7
-rw-r--r--core/css/styles.css4
-rw-r--r--settings/css/settings.css3
-rw-r--r--settings/templates/personal.php12
7 files changed, 22 insertions, 10 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index b85fccce5a3..3bc6640481c 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -205,6 +205,9 @@ table.multiselect thead {
left: 250px; /* sidebar */
}
+table thead th {
+ background-color: #fff;
+}
table.multiselect thead th {
background-color: rgba(220,220,220,.8);
color: #000;
diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index ddd9d10d664..04c482d10e4 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -92,7 +92,6 @@ thead {
#remote_address {
margin: 0;
height: 14px;
- line-height: 16px;
padding: 6px;
}
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 65e620a3425..87472c5c3b4 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -19,7 +19,7 @@
<span id="save" data-protected="<?php p($_['protected'])?>" data-owner="<?php p($_['displayName'])?>" data-name="<?php p($_['filename'])?>">
<button><?php p($l->t('Add to your ownCloud')) ?></button>
<form class="save-form hidden" action="#">
- <input type="text" id="remote_address" placeholder="<?php p($l->t('example.com/owncloud')) ?>"/>
+ <input type="text" id="remote_address" placeholder="example.com/owncloud"/>
<input type="submit" value="<?php p($l->t('Save')) ?>"/>
</form>
</span>
diff --git a/core/css/mobile.css b/core/css/mobile.css
index bdca29d888a..0a74178937d 100644
--- a/core/css/mobile.css
+++ b/core/css/mobile.css
@@ -58,14 +58,9 @@
/* APP SIDEBAR TOGGLE and SWIPE ----------------------------------------------*/
-/* prevent scrollbar when sidebar is open */
-.snapjs-left #content-wrapper {
- overflow-x: hidden;
-}
-
#app-navigation,
#app-content {
- position: absolute;
+ position: absolute !important;
top: 0;
left: 0;
right: 0;
diff --git a/core/css/styles.css b/core/css/styles.css
index bfa15eb7e50..d959aec0361 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -250,8 +250,7 @@ input[type="submit"].enabled {
width: 100%;
padding: 0;
margin: 0;
- background-color: rgba(235, 235, 235, .85);
- border-bottom: 1px solid #e7e7e7;
+ background-color: rgba(255, 255, 255, .95);
z-index: 50;
-webkit-user-select: none;
-moz-user-select: none;
@@ -297,6 +296,7 @@ input[type="submit"].enabled {
position: absolute;
height: 100%;
width: 100%;
+ overflow-x: hidden; /* prevent horizontal scrollbar */
padding-top: 45px;
-moz-box-sizing:border-box;
box-sizing:border-box;
diff --git a/settings/css/settings.css b/settings/css/settings.css
index ef8428bd3ef..7dbaf830096 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -19,6 +19,9 @@ input#openid, input#webdav { width:20em; }
.clientsbox .center {
margin-top: 10px;
}
+.clientsbox a {
+ font-weight: bold;
+}
#passworderror { display:none; }
#passwordchanged { display:none; }
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 1d1500743ad..ecdd6dad24a 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -15,6 +15,18 @@
<a href="<?php p($_['clients']['ios']); ?>" target="_blank">
<img src="<?php print_unescaped(OCP\Util::imagePath('core', 'appstore.png')); ?>" />
</a>
+
+ <?php if (OC_Util::getEditionString() === ''): ?>
+ <p class="center">
+ <?php print_unescaped($l->t('If you want to support the project
+ <a href="https://owncloud.org/contribute"
+ target="_blank">join development</a>
+ or
+ <a href="https://owncloud.org/promote"
+ target="_blank">spread the word</a>!'));?>
+ </p>
+ <?php endif; ?>
+
<?php if(OC_APP::isEnabled('firstrunwizard')) {?>
<p class="center"><a class="button" href="#" id="showWizard"><?php p($l->t('Show First Run Wizard again'));?></a></p>
<?php }?>