Skip to content
Snippets Groups Projects
Commit 8836e125 authored by Dimitrie Hoekstra's avatar Dimitrie Hoekstra
Browse files

updated readme with community contribution + added personal design files

parent 7d89ab58
No related branches found
No related tags found
No related merge requests found
Pipeline #
Loading
Loading
@@ -32,33 +32,49 @@ Contains all resources and information UX Designers need.
 
## Repository Organization
 
- archive
- oldfiles
- production
- _assets
- images
- archive/
- oldfiles/
- production/
- _assets/
- images/
- img1.jpg
- svg
- svg/
- icn1.svg
- projects/
- project.sketch
- progress
- designername/
- progress/
- community-contribution/
- @gitlabusername
- projects/
- project.sketch
- GitLab-designername/
- projects/
- project.sketch
 
*[Issue for Repository Organization Discussion](https://gitlab.com/gitlab-org/gitlab-design/issues/12)*
 
## Commit Workflow
## Commit Workflow (includes Community Contribution!)
 
As design files are mostly binary files, merge conflicts can easily get stuck in conflicts. We will do the file merging manually instead of git.
 
### Personal Folders
### GitLab Designer Personal Folders
 
1. In the `progress` directory, create your own folder
2. In your own folder, create a subfolder for each issue/project you are working on
3. Commit & Push changes
 
### Community Contribution :strawberry:
Every designer can contribute to GitLab. For GitLab community members we have a [special folder](https://gitlab.com/gitlab-org/gitlab-design/tree/master/progress/community-contribution) in the `progress` directory where you can create and commit your own designs. So you have a consistent backup, which can also be used by other designers to iterate upon! Follow the following steps to contribute.
1. Fork this repository and `git clone` it locally.
2. Create a new branch based off from the master with `git checkout -b branchname`
3. In the `community-contribution` directory, create your own folder based on your GitLab username following [the example](https://gitlab.com/gitlab-org/gitlab-design/tree/master/progress/community-contribution/@gitlabusername).
4. In your own folder, create a subfolder for each issue/project you are working on.
6. Review the files you are about to commit (with `git status -sb`), as ONLY files in YOUR folder are allowed to be added or changed!! If you have a hard time with this read through our [small section on Git](#oh-my-git)
5. Commit & Push changes
6. Create a new Merge Request and mention any [designer who manages this project](#project-managers).
### Production Folders
 
1. [Lock file](http://docs.gitlab.com/ee/user/project/file_lock.html)
Loading
Loading
@@ -109,6 +125,24 @@ Spec previews can be generated with the one of the [SUPERPOWERS](#repository-sup
 
When additional detail is needed, developers will ask for this. Take inspiration out of the link above if needed.
 
## Oh My Git
Git is hard: screwing up is easy, and figuring out how to fix your mistakes is sometimes almost impossible. Here are some links and tips to help you along!
### Delete your changes on a file and make it as if you never touched it! (before commited anything)
-
- [Learn git interactively for free on codeschool](https://www.codeschool.com/learn/git)
- [Oh shit, git!](http://ohshitgit.com/)
## Project managers
This project is managed by:
- Taurie Davis @tauriedavis
- Hazel Yang @hazelyang
- Chris Peressini @cperessini
- Dimitrie Hoekstra @dimitrieh
## Archive
 
The archive directory contains all old design files and resources, including those made with [Antetype](http://www.antetype.com/).
Loading
Loading
File added
progress/dimitrie/pipeline-builds-context/pipelinesbuilds-sketch-previews/Page 1.png

25.2 KiB | W: | H:

progress/dimitrie/pipeline-builds-context/pipelinesbuilds-sketch-previews/Page 1.png

492 KiB | W: | H:

progress/dimitrie/pipeline-builds-context/pipelinesbuilds-sketch-previews/Page 1.png
progress/dimitrie/pipeline-builds-context/pipelinesbuilds-sketch-previews/Page 1.png
progress/dimitrie/pipeline-builds-context/pipelinesbuilds-sketch-previews/Page 1.png
progress/dimitrie/pipeline-builds-context/pipelinesbuilds-sketch-previews/Page 1.png
  • 2-up
  • Swipe
  • Onion skin
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment