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

Commit

Permalink
Merge pull request #33 from RitaOak/interface-updatesv3
Browse files Browse the repository at this point in the history
Interface updatesv3
  • Loading branch information
RitaOak authored Jan 23, 2020
2 parents 68473b6 + 7cd689c commit 0cd76aa
Show file tree
Hide file tree
Showing 17 changed files with 169 additions and 77 deletions.
Binary file added images/home-back.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/home-back2.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/home-back3.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/home-back4.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion src/components/dashboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ class OAEDashboard extends PageViewElement {
<div class="column">
<quick-settings></quick-settings>
<info-card></info-card>
<tag-card></tag-card>
</div>
</div>
</div>
Expand Down
37 changes: 37 additions & 0 deletions src/components/followers.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import { html, LitElement } from 'lit-element';
import '@polymer/iron-icons/iron-icons.js';
import sharedStyles from '../../style/app.scss';
import infoBox from '../../style/info-box.scss';

class followersList extends LitElement {
static get styles() {
return [sharedStyles, infoBox];
}

render() {
return html`
<nav class="level followers-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="/images/avatar.jpg" />
</figure>
<section class=infoBox-followers">
<h4>
<a class="feed-user">Michael Brown</a>
</h4>
<p>
Following since October 2019
</p>
</section>
</div>
</div>
</div>
</hr>
</nav>
`;
}
}

window.customElements.define('followers-list', followersList);
28 changes: 6 additions & 22 deletions src/components/info-card.js
Original file line number Diff line number Diff line change
@@ -1,37 +1,21 @@
import { html, LitElement } from 'lit-element';
import homepageStyles from '../../style/homepage.scss';
import sharedStyles from '../../style/app.scss';
import infoBox from '../../style/info-box.scss';
import './followers.js';

class infoCard extends LitElement {
static get styles() {
return [sharedStyles, homepageStyles, infoBox];
return [sharedStyles, infoBox];
}

render() {
return html`
<div class="box info">
<div class="content info-card">
<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="/images/avatar.jpg" />
</figure>
<section class=infoBox-followers">
<h4>
<a class="feed-user">Michael Brown</a>
</h4>
<p>
Following since October 2019
</p>
</section>
</div>
</div>
</div>
</hr>
</nav>
<followers-list></followers-list>
<followers-list></followers-list>
<followers-list></followers-list>
<followers-list></followers-list>
</div>
</div>
`;
Expand Down
59 changes: 52 additions & 7 deletions src/components/library-table.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,13 @@ class libraryTable extends LitElement {
return html`
<div class="columns is-flex table-wrap">
<div class="library-box library-content library-padding ">
<table class="table is-fullwidth">
<table class="table is-fullwidth lib-table">
<thead>
<tr class="library-columns library-top">
<th>
<label class="checkbox checkbox-label is-inline-flex library-top">
<input type="checkbox" class="checkmark"/>
<p class="library-checkbox-label-top">
Select All
</p>
</label>
<label for="checkbox">
<input type="checkbox">
</label>
</th>
<th>
<p>
Expand Down Expand Up @@ -190,6 +187,54 @@ class libraryTable extends LitElement {
</td>
</tr>
</tbody>
<tbody class="library-section">
<tr class="library-designation-label is-size-6">
<th>
<div class="field">
<p class="control">
<div class="b-checkbox">
<label for="checkbox">
<input type="checkbox">
</label>
</div>
</p>
</div>
</th>
<td>
<p class="has-text-weight-bold">
Advertisement
</p>
<!-- Main container -->
<section class="level library-designation-wrap is-inline-flex">
<!-- Left side -->
<div class="level-left">
<div class="level-item">
<p class="library-designation-hover">
Group - Marketing
</p<
</div>
<div class="level-item library-designation-tag">
</div>
</div>
</section>
</td>
<td>
<p class="has-text-weight-medium">
Michael Brown
</p>
</td>
<td>
<p class="has-text-weight-medium">
27/03/2020
</p>
</td>
<td>
<p class="has-text-weight-medium">
Folder
</p>
</td>
</tr>
</tbody>
<tbody class="library-section">
<tr class="library-designation-label is-size-6">
<th>
Expand Down
28 changes: 19 additions & 9 deletions src/components/quick-settings.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,34 @@
import { html, LitElement } from 'lit-element';
import homepageStyles from '../../style/homepage.scss';
import '@polymer/iron-icons/iron-icons.js';
import calendarStyles from '../../style/calendar.scss';
import sharedStyles from '../../style/app.scss';

class quickSettings extends LitElement {
static get styles() {
return [sharedStyles, homepageStyles];
return [sharedStyles, calendarStyles];
}

render() {
return html`
<div class="box info">
<div class="box info calendar-card">
<article class="media">
<div class="media-content">
<div class="content info-card">
<p>
LAST SIGN IN
</p>
<h3>
<strong>TUESDAY APRIL 4 2019</strong>
</h3>
<nav class="level">
<div class="level-left calendar">
<div class="level-item">
<span class="card-icon">
<iron-icon icon="icons:today"></iron-icon>
</span>
</div>
<div class="level-item calendar-p">
<p>Last Sign In</p>
</div>
<div class="level-item calendar-date">
<p>Thursday 4 April 2019</p>
</div>
</div>
</nav>
</div>
</div>
</article>
Expand Down
19 changes: 19 additions & 0 deletions style/calendar.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.calendar-p {
color: white;
font-size: 0.9em;
font-weight: 600;
text-transform: uppercase;
}

.calendar-date {
color: white;
font-size: 0.9em;
text-transform: uppercase;
}
.card-icon {
color: white;
}

.calendar-card {
background-color: #424242;
}
32 changes: 9 additions & 23 deletions style/homepage-navv2.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.navbar-brand {
padding-left: 2em;
padding-left: 5em;
}

.navbar-item img {
Expand All @@ -11,33 +11,19 @@
}

.signIn-button {
text-transform: uppercase;
font-size: 0.9em;
border-radius: 25px;
width: 100px;
height: 28px;
color: #0260ff;
background-color: #e5efff;
color: #00253D;
background-color: white;
border: none;
transition: 0.8s;
-webkit-transition: 0.8s;
-moz-transition: 0.8s;
-ms-transition: 0.8s;
-o-transition: 0.8s;
&:hover {
color: white;
background-color: #2128bd;
transition: 0.8s;
-webkit-transition: 0.8s;
-moz-transition: 0.8s;
-ms-transition: 0.8s;
-o-transition: 0.8s;
-webkit-transform: rotate(10deg);
-moz-transform: rotate(10deg);
-o-transform: rotate(10deg);
-ms-transform: rotate(10deg);
transform: rotate(10deg);
color: #2E98D5;
background-color: transparent;
border: none;
}
}

.navEnd {
padding-right: 2em;
padding-right: 5em;
}
4 changes: 2 additions & 2 deletions style/homepage-search.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
border-style: solid;
border-color: white;
background-color: white;
border-width: 1px;
border-width: 0.2px;
&:hover, :active {
border-style: solid;
border-color: white;
Expand All @@ -19,7 +19,7 @@
.input:focus {
border-style: solid;
border-color: white;
border-width: 1px;
border-width: 0.75px;
background-color: white;
}

Expand Down
9 changes: 5 additions & 4 deletions style/homepage-v2.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ $secondaryFontColor: #424242;
@import url("https://fonts.googleapis.com/css?family=Roboto:700&display=swap");

.is-gapless {
background: url("/images/background.jpg") no-repeat center fixed;
background: url("/images/home-back3.jpg") no-repeat center fixed;
-webkit-background-size: cover;
-moz-background-size: cover;
-o-background-size: cover;
Expand All @@ -16,7 +16,7 @@ $secondaryFontColor: #424242;

.home-rightv2 {
transform: translate(0, 60%);
margin-left: 2em;
margin-left: 5em;
}

.home-leftCol {
Expand All @@ -32,9 +32,10 @@ $secondaryFontColor: #424242;
}

.home-titlev2 {
font-weight: 700;
font-weight: 600;
margin-top: 1em;
text-transform: uppercase;
font-size: 2.3em;
font-size: 2em;
margin-bottom: 0.2em;
color: white;
}
Expand Down
12 changes: 11 additions & 1 deletion style/info-box.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
margin: 0;
}

.info {
background-color: transparent;
border: none;
box-shadow: none;
}

* {
font-size: 13px;
}
Expand All @@ -19,5 +25,9 @@
}

.info-box p {
color: #BDBDBD;
color: rgb(216, 197, 197);
}

.level.followers-top {
margin-bottom: 0;
}
3 changes: 2 additions & 1 deletion style/landing-page.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ $secondaryFontColor: #424242;
font-size: 3em;
margin-bottom: 0.2em;
color: white;
margin-top: 3em;
}

.home-right h6 {
Expand All @@ -36,7 +37,7 @@ $secondaryFontColor: #424242;
min-height: 700px;
margin-top: 0;
margin-bottom: 0;
background: url("/images/background_02.jpg") no-repeat center fixed;
background: url("/images/home-back3.jpg") no-repeat center fixed;
-webkit-background-size: cover;
-moz-background-size: cover;
-o-background-size: cover;
Expand Down
2 changes: 1 addition & 1 deletion style/library-table-entries.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ tr:nth-child(even) {
color: #666666;
}
.library-padding {
padding: 15px;
padding: 5px, 15px, 15px, 50px;
}

.library-designation-wrap {
Expand Down
Loading

0 comments on commit 0cd76aa

Please sign in to comment.