Giter Club home page Giter Club logo

Comments (9)

jkmacc-LANL avatar jkmacc-LANL commented on May 19, 2024

The demo web page is using the dev branch. I liked it too, and it works just fine for me. Give it a try!

from al-folio.

christineymshen avatar christineymshen commented on May 19, 2024

The demo web page is using the dev branch. I liked it too, and it works just fine for me. Give it a try!

I've been making some customizations here and there since I started working on it... I'm pretty new to this. So I'm a bit concerned that if I switch to dev branch version, I might mess things up...

from al-folio.

jkmacc-LANL avatar jkmacc-LANL commented on May 19, 2024

I’d done the same thing. I had to git rebase <the branch you modified> dev, and follow the instructions to fix several conflicts. Git-rebase is always a bit gnarly, but it worked for me.

from al-folio.

christineymshen avatar christineymshen commented on May 19, 2024

I’d done the same thing. I had to git rebase <the branch you modified> dev, and follow the instructions to fix several conflicts. Git-rebase is always a bit gnarly, but it worked for me.

I'm actually wondering how I could adopt later versions of the theme once it's released... definitely should explore Git-rebases sometimes...

from al-folio.

jkmacc-LANL avatar jkmacc-LANL commented on May 19, 2024

My thinking is that, once dev merges into master, I can just rebase my modified branch onto master whenever there’s an update. I wonder if I’ll constantly have to re-fix the same merge conflicts, though. That gets a little above my understanding of git to predict 😁

from al-folio.

christineymshen avatar christineymshen commented on May 19, 2024

@alshedivat I'm trying to decide whether to rebase to the dev branch. But I also like the grey-ish colored text in the current theme set up. I wonder whether there's any quick way to have the current text font if I change to the dev branch? Also I wonder whether you would recommend switching to dev branch now~? Many thanks!!

from al-folio.

jkmacc-LANL avatar jkmacc-LANL commented on May 19, 2024

It sounded to me like @alshedivat was going to merge this into master soon-ish, but it depends on how long you’re willing to wait:-) If you modify the font color back to the one you like after you rebase, you should be able to choose your color when you resolve conflicts during the next rebase and have it persist after that.

from al-folio.

christineymshen avatar christineymshen commented on May 19, 2024

It sounded to me like @alshedivat was going to merge this into master soon-ish, but it depends on how long you’re willing to wait:-) If you modify the font color back to the one you like after you rebase, you should be able to choose your color when you resolve conflicts during the next rebase and have it persist after that.

I actually just cloned dev branch into my local and played with it for a while. I explored a bit but didn't manage to change the font color to my current one... I'm not familiar with CSS and HTML so... I'm thinking not to rebase it for now~~~ I'm hoping to maintain this with minimal efforts on formatting... But I had a look at the codes of the dev branch, it seems the whole structure is more streamlined~~

from al-folio.

jkmacc-LANL avatar jkmacc-LANL commented on May 19, 2024

Yeah, I have to learn more about CSS than I care to when I use Jekyll:-)

from al-folio.

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.