Giter Club home page Giter Club logo

Comments (30)

XhmikosR avatar XhmikosR commented on July 26, 2024

That is not broken. That is intentional. It's the active class.

from website.

FeodorFitsner avatar FeodorFitsner commented on July 26, 2024

But it looks different than the original. I'll do a new website to test
changes.

-Feodor

On Fri, Jan 16, 2015 at 2:00 PM, XhmikosR [email protected] wrote:

That is not broken. That is intentional. It's the active class.


Reply to this email directly or view it on GitHub
#42 (comment).

from website.

XhmikosR avatar XhmikosR commented on July 26, 2024

You mean the sidebar? Because that is intentional too; now it's using proper Foundation markup.

from website.

XhmikosR avatar XhmikosR commented on July 26, 2024

Hint for the future: you should check out the PRs locally and see the changes before merging; this workflow you followed here is bad...

Anyway, let me know what exactly is that you think is broken.

from website.

FeodorFitsner avatar FeodorFitsner commented on July 26, 2024

You're right - my bad, sorry for wasting your time.

I've setup Staging website http://appveyor-staging.azurewebsites.net/ which
is getting published from "staging" branch - now we can work together.
Target your PRs to that branch.

-Feodor

On Fri, Jan 16, 2015 at 2:03 PM, XhmikosR [email protected] wrote:

Hint for the future: you should check out the PRs locally and see the
changes before merging; this workflow you followed here is bad...

Anyway, let me know what exactly is that you think is broken.


Reply to this email directly or view it on GitHub
#42 (comment).

from website.

XhmikosR avatar XhmikosR commented on July 26, 2024

Can you revert the revert? Or even force push after skipping the rollback patch, it shouldn't matter since only we 2 seem to currently use the repo.

from website.

FeodorFitsner avatar FeodorFitsner commented on July 26, 2024

Sure, I reverted it on "staging" branch. And live site: http://appveyor-staging.azurewebsites.net/docs

from website.

FeodorFitsner avatar FeodorFitsner commented on July 26, 2024

I'm going to work on a new version of home page next week.

from website.

XhmikosR avatar XhmikosR commented on July 26, 2024

You should just force push the master branch. Having the rollback patch in git doesn't serve any purpose.

Your master should be like https://github.com/XhmikosR/website/commits/master

OK for the new webpage, most of this stuff will stay.

PS. If you switch to Bootstrap I can certainly do more changes easily.

from website.

FeodorFitsner avatar FeodorFitsner commented on July 26, 2024

Every push to "master" is automatically published to a live website :)

-Feodor

On Fri, Jan 16, 2015 at 2:14 PM, XhmikosR [email protected] wrote:

Your master should be like
https://github.com/XhmikosR/website/commits/master


Reply to this email directly or view it on GitHub
#42 (comment).

from website.

XhmikosR avatar XhmikosR commented on July 26, 2024

Yeah, but the rollback here is bogus ;) We can use the staging branch from now on after you do the force push of master.

from website.

FeodorFitsner avatar FeodorFitsner commented on July 26, 2024

OK, how to properly do that?

-Feodor

On Fri, Jan 16, 2015 at 2:15 PM, XhmikosR [email protected] wrote:

Yeah, but the rollback here is bogus ;) We can use the staging branch from
now on after you do the force push of master.


Reply to this email directly or view it on GitHub
#42 (comment).

from website.

XhmikosR avatar XhmikosR commented on July 26, 2024

Not sure how you can do via cmd, but basically you need to do

git reset --hard 40cd4bb2d1529b8bc6f4ee04f0dc3d35f547821b
git push --force-with-lease "origin" master:master

while you are the master branch.

from website.

FeodorFitsner avatar FeodorFitsner commented on July 26, 2024

I'm going to reset up to this one:
c1df27f

-Feodor

On Fri, Jan 16, 2015 at 2:22 PM, XhmikosR [email protected] wrote:

git reset --hard 40cd4bb
40cd4bb
git push --force-with-lease "origin" master:master


Reply to this email directly or view it on GitHub
#42 (comment).

from website.

XhmikosR avatar XhmikosR commented on July 26, 2024

Why is that? I thought you agreed with the other changes.

from website.

FeodorFitsner avatar FeodorFitsner commented on July 26, 2024

Those changes after c# code cleanup commit changed website look. I missed
it that time.

-Feodor

On Fri, Jan 16, 2015 at 2:39 PM, XhmikosR [email protected] wrote:

Why is that? I thought you agreed with the other changes.


Reply to this email directly or view it on GitHub
#42 (comment).

from website.

FeodorFitsner avatar FeodorFitsner commented on July 26, 2024

I wanna go through all style changes next week when I have time and before
doing a new home page.

-Feodor

On Fri, Jan 16, 2015 at 2:41 PM, Feodor Fitsner [email protected] wrote:

Those changes after c# code cleanup commit changed website look. I missed
it that time.

-Feodor

On Fri, Jan 16, 2015 at 2:39 PM, XhmikosR [email protected]
wrote:

Why is that? I thought you agreed with the other changes.


Reply to this email directly or view it on GitHub
#42 (comment).

from website.

XhmikosR avatar XhmikosR commented on July 26, 2024

And what are we supposed to do if you reset to that? It's way cleaner to tell me exactly what you don't like and let me fix it than doing unneeded blind reverts.

If you reset to the patch you say, then any other patches, useful or not will be removed. And that's bad because I have useful changes.

from website.

XhmikosR avatar XhmikosR commented on July 26, 2024

There are no style changes. The fact that you didn't use proper markup doesn't justify it :p

Anyway, again, it's much easier to tell me exactly what you don't like than resetting to the patch you said.

from website.

FeodorFitsner avatar FeodorFitsner commented on July 26, 2024

Sure, before some recent changes sidebar and top menu became looking
differently. At the top is how it looks with all PRs applied - at the
bottom is how it should look:

image

from website.

XhmikosR avatar XhmikosR commented on July 26, 2024

I don't see any image.

from website.

XhmikosR avatar XhmikosR commented on July 26, 2024

Cherry pick this https://github.com/XhmikosR/website/commit/df739e0ea208381f22749c0812f7dd6776655263 after you reset the master to 40cd4bb. It should be what you want, I guess and we won't lose any of the other changes.

Or check out my master branch, test it locally and if you are OK with that, force push it to your upstream/master.

from website.

FeodorFitsner avatar FeodorFitsner commented on July 26, 2024

Updated post, so you can see the image.

from website.

XhmikosR avatar XhmikosR commented on July 26, 2024

It's exactly what I told you. You used random sidebar markup, not the one Foundation supports and I added the active class, which makes totally sense.

Anyway, #42 (comment) do that, and should be OK.

from website.

FeodorFitsner avatar FeodorFitsner commented on July 26, 2024

OK, checked your master branch. Left side bar looks good though top menu highlight color is different (i guess it's standard one from Foundation). Compare:

image

from website.

FeodorFitsner avatar FeodorFitsner commented on July 26, 2024

When top menu is OK I think it makes sense to revert the revert and then you just send PR with sidebar and top bar fixes?

from website.

XhmikosR avatar XhmikosR commented on July 26, 2024

Patch updated to use the same hover background as before.

from website.

FeodorFitsner avatar FeodorFitsner commented on July 26, 2024

Reverted. Go ahead with PR.

from website.

XhmikosR avatar XhmikosR commented on July 26, 2024

This can be closed.

Also, delete and create the staging branch from the current master. Or reset it.

from website.

XhmikosR avatar XhmikosR commented on July 26, 2024

@FeodorFitsner: you can close this.

from website.

Related Issues (20)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.