Merge branch 'develop' into '11-side-bar' (a83301af) · Commits · CNS Netadmin / White Cabinet theme · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

W

White Cabinet theme
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

a83301af

Commit a83301af authored 5 years ago by

Shoichiro Masuoka

Downloads
- Plain Diff

Merge branch 'develop' into '11-side-bar'

# Conflicts:
#   themes/cns_hp_theme/layouts/partials/sidebar.html

parents 8c06f57b edac7217

Tags

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

config.toml 11 additions, 11 deletions

config.toml
content/main_menu_content/about.md 5 additions, 0 deletions

content/main_menu_content/about.md
content/main_menu_content/for_students.md 3 additions, 0 deletions

content/main_menu_content/for_students.md
content/post/event1.md 2 additions, 1 deletion

content/post/event1.md
content/post/event2.md 1 addition, 1 deletion

content/post/event2.md
content/post/event3.md 1 addition, 1 deletion

content/post/event3.md
content/post/event4.md 1 addition, 1 deletion

content/post/event4.md
content/post/event5.md 1 addition, 1 deletion

content/post/event5.md
content/post/event6.md 4 additions, 3 deletions

content/post/event6.md
themes/cns_hp_theme/layouts/partials/footer.html 2 additions, 0 deletions

themes/cns_hp_theme/layouts/partials/footer.html
themes/cns_hp_theme/layouts/partials/header.html 10 additions, 3 deletions

themes/cns_hp_theme/layouts/partials/header.html
themes/cns_hp_theme/layouts/partials/main_menu.html 8 additions, 7 deletions

themes/cns_hp_theme/layouts/partials/main_menu.html
themes/cns_hp_theme/static/css/main_menu.css 75 additions, 13 deletions

themes/cns_hp_theme/static/css/main_menu.css
themes/cns_hp_theme/static/css/sidebar.css 1 addition, 1 deletion

themes/cns_hp_theme/static/css/sidebar.css

with 125 additions and 43 deletions

0% 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