Merge branch 'staging' into 'migrate-0.8' (4ad2b056) · Commits · Applications / Orbit · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Orbit
- Activity
- Members
- Labels
- Environments
- Incidents

Snippets Groups Projects

4ad2b056

Commit 4ad2b056 authored 5 years ago by Jean-Baptiste Pasquier

Downloads
- Plain Diff

Merge branch 'staging' into 'migrate-0.8'

# Conflicts:
#   src/dependencies.pug
#   src/scripts/index.js

parents 48ee36d1 5c52a5da

No related branches found

No related tags found

1 merge request!56Migrate 0.8

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

src/styles/_index.scss 1 addition, 0 deletions

src/styles/_index.scss
src/styles/base/header.scss 22 additions, 7 deletions

src/styles/base/header.scss
src/styles/base/main.scss 4 additions, 0 deletions

src/styles/base/main.scss
src/styles/components/comment.scss 122 additions, 0 deletions

src/styles/components/comment.scss
src/styles/components/filters.scss 1 addition, 1 deletion

src/styles/components/filters.scss
src/styles/layout/job-offers/job-offers.scss 104 additions, 82 deletions

src/styles/layout/job-offers/job-offers.scss
src/styles/layout/members/member-profile.scss 23 additions, 2 deletions

src/styles/layout/members/member-profile.scss
src/styles/layout/members/members.scss 10 additions, 5 deletions

src/styles/layout/members/members.scss
src/templates/hd-user-avatar.pug 1 addition, 2 deletions

src/templates/hd-user-avatar.pug
www/images/alien.jpg 0 additions, 0 deletions

www/images/alien.jpg
www/images/alien.svg 20 additions, 0 deletions

www/images/alien.svg

with 308 additions and 99 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment