Merge branch 'fix/20210728' into fix/forms-seach-input-mods

merge fix/20210728 into actual branch
2021-07-28 14:21:41 +02:00 · 2021-07-28 12:30:42 +02:00 · 2021-07-28 12:20:44 +02:00 · 2021-07-15 20:59:23 +02:00 · 2021-07-15 20:58:23 +02:00
3 changed files with 76 additions and 65 deletions
--- a/asset/css/default.css
+++ b/asset/css/default.css
--- a/asset/scss/components/_forms.scss
+++ b/asset/scss/components/_forms.scss
@ -1,3 +1,4 @@
 .hero{
  .search{
    .input-group * {
      margin: 0;
@ -37,8 +38,7 @@
        right: 2rem;
        + .appear {
          display: block;
-        color: $primary-color;
+          background-color: scale-color($input-background-focus, $lightness: -20%);
        background-color: $input-background-focus;
          z-index: 2;
          &:hover {
            color: $white;
@ -64,3 +64,4 @@
      }
    }
  }
 }
--- a/asset/scss/global/_omeka.scss
+++ b/asset/scss/global/_omeka.scss
@ -554,8 +554,18 @@ body.vertical-menu header .desktop {
   margin-bottom: 0;
 }
-.sorting button {
+.sorting {
-  // margin-bottom: 0;
+  display: flex;
  button,.button {
    padding: 0 $global-padding*1.4;
    font-size: $global-font-size * 0.85;
    margin: 0 $global-margin;
  }
  select {
    // width: 100%;
    // height: 100%;
    margin-bottom: 0;
  }
 }
 .layout-toggle button {
Author	SHA1	Message	Date
jorge	abb51ac63a	Merge branch 'fix/20210728' into fix/forms-seach-input-mods	2021-07-28 14:21:41 +02:00
jorge	0bffead98a	Merge branch 'fix/20210728' into fix/forms-seach-input-mods	2021-07-28 12:30:42 +02:00
jorge	d0a193e5ba	merge fix/20210728 into actual branch	2021-07-28 12:20:44 +02:00
jorge	4291eb09e9	make small changes in forms from browse-control and search sorting	2021-07-15 20:59:23 +02:00
jorge	0250b8f118	make search form act only at hero and mod colors	2021-07-15 20:58:23 +02:00