summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package.json1
-rw-r--r--src/components/top-nav/styles.css7
-rw-r--r--src/containers/feed/index.js24
-rw-r--r--src/containers/feed/styles.css48
-rw-r--r--src/global.css13
-rw-r--r--src/index.js1
-rw-r--r--yarn.lock4
7 files changed, 94 insertions, 4 deletions
diff --git a/package.json b/package.json
index 98ab0a7..6b8effe 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
"dependencies": {
"axios": "^0.18.0",
"bootstrap": "^4.1.3",
+ "font-awesome": "^4.7.0",
"react": "^16.4.2",
"react-dom": "^16.4.2",
"react-redux": "^5.0.7",
diff --git a/src/components/top-nav/styles.css b/src/components/top-nav/styles.css
index 16d412c..c91d753 100644
--- a/src/components/top-nav/styles.css
+++ b/src/components/top-nav/styles.css
@@ -2,9 +2,14 @@
background: #fff;
border-bottom: 1px solid #e8e8e8;
padding: 15px 0;
+ margin-bottom: 35px;
position: relative;
}
+.logo {
+ margin-left: -10px;
+}
+
.logo img {
height: 75px;
float: left;
@@ -28,8 +33,6 @@
.duration-btns a.btn {
margin-left: 10px;
- border-radius: 8px;
- font-size: 14px;
margin-top: 24px;
}
diff --git a/src/containers/feed/index.js b/src/containers/feed/index.js
index c9e28e2..8af92f5 100644
--- a/src/containers/feed/index.js
+++ b/src/containers/feed/index.js
@@ -8,7 +8,29 @@ class FeedContainer extends React.Component {
return (
<div className="page-wrap">
<TopNav/>
- <div className="container">
+
+ <div className="container mt-4">
+ <div className="header-row clearfix">
+ <div className="group-heading">
+ <h4>Today <span className="small text-muted">July 12, 2019</span></h4>
+ </div>
+ <div className="group-filters">
+ <a href="#" className="btn btn-light language-filter">
+ <i className="fa fa-filter mr-2"></i>
+ All Languages
+ </a>
+ <div className="view-type btn">
+ <a href="#" className="active">
+ <i className="fa fa-list mr-2"></i>
+ List
+ </a>
+ <a href="#">
+ <i className="fa fa-table mr-2"></i>
+ Grid
+ </a>
+ </div>
+ </div>
+ </div>
</div>
</div>
);
diff --git a/src/containers/feed/styles.css b/src/containers/feed/styles.css
index e69de29..6e006fb 100644
--- a/src/containers/feed/styles.css
+++ b/src/containers/feed/styles.css
@@ -0,0 +1,48 @@
+.group-heading {
+ font-size: 22px;
+ font-weight: 600;
+ float: left;
+}
+
+.group-filters {
+ float: right;
+}
+
+.group-heading .small {
+ font-size: 14px;
+ font-weight: 400;
+ margin-left: 3px;
+}
+
+.btn.view-type, .btn.language-filter {
+ display: inline;
+ box-shadow: 0 9px 62px -13px rgba(0, 0, 0, 0.20);
+}
+
+.language-filter {
+ border-radius: 8px;
+ padding: 10px 20px;
+ background-color: white;
+}
+
+.group-filters .view-type.btn {
+ border-radius: 8px;
+ padding: 10px 20px;
+ background: white;
+ margin-left: 10px;
+ cursor: default;
+}
+
+.view-type a {
+ color: #ccc;
+ margin-left: 20px;
+ text-decoration: none;
+}
+
+.view-type a.active, .view-type a:hover {
+ color: #343a40;
+}
+
+.view-type a:first-child {
+ margin-left: 0;
+}
diff --git a/src/global.css b/src/global.css
index 93d7a99..336698a 100644
--- a/src/global.css
+++ b/src/global.css
@@ -1,4 +1,15 @@
body {
- background-color: #f9f9f9;
+ /*background-color: #f9f9f9;*/
+ background: #f4f4f4;
min-height: 100vh;
}
+
+.btn {
+ font-size: 14px;
+ border-radius: 8px;
+}
+
+.btn-primary {
+ background: #1157ed;
+ border-color: #1157ed;
+}
diff --git a/src/index.js b/src/index.js
index 930791d..0e4a13b 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,6 +1,7 @@
import React from 'react';
import ReactDOM from 'react-dom';
import 'bootstrap/dist/css/bootstrap.css';
+import 'font-awesome/css/font-awesome.css'
import './global.css';
import App from './app';
diff --git a/yarn.lock b/yarn.lock
index e017ff1..2e107b6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2802,6 +2802,10 @@ follow-redirects@^1.0.0, follow-redirects@^1.3.0:
dependencies:
debug "^3.1.0"
+font-awesome@^4.7.0:
+ version "4.7.0"
+ resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
+
for-in@^1.0.1, for-in@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"