Merge branch '129-admin-link' into 'master' (6c684552) · Commits · minerva / core · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

core
- Activity
- Members
- Labels
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

6c684552

Commit 6c684552 authored 7 years ago by Piotr Gawron

Downloads
- Plain Diff

Merge branch '129-admin-link' into 'master'

Resolve "Admin link"

Closes #129

See merge request !26

parents 20aaee78 c24601df

No related branches found

No related tags found

1 merge request!26Resolve "Admin link"

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

frontend-js/src/main/js/gui/Header.js 12 additions, 3 deletions

frontend-js/src/main/js/gui/Header.js
frontend-js/src/main/js/gui/leftPanel/Footer.js 0 additions, 9 deletions

frontend-js/src/main/js/gui/leftPanel/Footer.js
web/src/main/webapp/WEB-INF/components/admin/header.xhtml 5 additions, 1 deletion

web/src/main/webapp/WEB-INF/components/admin/header.xhtml
web/src/main/webapp/resources/css/global.css 23 additions, 0 deletions

web/src/main/webapp/resources/css/global.css
web/src/main/webapp/resources/css/style.css 0 additions, 5 deletions

web/src/main/webapp/resources/css/style.css

with 40 additions and 18 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