feat(SHS-5907): Fix content_access_simple settings and revert acciden…

…tal change from 11.6.1
SU-HSDO · Nov 26, 2024 · c22210e · c22210e
1 parent 6e974f6
commit c22210e
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 1 deletion.
diff --git a/config/default/content_access_simple.settings.yml b/config/default/content_access_simple.settings.yml
@@ -1,8 +1,9 @@
 role_config:
   hidden_roles:
     - anonymous
-    - authenticated
     - administrator
+    - author
+    - intranet_viewer
   disabled_roles:
     - site_manager
 debug: false

diff --git a/docroot/themes/humsci/humsci_basic/src/scss/admin/_toolbar.scss b/docroot/themes/humsci/humsci_basic/src/scss/admin/_toolbar.scss
@@ -35,6 +35,34 @@
       right: unset;
       left: 100%;
     }
+
+    li:has(.menu) {
+      & > a {
+        position: relative;
+        padding-right: 15px;
+
+        &::after {
+          content: '';
+          width: 16px;
+          height: 16px;
+          display: block;
+          position: absolute;
+          background-color: var(--gin-color-disabled);
+          mask-image: url('../../../contrib/gin/dist/media/sprite.svg#handle-view');
+          mask-position: center center;
+          mask-repeat: no-repeat;
+          mask-size: 14px 14px;
+          top: var(--gin-spacing-m);
+          right: var(--gin-spacing-s);
+        }
+      }
+
+      &:hover {
+        & > a::after {
+          background-color: var(--gin-color-primary-hover)
+        }
+      }
+    }
   }
 
   .menu:not(.toolbar-menu) li {

diff --git a/docroot/themes/humsci/su_humsci_gin_admin/dist/su_humsci_gin_admin.css b/docroot/themes/humsci/su_humsci_gin_admin/dist/su_humsci_gin_admin.css
@@ -43,6 +43,25 @@ html:not(.gin--dark-mode) .user-logged-in[data-gin-accent="custom"] {
   left: 100%;
 }
 
+#toolbar-item-shortcuts-tray li > ul li:has(.menu) > a::after {
+  content: '';
+  width: 16px;
+  height: 16px;
+  display: block;
+  position: absolute;
+  background-color: var(--gin-color-disabled);
+  mask-image: url('../../../contrib/gin/dist/media/sprite.svg#handle-view');
+  mask-position: center center;
+  mask-repeat: no-repeat;
+  mask-size: 14px 14px;
+  top: 12px;
+  right: var(--gin-spacing-s);
+}
+
+#toolbar-item-shortcuts-tray li > ul li:has(.menu):hover > a::after {
+  background-color: var(--gin-color-primary-hover);
+}
+
 #toolbar-item-shortcuts-tray .menu:not(.toolbar-menu) li {
   border-bottom: 1px solid var(--gin-border-color);
   min-width: 18rem;