Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Carbon 10 navbar & menu #6963

Merged
merged 57 commits into from
Jun 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
0a38946
Replace MainMenu with a carbon wrapper
himdel Apr 9, 2020
f87c48c
Remove old specs
himdel May 28, 2020
873fcd9
Navbar component - wraps navbar, menu, notifications/toasts
himdel Apr 9, 2020
e143594
Menu icons - display, cleanup 2nd level
himdel Apr 9, 2020
e5c4218
MainMenu - simplify props
himdel Apr 9, 2020
3fe5897
NotificationDrawer, ToastList - both can live outside Navbar
himdel Apr 9, 2020
0d2b1ae
NotificationDrawer sizing fix
himdel Apr 9, 2020
7b1fe79
Navbar - integrate navbar header
himdel Apr 9, 2020
32c46c0
_header - no separate helpMenu or userMenu
himdel Apr 29, 2020
1abac90
Menu - merge help and settings sections
himdel Apr 29, 2020
0047481
TopNavbar - remove old configuration, help menu, user menu code
himdel Apr 29, 2020
f26ea54
Notifications - move toggle to breadcrumbs, fix styling
himdel May 1, 2020
63dfcc8
menu.{Navbar,MainMenu} - separate, move everything to the right place
himdel May 1, 2020
848608a
Remove obsolete styles - masthead, custom_logo, vertical_navigation
himdel May 1, 2020
4831f3c
Menu - add custom styling
himdel May 1, 2020
e9935bb
Menu - remember collapsed/expanded state, adjust body
himdel May 1, 2020
f2fb918
Menu - allow & use carbon icons
himdel May 1, 2020
4d07ab4
menu styling - rem fix, use SideNavHeader, SideNavItem, chevron icons…
himdel May 1, 2020
f24d426
SideNavMenuItem - support renderIcon, same as SideNavMenu
himdel May 1, 2020
6cc557b
NotificationsToggle - use MiqIcon and carbon icons
himdel May 1, 2020
1c68ca8
remove custom SideNavMenuItem, use SideNavLink for first level menu i…
himdel May 2, 2020
944906e
Menu carbonize UserOptions, split into user bit and GroupSwitcher
himdel May 4, 2020
25c0932
menu: use Search
himdel May 4, 2020
163e943
Menu - add second level
himdel May 4, 2020
a6373fa
menu - fix second level root item to use MenuItem, not Link
himdel May 6, 2020
251e864
menu - rebase colors on theme
himdel May 6, 2020
0d86a04
add new menu logos - expanded and collapsed
himdel May 7, 2020
8019aa7
Menu - replace imagePath with logoLarge & logoSmall; add showLogo, sh…
himdel May 7, 2020
9b2348d
Menu - appearExpanded vs expanded
himdel May 7, 2020
fc7cb69
MenuSearch, SearchResults - search and display the results
himdel May 8, 2020
ab8c2d5
menu Username - display username, convert to initials when collapsed
himdel May 8, 2020
705d54e
menu color fixes
himdel May 8, 2020
145a365
Menu FirstLevelSection - add chevrons
himdel May 8, 2020
2be83e9
Menu - add overlay, clicking in menu hides sections
himdel May 11, 2020
57a05ad
menu positioning - icon
himdel May 11, 2020
7ce55c3
menu - reorganize into files, simplify first&second level, document
himdel May 11, 2020
a98a701
menu username styling
himdel May 14, 2020
b961aa2
Menu - ignore placement by default
himdel May 22, 2020
83fc416
Carbon spacing & color fixes
himdel May 22, 2020
d55a9c2
menu - simulate hover effect on opened section
himdel May 28, 2020
ff55409
Split off menu-colors from rest of menu css
himdel May 27, 2020
5a9ad77
menu - drop custom logo (not brand)
himdel May 29, 2020
c6b7567
cypress - fix menu helper; expose menu globally
himdel May 29, 2020
4f99c18
item-type: add noreferrer noopener rel to external links (help)
himdel May 29, 2020
c4ee22c
Fix breadcrumbs spec - needs redux for the notification button, updat…
himdel May 29, 2020
a7b37b3
Breadcrumbs - split into original Breadcrumbs + BreadcrumbsBar with N…
himdel Jun 2, 2020
4441de9
nottificationsToggle: use classnames
himdel Jun 2, 2020
3f1607c
nottificationsToggle, searchResults: prefer {" "} over  
himdel Jun 2, 2020
92fb0d2
group-switcher: use destructuring
himdel Jun 2, 2020
fdc9057
group-switcher: remove nested tertiary
himdel Jun 2, 2020
4c14fcf
main-menu: comment about useEffect having external effect
himdel Jun 2, 2020
dae234f
main-menu: change single prop components to oneliners
himdel Jun 2, 2020
12e03ba
item-type: linter spacing fix
himdel Jun 2, 2020
50f6bb1
second level menu - hide after clicking on items
himdel Jun 2, 2020
858589f
menu: miqSparkleOn, miqSparkleOff for react routes
himdel Jun 2, 2020
a875324
breadcrumbs spec - fix import, update snapshot links
himdel Jun 2, 2020
e2aab96
Menu - add history support for react router
himdel Jun 4, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 3 additions & 43 deletions app/assets/images/layout/brand.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions app/assets/images/layout/manageiq-logo-glyph-inverse.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions app/assets/images/layout/manageiq-logo-inverse.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/assets/javascripts/miq_global.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ if (!window.ManageIQ) {
mark_translated_strings: false,
},
logoutInProgress: false, // prevent redirectLogin *during* logout and group change
menu: [],
mouse: {
x: null, // mouse X coordinate for popup menu
y: null, // mouse Y coordinate for popup menu
Expand Down
4 changes: 0 additions & 4 deletions app/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
@import "patternfly";
@import "patternfly_overrides";
@import "icon_customizations";
@import "header_background"; // sets a custom background image in the header
@import "about_modal_background"; // sets a custom background image in the 'About' modal
@import "alerts";
@import "aggregate_status_card";
Expand All @@ -19,15 +18,12 @@
@import "dual_list";
@import "dynamic_prefix_form_input";
@import "login";
@import "masthead";
@import "metrics";
@import "miq_tree";
@import "notifications";
@import "piecharts";
@import "report_colors";
@import "report-data-table";
@import "timeline";
@import "topology";
@import "topology-toolbar";
@import "remote_console";
@import "vertical_navigation";
10 changes: 0 additions & 10 deletions app/assets/stylesheets/header_background.scss

This file was deleted.

34 changes: 0 additions & 34 deletions app/assets/stylesheets/masthead.scss

This file was deleted.

Empty file.
211 changes: 0 additions & 211 deletions app/assets/stylesheets/vertical_navigation.scss

This file was deleted.

2 changes: 1 addition & 1 deletion app/helpers/application_helper/navbar.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module ApplicationHelper
module Navbar
def menu_to_json(placement = :default)
def menu_to_json(placement = :_all)
Menu::Manager.menu(placement).map do |menu_section|
item_to_hash(menu_section) if menu_section.visible?
end.compact
Expand Down
1 change: 1 addition & 0 deletions app/javascript/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
"allowTemplateLiterals": true
}],
"react/jsx-filename-extension": "off",
"react/jsx-first-prop-new-line": [1, "multiline"],
"react/destructuring-assignment": [1, "always"],
"semi": [2, "always"],
"space-before-function-paren": [2, "never"],
Expand Down
Loading