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

Commit

Permalink
feat: fixed reviewable.io issues. News-feed modifications.
Browse files Browse the repository at this point in the history
  • Loading branch information
RitaOak committed Aug 8, 2019
1 parent 98a22d3 commit 34cbf83
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 35 deletions.
5 changes: 1 addition & 4 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@

<link rel="icon" href="images/favicon.ico">
<link rel="stylesheet" href="https://cdn.materialdesignicons.com/3.8.95/css/materialdesignicons.min.css">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons"
rel="stylesheet">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.7.5/css/bulma.min.css">
<script defer src="https://use.fontawesome.com/releases/v5.3.1/js/all.js"></script>

<!-- See https://goo.gl/OOhYW5 -->
<link rel="manifest" href="manifest.json">

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { html, LitElement } from 'lit-element';
import homepageStyles from '../../style/homepage.scss';
import sharedStyles from '../../style/app.scss';

class breadCrumbs extends LitElement {
class breadCrumb extends LitElement {
static get styles() {
return [sharedStyles, homepageStyles];
}
Expand All @@ -21,4 +21,4 @@ class breadCrumbs extends LitElement {
}
}

window.customElements.define('breadcrumbs', breadCrumbs);
window.customElements.define('breadcrumb', breadCrumb);
8 changes: 4 additions & 4 deletions src/components/dashboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import sharedStyles from '../../style/app.scss';
import { PageViewElement } from './page-view-element.js';
import './sidebar.js';
import './top-nav.js';
import './info-cards.js';
import './tag-cards.js';
import './info-card.js';
import './tag-card.js';
import './news-feed.js';
import './quick-settings.js';
import './tags.js';
Expand All @@ -31,8 +31,8 @@ class OAEDashboard extends PageViewElement {
<div class=" columns is-flex main-content">
<div class="column is-two-thirds">
<section class="column is-inline-flex">
<info-cards></info-cards>
<tag-cards></tag-cards>
<info-card></info-card>
<tag-card></tag-card>
</section>
<section class="column activity-dashboard">
<section class="is-flex">
Expand Down
4 changes: 2 additions & 2 deletions src/components/info-cards.js → src/components/info-card.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { html, LitElement } from 'lit-element';
import homepageStyles from '../../style/homepage.scss';
import sharedStyles from '../../style/app.scss';

class infoCards extends LitElement {
class infoCard extends LitElement {
static get styles() {
return [sharedStyles, homepageStyles];
}
Expand Down Expand Up @@ -31,4 +31,4 @@ class infoCards extends LitElement {
}
}

window.customElements.define('info-cards', infoCards);
window.customElements.define('info-card', infoCard);
16 changes: 6 additions & 10 deletions src/components/news-feed.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,12 @@ class newsFeed extends LitElement {
<nav class="level bottom-nav-news">
<div class="level-left">
<div class="level-item">
<div class="dropdown is-active">
<div class="dropdown-trigger">
<button class="button" aria-haspopup="true" aria-controls="dropdown-menu">
<span>25 comments</span>
<span class="icon is-small">
<i class="fas fa-angle-down" aria-hidden="true"></i>
</span>
</button>
</div>
</div>
<a class="button is-inverted is-link">
<span>View (25) comments</span>
<span class="icon is-small">
<i class="mdi mdi-alert"></i>
</span>
</a>
</div>
</div>
<div class="level-right is-pulled-right">
Expand Down
3 changes: 2 additions & 1 deletion src/components/quick-settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ class quickSettings extends LitElement {
<div class="content info-card">
<p>
LAST SIGN IN
</p>
<h3>
<strong>TUESDAY APRIL 4 2019</strong>
<strong>TUESDAY APRIL 4 2019</strong>
</h3>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/components/tag-cards.js → src/components/tag-card.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import homepageStyles from '../../style/homepage.scss';
import sharedStyles from '../../style/app.scss';
import './tags.js';

class tagCards extends LitElement {
class tagCard extends LitElement {
static get styles() {
return [sharedStyles, homepageStyles];
}
Expand All @@ -26,4 +26,4 @@ class tagCards extends LitElement {
}
}

window.customElements.define('tag-cards', tagCards);
window.customElements.define('tag-card', tagCard);
20 changes: 10 additions & 10 deletions style/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
//@import "../node_modules/bulma/sass/elements/_all.sass";
//@import "../node_modules/bulma/sass/components/_all.sass";

//Material Design Icons
//Default Styles
// Material Design Icons
// Default Styles
.alert.mdi::before,
.breadcrumb .mdi::before,
.btn.mdi::before,
Expand Down Expand Up @@ -72,7 +72,7 @@
margin-right: 0.5rem;
}

//Structure
// Structure
html,
body {
margin: 0;
Expand Down Expand Up @@ -137,7 +137,7 @@ h2 {
background-color: #2962ff;
}

//Side Menu
// Side Menu
.aside {
height: 100%;
}
Expand Down Expand Up @@ -224,7 +224,7 @@ img.search_icon {
}
}

//Navbar
// Navbar
.navbar {
background-color: transparent;
}
Expand Down Expand Up @@ -269,7 +269,7 @@ img.search_icon {
border-radius: 25px;
}

//Cards
// Cards
.box {
margin: 0;
}
Expand Down Expand Up @@ -303,7 +303,7 @@ img.search_icon {
font-weight: bold;
}

//News Feed - Dashboard
// News Feed - Dashboard
.tag-activity-dashboard {
margin-right: 10px;
}
Expand All @@ -314,7 +314,7 @@ img.search_icon {
.news-feed-message {
margin-left: 65px;
width: auto;
background-color: #d8dce8;
background-color: #fafafa;
border-radius: 5px;
word-wrap: break-word;
}
Expand All @@ -334,9 +334,9 @@ img.search_icon {
margin-left: 65px;
}

//Tags
// Tags
.tag-structure {
margin-right: 5px;
margin-right: 5px;
}
.tag-buttons {
margin-right: 5px;
Expand Down

1 comment on commit 34cbf83

@datreeio
Copy link

@datreeio datreeio bot commented on 34cbf83 Aug 8, 2019

Choose a reason for hiding this comment

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

1 / 6 Rules Failed

🔁 Block out-of-date pull requests


👉 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.