class names and minor changes per PR comments

oarepo · Feb 2, 2024 · a6dbddf · a6dbddf
1 parent a349af9
commit a6dbddf
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 91 deletions.
diff --git a/oarepo_ui/templates/components/Searchbar.jinja b/oarepo_ui/templates/components/Searchbar.jinja
@@ -1,14 +1,6 @@
 {# def search_link="/search"  #}
-{% set options = [
-    {
-      "key": "docs",
-      "title": _("All document records"),
-      "text": _("in") ~ " " ~ _("All document records"),
-      "value": search_link
-    }]
-%}
-<div class="item p-0 search-bar rel-mr-1">
-  <div id="header-search-bar" data-options='{{ options | tojson }}'>
+<div class="item p-0 search-bar">
+  <div id="header-search-bar">
     <form action="{{ search_link }}" class="ui form" role="search">
       <div class="ui fluid action input">
         <input type="text" name="q" class="form-control" placeholder="{{ _('Search') }}">

diff --git a/oarepo_ui/templates/oarepo_ui/footer.html b/oarepo_ui/templates/oarepo_ui/footer.html
@@ -3,7 +3,7 @@
 free software; you can redistribute it and/or modify it under the terms of the
 MIT License; see LICENSE file for more details. #}
 
-<footer class="ui footer-component">
+<footer class="ui page-footer">
   <div id="nr-footer-container">
     <div class="ui container">
       <div class="ui middle aligned grid">

diff --git a/oarepo_ui/templates/oarepo_ui/header.html b/oarepo_ui/templates/oarepo_ui/header.html
@@ -8,7 +8,7 @@
   Invenio App RDM is free software; you can redistribute it and/or modify it
   under the terms of the MIT License; see LICENSE file for more details.
 #}
-<header class="ui header-component">
+<header class="ui page-header">
   {%- block site_banner %}
   {%- endblock site_banner %}
   <div class="outer-navbar">

diff --git a/oarepo_ui/templates/oarepo_ui/header_login.html b/oarepo_ui/templates/oarepo_ui/header_login.html
@@ -27,7 +27,7 @@
     {%- if plus_menu_items %}
       <div
         id="quick-create-dropdown"
-        class="rdm-plus-menu rdm-plus-menu-responsive ui dropdown pr-15 computer only"
+        class="ui dropdown pr-15 computer only"
       >
         <a
           id="quick-create-dropdown-btn"
@@ -43,7 +43,7 @@
 
         <div role="menu" aria-labelledby="quick-create-dropdown-btn" id="quick-create-menu" class="menu">
           {%- for item in plus_menu_items if item.visible %}
-            <a role="menuitem" class="item" href="{{ item.url }}">{{ item.text|safe }}</a>
+            <a role="menuitem" class="item" href="{{ item.url }}">{{ item.text }}</a>
           {%- endfor %}             
         </div>
       </div>
@@ -55,7 +55,7 @@ <h2 class="ui small header">{{ _("Actions") }}</h2>
           {%- for item in plus_menu_items if item.visible %}
             <a role="menuitem" class="item" href="{{ item.url }}">
               <i class="plus icon"></i>
-              {{ item.text|safe }}
+              {{ item.text }}
             </a>
           {%- endfor %}
         </div>

diff --git a/oarepo_ui/theme/assets/semantic-ui/less/oarepo_ui/definitions/page_footer.less b/oarepo_ui/theme/assets/semantic-ui/less/oarepo_ui/definitions/page_footer.less
@@ -34,7 +34,7 @@ name of the component from above)
   will allow users to override these values.
  */
 
-.ui.footer-component {
+.ui.page-footer {
   margin: 0;
   min-height: @pageFooterMinHeight;
   #nr-footer-container {

diff --git a/oarepo_ui/theme/assets/semantic-ui/less/oarepo_ui/definitions/page_header.less b/oarepo_ui/theme/assets/semantic-ui/less/oarepo_ui/definitions/page_header.less
@@ -34,7 +34,7 @@ name of the component from above)
   will allow users to override these values.
  */
 
-.ui.header-component {
+.ui.page-header {
   margin-top: 0;
   background-color: @pageHeaderBackgroundColor;
   border-bottom: @pageHeaderBottomBorder;
@@ -77,80 +77,6 @@ name of the component from above)
     }
   }
 
-  #invenio-nav.ui.menu {
-    height: @relative75px;
-    position: relative;
-
-    .ui.menu {
-      background-color: transparent;
-      box-shadow: none;
-
-      .ui.dropdown.invenio-plus-menu {
-        padding: 1rem;
-      }
-
-      .item {
-        padding: 0;
-
-        a:not(.ui.button) {
-          padding: 2rem 1rem;
-
-          &:hover {
-            background-color: rgba(255, 255, 255, 0.2);
-            color: @white;
-            text-decoration: none;
-          }
-        }
-      }
-    }
-
-    .item {
-      &.logo {
-        padding-right: 1rem;
-        img {
-          height: @pageHeaderLogoHeight;
-        }
-      }
-
-      &.search-bar {
-        padding-right: 1rem;
-      }
-
-      &:first-of-type {
-        padding-left: 0;
-      }
-
-      &:last-of-type {
-        padding-left: 0;
-      }
-
-      &.right.menu {
-        padding-right: 0;
-        display: flex;
-      }
-    }
-
-    .invenio-plus-menu {
-      padding-right: 15px;
-    }
-
-    #user-profile-dropdown {
-      width: 13em;
-
-      #user-profile-dropdown-btn {
-        width: inherit;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
-
-      #user-profile-menu.ui.menu {
-        width: inherit;
-        background-color: rgb(255, 255, 255);
-      }
-    }
-  }
-
   @media all and (max-width: @largestTabletScreen) {
     #invenio-nav.ui.menu {
       &.active #invenio-menu.ui.menu {