Skip to content
This repository has been archived by the owner on Oct 1, 2019. It is now read-only.

Commit

Permalink
Remove obsolete logic of small and big logo size
Browse files Browse the repository at this point in the history
  • Loading branch information
artkravchenko committed Mar 19, 2017
1 parent 09be114 commit f9773e3
Show file tree
Hide file tree
Showing 17 changed files with 18 additions and 22 deletions.
8 changes: 2 additions & 6 deletions src/components/header-logo.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import React, { Component } from 'react';
import { Link } from 'react-router';
import { connect } from 'react-redux';
import classNames from 'classnames';

import { Immutable as ImmutablePropType } from '../prop-types/common';
import { CurrentUser as CurrentUserPropType } from '../prop-types/users';
Expand All @@ -38,13 +37,10 @@ class HeaderLogo extends Component {
}

render() {
const {
current_user,
small
} = this.props;
const { current_user } = this.props;

const logoBody = (
<div className={classNames('logo', { 'logo-size_small': small })}>
<div className="logo logo-size_small">
<span className="logo__title">Liberty Soil</span>
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion src/components/header.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const HeaderComponent = ({
<div className="header__body">
<div className="header__content">
{!React.Children.count(children) &&
<HeaderLogo small />
<HeaderLogo />
}
{children}
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/base/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class BaseSettingsPage extends React.Component {
return (
<div>
<Header current_user={current_user} is_logged_in={is_logged_in}>
<HeaderLogo small />
<HeaderLogo />
<div className="header__breadcrumbs">
<Breadcrumbs title={name}>
<div className="user_box__avatar user_box__avatar-round">
Expand Down
2 changes: 1 addition & 1 deletion src/pages/base/tag.js
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ export default class BaseTagPage extends React.Component {
return (
<div>
<Header is_logged_in={is_logged_in} current_user={current_user}>
<HeaderLogo small />
<HeaderLogo />
<TagBreadcrumbs type={type} tag={tag} />
</Header>

Expand Down
2 changes: 1 addition & 1 deletion src/pages/base/user-without_header.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const BaseUserPageWithoutHeader = (props) => {
return (
<div>
<Header current_user={current_user} is_logged_in={is_logged_in}>
<HeaderLogo small />
<HeaderLogo />
<div className="header__breadcrumbs">
<Breadcrumbs title={name}>
<User
Expand Down
2 changes: 1 addition & 1 deletion src/pages/base/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ const BaseUserPage = (props) => {
return (
<div>
<Header current_user={current_user} is_logged_in={is_logged_in}>
<HeaderLogo small />
<HeaderLogo />
<div className="header__breadcrumbs">
<Breadcrumbs title={name}>
<User
Expand Down
2 changes: 1 addition & 1 deletion src/pages/geotag-cloud.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class GeotagCloudPage extends Component {
<div>
<Helmet title="Geotags of " />
<Header current_user={current_user} is_logged_in={is_logged_in}>
<HeaderLogo small />
<HeaderLogo />
<div className="header__breadcrumbs">
<Breadcrumbs title="All Geotags">
<TagIcon big type={TAG_PLANET} />
Expand Down
2 changes: 1 addition & 1 deletion src/pages/post-edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ class PostEditPage extends React.Component {
current_user={current_user}
is_logged_in={is_logged_in}
>
<HeaderLogo small />
<HeaderLogo />
<Breadcrumbs title="Edit post" />
</Header>
<Page>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/post.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ export class UnwrappedPostPage extends React.Component {
<div>
<Helmet title={`${current_post.getIn(['more', 'pageTitle'])} on `} />
<Header current_user={current_user} is_logged_in={is_logged_in}>
<HeaderLogo small />
<HeaderLogo />
<Breadcrumbs title={truncate(current_post.get('text'), { length: 16 })}>
<Link
className="user_box__avatar user_box__avatar-round"
Expand Down
2 changes: 1 addition & 1 deletion src/pages/school-cloud.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class SchoolCloudPage extends Component {
<div>
<Helmet title="Tags of " />
<Header is_logged_in={is_logged_in} current_user={current_user}>
<HeaderLogo small />
<HeaderLogo />
<div className="header__breadcrumbs">
<Breadcrumbs title="All Schools">
<TagIcon big type={TAG_SCHOOL} />
Expand Down
2 changes: 1 addition & 1 deletion src/pages/search.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class SearchPage extends Component {
<div>
<Helmet title="Search of " />
<Header current_user={current_user} is_logged_in={is_logged_in}>
<HeaderLogo small />
<HeaderLogo />
<div className="header__breadcrumbs">
<Breadcrumbs title="Search" />
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/tag-cloud.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class TagCloudPage extends Component {
<div>
<Helmet title="Tags of " />
<Header is_logged_in={is_logged_in} current_user={current_user}>
<HeaderLogo small />
<HeaderLogo />
<Breadcrumbs title="All Hashtags">
<TagIcon big type={TAG_HASHTAG} />
</Breadcrumbs>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/tools/conversations-tool.js
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ class ConversationsToolPage extends React.Component {
<div>
<Helmet title="Conversations on " />
<Header current_user={current_user} is_logged_in={!!current_user.get('id')}>
<HeaderLogo small />
<HeaderLogo />
</Header>

<Page>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/tools/new-school-tool.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ export class AddSchoolToolPage extends React.Component {
<div>
<Helmet title="New school on " />
<Header current_user={current_user} is_logged_in={!!current_user.get('id')}>
<HeaderLogo small />
<HeaderLogo />
</Header>

<Page>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/tools/people-tool.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class PeopleToolPage extends React.Component {
<div>
<Helmet title="Followed people on " />
<Header current_user={current_user} is_logged_in={!!current_user.get('id')}>
<HeaderLogo small />
<HeaderLogo />
</Header>

<Page>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/tools/schools-tool.js
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ class SchoolsToolPage extends React.Component {
<div>
<Helmet title="Schools tool on " />
<Header current_user={current_user} is_logged_in={!!current_user.get('id')}>
<HeaderLogo small />
<HeaderLogo />
</Header>

<Page>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/welcome.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class Welcome extends React.Component {
<div className="page__container-bg font-open_sans font-light">
<section className="landing landing-big landing-bg">
<Header is_logged_in={false} className="header-transparent" needMenu={false}>
<HeaderLogo big />
<HeaderLogo />
</Header>
<header className="landing__header">
<h1 className="landing__title">Education change network</h1>
Expand Down

0 comments on commit f9773e3

Please sign in to comment.