@@ -81,7 +81,7 @@ class topNav extends LitElement {
`;
- return version2;
+ return version1;
}
}
diff --git a/style/app.scss b/style/app.scss
index 53b0851..87b8675 100644
--- a/style/app.scss
+++ b/style/app.scss
@@ -12,32 +12,19 @@ $link: #0060df;
// @import "../node_modules/material-design-icons/iconfont/";
// Bulma *ALL SASS imports
-@import 'bulma/sass/utilities/mixins';
+@import '../node_modules/bulma/sass/utilities/_all.sass';
@import '../node_modules/bulma/sass/grid/_all.sass';
@import '../node_modules/bulma/sass/utilities/_all.sass';
@import '../node_modules/bulma/sass/base/_all.sass';
@import '../node_modules/bulma/sass/form/_all.sass';
@import '../node_modules/bulma/sass/layout/_all.sass';
+@import '../node_modules/bulma/sass/elements/_all.sass';
// Components
@import '../node_modules/bulma/sass/components/navbar.sass';
@import '../node_modules/bulma/sass/components/dropdown.sass';
@import '../node_modules/bulma/sass/components/modal.sass';
@import '../node_modules/bulma/sass/components/level.sass';
-@import '../node_modules/bulma/sass/components/tabs.sass';
-
-// Elements
-@import '../node_modules/bulma/sass/elements/box.sass';
-@import '../node_modules/bulma/sass/elements/button.sass';
-@import '../node_modules/bulma/sass/elements/container.sass';
-@import '../node_modules/bulma/sass/elements/title.sass';
-@import '../node_modules/bulma/sass/elements/image.sass';
-@import '../node_modules/bulma/sass/elements/icon.sass';
-@import '../node_modules/bulma/sass/elements/table.sass';
-
-// Should remake the structure in order to include these imports
-// @import "../node_modules/bulma/sass/elements/_all.sass";
-// @import "../node_modules/bulma/sass/components/_all.sass";
// Material Design Icons
// Default Styles
@@ -76,7 +63,7 @@ $link: #0060df;
margin-left: -0.5rem;
}
.modal-title.mdi::before {
- font-size: 1.5em;
+ font-size: 1em;
line-height: 0.5;
position: relative;
top: 0.26rem;
@@ -108,7 +95,7 @@ body {
}
.container.is-fluid {
- margin: 0.5em 5.5em 0 5.5em;
+ margin: 0.5em 5.5em 0 5em;
padding: 0;
height: 100%;
}
@@ -158,11 +145,6 @@ body {
height: 100%;
}
-.sidebar-brand {
- margin: -10px 0 30px 0;
- padding-left: 25px;
-}
-
.navbar-item img {
max-height: 3.2rem;
}
@@ -177,12 +159,12 @@ body {
}
.menu-list {
- font-size: 14px;
+ font-size: 1em;
font-family: 'Open Sans', sans-serif;
}
.menu-list li {
- padding-left: 30px;
+ padding-left: 0;
margin-bottom: 18px;
border-radius: 0 25px 25px 0;
height: 30px;
@@ -191,15 +173,15 @@ body {
align-items: center;
&:hover {
color: #0060df;
- background-color: #f5f7ff;
+ background-color: #EDEDF0;
}
&:active {
color: #0060df;
- background-color: #f5f7ff;
+ background-color: #EDEDF0;
}
&:focus {
color: #0060df;
- background-color: #f5f7ff;
+ background-color: #EDEDF0;
}
}
@@ -217,13 +199,17 @@ a.network {
}
.navbar-divider {
- margin: 20px 0 0 0;
+ margin: 5px 0 5px 0;
+}
+
+.top-divider {
+ margin: 30px 0 5px 0;
}
// Top Bar
.top-nav {
- margin: 0.5em 5.5em 0.5em 5.5em;
- max-width: 97%;
+ margin: 0.5em 2.5em 0.5em 2.5em;
+ max-width: 100%;
}
.topbar-search-icon {
@@ -240,7 +226,7 @@ a.network {
background-color: transparent;
box-shadow: none;
padding-left: 20px;
- font-size: 14px;
+ font-size: 1em;
width: 350px;
&:focus {
-webkit-appearance: none;
@@ -297,7 +283,7 @@ ul.breadcrumb {
ul.breadcrumb li {
display: inline;
- font-size: 13px;
+ font-size: 0.9em;
color: #424242;
font-weight: 500;
}
diff --git a/style/groups-avatar.scss b/style/groups-avatar.scss
new file mode 100644
index 0000000..0644981
--- /dev/null
+++ b/style/groups-avatar.scss
@@ -0,0 +1,12 @@
+.avatar {
+ z-index: 5;
+ margin-top: -100px;
+ margin-left: -3%;
+}
+
+img {
+ border-radius: 150px;
+ width: 150px;
+ height: 150px;
+ object-fit: cover;
+}
diff --git a/style/groups-banner.scss b/style/groups-banner.scss
new file mode 100644
index 0000000..6aa099f
--- /dev/null
+++ b/style/groups-banner.scss
@@ -0,0 +1,9 @@
+.banner {
+ margin: 0;
+}
+
+.banner img {
+ width: 100%;
+ height: 240px;
+ object-fit: cover;
+}
diff --git a/style/groups-button.scss b/style/groups-button.scss
new file mode 100644
index 0000000..3ae65f6
--- /dev/null
+++ b/style/groups-button.scss
@@ -0,0 +1,30 @@
+// JOIN BUTTON
+.group-join-button {
+ border-radius: 25px;
+ width: 150px;
+ height: 20px;
+ font-weight: bold;
+ background-color: transparent;
+ border: 2px solid #2962ff;
+ color: #2962ff;
+ &:hover {
+ background-color: #ededf0;
+ color: #2962ff;
+ border: 2px solid #2962ff;
+ color: #2962ff;
+ }
+}
+
+.group-join-button {
+ text-align: center;
+}
+
+.group-name-icon {
+ padding-right: 10px;
+ color: black;
+}
+
+.group-join-icon {
+ padding-right: 10px;
+ color: #2962ff;
+}
diff --git a/style/groups-filter.scss b/style/groups-filter.scss
index 71ad047..5c83011 100644
--- a/style/groups-filter.scss
+++ b/style/groups-filter.scss
@@ -1,7 +1,6 @@
.filter-feed {
- color: #0060df;
+ color: #2962ff;
margin-right: 15px;
- font-size: 13px;
height: 20px;
width: 6em;
border-radius: 25px;
@@ -10,7 +9,7 @@
}
.filter-active-feed {
- background-color: #0060df;
+ background-color: #2962ff;
color: white;
&:hover {
color: white;
diff --git a/style/groups-header.scss b/style/groups-header.scss
new file mode 100644
index 0000000..90fdc7b
--- /dev/null
+++ b/style/groups-header.scss
@@ -0,0 +1,12 @@
+h1{
+ font-weight: bolder;
+ font-size: 1.5em;
+}
+
+.about-header a {
+ color: #2962ff;
+ &:hover {
+ color: #0d47a1;
+ }
+}
+
diff --git a/style/groups-tabs.scss b/style/groups-tabs.scss
new file mode 100644
index 0000000..0b11ffd
--- /dev/null
+++ b/style/groups-tabs.scss
@@ -0,0 +1,50 @@
+/* Style the tab */
+*{
+ font-size: 1em;
+}
+
+.tab {
+ overflow: hidden;
+ border: none;
+ background-color: transparent;
+ padding: 10px 0 10px 0;
+}
+
+/* Style the buttons that are used to open the tab content */
+.tab button {
+ background-color: inherit;
+ float: left;
+ border: none;
+ outline: none;
+ cursor: pointer;
+ padding: 15px 25px 15px 0;
+}
+
+/* Change background color of buttons on hover */
+.tab button:hover {
+ border-bottom: 2px solid #2962ff;
+ color: #2962ff;
+}
+
+/* Create an active/current tablink class */
+.tab button.active {
+ background-color: transparent;
+ border-bottom: 2px solid #2962ff;
+}
+
+/* Style the tab content */
+.tabcontent {
+ display: none;
+ padding: 6px 12px;
+ border: 1px solid #ccc;
+ border-top: none;
+}
+
+.button-icon {
+ padding-right: 5px;
+}
+
+.section-divider {
+ margin-bottom: 30px;
+ border: 1px solid #EEEEEE;
+}
diff --git a/style/groups.scss b/style/groups.scss
index 84442f9..0914be0 100644
--- a/style/groups.scss
+++ b/style/groups.scss
@@ -1,9 +1,11 @@
h3 {
color: #212121;
- font-size: 14px;
+ font-size: 1em;
}
.dashboard-icon {
- color: #212121;
+ color: #2c2a2a;
margin-right: 0.8em;
- }
\ No newline at end of file
+ }
+
+
diff --git a/style/homepage-navv2.scss b/style/homepage-navv2.scss
index 23d2216..1af9986 100644
--- a/style/homepage-navv2.scss
+++ b/style/homepage-navv2.scss
@@ -1,4 +1,3 @@
-
.navbar-brand {
padding-left: 3em;
}
@@ -8,7 +7,8 @@
}
.navbar-item img {
- max-height: 3rem;
+ width: 100%;
+ height: 400px;
}
.home-nav {
diff --git a/style/library-table-entries.scss b/style/library-table-entries.scss
index e846474..dc2eb83 100644
--- a/style/library-table-entries.scss
+++ b/style/library-table-entries.scss
@@ -36,7 +36,7 @@ tr:nth-child(even) {
}
.library-columns p {
- font-size: 0.75rem;
+ font-size: 1em;
text-transform: uppercase;
color: #666666;
}
@@ -49,7 +49,7 @@ tr:nth-child(even) {
}
.table p {
- font-size: 0.75rem;
+ font-size: 0.9em;
text-transform: uppercase;
}
diff --git a/style/news-feed.scss b/style/news-feed.scss
index 6c64b29..3819c98 100644
--- a/style/news-feed.scss
+++ b/style/news-feed.scss
@@ -1,9 +1,13 @@
-// News Feed - Dashboard
+// News Feed
.box {
box-shadow: none;
background-color: white;
- //box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
+ transition: all 0.3s cubic-bezier(0.25, 0.8, 0.25, 1);
+ &:hover {
+ //box-shadow: 0 19px 38px rgba(0, 0, 0, 0.3), 0 15px 12px rgba(0, 0, 0, 0.22);
+ box-shadow: 0 14px 28px rgba(0, 0, 0, 0.25), 0 10px 10px rgba(0, 0, 0, 0.22);
+ }
}
.box-feed {
@@ -13,14 +17,30 @@
}
* {
- font-size: 13px;
+ font-size: 1m;
}
+// Avatar
.avatar-news-feed img {
height: 100%;
object-fit: cover;
}
+.content figure {
+ margin-left: 0;
+ margin-right: 1em;
+}
+
+// Avatar Info
+p.user-info {
+ margin-bottom: 0;
+}
+
+.content p {
+ font-size: 1em;
+ margin-bottom: 0;
+}
+
.news-feed {
padding: 10px;
}
@@ -32,24 +52,24 @@
.news-feed-message {
margin-left: 65px;
margin-right: 65px;
- margin-top: -15px;
+ margin-top: -3em;
width: auto;
- background-color: #fafafa;
+ background-color: #f9f8ff;
border-radius: 5px;
word-wrap: break-word;
}
-.news-feed-message h4 {
+.news-feed-message h5 {
font-weight: bold;
margin-bottom: 5px;
}
.feed-user {
text-decoration: none;
- color: #0060df;
- background-color: #f5f7ff;
+ color: #424242;
+ font-weight: bold;
&:hover {
- color: #0060df;
+ color: #2962ff;
background-color: #f5f7ff;
text-decoration: underline;
}
@@ -58,8 +78,6 @@
.avatar-news-feed {
width: 50px;
height: 50px;
- margin-left: 0;
- margin-right: 15px;
}
.bottom-nav-news {
@@ -80,7 +98,7 @@
width: 0;
margin-left: 55px;
&:hover {
- color: #0060df;
+ color: #2962ff;
text-decoration: underline;
}
}
@@ -93,42 +111,44 @@
width: 0;
margin-left: 90px;
&:hover {
- color: #0060df;
+ color: #2962ff;
text-decoration: underline;
}
}
.comments-icon {
- color: #0060df;
+ color: #272b2e;
margin-right: 5px;
&:hover {
- color: #0060df;
+ color: #272b2e;
}
}
.reply-icon {
- color: #0060df;
+ color: #272b2e;
margin-right: 5px;
&:hover {
- color: #0060df;
+ color: #272b2e;
}
}
.icon-feed {
- color: #0060df;
+ color: #272b2e;
margin-left: 5px;
}
.news-pin {
- background-color: transparent;
- transform: rotate(-35deg);
margin-right: 15px;
+ margin-top: -50px;
border-radius: 25px;
border: none;
- background-color: #fafafa;
+ background-color: white;
color: #424242;
&:hover {
- background-color: #0060df;
- color: white;
+ color: #2962ff;
+ }
+ &:focus,
+ :active {
+ border: none;
}
}
diff --git a/style/tag-menu.scss b/style/tag-menu.scss
index 8dea9f4..0479d42 100644
--- a/style/tag-menu.scss
+++ b/style/tag-menu.scss
@@ -4,14 +4,16 @@
color: #212121;
text-transform: uppercase;
font-weight: 500;
- font-size: 0.75em;
+ font-size: 0.9em;
}
.add-menu-label {
color: #212121;
- text-transform: uppercase;
- font-weight: 500;
- font-size: 0.75em;
+ font-weight: bold;
+ font-size: 1em;
+ background: transparent;
+ border: none;
+ padding: 0;
&:hover {
color: #0060df;
}
diff --git a/style/topnav-buttons.scss b/style/topnav-buttons.scss
index 26b23ff..7c540ee 100644
--- a/style/topnav-buttons.scss
+++ b/style/topnav-buttons.scss
@@ -1,6 +1,5 @@
// Code in the comments belongs to a previous iteration of the project that might need to be returned to
-
.navbar-item {
background-color: transparent;
}
@@ -17,7 +16,7 @@
color: #0060df;
margin-top: 18px;
margin-right: 10px;
- font-size: 14px;
+ font-size: 1em;
height: 35px;
// Original top navbar styling
// Code is commented in case we need to use this approach again
@@ -29,7 +28,6 @@
.notification-icon {
color: #212121;
-
}
.navbar-link {
border-radius: 25px;
diff --git a/yarn.lock b/yarn.lock
index 9551ba0..a73ab3d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3180,10 +3180,10 @@ builtin-status-codes@^3.0.0:
resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
-bulma@^0.7.5:
- version "0.7.5"
- resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.7.5.tgz#35066c37f82c088b68f94450be758fc00a967208"
- integrity sha512-cX98TIn0I6sKba/DhW0FBjtaDpxTelU166pf7ICXpCCuplHWyu6C9LYZmL5PEsnePIeJaiorsTEzzNk3Tsm1hw==
+bulma@^0.8.2:
+ version "0.8.2"
+ resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.8.2.tgz#5d928f16ed4a84549c2873f95c92c38c69c631a7"
+ integrity sha512-vMM/ijYSxX+Sm+nD7Lmc1UgWDy2JcL2nTKqwgEqXuOMU+IGALbXd5MLt/BcjBAPLIx36TtzhzBcSnOP974gcqA==
busboy@^0.2.11:
version "0.2.14"