changed color of github icon and refactored code #3034 #3050

dewanhimanshu · 2018-07-11T14:29:02Z

Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!

tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with rake test
code is in uniquely-named feature branch and has no merge conflicts
PR is descriptively titled
PR body includes fixes #0000-style reference to original issue #
ask @publiclab/reviewers for help, in a comment below

We're happy to help you get this ready -- don't be afraid to ask for help, and don't be discouraged if your tests fail at first!

If tests do fail, click on the red X to learn why by reading the logs.

Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software

We have a loose schedule of reviewing and pulling in changes every Tuesday and Friday, and publishing changes on Fridays.

Thanks!

dewanhimanshu · 2018-07-11T14:31:56Z

dewanhimanshu · 2018-07-11T14:34:11Z

i have made partial and also changed color of github icons to black

plotsbot · 2018-07-11T14:40:39Z

	1 Message
📖	@dewanhimanshu Thank you for your pull request! I’m here to help with some tips and recommendations. Please take a look at the list provided and help us review and accept your contribution! And don’t be discouraged if you see errors – we’re here to help.

Generated by 🚫 Danger

jywarren · 2018-07-11T15:22:09Z

This looks great! Did you want to try tweaking the Twitter color to be more Twitter-y? A little more turquoise, right? I bet the official colors are posted somewhere. I really appreciate the attention to detail!!!

…

On Wed, Jul 11, 2018 at 10:40 AM plotsbot ***@***.***> wrote: 2 Messages 📖 @dewanhimanshu <https://github.com/dewanhimanshu> Thank you for your pull request! I’m here to help with some tips and recommendations. Please take a look at the list provided and help us review and accept your contribution! And *don’t be discouraged if you see errors* – we’re here to help. 📖 It looks like you haven’t marked all the checkboxes. Help us review and accept your suggested changes by going through the steps one by one. If it is still a ‘Work in progresss’, please include ‘[WIP]’ in the title. Generated by 🚫 Danger <https://danger.systems/> — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub <#3050 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AABfJ-SecpRONc02YmI15sQLb1otmawLks5uFg5ngaJpZM4VLP_c> .

dewanhimanshu · 2018-07-11T15:29:12Z

ok @jywarren i will tweak that . Thanks for your appreciation

dewanhimanshu · 2018-07-11T15:47:30Z

how is this? I took official colors hex codes from internet

jywarren · 2018-07-11T15:54:20Z

hmm, looks good... what do other folks think? Also, is it possible to ensure they're all the same width?

…

On Wed, Jul 11, 2018 at 11:48 AM Himanshu Dewan ***@***.***> wrote: how is this? I took official colors hex codes from internet [image: screenshot from 2018-07-11 21-13-21] <https://user-images.githubusercontent.com/32437794/42583981-cdaf765c-854f-11e8-969c-cfcf1eac75ea.png> — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#3050 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AABfJ_CnliuEYO0erBu9SLDVQMaiCh7yks5uFh4WgaJpZM4VLP_c> .

SidharthBansal · 2018-07-11T15:59:01Z

@dewanhimanshu can you please

shift the provider up on all the 4 pages --> Login page in one of the prs was made above and header too.
solve the conflicts which may arise with this pr and errors on signup page #3044 in this pr?
make the cell padding between the providers same
Login with icons and text should be center aligned.
They are looking awesome btw

dewanhimanshu · 2018-07-11T16:01:47Z

@SidharthBansal thanks will do the above changes.

SidharthBansal · 2018-07-11T16:03:25Z

In #3044 I just set the icons inside the form. Please post the screenshots once all the changes are made. Also post screenshot for #3044.

dewanhimanshu · 2018-07-11T16:34:12Z

dewanhimanshu · 2018-07-11T16:36:01Z

@SidharthBansal i am made my branch from latest master branch . #3044 is not merged till now i think so

dewanhimanshu · 2018-07-11T16:50:45Z

center allign the text

SidharthBansal · 2018-07-11T16:51:41Z

Changes looks good.
#3044 I will do the changes. I will ping you when needed there.
Can you please add or in between on header?
Can you please center align the buttons on login page they are a little towards left

dewanhimanshu · 2018-07-11T16:59:47Z

dewanhimanshu · 2018-07-11T17:02:59Z

@SidharthBansal #3044 after this is merged i will need your help as i dont know how to pull lastest changes (i am new to open-source). I red about how to rebase but messed in that

SidharthBansal · 2018-07-11T17:57:42Z

Please ignore #3044 now. I will fix that one.
Yes, you can contact me when this PR is merged and you will be free. I will help you for sure

dewanhimanshu · 2018-07-11T19:22:47Z

@jywarren no problem you can merge #3021 . I will make changes

* Change Login page & remove Gemfile.lock from PR * Add Rails production environment check back in

jywarren · 2018-07-11T19:33:39Z

OK, thank you so much!!! 🙌

SidharthBansal · 2018-07-11T19:36:08Z

Now we need to make sure that #3044 and #3021 changes are there in this pr

* Uid visible to admin and account holder * few changes * . * minor tweaks * test rectified * .. * test rectified

* fallback welcome email * sending welcome mail in oauth * test

dewanhimanshu · 2018-07-12T06:33:11Z

@SidharthBansal i have resolved the conflicts

SidharthBansal · 2018-07-12T07:03:10Z

@dewanhimanshu can you please try to produce error on signup page and post the screenshots and it is well written on the page like I did in #3044

SidharthBansal · 2018-07-12T07:04:01Z

Please see the issue of #3044. It must be resolved

dewanhimanshu · 2018-07-12T07:22:45Z

SidharthBansal · 2018-07-12T08:28:06Z

Awesome

SidharthBansal · 2018-07-12T08:28:38Z

app/views/layouts/_header.html.erb

+                    <br style="clear:both;"/>
+                   <label style="display: block; text-align: center; margin-top:13px;">OR</label>
+                  <% end %>
+


Please remove empty lines

SidharthBansal

Awesome

dewanhimanshu · 2018-07-12T09:56:02Z

@SidharthBansal Thank you

jywarren · 2018-07-12T17:32:19Z

Fantastic!!! 👍 🙌 ⚡️

dewanhimanshu · 2018-07-12T18:36:18Z

thank you

dewanhimanshu · 2018-07-12T18:36:47Z

Looking forward to solve more issues

jywarren · 2018-07-12T19:00:22Z

We'd love that! We're especially looking to close out as many recent bugs as possible: bug the issue is regarding one of our programs which faces problems when a certain task is executed

Thanks!!

…iclab#3050) * changed color of github icon and refactored code * Update _comment.html.erb (publiclab#3048) * changed icons styles * changed env back * some fixes * all icons width set same * fix * added back env * some fix * Update API.md * center align the text * center align and added or * added back env * added spacing in or * added env back * errors on signup page (publiclab#3044) * Update .travis.yml * Swap the providers and email-password login (publiclab#3021) * Change Login page & remove Gemfile.lock from PR * Add Rails production environment check back in * Uid visible to admin and account holder (publiclab#3039) * Uid visible to admin and account holder * few changes * . * minor tweaks * test rectified * .. * test rectified * Fallback email and welcome email with Oauth (publiclab#3052) * fallback welcome email * sending welcome mail in oauth * test * added back env * fixes * removed extra spaves

changed color of github icon and refactored code

7e6bde7

Update _comment.html.erb (#3048)

dabb666

dewanhimanshu added 2 commits July 11, 2018 21:15

changed icons styles

8faa9a0

changed env back

49ffe7c

some fixes

d63a3da

dewanhimanshu added 3 commits July 11, 2018 21:37

all icons width set same

8edc7f9

fix

69ff567

added back env

a87e7e4

dewanhimanshu and others added 3 commits July 11, 2018 22:15

some fix

8de11f7

Update API.md

1804904

center align the text

7eb2092

center align and added or

9c8b0a7

added back env

36f0bca

Update .travis.yml

a4c1f67

Swap the providers and email-password login (#3021)

87a3582

* Change Login page & remove Gemfile.lock from PR * Add Rails production environment check back in

SidharthBansal added this to the OAuth Login milestone Jul 11, 2018

SidharthBansal and others added 5 commits July 11, 2018 17:02

Uid visible to admin and account holder (#3039)

4bc23af

* Uid visible to admin and account holder * few changes * . * minor tweaks * test rectified * .. * test rectified

Fallback email and welcome email with Oauth (#3052)

07b5bed

* fallback welcome email * sending welcome mail in oauth * test

resolving conflicts

fcc7a91

added back env

e3f88cb

fixes

8e070a4

SidharthBansal added the in progress label Jul 12, 2018

SidharthBansal requested changes Jul 12, 2018

View reviewed changes

removed extra spaves

7befd22

SidharthBansal approved these changes Jul 12, 2018

View reviewed changes

sagarpreet-chadha approved these changes Jul 12, 2018

View reviewed changes

jywarren merged commit 5373199 into publiclab:master Jul 12, 2018

ghost removed the in progress label Jul 12, 2018

SidharthBansal mentioned this pull request Jul 12, 2018

Error on edit page #3060

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

changed color of github icon and refactored code #3034 #3050

changed color of github icon and refactored code #3034 #3050

dewanhimanshu commented Jul 11, 2018 •

edited

Loading

dewanhimanshu commented Jul 11, 2018

dewanhimanshu commented Jul 11, 2018

plotsbot commented Jul 11, 2018 •

edited

Loading

jywarren commented Jul 11, 2018 via email

dewanhimanshu commented Jul 11, 2018 •

edited

Loading

dewanhimanshu commented Jul 11, 2018

jywarren commented Jul 11, 2018 via email

SidharthBansal commented Jul 11, 2018 •

edited

Loading

dewanhimanshu commented Jul 11, 2018

SidharthBansal commented Jul 11, 2018

dewanhimanshu commented Jul 11, 2018

dewanhimanshu commented Jul 11, 2018

dewanhimanshu commented Jul 11, 2018

SidharthBansal commented Jul 11, 2018

dewanhimanshu commented Jul 11, 2018

dewanhimanshu commented Jul 11, 2018 •

edited

Loading

SidharthBansal commented Jul 11, 2018

dewanhimanshu commented Jul 11, 2018

jywarren commented Jul 11, 2018

SidharthBansal commented Jul 11, 2018

dewanhimanshu commented Jul 12, 2018

SidharthBansal commented Jul 12, 2018

SidharthBansal commented Jul 12, 2018

dewanhimanshu commented Jul 12, 2018

SidharthBansal commented Jul 12, 2018

SidharthBansal Jul 12, 2018

SidharthBansal left a comment

dewanhimanshu commented Jul 12, 2018

jywarren commented Jul 12, 2018

dewanhimanshu commented Jul 12, 2018

dewanhimanshu commented Jul 12, 2018

jywarren commented Jul 12, 2018

changed color of github icon and refactored code #3034 #3050

changed color of github icon and refactored code #3034 #3050

Conversation

dewanhimanshu commented Jul 11, 2018 • edited Loading

dewanhimanshu commented Jul 11, 2018

dewanhimanshu commented Jul 11, 2018

plotsbot commented Jul 11, 2018 • edited Loading

jywarren commented Jul 11, 2018 via email

dewanhimanshu commented Jul 11, 2018 • edited Loading

dewanhimanshu commented Jul 11, 2018

jywarren commented Jul 11, 2018 via email

SidharthBansal commented Jul 11, 2018 • edited Loading

dewanhimanshu commented Jul 11, 2018

SidharthBansal commented Jul 11, 2018

dewanhimanshu commented Jul 11, 2018

dewanhimanshu commented Jul 11, 2018

dewanhimanshu commented Jul 11, 2018

SidharthBansal commented Jul 11, 2018

dewanhimanshu commented Jul 11, 2018

dewanhimanshu commented Jul 11, 2018 • edited Loading

SidharthBansal commented Jul 11, 2018

dewanhimanshu commented Jul 11, 2018

jywarren commented Jul 11, 2018

SidharthBansal commented Jul 11, 2018

dewanhimanshu commented Jul 12, 2018

SidharthBansal commented Jul 12, 2018

SidharthBansal commented Jul 12, 2018

dewanhimanshu commented Jul 12, 2018

SidharthBansal commented Jul 12, 2018

SidharthBansal Jul 12, 2018

Choose a reason for hiding this comment

SidharthBansal left a comment

Choose a reason for hiding this comment

dewanhimanshu commented Jul 12, 2018

jywarren commented Jul 12, 2018

dewanhimanshu commented Jul 12, 2018

dewanhimanshu commented Jul 12, 2018

jywarren commented Jul 12, 2018

dewanhimanshu commented Jul 11, 2018 •

edited

Loading

plotsbot commented Jul 11, 2018 •

edited

Loading

dewanhimanshu commented Jul 11, 2018 •

edited

Loading

SidharthBansal commented Jul 11, 2018 •

edited

Loading

dewanhimanshu commented Jul 11, 2018 •

edited

Loading