Hi Did you rebase this? It doesn't apply for me:
(pgadmin4) dpage@hal:*~/git/pgadmin4*$ git apply ~/Downloads/RM3562_v3.patch error: patch failed: web/pgadmin/static/scss/_select2.overrides.scss:2 error: web/pgadmin/static/scss/_select2.overrides.scss: patch does not apply /Users/dpage/Downloads/RM3562_v3.patch:6137: new blank line at EOF. + On Wed, Oct 10, 2018 at 11:23 AM Aditya Toshniwal < aditya.toshni...@enterprisedb.com> wrote: > Hi, > > Attached is the updated patch - v3. I missed the user login related > stuffs. The patch includes changes for those. > I have also changed the colour style of login page. > > Kindly review. > > On Tue, Oct 9, 2018 at 4:18 PM Dave Page <dp...@pgadmin.org> wrote: > >> Hi >> >> Almost there - unfortunately I found another couple of issues in server >> mode (placement of the username, and formatting of the menu). Please see >> the attached screenshot. >> >> Regards, Dave. >> >> On Tue, Oct 9, 2018 at 10:13 AM Aditya Toshniwal < >> aditya.toshni...@enterprisedb.com> wrote: >> >>> Hi Hackers, >>> >>> Attached it the updated patch v2. >>> Kindly review. >>> >>> >>> On Mon, Oct 8, 2018 at 5:55 PM Aditya Toshniwal < >>> aditya.toshni...@enterprisedb.com> wrote: >>> >>>> Hi, >>>> >>>> On Mon, Oct 8, 2018 at 4:06 PM Dave Page <dp...@pgadmin.org> wrote: >>>> >>>>> Hi >>>>> >>>>> On Fri, Oct 5, 2018 at 1:51 PM Aditya Toshniwal < >>>>> aditya.toshni...@enterprisedb.com> wrote: >>>>> >>>>>> Hi Hackers, >>>>>> >>>>>> Attached is the patch to migrate pgAdmin4 currently based on >>>>>> Bootstrap 3, to be Bootstrap 4 compatible. The idea is to move to >>>>>> Bootstrap >>>>>> 4 with minimum possible changes in pgAdmin4. I have also used bootstrap >>>>>> scss (and not the dist file of bootstrap) to customize bootstrap as per >>>>>> the >>>>>> need of pgAdmin4. >>>>>> I have done a basic testing. It may not look alike to that with >>>>>> Bootstrap 3, but it is possible that you may find some discrepancy (which >>>>>> was proper before :P ). Kindly let me know. >>>>>> >>>>> >>>>> Looks good. I spotted a couple of issues though: >>>>> >>>>> - The menu bar is a different colour now (dark grey rather than >>>>> black). Not the end of the world, but I thought I'd mention it. >>>>> >>>> I thought of keeping the bootstrap default dark color. Will customize >>>> it to black. >>>> >>> >>>>> - The subnode control has lost some of it's styling. This does need to >>>>> be fixed I think. See the attached screenshot ( boostrap 3 is on the >>>>> left). >>>>> >>>> Yes. Will send the fix with updated patch. >>>> >>> >>>>> Thanks. >>>>> >>>>> >>>>> -- >>>>> Dave Page >>>>> Blog: http://pgsnake.blogspot.com >>>>> Twitter: @pgsnake >>>>> >>>>> EnterpriseDB UK: http://www.enterprisedb.com >>>>> The Enterprise PostgreSQL Company >>>>> >>>> >>>> >>>> -- >>>> Thanks and Regards, >>>> Aditya Toshniwal >>>> Software Engineer | EnterpriseDB Software Solutions | Pune >>>> "Don't Complain about Heat, Plant a tree" >>>> >>> >>> >>> -- >>> Thanks and Regards, >>> Aditya Toshniwal >>> Software Engineer | EnterpriseDB Software Solutions | Pune >>> "Don't Complain about Heat, Plant a tree" >>> >> >> >> -- >> Dave Page >> Blog: http://pgsnake.blogspot.com >> Twitter: @pgsnake >> >> EnterpriseDB UK: http://www.enterprisedb.com >> The Enterprise PostgreSQL Company >> > > > -- > Thanks and Regards, > Aditya Toshniwal > Software Engineer | EnterpriseDB Software Solutions | Pune > "Don't Complain about Heat, Plant a tree" > -- Dave Page Blog: http://pgsnake.blogspot.com Twitter: @pgsnake EnterpriseDB UK: http://www.enterprisedb.com The Enterprise PostgreSQL Company
