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

Interface updatesv2 #27

Merged
merged 8 commits into from
Dec 18, 2019
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
Binary file added images/avatar.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/user.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/dashboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class OAEDashboard extends PageViewElement {
<top-nav></top-nav>
</div>
<div class=" columns is-flex main-content">
<div class="column is-two-thirds">
<div class="column is-three-fifths main-left">
<section class="column activity-dashboard">
<section class="is-flex">
<span class="icon tag-activity-dashboard">
Expand Down
24 changes: 16 additions & 8 deletions src/components/news-feed.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ import { html, LitElement } from 'lit-element';
import homepageStyles from '../../style/homepage.scss';
import sharedStyles from '../../style/app.scss';
import newsFeedComponent from '../../style/news-feed.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 './tags.js';

class newsFeed extends LitElement {
Expand All @@ -13,19 +17,19 @@ class newsFeed extends LitElement {
return html`
<div class="box box-feed">
<div class="content news-feed">
<nav class="level">
<nav class="level news-feed-top">
<div class="level-left">
<div class="level-item">
<div class="column is-flex news-feed-nav">
<figure class="image avatar-news-feed">
<img class="is-rounded avatar-news-feed" src="https://bulma.io/images/placeholders/128x128.png" />
<img class="is-rounded avatar-news-feed" src="/images/avatar.jpg" />
</figure>
<section>
<h4>
<a> Rita Carvalho</a>
<a class="feed-user">Michael Brown</a>
uploaded a file
<span class="panel-icon">
<i class="fas fa-book" aria-hidden="true"></i>
<span class="panel-icon icon-feed">
<iron-icon icon="icons:cloud-upload"></iron-icon>
</span>
</h4>
<p>
Expand All @@ -36,7 +40,11 @@ class newsFeed extends LitElement {
</div>
</div>
<div class="level-right">
<p class="level-item"><a class="button is-info">Pin</a></p>
<p class="level-item">
<a class="button news-pin">
<iron-icon icon="icons:label-outline"></iron-icon>
</a>
</p>
</div>
</nav>
<section class="column news-feed-message">
Expand All @@ -49,11 +57,10 @@ class newsFeed extends LitElement {
<tags-button></tags-button>
<tags-button></tags-button>
</section>
<hr class="news-feed-break" />
<nav class="level bottom-nav-news">
<div class="level-left">
<div class="level-item">
<a class="button is-inverted is-link">
<a class="button comments-button">
<span>View (25) comments</span>
<span class="icon is-small">
<i class="mdi mdi-alert"></i>
Expand All @@ -69,6 +76,7 @@ class newsFeed extends LitElement {
</div>
</div>
</nav>
<hr class="news-feed-break" />
</div>
</div>
`;
Expand Down
6 changes: 3 additions & 3 deletions src/components/user-button.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ class User extends LitElement {
<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>
<figure class="image user-avatar">
<img class="is-rounded" src="/images/user.jpg" />
</figure>
</a>
<div class="navbar-dropdown">
<a class="navbar-item">
Expand Down
8 changes: 5 additions & 3 deletions style/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,6 @@ h2 {

.column.is-narrow {
background-color: white;
-moz-box-shadow: 3px 3px 5px 6px #ccc;
-webkit-box-shadow: 3px 3px 5px 6px #ccc;
box-shadow: 5px 5px 6px #d8d3d3;
z-index: 1;
width: 210px;
padding: 0;
Expand Down Expand Up @@ -264,6 +261,11 @@ a.network {
.activity-dashboard h3 {
color: black;
font-weight: bold;
font-size: 14px;
}

.main-left {
padding: 0;
}

.tag-activity-dashboard {
Expand Down
96 changes: 80 additions & 16 deletions style/news-feed.scss
Original file line number Diff line number Diff line change
@@ -1,33 +1,97 @@
// News Feed - Dashboard
.box {
box-shadow: none;
}

.box-feed {
margin-top: 25px;
&:hover {
border: 5px solid #2962ff;
}
margin-top: 25px;
padding: 5px;
background-color: transparent;
border: none;
}

* {
font-size: 13px;
}

.avatar-news-feed img {
height: 100%;
object-fit: cover;
}

.news-feed {
padding: 10px;
padding: 10px;
}

.news-feed-top {
margin-bottom: 0;
}

.news-feed-message {
margin-left: 65px;
width: auto;
background-color: #fafafa;
border-radius: 5px;
word-wrap: break-word;
margin-left: 65px;
margin-top: -15px;
width: auto;
background-color: rgb(253, 253, 253);
border-radius: 5px;
box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
word-wrap: break-word;
}

.news-feed-message h4 {
font-weight: bold;
margin-bottom: 5px;
font-weight: bold;
margin-bottom: 5px;
}

.feed-user {
text-decoration: underline;
color: #0060df;
background-color: #f5f7ff;
&:hover {
color: #0d47a1;
background-color: #f5f7ff;
text-decoration: none;
}
}

.avatar-news-feed {
width: 50px;
height: 50px;
margin-right: 15px;
width: 50px;
height: 50px;
margin-right: 15px;
}

.bottom-nav-news {
margin-left: 65px;
margin-left: 65px;
margin-top: 1.8em;
}

.news-feed-break {
margin-top: 3em;
}

.comments-button {
border: none;
background-color: transparent;
height: 5px;
color: #0060df;
text-decoration: underline;
&:hover {
color: #0d47a1;
text-decoration: none;
}
}

.icon-feed {
color: #424242;
}

.news-pin {
background-color: transparent;
border-radius: 25px;
border: none;
background-color: #0060df;
color: white;
&:hover {
background-color: #0d47a1;
color: white;
}
}
12 changes: 12 additions & 0 deletions style/topnav-buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
}

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

.navbar-item {
border-color: #0060df;
}

Expand All @@ -12,10 +16,18 @@
font-size: 14px;
height: 35px;
border-radius: 25px;
border: solid;
border-color: #EEEEEE;
border-width: 1px;
}

.notification-icon {
color: black;

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

.navbar-link:not(.is-arrowless)::after {
Expand Down
11 changes: 11 additions & 0 deletions style/user.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,14 @@
.topnav-icon-left {
padding-left: 8px;
}

.user-avatar {
padding-left: 5px;
height: 25px;
width: 25px;
}

.user-avatar img {
height: 100%;
object-fit: cover;
}