Skip to content
This repository has been archived by the owner on Jul 30, 2021. It is now read-only.

Commit

Permalink
fix: indentation + removed unnecessary style files
Browse files Browse the repository at this point in the history
  • Loading branch information
@RitaOak
RitaOak committed Dec 5, 2019
1 parent a78c58f commit 5b60e5f
Show file tree
Hide file tree
Showing 7 changed files with 117 additions and 204 deletions.
45 changes: 22 additions & 23 deletions src/components/context.js
View file
Original file line number Diff line number Diff line change
@@ -1,42 +1,41 @@
import { html, LitElement } from 'lit-element';
import homepageStyles from '../../style/homepage.scss';
import sharedStyles from '../../style/app.scss';
import TopnavButtonStyles from '../../style/topnav-buttons.scss';
import '@polymer/iron-icons/iron-icons.js';
import '@polymer/iron-icons/social-icons.js';
import '@polymer/iron-icons/av-icons.js';
import '@polymer/iron-icons/maps-icons.js';
import contextStyles from '../../style/context.scss';

class Context extends LitElement {
static get styles() {
return [sharedStyles, homepageStyles, contextStyles];
return [sharedStyles, TopnavButtonStyles];
}

render() {
return html`
<div class="navbar-item has-dropdown is-hoverable notifications-button">
<a class="navbar-link">
<span class="icon notification-icon">
<iron-icon icon="maps:map"></iron-icon>
</span>
<span class="notifications-label">Context</span>
</a>
<div class="navbar-dropdown">
<a class="navbar-item">
Notification 1
<div class="navbar-item has-dropdown is-hoverable notifications-button">
<a class="navbar-link">
<span class="icon notification-icon">
<iron-icon icon="maps:map"></iron-icon>
</span>
<span class="notifications-label">Context</span>
</a>
<a class="navbar-item">
Notification 2
</a>
<a class="navbar-item">
Notification 3
</a>
<hr class="navbar-divider">
<div class="navbar-item">
See all
<div class="navbar-dropdown">
<a class="navbar-item">
Notification 1
</a>
<a class="navbar-item">
Notification 2
</a>
<a class="navbar-item">
Notification 3
</a>
<hr class="navbar-divider" />
<div class="navbar-item">
See all
</div>
</div>
</div>
</div>
`;
}
}
Expand Down
45 changes: 22 additions & 23 deletions src/components/notifications.js
View file
Original file line number Diff line number Diff line change
@@ -1,42 +1,41 @@
import { html, LitElement } from 'lit-element';
import homepageStyles from '../../style/homepage.scss';
import sharedStyles from '../../style/app.scss';
import TopnavButtonStyles from '../../style/topnav-buttons.scss';
import '@polymer/iron-icons/iron-icons.js';
import '@polymer/iron-icons/social-icons.js';
import '@polymer/iron-icons/av-icons.js';
import '@polymer/iron-icons/hardware-icons.js';
import notificationStyles from '../../style/notifications.scss';

class Notifications extends LitElement {
static get styles() {
return [sharedStyles, homepageStyles, notificationStyles];
return [sharedStyles, TopnavButtonStyles];
}

render() {
return html`
<div class="navbar-item has-dropdown is-hoverable notifications-button">
<a class="navbar-link">
<span class="icon notification-icon">
<iron-icon icon="social:notifications-none"></iron-icon>
</span>
<span class="notifications-label">Notifications</span>
</a>
<div class="navbar-dropdown">
<a class="navbar-item">
Notification 1
<div class="navbar-item has-dropdown is-hoverable notifications-button">
<a class="navbar-link">
<span class="icon notification-icon">
<iron-icon icon="social:notifications-none"></iron-icon>
</span>
<span class="notifications-label">Notifications</span>
</a>
<a class="navbar-item">
Notification 2
</a>
<a class="navbar-item">
Notification 3
</a>
<hr class="navbar-divider">
<div class="navbar-item">
See all
<div class="navbar-dropdown">
<a class="navbar-item">
Notification 1
</a>
<a class="navbar-item">
Notification 2
</a>
<a class="navbar-item">
Notification 3
</a>
<hr class="navbar-divider" />
<div class="navbar-item">
See all
</div>
</div>
</div>
</div>
`;
}
}
Expand Down
46 changes: 23 additions & 23 deletions src/components/user-button.js
View file
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
import { html, LitElement } from 'lit-element';
import homepageStyles from '../../style/homepage.scss';
import sharedStyles from '../../style/app.scss';
import TopnavButtonStyles from '../../style/topnav-buttons.scss';
import userStyles from '../../style/user.scss';
import '@polymer/iron-icons/iron-icons.js';
import '@polymer/iron-icons/social-icons.js';
import '@polymer/iron-icons/av-icons.js';
import '@polymer/iron-icons/hardware-icons.js';
import userStyles from '../../style/user.scss';

class User extends LitElement {
static get styles() {
return [sharedStyles, homepageStyles, userStyles];
return [sharedStyles, userStyles, TopnavButtonStyles];
}

render() {
return html`
<div class="navbar-item has-dropdown is-hoverable notifications-button">
<a class="navbar-link">
<span class="notifications-label">Hi, Rita Carvalho</span>
<span class="icon user-icon">
<iron-icon icon="social:person-outline"></iron-icon>
</span>
</a>
<div class="navbar-dropdown">
<a class="navbar-item">
Notification 1
</a>
<a class="navbar-item">
Notification 2
</a>
<a class="navbar-item">
Notification 3
<div class="navbar-item has-dropdown is-hoverable notifications-button">
<a class="navbar-link">
<span class="notifications-label">Hi, Rita Carvalho</span>
<span class="icon user-icon">
<iron-icon icon="social:person-outline"></iron-icon>
</span>
</a>
<hr class="navbar-divider">
<div class="navbar-item">
See all
<div class="navbar-dropdown">
<a class="navbar-item">
Notification 1
</a>
<a class="navbar-item">
Notification 2
</a>
<a class="navbar-item">
Notification 3
</a>
<hr class="navbar-divider" />
<div class="navbar-item">
See all
</div>
</div>
</div>
</div>
`;
}
}
Expand Down
45 changes: 0 additions & 45 deletions style/context.scss
View file

This file was deleted.

45 changes: 0 additions & 45 deletions style/notifications.scss
View file

This file was deleted.

43 changes: 43 additions & 0 deletions style/topnav-buttons.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
.navbar-item {
background-color: transparent;
}

.notification-button {
border-color: #0060df;
}

.navbar-item.has-dropdown {
color: #0060df;
margin-right: 15px;
font-size: 14px;
height: 35px;
border-radius: 25px;
}

.navbar-link {
border-radius: 25px;
}

.navbar-link:not(.is-arrowless)::after {
border-color: black;
margin-top: -0.5em;
margin-left: 15;
right: 0.5em;
margin-right: 5px;
}

.navbar-link.avatar {
padding-left: 15px;
}

.navbar-item.is-hoverable {
background-color: white;
}

.notification-icon {
padding-right: 5px;
}

.topnav-icon-left {
padding-left: 8px;
}
52 changes: 7 additions & 45 deletions style/user.scss
View file
Original file line number Diff line number Diff line change
@@ -1,45 +1,7 @@
.navbar-item {
background-color: transparent;
}

.notification-button {
border-color: #0060df;
}

.navbar-item.has-dropdown {
color: #0060df;
margin-right: 15px;
font-size: 14px;
height: 35px;
border-radius: 25px;
}

.navbar-link {
border-radius: 25px;

}

.navbar-link:not(.is-arrowless)::after {
border-color: black;
margin-top: -0.5em;
margin-left: 15;
right: 0.5em;
margin-right: 5px;
}

.navbar-link.avatar {
padding-left: 15px;
}

.navbar-item.is-hoverable {
background-color: white;
}

.user-icon {
padding-left: 5px;
}

.topnav-icon-left {
padding-left: 8px;
}

.user-icon {
padding-left: 5px;
}

.topnav-icon-left {
padding-left: 8px;
}

1 comment on commit 5b60e5f

@datreeio
Copy link

@datreeio datreeio bot commented on 5b60e5f Dec 5, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ All Rules (6 / 6) Passed

👑 Good job! this pull request is aligned with your organization's best practices!

👉 You can review your rules settings at smart policy management 👈

👉 click here to view a full list of the events 👈

Please sign in to comment.