Skip to content

Conversation

@boy-who-codes
Copy link

i had changed this code

 #clock{
        width: 600px;
        margin-left: 30%;
        margin-top: 3%;
        margin-bottom: 2%;
        font-size: 70px;
        width: 50%;
        height: auto;

        margin-top: 10%;

        font-size: 50px;
        border: 2px solid white;
        align-items: center;
        text-align: center;
        align-items: center;
        color: white;
    }
    @media only screen and (max-width:700px) {
        #clock{
            width: 60%;
            font-size: 40px;
        }
    }
    #map{
    width: 70%x;
    height: 400px;
    width: 70%;
    height: 100vh;
    padding: 18px;
    margin-left: 100px;
    margin-right: 100px;
    align-items: center;
    bottom: 0;
    } 

Changes made:

[] Added responsiveness
[] Changed Fonts Size
[] Change nav bar position from fixed to Sticky
[] Changed clock layout by setting width to 100%
[] Changes padding and margin of selector.

Copy link
Collaborator

@surajcool203 surajcool203 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you need to resolve conflict

@boy-who-codes
Copy link
Author

you need to resolve conflict

Ok I'll do it but please don't make this pull request invalid 😅

@boy-who-codes
Copy link
Author

you need to resolve conflict

What is the conflict i can't understand sir please explain me!

@Aditya-shrivastav
Copy link
Contributor

You have to fetch the updated repo from here. Your forked repo is not updated. Please update it and then after resolving all the conflicts you can send the PR again

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants