fix: conflicts with master (6d70a9c1) · Commits · Applications / Orbit · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Orbit
- Activity
- Members
- Labels
- Environments
- Incidents

Snippets Groups Projects

6d70a9c1

Commit 6d70a9c1 authored 5 years ago by Jean-Baptiste Pasquier

Downloads
- Plain Diff

fix: conflicts with master

parents 3a859bcd 97af8eb3

No related branches found

No related tags found

1 merge request!74Deploy sibapp with managers

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

src/config.sample.json 1 addition, 0 deletions

src/config.sample.json
src/dependencies.pug 4 additions, 4 deletions

src/dependencies.pug
src/header.pug 1 addition, 0 deletions

src/header.pug
src/menu-left.pug 16 additions, 2 deletions

src/menu-left.pug
src/page-circle-chat.pug 13 additions, 8 deletions

src/page-circle-chat.pug
src/page-messages.pug 12 additions, 7 deletions

src/page-messages.pug
src/scripts/index.js 4 additions, 5 deletions

src/scripts/index.js
src/styles/base/header.scss 3 additions, 1 deletion

src/styles/base/header.scss
src/styles/base/menu-left.scss 5 additions, 0 deletions

src/styles/base/menu-left.scss
src/styles/components/chat.scss 16 additions, 2 deletions

src/styles/components/chat.scss
src/styles/layout/members/member-profile.scss 2 additions, 2 deletions

src/styles/layout/members/member-profile.scss
src/styles/layout/members/members.scss 106 additions, 88 deletions

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

src/templates/hd-user-avatar.pug

with 184 additions and 120 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