Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix search box overlapping on mobile #450

Merged
merged 3 commits into from
Jul 22, 2016
Merged

Conversation

jancborchardt
Copy link
Member

Fix search bar is overlapping in mobile view #286

Simply added a background color again, the same as the header color is. Also adjusted that in theming.
Bonus: the background color of the log in page is now also fixed to be the themed one.

Please review @nextcloud/designers @Mar1u5 @Bugsbane @williambargent @juliushaertl :)
Needs backport too.

@jancborchardt jancborchardt added bug design Design, UI, UX, etc. 3. to review Waiting for reviews backport-request labels Jul 19, 2016
@jancborchardt jancborchardt added this to the Nextcloud Next milestone Jul 19, 2016
@mention-bot
Copy link

@jancborchardt, thanks for your PR! By analyzing the annotation information on this pull request, we identified @schiessle, @LukasReschke and @MorrisJobke to be potential reviewers

@MorrisJobke
Copy link
Member

MorrisJobke commented Jul 19, 2016

Tested and works 👍

@MorrisJobke
Copy link
Member

@jancborchardt Please fix the unit tests:

There were 4 failures:

1) OCA\Theming\Tests\Controller\ThemingControllerTest::testGetStylesheetWithOnlyColor
Failed asserting that two objects are equal.
--- Expected
+++ Actual
@@ @@
 OCP\AppFramework\Http\DataDownloadResponse Object (
-    'data' => '#body-user #header,#body-settings #header,#body-public #header {background-color: #000}'
+    'data' => '#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: #000}'
     'filename' => 'style'
     'contentType' => 'text/css'
     'headers' => Array (...)
     'cookies' => Array ()
     'status' => 200
     'lastModified' => null
     'ETag' => null
     'contentSecurityPolicy' => null
 )

/drone/src/github.com/nextcloud/server/apps/theming/tests/lib/controller/ThemingControllerTest.php:328

2) OCA\Theming\Tests\Controller\ThemingControllerTest::testGetStylesheetWithOnlyColorInvert
Failed asserting that two objects are equal.
--- Expected
+++ Actual
@@ @@
 OCP\AppFramework\Http\DataDownloadResponse Object (
-    'data' => '#body-user #header,#body-settings #header,#body-public #header {background-color: #fff}#header .header-appname, #expandDisplayName { color: #000000; } #header .icon-caret { background-image: url('/owncloud/core/img/actions/caret-dark.svg'); } .searchbox input[type="search"] { background: transparent url('/owncloud/core/img/actions/search.svg') no-repeat 6px center; color: #000; }.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid { color: #000; border: 1px solid rgba(0, 0, 0, .5); }'
+    'data' => '#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: #fff}#header .header-appname, #expandDisplayName { color: #000000; } #header .icon-caret { background-image: url('/owncloud/core/img/actions/caret-dark.svg'); } .searchbox input[type="search"] { background: transparent url('/owncloud/core/img/actions/search.svg') no-repeat 6px center; color: #000; }.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid { color: #000; border: 1px solid rgba(0, 0, 0, .5); }'
     'filename' => 'style'
     'contentType' => 'text/css'
     'headers' => Array (...)
     'cookies' => Array ()
     'status' => 200
     'lastModified' => null
     'ETag' => null
     'contentSecurityPolicy' => null
 )

/drone/src/github.com/nextcloud/server/apps/theming/tests/lib/controller/ThemingControllerTest.php:355

3) OCA\Theming\Tests\Controller\ThemingControllerTest::testGetStylesheetWithAllCombined
Failed asserting that two objects are equal.
--- Expected
+++ Actual
@@ @@
 OCP\AppFramework\Http\DataDownloadResponse Object (
-    'data' => '#body-user #header,#body-settings #header,#body-public #header {background-color: #000}#header .logo {
+    'data' => '#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: #000}#header .logo {
                    background-image: url('./logo?v=0');
                }
                #header .logo-icon {
                    background-image: url('./logo?v=0');
                    background-size: 62px 34px;
                }#body-login {
                    background-image: url('./loginbackground?v=0');
                }'
     'filename' => 'style'
     'contentType' => 'text/css'
     'headers' => Array (...)
     'cookies' => Array ()
     'status' => 200
     'lastModified' => null
     'ETag' => null
     'contentSecurityPolicy' => null
 )

/drone/src/github.com/nextcloud/server/apps/theming/tests/lib/controller/ThemingControllerTest.php:452

4) OCA\Theming\Tests\Controller\ThemingControllerTest::testGetStylesheetWithAllCombinedInverted
Failed asserting that two objects are equal.
--- Expected
+++ Actual
@@ @@
 OCP\AppFramework\Http\DataDownloadResponse Object (
-    'data' => '#body-user #header,#body-settings #header,#body-public #header {background-color: #fff}#header .logo {
+    'data' => '#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: #fff}#header .logo {
                    background-image: url('./logo?v=0');
                }
                #header .logo-icon {
                    background-image: url('./logo?v=0');
                    background-size: 62px 34px;
                }#body-login {
                    background-image: url('./loginbackground?v=0');
                }#header .header-appname, #expandDisplayName { color: #000000; } #header .icon-caret { background-image: url('/owncloud/core/img/actions/caret-dark.svg'); } .searchbox input[type="search"] { background: transparent url('/owncloud/core/img/actions/search.svg') no-repeat 6px center; color: #000; }.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid { color: #000; border: 1px solid rgba(0, 0, 0, .5); }'
     'filename' => 'style'
     'contentType' => 'text/css'
     'headers' => Array (...)
     'cookies' => Array ()
     'status' => 200
     'lastModified' => null
     'ETag' => null
     'contentSecurityPolicy' => null
 )

/drone/src/github.com/nextcloud/server/apps/theming/tests/lib/controller/ThemingControllerTest.php:486

@jancborchardt
Copy link
Member Author

@MorrisJobke sorry, on vacation now – could do it on Friday only (or if I am down to work the next two days ;)

@MorrisJobke MorrisJobke added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Jul 20, 2016
@MorrisJobke
Copy link
Member

@MorrisJobke sorry, on vacation now – could do it on Friday only (or if I am down to work the next two days ;)

I fixed the unit tests. :)

@MorrisJobke MorrisJobke added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jul 21, 2016
@jancborchardt
Copy link
Member Author

Ok, so can we have reviews here ;) We should get this fix in soon and need to backport to 9 as well.

Please review @nextcloud/designers @Mar1u5 @Bugsbane @williambargent @juliushaertl

@LukasReschke
Copy link
Member

👍

1 similar comment
@MariusBluem
Copy link
Member

👍

@MariusBluem MariusBluem merged commit dd1a5b9 into master Jul 22, 2016
@MariusBluem MariusBluem deleted the fix-searchbox-background branch July 22, 2016 13:38
@MariusBluem
Copy link
Member

Backport to stable9 and stable10 was requested and makes sense. @karlitschek

@karlitschek
Copy link
Member

cool! 👍 please backport

@Bugsbane
Copy link
Member

👍

@jancborchardt
Copy link
Member Author

@Mar1u5 has this been backported? I can’t see any referenced pull requests.

@MorrisJobke
Copy link
Member

@jancborchardt No. Could you create the backport PRs?

@MorrisJobke
Copy link
Member

stable10: #622
stable9: #623

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews bug design Design, UI, UX, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants