Skip to content
Snippets Groups Projects

Resolve "Graphs and Wiki subnav"

Merged Annabel Gray requested to merge 18533-graphs-wiki-subnav into master

What does this MR do?

Styles sub nav in Wiki and Graphs

What are the relevant issue numbers?

Closes #18533 (closed)

Screenshots (if relevant)

Screen_Shot_2016-06-15_at_9.32.43_AM

cc @dzaporozhets

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
1 .top-area
2 %ul.nav-links
1 .nav-links.sub-nav
2 %ul{ class: (container_class) }
3 3 = nav_link(html_options: {class: params[:id] == 'home' ? 'active' : '' }) do
  • @annabeldunstone This whole thing looks weird

    Contributors___Graphs___Administrator___project1___GitLab

    Edited by Jacob Schatz
  • Annabel Gray Added 146 commits:

    Added 146 commits:

    • 83ca2b85...d9812bae - 141 commits from branch master
    • f8cc887b - Style sub nav links in Graphs
    • ff173ae5 - Style wiki sub nav links
    • 4b6e1dee - Update CHANGELOG
    • 162d9e68 - Fix graph columns
    • 8f28e173 - Add new style for sub header block info
  • @annabeldunstone @connorshea new page should not be in navigation

    wiki

  • Annabel Gray Added 2 commits:

    Added 2 commits:

    • a0cf78b0 - Add new style for sub header block info
    • 92d2d123 - Move new page link out of sub nav
  • @jschatz1 good call; that gray section didn't really look right with the new sub nav styling. I've added a new style for those sections that matches the sub-header areas across the other pages. @dzaporozhets Moved the New Page button out of the nav and into the wiki home page

  • Annabel Gray Added 1 commit:

    Added 1 commit:

    • 1da173e7 - Add new page button to wiki home
  • Reassigned to @jschatz1

  • Annabel Gray Added 58 commits:

    Added 58 commits:

    • 1da173e7...1051f0c5 - 51 commits from branch master
    • 65f00851 - Style sub nav links in Graphs
    • 5fb6ad7d - Style wiki sub nav links
    • d5a926ac - Update CHANGELOG
    • 5215bd0d - Fix graph columns
    • d01422e5 - Add new style for sub header block info
    • 3e40e34a - Move new page link out of sub nav
    • 04e09f30 - Add new page button to wiki home
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading