diff --git a/src/user/dashboard/navigation/navigation.js b/src/user/dashboard/navigation/navigation.js index 2ceaa8ec..b1c3e39b 100644 --- a/src/user/dashboard/navigation/navigation.js +++ b/src/user/dashboard/navigation/navigation.js @@ -1,15 +1,22 @@ import React, { Component } from "react"; -import { ListGroup } from "react-bootstrap"; -import { NavLink } from "react-router-dom"; +import { ListGroup , Nav} from "react-bootstrap"; +import {Link, NavLink, Route} from 'react-router-dom'; import "./navigation.scss"; + import logo from "../../../svgs/donut.svg"; +import dashboard from "../../../svgs/dashboard.svg"; + class Navigation extends Component { // onClick(params) { // this.state.Link("/" + params); // console.log(params); // } + constructor(props) { + super(props) + } + render() { const divStyle = { @@ -21,96 +28,74 @@ class Navigation extends Component {
- - logo - + logo this.onClick("dashboard")} > - - + + - - Dashboard - +Dashboard this.onClick("posts")} > - - + + - - Pinned Posts - + Pinned Posts this.onClick("orginization")} > - - + + - - Organization - + Organization this.onClick("profile")} > - - + + - - Account - + Account - Settings + + + +Settings
); diff --git a/src/user/dashboard/navigation/navigation.scss b/src/user/dashboard/navigation/navigation.scss index 697db11d..a6378291 100644 --- a/src/user/dashboard/navigation/navigation.scss +++ b/src/user/dashboard/navigation/navigation.scss @@ -26,6 +26,19 @@ .list-group{ .active{ background-color: rgba(26, 115, 232, 0.1); + .link { + color : #1A73E8 + } + } + } +} + +.navigation { + .list-group { + .inactive { + .link { + color: rgba(0, 0, 0, 0.5); + } } } } @@ -38,4 +51,17 @@ } } } +} + +.navigation{ + .list-group { + .active { + .icon{ + .path-name{ + fill : #1A73E8; + fill-opacity : 10 + } + } + } + } } \ No newline at end of file diff --git a/src/user/organization/org-info/org-info.scss b/src/user/organization/org-info/org-info.scss index d1bd9736..9392e4d3 100644 --- a/src/user/organization/org-info/org-info.scss +++ b/src/user/organization/org-info/org-info.scss @@ -44,6 +44,35 @@ margin: 5px 7px 0 0; padding: 8px; font-size: 14px; + box-shadow: 1px 2px 5px rgba(0, 0, 0, 0.1); + border-radius: 20px; + width: 100px; + height: 35px; + font-family: Inter; + font-style: normal; + font-weight: 600; + font-size: 14px; + line-height: 17px; + text-align: center; + } + } + } +} + +.org-details { + .org-data { + h1 { + .btn-primary { + box-shadow: 1px 2px 5px rgba(0, 0, 0, 0.1); + border-radius: 20px; + width: 100px; + height: 35px; + font-family: Inter; + font-style: normal; + font-weight: 600; + font-size: 14px; + line-height: 17px; + text-align: center; } } } diff --git a/src/user/profile/user-info/user-info.scss b/src/user/profile/user-info/user-info.scss index 09e4da0b..ae7199bd 100644 --- a/src/user/profile/user-info/user-info.scss +++ b/src/user/profile/user-info/user-info.scss @@ -44,7 +44,37 @@ margin: 5px 7px 0 0; padding: 8px; font-size: 14px; + box-shadow: 1px 2px 5px rgba(0, 0, 0, 0.1); + border-radius: 20px; + width: 80px; + height: 35px; + font-family: Inter; + font-style: normal; + font-weight: 600; + font-size: 14px; + line-height: 17px; + text-align: center; + } + } + } +} + +.user-details { + .user-data { + h1 { + .btn-primary{ + box-shadow: 1px 2px 5px rgba(0, 0, 0, 0.1); + border-radius: 20px; + width: 80px; + height: 35px; + font-family: Inter; + font-style: normal; + font-weight: 600; + font-size: 14px; + line-height: 17px; + text-align: center; } } } } +