From 1089b8c5aa1ab828facc5d6fd11fa6192b72237b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Wed, 13 Dec 2017 11:53:19 +0100 Subject: [PATCH 1/7] Fixed gallery button insertion script and design fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- css/gallerybutton.css | 3 +-- js/gallerybutton.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/css/gallerybutton.css b/css/gallerybutton.css index 5dbf1f86f..02ec62184 100644 --- a/css/gallerybutton.css +++ b/css/gallerybutton.css @@ -4,9 +4,8 @@ } #controls .button.view-switcher { - float: right; - margin-top: 5px; padding: 6px 11px; + margin-left: auto; } #controls .button.view-switcher.gallery { diff --git a/js/gallerybutton.js b/js/gallerybutton.js index 491929379..8bd01f97b 100644 --- a/js/gallerybutton.js +++ b/js/gallerybutton.js @@ -81,7 +81,7 @@ $(document).ready(function () { window.location.href = GalleryButton.url; }); - $('#controls').prepend(GalleryButton.button); + $('#controls .actions').append(GalleryButton.button); } } ); From 27f4c4e9804e608ad56d31b1f2856a8351ed3072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Wed, 13 Dec 2017 13:42:45 +0100 Subject: [PATCH 2/7] Fixed multiplde design flaws MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- css/gallerybutton.css | 8 --- css/styles.css | 12 +++-- css/upload.css | 6 +-- templates/part.content.php | 100 ++++++++++++++++++------------------- 4 files changed, 60 insertions(+), 66 deletions(-) diff --git a/css/gallerybutton.css b/css/gallerybutton.css index 02ec62184..df1c0e6f5 100644 --- a/css/gallerybutton.css +++ b/css/gallerybutton.css @@ -1,15 +1,10 @@ /* Gallery buttons design */ -#controls .left { - float: left; -} - #controls .button.view-switcher { padding: 6px 11px; margin-left: auto; } #controls .button.view-switcher.gallery { - float: none; margin-right: 4px; padding: 9px 11px; } @@ -27,15 +22,12 @@ #controls .button.left-switch-button, #controls .button.left-switch-button:hover { - float: right; display: inline; border-radius: 3px 0 0 3px; - margin-left: 3px; margin-right: 0; } #controls .button.right-switch-button { - float: right; display: inline; border-radius: 0 3px 3px 0; margin-left: -1px; diff --git a/css/styles.css b/css/styles.css index f3092b326..1390bb9cb 100644 --- a/css/styles.css +++ b/css/styles.css @@ -6,8 +6,8 @@ body:after { content: url("../img/nameasc.svg") url("../img/namedes.svg") url("../img/dateasc.svg") url("../img/datedes.svg"); } -#breadcrumbs { - float: left; +#controls { + width: 100%; } .breadcrumbs-droppable { @@ -29,8 +29,12 @@ div.crumb.last a { width: 40px; } -#controls > .right { - float: right; +#controls .button:not(:last-child) { + margin-right: 3px; +} + +#controls .actions > .right { + margin-left: auto; } #album-info-button { diff --git a/css/upload.css b/css/upload.css index 796e2a621..630a3a84d 100644 --- a/css/upload.css +++ b/css/upload.css @@ -12,10 +12,6 @@ margin-top: 5px; } -.actions { - float: left; -} - .actions input, .actions button, .actions .button { margin: 0; float: left; @@ -34,6 +30,8 @@ .actions.creatable { position: relative; z-index: -30; + display: flex; + flex: 1 1; } .newFileMenu { diff --git a/templates/part.content.php b/templates/part.content.php index e4c70c341..917855684 100644 --- a/templates/part.content.php +++ b/templates/part.content.php @@ -38,30 +38,30 @@ ?>
-
- -
-
- <?php p($l->t('Sort by date')); ?> - <?php p($l->t('Sort by date')); ?> +
+
+ +
+
+ <?php p($l->t('Sort by name')); ?> + <?php p($l->t('Sort by name')); ?> +
-
-
-
- <?php p($l->t('Sort by name')); ?> - <?php p($l->t('Sort by name')); ?> +
+
+ <?php p($l->t('Sort by date')); ?> + <?php p($l->t('Sort by date')); ?> +
-
-
+
+ +
+ <?php p($l->t("/> +
+ + +
+ + <?php p($l->t('Album information')); ?> +
+
+
+
+
+ + +
- - -
- <?php p($l->t("/> -
- - -
- - <?php p($l->t('Album information')); ?> -
-
-
-
-
- - -
From a418fadac94b5b4d377696914a8de7f159d4d422 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 20 Dec 2017 12:24:46 +0100 Subject: [PATCH 3/7] Fix CSS to work around wrong gallery DOM structure Signed-off-by: Morris Jobke --- css/styles.css | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/css/styles.css b/css/styles.css index 1390bb9cb..cc3596af1 100644 --- a/css/styles.css +++ b/css/styles.css @@ -24,6 +24,10 @@ div.crumb.last a { cursor: default; } +#controls { + margin-top: 45px; +} + #controls .button { margin-top: 5px; width: 40px; @@ -78,16 +82,16 @@ div.crumb.last a { -webkit-overflow-scrolling: touch; -webkit-transition: background-color 1s linear; transition: background-color 1s linear; + margin-top: -45px; + height: calc(100% - 45px); } #gallery.hascontrols { position: relative; overflow: hidden; text-align: justify; - top: 45px; padding-bottom: 10px; margin-bottom: 45px; - margin-top: 0; } #gallery .row { From 55dd75045d9261cbe77d41a5a0789749bd4bd3d3 Mon Sep 17 00:00:00 2001 From: Marin Treselj Date: Wed, 20 Dec 2017 14:55:03 +0100 Subject: [PATCH 4/7] Fix button and breadcrumb margins/paddings Signed-off-by: Marin Treselj --- css/styles.css | 22 +++++++++++----------- css/upload.css | 6 +++++- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/css/styles.css b/css/styles.css index cc3596af1..92bdbf64d 100644 --- a/css/styles.css +++ b/css/styles.css @@ -8,10 +8,7 @@ body:after { #controls { width: 100%; -} - -.breadcrumbs-droppable { - + top: 45px; } .breadcrumbs-droppable-hover { @@ -20,16 +17,19 @@ body:after { transition: transform .1s ease-in; } -div.crumb.last a { - cursor: default; +/* Two ugly hacks to fix breadcrumbs in Gallery */ +div.crumb:not(:first-child), +div.crumb.last { + position: relative; + top: -3px; + margin-right: 10px; } -#controls { - margin-top: 45px; +div.crumb.last a { + cursor: default; } #controls .button { - margin-top: 5px; width: 40px; } @@ -78,12 +78,12 @@ div.crumb.last a { } #content-wrapper { + position: relative; + padding: 0; overflow-x: auto; -webkit-overflow-scrolling: touch; -webkit-transition: background-color 1s linear; transition: background-color 1s linear; - margin-top: -45px; - height: calc(100% - 45px); } #gallery.hascontrols { diff --git a/css/upload.css b/css/upload.css index 630a3a84d..b7f318c66 100644 --- a/css/upload.css +++ b/css/upload.css @@ -12,6 +12,10 @@ margin-top: 5px; } +.actions { + padding: 5px; +} + .actions input, .actions button, .actions .button { margin: 0; float: left; @@ -69,4 +73,4 @@ padding-left: 5px; color: #000; padding: 0; -} \ No newline at end of file +} From c44d7f0a868bf0d7b74d7c9eea1673db09cdcee2 Mon Sep 17 00:00:00 2001 From: Marin Treselj Date: Wed, 20 Dec 2017 15:17:18 +0100 Subject: [PATCH 5/7] Fix public sharing view Signed-off-by: Marin Treselj --- css/public.css | 5 +++++ templates/public.php | 26 ++++++++++++-------------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/css/public.css b/css/public.css index 3116416d5..99d7e22b3 100644 --- a/css/public.css +++ b/css/public.css @@ -58,3 +58,8 @@ html.ie #content { #gallery.hascontrols { padding-bottom: 0; } + +#controls .buttons { + display: flex; + flex: 1 1; +} diff --git a/templates/public.php b/templates/public.php index 2ca1b071c..28e6271b9 100644 --- a/templates/public.php +++ b/templates/public.php @@ -74,17 +74,7 @@ class="icon-confirm svg" disabled>
-
-
-
- <?php p($l->t('Sort by date')); ?> - <?php p($l->t('Sort by date')); ?> -
-
+
); ?>" alt="t('Sort by name')); ?>"/>
-
- +
+
+ <?php p($l->t('Sort by date')); ?> + <?php p($l->t('Sort by date')); ?> +
+
image_path('core', 'actions/toggle-filelist.svg') ); ?>" alt="t('Picture view')); ?>"/>
- +