From 0250b8f118a73eb8ea5c97b1f4818400d4b01f59 Mon Sep 17 00:00:00 2001 From: jorge-hangar Date: Thu, 15 Jul 2021 20:58:23 +0200 Subject: [PATCH 01/31] make search form act only at hero and mod colors --- asset/scss/components/_forms.scss | 117 +++++++++++++++--------------- 1 file changed, 59 insertions(+), 58 deletions(-) diff --git a/asset/scss/components/_forms.scss b/asset/scss/components/_forms.scss index a510910..6db0b1b 100644 --- a/asset/scss/components/_forms.scss +++ b/asset/scss/components/_forms.scss @@ -1,66 +1,67 @@ -.search{ - .input-group * { - margin: 0; - } - .input-group { - position: relative; - border-radius: 4rem; - overflow: hidden; - padding: 0; - margin: 0; - } - .input-group .appear { - right: 0; - position: absolute; - height: 100%; - padding: 0.3rem 1rem; - } - .button{ - border-color: $primary-color; - } - .appear{ - display:none; - } - input{ - &:active{ - border-color: $primary-color; - background-color: $input-background-focus; +.hero{ + .search{ + .input-group * { + margin: 0; } - &:focus,&:focus-within{ - border-color: $primary-color; - background-color: $input-background; - } - &:not(:placeholder-shown) { - border:none; - background-color: $input-background-focus; + .input-group { position: relative; - right: 2rem; - + .appear { - display: block; - color: $primary-color; + border-radius: 4rem; + overflow: hidden; + padding: 0; + margin: 0; + } + .input-group .appear { + right: 0; + position: absolute; + height: 100%; + padding: 0.3rem 1rem; + } + .button{ + border-color: $primary-color; + } + .appear{ + display:none; + } + input{ + &:active{ + border-color: $primary-color; background-color: $input-background-focus; - z-index: 2; - &:hover { - color: $white; - background-color: $primary-color; - } + } + &:focus,&:focus-within{ + border-color: $primary-color; + background-color: $input-background; + } + &:not(:placeholder-shown) { + border:none; + background-color: $input-background-focus; + position: relative; + right: 2rem; + + .appear { + display: block; + background-color: scale-color($input-background-focus, $lightness: -20%); + z-index: 2; + &:hover { + color: $white; + background-color: $primary-color; + } + } + } + } + .hollow { + border-color: $primary-color; + color: $primary-color; + &::after { + } + &::placeholder { + color: scale-color($primary-color, $lightness: -20%); + } + &:hover { + background-color: scale-color($primary-color, $lightness: 95%); + } + &:active { + background-color: scale-color($primary-color, $lightness: 85%); } } } - .hollow { - border-color: $primary-color; - color: $primary-color; - &::after { - } - &::placeholder { - color: scale-color($primary-color, $lightness: -20%); - } - &:hover { - background-color: scale-color($primary-color, $lightness: 95%); - } - &:active { - background-color: scale-color($primary-color, $lightness: 85%); - } - } } From 4291eb09e93b57c97c95f3fe53efaa5b4f119e99 Mon Sep 17 00:00:00 2001 From: jorge-hangar Date: Thu, 15 Jul 2021 20:59:23 +0200 Subject: [PATCH 02/31] make small changes in forms from browse-control and search sorting --- asset/scss/global/_omeka.scss | 79 +++++++++++++++++------------------ 1 file changed, 39 insertions(+), 40 deletions(-) diff --git a/asset/scss/global/_omeka.scss b/asset/scss/global/_omeka.scss index 82f11cd..10823eb 100644 --- a/asset/scss/global/_omeka.scss +++ b/asset/scss/global/_omeka.scss @@ -355,36 +355,34 @@ body.vertical-menu header .desktop { } .browse-controls { - // @include xy-grid; - // justify-content: space-between; - // align-items: center; - // margin: 0 (-.5 * $global-margin); - // font-size: .875 * $global-font-size; - // - // input, - // select, - // button, - // .button { + @include xy-grid; + justify-content: space-between; + align-items: center; + input, + select, + button, + .button { // font-size: .875 * $global-font-size; // padding: (.5 * $global-padding); - // } - // - // .sorting select { - // margin-right: .5 * $global-margin; - // } - // - // @include breakpoint(small down) { - // margin: 0; - // display: none; - // - // &.open { - // display: flex; - // align-items: stretch; - // } - // - // &.closed { - // display: none; - // } + width: auto; + } + + .sorting select { + // margin-right: .5 * $global-margin; + } + + @include breakpoint(small down) { + margin: 0; + display: none; + + &.open { + display: flex; + align-items: stretch; + } + + &.closed { + display: none; + } // // .sorting, // .omeka-pagination, @@ -395,7 +393,7 @@ body.vertical-menu header .desktop { // .advanced-search { // order: 3; // } - // } + } } .filter { @@ -537,18 +535,19 @@ body.vertical-menu header .desktop { // margin-bottom: 0; } + .sorting { - // display: flex; -} - -.sorting select { - // width: 100%; - // height: 100%; - // margin-bottom: 0; -} - -.sorting button { - // 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 { From f211fb8f41c1f4298f7812ff6b5a52632c94aa2c Mon Sep 17 00:00:00 2001 From: jorge-hangar Date: Tue, 20 Jul 2021 11:59:26 +0200 Subject: [PATCH 03/31] mods on hero to be shown in collections --- view/common/hero-collections.phtml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/view/common/hero-collections.phtml b/view/common/hero-collections.phtml index fd7c308..0e7c07b 100644 --- a/view/common/hero-collections.phtml +++ b/view/common/hero-collections.phtml @@ -1,25 +1,25 @@ -
+
- themeSetting('logo')): ?> + themeSetting('logo')): ?>
-
- +
-
- +