Commit 492afe89 authored by Robert Knight's avatar Robert Knight

Rename group-list-v2 => group-list

Now that the old group list/menu has been removed, rename the new
version so that the file name matches the component name.
parent e00b9cf3
...@@ -57,9 +57,9 @@ function GroupList({ serviceUrl, settings }) { ...@@ -57,9 +57,9 @@ function GroupList({ serviceUrl, settings }) {
if (focusedGroup) { if (focusedGroup) {
const icon = focusedGroup.organization.logo; const icon = focusedGroup.organization.logo;
label = ( label = (
<span className="group-list-v2__menu-label"> <span className="group-list__menu-label">
<img <img
className="group-list-v2__menu-icon" className="group-list__menu-icon"
src={icon || publisherProvidedIcon(settings)} src={icon || publisherProvidedIcon(settings)}
/> />
{focusedGroup.name} {focusedGroup.name}
...@@ -82,7 +82,7 @@ function GroupList({ serviceUrl, settings }) { ...@@ -82,7 +82,7 @@ function GroupList({ serviceUrl, settings }) {
return ( return (
<Menu <Menu
align="left" align="left"
contentClass="group-list-v2__content" contentClass="group-list__content"
label={label} label={label}
title="Select group" title="Select group"
> >
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
const { shallow } = require('enzyme'); const { shallow } = require('enzyme');
const { createElement } = require('preact'); const { createElement } = require('preact');
const GroupList = require('../group-list-v2'); const GroupList = require('../group-list');
describe('GroupList', () => { describe('GroupList', () => {
let fakeServiceConfig; let fakeServiceConfig;
......
...@@ -162,7 +162,7 @@ function startAngularApp(config) { ...@@ -162,7 +162,7 @@ function startAngularApp(config) {
.component('excerpt', require('./components/excerpt')) .component('excerpt', require('./components/excerpt'))
.component( .component(
'groupList', 'groupList',
wrapReactComponent(require('./components/group-list-v2')) wrapReactComponent(require('./components/group-list'))
) )
.component( .component(
'helpLink', 'helpLink',
......
.group-list-v2__content { .group-list__content {
min-width: 250px; min-width: 250px;
} }
.group-list-v2__menu-label { .group-list__menu-label {
align-items: center; align-items: center;
color: $grey-6; color: $grey-6;
display: flex; display: flex;
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
font-weight: bold; font-weight: bold;
} }
.group-list-v2__menu-icon { .group-list__menu-icon {
width: 15px; width: 15px;
height: 15px; height: 15px;
margin-right: 4px; margin-right: 4px;
......
...@@ -23,7 +23,7 @@ $base-line-height: 20px; ...@@ -23,7 +23,7 @@ $base-line-height: 20px;
@import './components/annotation-publish-control'; @import './components/annotation-publish-control';
@import './components/annotation-thread'; @import './components/annotation-thread';
@import './components/excerpt'; @import './components/excerpt';
@import './components/group-list-v2'; @import './components/group-list';
@import './components/group-list-item'; @import './components/group-list-item';
@import './components/help-panel'; @import './components/help-panel';
@import './components/loggedout-message'; @import './components/loggedout-message';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment