diff --git a/src/assets/notif_approved.svg b/src/assets/notif_approved.svg
deleted file mode 100644
index d284f74..0000000
--- a/src/assets/notif_approved.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/src/components/common/notificationCard.js b/src/components/common/notificationCard.js
index 738fcb5..5ccbef0 100644
--- a/src/components/common/notificationCard.js
+++ b/src/components/common/notificationCard.js
@@ -8,7 +8,6 @@ import { CLOSE_MODAL } from 'constants/action-types';
import parseDate from 'utils/parseDate';
import defaultIcon from 'assets/notif_default.svg';
-import approved from 'assets/notif_approved.svg';
import file from 'assets/notif_file.svg';
import course from 'assets/notif_course.svg';
import request from 'assets/notif_request.svg';
@@ -44,11 +43,10 @@ const getTemplateData = (notification_data) => {
break;
case 'request':
+ templateData.icon = request;
if (verb.includes('you requested')) {
- templateData.icon = approved;
- templateData.title = 'Request Approved';
+ templateData.title = 'Request Updated';
} else {
- templateData.icon = request;
templateData.title = 'New Request Added';
}
break;
diff --git a/src/components/coursecard/materialCard.js b/src/components/coursecard/materialCard.js
index 3a37931..fd60dc8 100644
--- a/src/components/coursecard/materialCard.js
+++ b/src/components/coursecard/materialCard.js
@@ -68,7 +68,7 @@ const MaterialCard = (props) => {
viewFile(props.url)} title={props.name}>
- {props.name.length < 30 ? props.name : ShortName(props.name)}
+ {props.name.length < 10 ? props.name : ShortName(props.name)}
Downloads: {props.downloads}
diff --git a/src/components/header/searchResult.js b/src/components/header/searchResult.js
index 57a1470..7ebafcb 100644
--- a/src/components/header/searchResult.js
+++ b/src/components/header/searchResult.js
@@ -29,7 +29,7 @@ const SearchResult = (props) => {
- {props.name.length < 30 ? props.name : shortName(props.name)}
+ {props.name.length < 20 ? props.name : shortName(props.name)}
diff --git a/src/components/request/request.js b/src/components/request/request.js
index 15cf6ef..f15b541 100644
--- a/src/components/request/request.js
+++ b/src/components/request/request.js
@@ -79,6 +79,8 @@ class Request extends Component {
* @param {object} e
*/
file_active_material = (e) => {
+ $('input:radio').prop('checked', false);
+ $('input:text').val('');
this.setState({ disable: 2 });
};
@@ -89,6 +91,13 @@ class Request extends Component {
this.setState({ disable: 3 });
};
+ /**
+ * Activates request button in file.
+ */
+ active_request_file = () => {
+ this.setState({ disable: 4 });
+ };
+
/**
* Activates course name input.
*/
@@ -103,6 +112,13 @@ class Request extends Component {
this.setState({ disableCourse: 2 });
};
+ /**
+ * Activates request button in course.
+ */
+ active_request_course = () => {
+ this.setState({ disableCourse: 4 });
+ };
+
/**
* Requests file through API.
*
@@ -340,6 +356,7 @@ class Request extends Component {
type="text"
disabled={!(this.state.disable >= 3)}
name="name"
+ onChange={this.active_request_file}
/>
{this.state.requested ? (
@@ -377,7 +394,14 @@ class Request extends Component {
) : (
-
diff --git a/src/styles/partials/_coursePage.scss b/src/styles/partials/_coursePage.scss
index 6f2e711..280f8a0 100644
--- a/src/styles/partials/_coursePage.scss
+++ b/src/styles/partials/_coursePage.scss
@@ -39,7 +39,7 @@
height: 0.0625rem;
align-self: center;
margin-top: 0.625rem;
- border: 0.02125rem solid $primary;
+ border-bottom: 0.125rem solid $primary;
}
&addcourse {
diff --git a/src/styles/partials/_landingHeader.scss b/src/styles/partials/_landingHeader.scss
index f9bd1df..5eef829 100644
--- a/src/styles/partials/_landingHeader.scss
+++ b/src/styles/partials/_landingHeader.scss
@@ -7,7 +7,6 @@
background-size: contain;
height: 24.4375rem;
width: 100%;
- overflow: hidden;
cursor: default;
@@ -69,6 +68,7 @@
&search {
display: flex;
flex-direction: row;
+ justify-content: center;
margin-top: 1.25rem;
width: 70%;
border-radius: 0.25rem;
@@ -104,7 +104,7 @@
&login {
@include font;
- width: 6.25rem;
+ width: 5.25rem;
height: 2.5625rem;
color: $secondary;
background: transparent;
@@ -113,11 +113,11 @@
&signup {
@include font;
- width: 7.5625rem;
+ width: 4.99625rem;
height: 2.5625rem;
color: $font-color;
- border-radius: 0.25rem;
- border: 1px solid $font-color;
+ border-radius: 0.125rem;
+ border: 0.0625rem solid $font-color;
background: transparent;
}
diff --git a/src/styles/partials/_materialCard.scss b/src/styles/partials/_materialCard.scss
index 1689ebc..e1afe6b 100644
--- a/src/styles/partials/_materialCard.scss
+++ b/src/styles/partials/_materialCard.scss
@@ -82,7 +82,7 @@
&size {
@include font;
- width: 3.8rem;
+ width: 4.5rem;
height: 1.1875rem;
margin-right: 7.75rem;
margin-top: 1.5rem;
diff --git a/src/styles/partials/_search.scss b/src/styles/partials/_search.scss
index 2895dc1..aad8904 100644
--- a/src/styles/partials/_search.scss
+++ b/src/styles/partials/_search.scss
@@ -1,4 +1,5 @@
.search {
+ @include center;
display: flex;
flex-direction: column;
width: 100%;
@@ -118,7 +119,7 @@
}
&-seeall {
@include font;
- width: 2.625rem;
+ width: 3rem;
height: 1.0625rem;
margin-left: 87.69%;
margin-bottom: 1rem;
diff --git a/src/utils/short-name.js b/src/utils/short-name.js
index 81b5d9b..81dfd85 100644
--- a/src/utils/short-name.js
+++ b/src/utils/short-name.js
@@ -4,9 +4,9 @@ let ShortName = function (name) {
}
let names = name.split(' ');
if (names.length === 1) {
- return name.length < 30 ? name : name.substr(0, 25) + '...';
+ return name.length < 10 ? name : name.substr(0, 8) + '...';
}
- let firstName = names[0];
+ let firstName = names[0].length < 10 ? names[0] : names[0].substr(0, 8) + '.';
let lastName = names[names.length - 1];
let lastInitial = `${lastName.substr(0, 1)}.`;
return `${firstName} ${lastInitial}`;