From 5a8d67bccebc7184ee0a47e4aed171a8617a9f51 Mon Sep 17 00:00:00 2001
From: Brian Canini <canini.16@osu.edu>
Date: Mon, 12 Oct 2020 10:10:11 -0400
Subject: [PATCH] code cleanup for people - removing redundancies - removing
unused file - reordering sass
---
.../sass/components/_people-styles.scss | 21 --
.../assets/sass/components/_people.scss | 74 ++++---
.../asc_bootstrap/assets/sass/style.scss | 1 -
web/themes/asc_bootstrap/css/style.css | 191 ++++++++----------
4 files changed, 118 insertions(+), 169 deletions(-)
delete mode 100644 web/themes/asc_bootstrap/assets/sass/components/_people-styles.scss
diff --git a/web/themes/asc_bootstrap/assets/sass/components/_people-styles.scss b/web/themes/asc_bootstrap/assets/sass/components/_people-styles.scss
deleted file mode 100644
index b7d9f6ec24..0000000000
--- a/web/themes/asc_bootstrap/assets/sass/components/_people-styles.scss
+++ /dev/null
@@ -1,21 +0,0 @@
-/*#block-views-block-people-directory-block-1 .views-field.views-field-user-picture a img {
- border-radius: 10%;
- width: 100px;
- height: 100px;
- position: relative;
- overflow: hidden;
- object-fit: cover;
-}
-
-#block-views-block-people-directory-block-1 .more-link.form-group {
- margin: 15px 15px 15px 15px;
- float: right;
-}
-
-#block-views-block-people-directory-block-1 .views-field.views-field-field-phone {
- font-size: smaller;
-}
-
-#block-views-block-people-directory-block-1 .views-field.views-field-mail a {
- font-size: smaller;
-}*/
diff --git a/web/themes/asc_bootstrap/assets/sass/components/_people.scss b/web/themes/asc_bootstrap/assets/sass/components/_people.scss
index 5100c87b5e..a852e03d7b 100644
--- a/web/themes/asc_bootstrap/assets/sass/components/_people.scss
+++ b/web/themes/asc_bootstrap/assets/sass/components/_people.scss
@@ -7,6 +7,7 @@
//## People grid.
.view-people-directory {
+ margin-bottom: 40px;
h3 {
text-transform: uppercase;
@@ -70,13 +71,44 @@
}
}
}
-}
-.view-display-id-page_1 {
- margin-bottom: 40px;
+ .square-opic {
+ max-width: 220px;
+ max-height: 220px;
+ overflow: hidden;
+ position: relative;
+
+ &:after {
+ content: "";
+ display: block;
+ padding-bottom: 100%;
+ }
+
+ @media (max-width: 768px) {
+ max-width: 100%;
+ max-height: 630px;
+ }
+ }
+
+ .square-opic-content {
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ }
}
+
+// --------------------------------------------------
+
+//## Siderbar and Filters form.
+
+
+.block-views-exposed-filter-blockpeople-directory-page-1 {
+ padding: 20px 0px;
+
+}
+
#views-exposed-form-people-directory-page-1 {
.form-item {
width: 100%;
@@ -115,10 +147,6 @@
color: $white;
}
}
-}
-
-.block-views-exposed-filter-blockpeople-directory-page-1 {
- padding: 20px 0px;
.form-wrapper {
margin-top: 20px;
@@ -132,38 +160,6 @@
margin-bottom: 5px;
}
}
-}
-
-.square-opic {
- max-width: 220px;
- max-height: 220px;
- overflow: hidden;
- position: relative;
-
- &:after {
- content: "";
- display: block;
- padding-bottom: 100%;
- }
-
- @media (max-width: 768px) {
- max-width: 100%;
- max-height: 630px;
- }
-}
-
-.square-opic-content {
- position: absolute;
- width: 100%;
- height: 100%;
-}
-
-
-// --------------------------------------------------
-
-//## Sidebar menu.
-
-#views-exposed-form-people-directory-page-1 {
label {
width: 90%;
diff --git a/web/themes/asc_bootstrap/assets/sass/style.scss b/web/themes/asc_bootstrap/assets/sass/style.scss
index f0561e58a4..6ee6f77098 100644
--- a/web/themes/asc_bootstrap/assets/sass/style.scss
+++ b/web/themes/asc_bootstrap/assets/sass/style.scss
@@ -77,7 +77,6 @@
@import "components/newsletter";
@import "components/paragraphs";
@import "components/people";
-@import "components/people-styles";
@import "components/research";
@import "components/simplemenu";
@import "components/sidebar-menu";
diff --git a/web/themes/asc_bootstrap/css/style.css b/web/themes/asc_bootstrap/css/style.css
index f9866ec73a..da135a0e72 100644
--- a/web/themes/asc_bootstrap/css/style.css
+++ b/web/themes/asc_bootstrap/css/style.css
@@ -12341,39 +12341,43 @@ article.news-story {
width: 100% !important;
}
-/* line 11, ../assets/sass/components/_people.scss */
+/* line 9, ../assets/sass/components/_people.scss */
+.view-people-directory {
+ margin-bottom: 40px;
+}
+/* line 12, ../assets/sass/components/_people.scss */
.view-people-directory h3 {
text-transform: uppercase;
}
-/* line 15, ../assets/sass/components/_people.scss */
+/* line 16, ../assets/sass/components/_people.scss */
.view-people-directory .row {
display: flex;
}
@media (max-width: 768px) {
- /* line 15, ../assets/sass/components/_people.scss */
+ /* line 16, ../assets/sass/components/_people.scss */
.view-people-directory .row {
display: block;
}
}
-/* line 23, ../assets/sass/components/_people.scss */
+/* line 24, ../assets/sass/components/_people.scss */
.view-people-directory .view-header {
margin-bottom: 20px;
padding-bottom: 20px;
border-bottom: solid #979797 3px;
}
-/* line 29, ../assets/sass/components/_people.scss */
+/* line 30, ../assets/sass/components/_people.scss */
.view-people-directory .people-row {
font-size: 14px;
line-height: 1.6;
display: flex;
}
@media (max-width: 768px) {
- /* line 29, ../assets/sass/components/_people.scss */
+ /* line 30, ../assets/sass/components/_people.scss */
.view-people-directory .people-row {
display: block;
}
}
-/* line 38, ../assets/sass/components/_people.scss */
+/* line 39, ../assets/sass/components/_people.scss */
.view-people-directory .people-row .inner-people-grid {
flex: 1;
background: #F9F9F9;
@@ -12381,41 +12385,67 @@ article.news-story {
margin-bottom: 30px;
}
@media (max-width: 768px) {
- /* line 38, ../assets/sass/components/_people.scss */
+ /* line 39, ../assets/sass/components/_people.scss */
.view-people-directory .people-row .inner-people-grid {
flex: none;
}
}
-/* line 48, ../assets/sass/components/_people.scss */
+/* line 49, ../assets/sass/components/_people.scss */
.view-people-directory .people-row .inner-people-grid .views-field-user-picture {
margin-bottom: 10px;
}
-/* line 54, ../assets/sass/components/_people.scss */
+/* line 55, ../assets/sass/components/_people.scss */
.view-people-directory .people-row .inner-people-grid .views-field-nothing-1 img {
width: 100%;
}
-/* line 59, ../assets/sass/components/_people.scss */
+/* line 60, ../assets/sass/components/_people.scss */
.view-people-directory .people-row .inner-people-grid .views-field-field-first-name,
.view-people-directory .people-row .inner-people-grid .views-field-field-last-name {
font-weight: bold;
font-size: 16px;
}
-/* line 66, ../assets/sass/components/_people.scss */
+/* line 67, ../assets/sass/components/_people.scss */
.view-people-directory .people-row .inner-people-grid .views-field-field-first-name a:hover,
.view-people-directory .people-row .inner-people-grid .views-field-field-last-name a:hover {
color: #bb0000;
}
-
/* line 75, ../assets/sass/components/_people.scss */
-.view-display-id-page_1 {
- margin-bottom: 40px;
+.view-people-directory .square-opic {
+ max-width: 220px;
+ max-height: 220px;
+ overflow: hidden;
+ position: relative;
}
-
/* line 81, ../assets/sass/components/_people.scss */
+.view-people-directory .square-opic:after {
+ content: "";
+ display: block;
+ padding-bottom: 100%;
+}
+@media (max-width: 768px) {
+ /* line 75, ../assets/sass/components/_people.scss */
+ .view-people-directory .square-opic {
+ max-width: 100%;
+ max-height: 630px;
+ }
+}
+/* line 93, ../assets/sass/components/_people.scss */
+.view-people-directory .square-opic-content {
+ position: absolute;
+ width: 100%;
+ height: 100%;
+}
+
+/* line 107, ../assets/sass/components/_people.scss */
+.block-views-exposed-filter-blockpeople-directory-page-1 {
+ padding: 20px 0px;
+}
+
+/* line 113, ../assets/sass/components/_people.scss */
#views-exposed-form-people-directory-page-1 .form-item {
width: 100%;
}
-/* line 85, ../assets/sass/components/_people.scss */
+/* line 117, ../assets/sass/components/_people.scss */
#views-exposed-form-people-directory-page-1 .form-checkbox {
-webkit-appearance: none;
-moz-appearance: none;
@@ -12429,18 +12459,18 @@ article.news-story {
position: relative;
top: 4px;
}
-/* line 98, ../assets/sass/components/_people.scss */
+/* line 130, ../assets/sass/components/_people.scss */
#views-exposed-form-people-directory-page-1 .form-checkbox:active, #views-exposed-form-people-directory-page-1 .form-checkbox:checked:active {
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05), inset 0px 1px 3px rgba(0, 0, 0, 0.1);
}
-/* line 102, ../assets/sass/components/_people.scss */
+/* line 134, ../assets/sass/components/_people.scss */
#views-exposed-form-people-directory-page-1 .form-checkbox:checked {
background-color: #442369;
border: 1px solid #adb8c0;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05), inset 0px -15px 10px -12px rgba(0, 0, 0, 0.05), inset 15px 10px -12px rgba(255, 255, 255, 0.1);
color: #99a1a7;
}
-/* line 109, ../assets/sass/components/_people.scss */
+/* line 141, ../assets/sass/components/_people.scss */
#views-exposed-form-people-directory-page-1 .form-checkbox:checked:after {
content: '\2713';
font-size: 14px;
@@ -12449,17 +12479,12 @@ article.news-story {
left: 3px;
color: #ffffff;
}
-
-/* line 120, ../assets/sass/components/_people.scss */
-.block-views-exposed-filter-blockpeople-directory-page-1 {
- padding: 20px 0px;
-}
-/* line 123, ../assets/sass/components/_people.scss */
-.block-views-exposed-filter-blockpeople-directory-page-1 .form-wrapper {
+/* line 151, ../assets/sass/components/_people.scss */
+#views-exposed-form-people-directory-page-1 .form-wrapper {
margin-top: 20px;
}
-/* line 126, ../assets/sass/components/_people.scss */
-.block-views-exposed-filter-blockpeople-directory-page-1 .form-wrapper legend {
+/* line 154, ../assets/sass/components/_people.scss */
+#views-exposed-form-people-directory-page-1 .form-wrapper legend {
text-transform: uppercase;
color: #4A4A4A;
font-weight: bold;
@@ -12467,69 +12492,40 @@ article.news-story {
border-bottom: none;
margin-bottom: 5px;
}
-
-/* line 137, ../assets/sass/components/_people.scss */
-.square-opic {
- max-width: 220px;
- max-height: 220px;
- overflow: hidden;
- position: relative;
-}
-/* line 143, ../assets/sass/components/_people.scss */
-.square-opic:after {
- content: "";
- display: block;
- padding-bottom: 100%;
-}
-@media (max-width: 768px) {
- /* line 137, ../assets/sass/components/_people.scss */
- .square-opic {
- max-width: 100%;
- max-height: 630px;
- }
-}
-
-/* line 155, ../assets/sass/components/_people.scss */
-.square-opic-content {
- position: absolute;
- width: 100%;
- height: 100%;
-}
-
-/* line 168, ../assets/sass/components/_people.scss */
+/* line 164, ../assets/sass/components/_people.scss */
#views-exposed-form-people-directory-page-1 label {
width: 90%;
margin-left: 28px;
}
-/* line 172, ../assets/sass/components/_people.scss */
+/* line 168, ../assets/sass/components/_people.scss */
#views-exposed-form-people-directory-page-1 label input {
margin-left: -28px;
margin-right: 8px;
}
-/* line 185, ../assets/sass/components/_people.scss */
+/* line 181, ../assets/sass/components/_people.scss */
#views-exposed-form-people-directory-page-2 {
background: #D8D8D8;
padding: 10px;
}
-/* line 189, ../assets/sass/components/_people.scss */
+/* line 185, ../assets/sass/components/_people.scss */
#views-exposed-form-people-directory-page-2 details {
background: #ffffff;
padding: 5px 10px;
border-radius: 8px;
margin: 10px 0;
}
-/* line 196, ../assets/sass/components/_people.scss */
+/* line 192, ../assets/sass/components/_people.scss */
#views-exposed-form-people-directory-page-2 .ppl-filter-heading {
color: #225D62;
margin: 5px 0;
text-transform: capitalize;
}
-/* line 202, ../assets/sass/components/_people.scss */
+/* line 198, ../assets/sass/components/_people.scss */
#views-exposed-form-people-directory-page-2 .ppl-taxon-heading {
margin-top: 20px;
}
-/* line 206, ../assets/sass/components/_people.scss */
+/* line 202, ../assets/sass/components/_people.scss */
#views-exposed-form-people-directory-page-2 .form-checkbox {
-webkit-appearance: none;
-moz-appearance: none;
@@ -12544,18 +12540,18 @@ article.news-story {
top: 4px;
margin-right: 5px;
}
-/* line 220, ../assets/sass/components/_people.scss */
+/* line 216, ../assets/sass/components/_people.scss */
#views-exposed-form-people-directory-page-2 .form-checkbox:active, #views-exposed-form-people-directory-page-2 .form-checkbox:checked:active {
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05), inset 0px 1px 3px rgba(0, 0, 0, 0.1);
}
-/* line 224, ../assets/sass/components/_people.scss */
+/* line 220, ../assets/sass/components/_people.scss */
#views-exposed-form-people-directory-page-2 .form-checkbox:checked {
background-color: #442369;
border: 1px solid #adb8c0;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05), inset 0px -15px 10px -12px rgba(0, 0, 0, 0.05), inset 15px 10px -12px rgba(255, 255, 255, 0.1);
color: #99a1a7;
}
-/* line 231, ../assets/sass/components/_people.scss */
+/* line 227, ../assets/sass/components/_people.scss */
#views-exposed-form-people-directory-page-2 .form-checkbox:checked:after {
content: '\2713';
font-size: 14px;
@@ -12564,120 +12560,99 @@ article.news-story {
left: 3px;
color: #ffffff;
}
-/* line 241, ../assets/sass/components/_people.scss */
+/* line 237, ../assets/sass/components/_people.scss */
#views-exposed-form-people-directory-page-2 #edit-submit-people-directory {
text-transform: uppercase;
}
-/* line 245, ../assets/sass/components/_people.scss */
+/* line 241, ../assets/sass/components/_people.scss */
#views-exposed-form-people-directory-page-2 #edit-reset {
text-transform: uppercase;
}
-/* line 256, ../assets/sass/components/_people.scss */
+/* line 252, ../assets/sass/components/_people.scss */
.path-user .page-header {
display: none;
}
-/* line 260, ../assets/sass/components/_people.scss */
+/* line 256, ../assets/sass/components/_people.scss */
.bio-header-top {
background: #F9F9F9;
}
-/* line 265, ../assets/sass/components/_people.scss */
+/* line 261, ../assets/sass/components/_people.scss */
.bio-header-top .bio-top-right img {
padding: 15px 0;
width: 100%;
}
-/* line 273, ../assets/sass/components/_people.scss */
+/* line 269, ../assets/sass/components/_people.scss */
.bio-header-top .field--name-field-google-map-location .field--item {
padding: 20px 0;
}
-/* line 276, ../assets/sass/components/_people.scss */
+/* line 272, ../assets/sass/components/_people.scss */
.bio-header-top .field--name-field-google-map-location .field--item .geolocation-formatter-map-wrapper {
border: solid 2px #979797;
}
-/* line 284, ../assets/sass/components/_people.scss */
+/* line 280, ../assets/sass/components/_people.scss */
.bio-header-top .bio-top-left h1 {
margin-bottom: 0;
}
-/* line 291, ../assets/sass/components/_people.scss */
+/* line 287, ../assets/sass/components/_people.scss */
.bio-header {
width: 100%;
float: left;
margin: 0 0 20px;
}
-/* line 297, ../assets/sass/components/_people.scss */
+/* line 293, ../assets/sass/components/_people.scss */
.bio-btm-left {
margin-bottom: 40px;
}
-/* line 300, ../assets/sass/components/_people.scss */
+/* line 296, ../assets/sass/components/_people.scss */
.bio-btm-left h2 {
font-size: 22px;
}
-/* line 304, ../assets/sass/components/_people.scss */
+/* line 300, ../assets/sass/components/_people.scss */
.bio-btm-left .carousel {
height: auto;
overflow: hidden;
width: 100%;
}
-/* line 309, ../assets/sass/components/_people.scss */
+/* line 305, ../assets/sass/components/_people.scss */
.bio-btm-left .carousel .field--name-field-media-image {
padding-bottom: 0;
}
-/* line 312, ../assets/sass/components/_people.scss */
+/* line 308, ../assets/sass/components/_people.scss */
.bio-btm-left .carousel .field--name-field-media-image .img-responsive {
width: 100%;
}
@media (max-width: 1030px) {
- /* line 304, ../assets/sass/components/_people.scss */
+ /* line 300, ../assets/sass/components/_people.scss */
.bio-btm-left .carousel {
height: auto;
}
}
-/* line 322, ../assets/sass/components/_people.scss */
+/* line 318, ../assets/sass/components/_people.scss */
.bio-btm-left .bio-exp {
padding-left: 0;
}
-/* line 326, ../assets/sass/components/_people.scss */
+/* line 322, ../assets/sass/components/_people.scss */
.bio-btm-left .taxonomy-people-heading {
float: left;
width: 100%;
padding-top: 15px;
}
-/* line 331, ../assets/sass/components/_people.scss */
+/* line 327, ../assets/sass/components/_people.scss */
.bio-btm-left .taxonomy-people-heading h2 {
line-height: 0;
font-size: 18px;
}
-/* line 339, ../assets/sass/components/_people.scss */
+/* line 335, ../assets/sass/components/_people.scss */
.bio-btm-right h3 {
font-size: 18px;
padding-top: 20px;
}
-/*#block-views-block-people-directory-block-1 .views-field.views-field-user-picture a img {
- border-radius: 10%;
- width: 100px;
- height: 100px;
- position: relative;
- overflow: hidden;
- object-fit: cover;
-}
-
-#block-views-block-people-directory-block-1 .more-link.form-group {
- margin: 15px 15px 15px 15px;
- float: right;
-}
-
-#block-views-block-people-directory-block-1 .views-field.views-field-field-phone {
- font-size: smaller;
-}
-
-#block-views-block-people-directory-block-1 .views-field.views-field-mail a {
- font-size: smaller;
-}*/
/* line 10, ../assets/sass/components/_research.scss */
.view-research-project-gallery .row {
display: flex;
--
GitLab