From c44f534c2b88b39dc90219699328510eca29e076 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 19 Nov 2013 15:53:49 +0100 Subject: account for shift of controls bar due to app navigation, do not shift on public page --- core/css/styles.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/core/css/styles.css b/core/css/styles.css index c651eb05238..73e9a8d073d 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -204,11 +204,18 @@ input[type="submit"].enabled { right: 0; left: 80px; height: 44px; + width: 100%; + padding: 0; margin: 0; background: #eee; border-bottom: 1px solid #e7e7e7; z-index: 50; } +/* account for shift of controls bar due to app navigation */ +#body-user #controls, +#body-settings #controls { + padding-right: 75px; +} #controls .button, #controls button, #controls input[type='submit'], -- cgit v1.2.3 From d673dd066a36a699380c2a3e1c10a0b7e90701f9 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 19 Nov 2013 15:54:27 +0100 Subject: fix details for buttons in header and controls bar --- apps/files_sharing/css/public.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css index 801c27506f1..039a9af6cb6 100644 --- a/apps/files_sharing/css/public.css +++ b/apps/files_sharing/css/public.css @@ -22,13 +22,17 @@ body { #public_upload, #download { font-weight:700; - margin: 0 0.4em 0 0; + margin: 0 0 0 .4em; padding: 0 5px; height: 32px; float: left; } +#openAsPhotoAlbum { + font-weight: normal; +} + .header-right #details { margin-right: 28px; } -- cgit v1.2.3 From 7867604e22a93ef8a83a818891980555c89897cb Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 20 Nov 2013 15:05:08 +0100 Subject: remove app specific code --- apps/files_sharing/css/public.css | 4 ---- 1 file changed, 4 deletions(-) diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css index 039a9af6cb6..1e6cd02a643 100644 --- a/apps/files_sharing/css/public.css +++ b/apps/files_sharing/css/public.css @@ -29,10 +29,6 @@ body { } -#openAsPhotoAlbum { - font-weight: normal; -} - .header-right #details { margin-right: 28px; } -- cgit v1.2.3 From 5e9ac2f20f8cf6d0f6834612711422799ef702f9 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 21 Nov 2013 13:33:04 +0100 Subject: change different shades of grey for public share page to white --- apps/files_sharing/css/public.css | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css index 1e6cd02a643..1ae2228cc82 100644 --- a/apps/files_sharing/css/public.css +++ b/apps/files_sharing/css/public.css @@ -1,5 +1,5 @@ body { - background:#ddd; + background: #fff; } #header { @@ -50,11 +50,10 @@ body { } #preview { - background:#eee; - border-bottom:1px solid #f8f8f8; - min-height:30em; - text-align:center; - margin:45px auto; + background: #fff; + min-height: 30em; + text-align: center; + margin: 45px auto 0; } #noPreview { @@ -62,11 +61,16 @@ body { padding-top:5em; } +footer { + background: #fff; +} + p.info { - color:#777; - text-align:center; - width:22em; - margin:2em auto; + color: #777; + text-align: center; + width: 22em; + margin: 0 auto; + padding: 20px; } p.info a { -- cgit v1.2.3 From a6f10a59fc43cec8085f63325cf73684fe355f8f Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 27 Nov 2013 21:21:29 +0100 Subject: fix and cleanup CSS for public page --- apps/files_sharing/css/public.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css index 1ae2228cc82..50f4ac7fee8 100644 --- a/apps/files_sharing/css/public.css +++ b/apps/files_sharing/css/public.css @@ -1,5 +1,5 @@ body { - background: #fff; + height: auto; } #header { @@ -51,7 +51,6 @@ body { #preview { background: #fff; - min-height: 30em; text-align: center; margin: 45px auto 0; } @@ -62,7 +61,7 @@ body { } footer { - background: #fff; + margin-top: 45px; } p.info { -- cgit v1.2.3 From 62827376b833ba35842892ee934505c15485a50d Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Tue, 3 Dec 2013 10:59:22 +0100 Subject: fix trashbin and pbulic page controls --- apps/files/css/files.css | 2 +- apps/files_sharing/css/public.css | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 2fc86ca537d..e96fa648157 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -14,7 +14,7 @@ padding: 0 !important; /* override default control bar button padding */ } #trash { - margin-right: 8px; + margin-right: 12px; float: right; z-index: 1010; padding: 10px; diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css index 50f4ac7fee8..3ccb35e327a 100644 --- a/apps/files_sharing/css/public.css +++ b/apps/files_sharing/css/public.css @@ -49,6 +49,10 @@ body { vertical-align:text-bottom; } +#controls { + left: 0; +} + #preview { background: #fff; text-align: center; -- cgit v1.2.3 From b3a96c081b3aa65820e4c6a9b35d0b0258868053 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Tue, 3 Dec 2013 13:46:58 +0100 Subject: fix public page - gallery view issues --- apps/files/css/files.css | 2 +- core/css/styles.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index e96fa648157..2fc86ca537d 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -14,7 +14,7 @@ padding: 0 !important; /* override default control bar button padding */ } #trash { - margin-right: 12px; + margin-right: 8px; float: right; z-index: 1010; padding: 10px; diff --git a/core/css/styles.css b/core/css/styles.css index 73e9a8d073d..6ace42a84cb 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -202,7 +202,7 @@ input[type="submit"].enabled { box-sizing: border-box; position: fixed; right: 0; - left: 80px; + left: 0; height: 44px; width: 100%; padding: 0; @@ -214,7 +214,7 @@ input[type="submit"].enabled { /* account for shift of controls bar due to app navigation */ #body-user #controls, #body-settings #controls { - padding-right: 75px; + padding-left: 80px; } #controls .button, #controls button, -- cgit v1.2.3