DGNum/poulpe
6
0
Fork 0
Code Issues 5 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Qwann/base template #29

Open
narmanli wants to merge 2 commits from Qwann/base_template into master
pull from: Qwann/base_template
merge into: DGNum:master
Conversation 2 Commits 2 Files changed 84 +760 -8653
narmanli commented 2017-08-30 16:43:36 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

Un premier jet qui définit le "contour" du css et templates du projet. Une prochaine MR s'occupera de finir le CSS. Comme ça on peut tous commencer à avancer le front avec les mêmes bases.

Un premier jet qui définit le "contour" du css et templates du projet. Une prochaine MR s'occupera de finir le CSS. Comme ça on peut tous commencer à avancer le front avec les mêmes bases.
delobell commented 2017-09-05 17:31:14 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

Sur les petits écrans, le menu de navigation est trop grand et le footer se fait avoir par l'ombre du conteneur principal.
Tu veux corriger ça maintenant ou dans une MR à venir ?

Sur les petits écrans, le menu de navigation est trop grand et le footer se fait avoir par l'ombre du conteneur principal. Tu veux corriger ça maintenant ou dans une MR à venir ?
delobell commented 2017-09-05 17:34:35 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

Il faudrait ajouter .sass-cache au .gitignore.

Il faudrait ajouter `.sass-cache` au `.gitignore`.
This pull request has changes conflicting with the target branch.
  • shared/static/css/global.css
  • shared/static/css/global.css.map
  • shared/static/css/global.scss
  • shared/templates/shared/base.html
  • shared/templates/shared/base_header.html
  • shared/templates/shared/home.html
  • shared/views.py
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin Qwann/base_template:Qwann/base_template
git checkout Qwann/base_template

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout master
git merge --no-ff Qwann/base_template
git checkout Qwann/base_template
git rebase master
git checkout master
git merge --ff-only Qwann/base_template
git checkout Qwann/base_template
git rebase master
git checkout master
git merge --no-ff Qwann/base_template
git checkout master
git merge --squash Qwann/base_template
git checkout master
git merge --ff-only Qwann/base_template
git checkout master
git merge Qwann/base_template
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Doing

   
Doing

   
Good first issue

   
To Do
  
bug

Something is not working

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
help wanted

Need some help

  
invalid

Something is wrong

  
question

More information is needed

  
wontfix

This won't be fixed

No labels
Doing
Doing
Good first issue
To Do
bug
duplicate
enhancement
help wanted
invalid
question
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: DGNum/poulpe#29
No description provided.
Delete branch "Qwann/base_template"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?