search

govCMS / govcms8_uikit_starter

GovCMS 8 UI-Kit Starter
10 stars 16 forks source link

Subtheming #50

Open OPCIT opened 5 years ago

OPCIT commented 5 years ago

Apologies in advance if I have this wrong.

New instance of Docker running, git clone the govcms8_uikit_starter theme into the 'theme' folder and run through the 'npm run setup' to get everything working on a local dev.....all good.

Question how do we then go about customising this theme to then push it back up to our site git project.

Keep getting:

$ git add . $ git status On branch dev Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) (commit or discard the untracked or modified content in submodules)

modified: themes/govcms8_uikit_starter (modified content, untracked content)

tobybellwood commented 5 years ago

what does your git remotes look like (at the theme and project level) - happy to take this into Slack if you want?

Probably - Once you've cloned the theme from this repo into the themes folder, you'd have the theme pointing here as a remote, and the project pointing to GitLab as a remote - which may be why git thinks you're trying to submodule - you'll need to un-submodule the theme directory into a subfolder.

You can ~probably remove the .git framework from the theme folder, or find a more elegant solution.

Personally the version we run was built from a zip download (no .git in there), and I use Meld sporadically to keep it in line with changes to the upstream. If I was smarter, we would be able to rebase our changes onto an updated master each time...