Merge pull request #865 from pressbooks/more-contributor-fixes

Contributor style fixes
pressbooks · Sep 27, 2021 · cea1f98 · cea1f98
2 parents 3dbe751 + 6db7cfd
commit cea1f98
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 30 deletions.
diff --git a/packages/buckram/assets/styles/components/specials/_contributors.scss b/packages/buckram/assets/styles/components/specials/_contributors.scss
@@ -19,6 +19,8 @@
   }
 
   .contributor {
+    margin-top: $contributors-margin-top;
+
     &__type {
       margin-top: $contributors-margin-top;
       margin-bottom: $contributors-margin-bottom;
@@ -32,29 +34,42 @@
 
     &__profile__picture {
       float: $contributor-profile-picture-float;
-      margin-top: if-map-get($contributor-profile-picture-margin-top, $type);
-      margin-right: $contributor-profile-picture-margin-right;
-      margin-bottom: $contributor-profile-picture-margin-bottom;
-      margin-left: $contributor-profile-picture-margin-left;
+      margin: $contributor-profile-picture-margin;
       width: 33%;
       max-width: 400px;
       border-radius: $contributor-profile-picture-border-radius;
     }
 
+    &__name__and__links > div {
+      float: $contributor-profile-picture-float;
+
+      &.contributor__info__small {
+        width: 67%;
+        padding-left: 1.5rem;
+        box-sizing: border-box;
+      }
+
+      &.contributor__info__large {
+        width: 100%;
+      }
+    }
+
     &__name {
       font-family: $h1-font-family;
       font-size: $h3-font-size;
       text-indent: $contributors-text-indent;
+      margin: 0;
     }
 
     &__institution {
       font-family: $h1-font-family;
       text-transform: $contributor-institution-text-transform;
       text-indent: $contributors-text-indent;
-      margin: 0;
+      margin: $contributor-link-margin-top;
     }
 
     &__website {
+      margin-top: $contributor-link-margin-top;
       text-indent: $contributors-text-indent;
     }
 
@@ -77,11 +92,8 @@
       text-indent: $contributors-text-indent;
     }
 
-
     &__bio {
-      text-indent: $contributors-text-indent;
       margin-top: $contributor-bio-margin-top;
     }
-
   }
 }
diff --git a/packages/buckram/assets/styles/variables/_specials.scss b/packages/buckram/assets/styles/variables/_specials.scss
@@ -986,25 +986,9 @@ $contributors-text-align: left !default;
 /// @type String
 $contributor-profile-picture-float: left !default;
 
-/// Margin-top for contributor profile pictures.
-/// @type String | Map
-$contributor-profile-picture-margin-top: (
-  epub: 1.5rem,
-  prince: 1.5rem,
-  web: 0
-) !default;
-
-/// Margin-right for contributor profile pictures.
+/// Margin for contributor profile pictures.
 /// @type String
-$contributor-profile-picture-margin-right: 1.5rem !default;
-
-/// Margin-left for contributor profile pictures.
-/// @type String
-$contributor-profile-picture-margin-left: 0 !default;
-
-/// Margin-bottom for contributor profile pictures.
-/// @type String
-$contributor-profile-picture-margin-bottom: 0 !default;
+$contributor-profile-picture-margin: 0 !default;
 
 /// Border radius for contributor profile pictures.
 /// @type String
@@ -1029,15 +1013,12 @@ $contributor-link-margin-top: 0 !default;
 /// Text decoration for contributor links.
 /// @type String | Map
 $contributor-links-text-decoration: (
-  epub: underline,
-  prince: underline,
   web: none
 ) !default;
 
-
 /// Margin top for contributor bio.
 /// @type String
-$contributor-bio-margin-top: 1rem !default;
+$contributor-bio-margin-top: 1em !default;
 
 /// NEW VARIABLES BEFORE FINDING PLACE FOR THEM