From 85912595e8ff1e851f383a83d25ba1b48de34dd2 Mon Sep 17 00:00:00 2001 From: Alasdair Smith Date: Thu, 11 Oct 2018 12:09:42 +0100 Subject: [PATCH 1/3] Port addsearch styles from v1 --- .../public/stylesheets/app/templates-v2.less | 75 ++++++++++++++++++- 1 file changed, 74 insertions(+), 1 deletion(-) diff --git a/services/web/public/stylesheets/app/templates-v2.less b/services/web/public/stylesheets/app/templates-v2.less index 8d8358a6b4..afdca4a3da 100644 --- a/services/web/public/stylesheets/app/templates-v2.less +++ b/services/web/public/stylesheets/app/templates-v2.less @@ -103,4 +103,77 @@ .section-tags { margin-bottom: @margin-xl; margin-top: @margin-md; -} \ No newline at end of file +} + +.search__container--addsearch { + .search__input-bar { + display: flex; + } + + .search__input { + flex: 1; + margin-right: 10px; + padding: 0 10px; + } + + // AddSearch overrides + #addsearch-results { + min-height: 0 !important; + + .addsearch-result-item-container { + background-size: auto 80px !important; // Resize image to be smaller + padding: 10px; + margin-left: 10px; + margin-right: 10px; + border-bottom: 2px solid rgb(236, 236, 236); + } + + .addsearch-result-item-sub { + min-height: 0 !important; + background: none !important; + border-bottom: none !important; + + // Unfortunately AddSearch doesn't add very useful classes, so have to use + // some horrible nesting :/ + & > div { + min-height: 0 !important; + padding-left: 90px !important; + + // Hide some unnecessary metadata + span { + display: none !important; + } + } + + a { + color: @ol-green !important; + } + + &:hover a { + color: @ol-dark-green !important; + } + } + } + + #addsearch-results-bottom { + height: auto !important; + background: none !important; + padding-top: 0 !important; + + #addsearch-rp-paging { + margin-bottom: 10px; + + a { + color: @ol-green !important; + + &.currentResultPage { + color: @ol-blue-gray-5 !important; + } + } + } + } + + #addsearch-logo { + display: none !important; + } +} From 0f9b65be23f2783dfb529468213943d0edf7cc44 Mon Sep 17 00:00:00 2001 From: Alasdair Smith Date: Fri, 12 Oct 2018 09:52:51 +0100 Subject: [PATCH 2/3] Fix spaces -> tabs in copy/pasted code --- .../public/stylesheets/app/templates-v2.less | 114 +++++++++--------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/services/web/public/stylesheets/app/templates-v2.less b/services/web/public/stylesheets/app/templates-v2.less index afdca4a3da..537d93d3a6 100644 --- a/services/web/public/stylesheets/app/templates-v2.less +++ b/services/web/public/stylesheets/app/templates-v2.less @@ -106,74 +106,74 @@ } .search__container--addsearch { - .search__input-bar { - display: flex; - } + .search__input-bar { + display: flex; + } - .search__input { - flex: 1; - margin-right: 10px; - padding: 0 10px; - } + .search__input { + flex: 1; + margin-right: 10px; + padding: 0 10px; + } - // AddSearch overrides - #addsearch-results { - min-height: 0 !important; + // AddSearch overrides + #addsearch-results { + min-height: 0 !important; - .addsearch-result-item-container { - background-size: auto 80px !important; // Resize image to be smaller - padding: 10px; - margin-left: 10px; - margin-right: 10px; - border-bottom: 2px solid rgb(236, 236, 236); - } + .addsearch-result-item-container { + background-size: auto 80px !important; // Resize image to be smaller + padding: 10px; + margin-left: 10px; + margin-right: 10px; + border-bottom: 2px solid rgb(236, 236, 236); + } - .addsearch-result-item-sub { - min-height: 0 !important; - background: none !important; - border-bottom: none !important; + .addsearch-result-item-sub { + min-height: 0 !important; + background: none !important; + border-bottom: none !important; - // Unfortunately AddSearch doesn't add very useful classes, so have to use - // some horrible nesting :/ - & > div { - min-height: 0 !important; - padding-left: 90px !important; + // Unfortunately AddSearch doesn't add very useful classes, so have to use + // some horrible nesting :/ + & > div { + min-height: 0 !important; + padding-left: 90px !important; - // Hide some unnecessary metadata - span { - display: none !important; - } - } + // Hide some unnecessary metadata + span { + display: none !important; + } + } - a { - color: @ol-green !important; - } + a { + color: @ol-green !important; + } - &:hover a { - color: @ol-dark-green !important; - } - } - } + &:hover a { + color: @ol-dark-green !important; + } + } + } - #addsearch-results-bottom { - height: auto !important; - background: none !important; - padding-top: 0 !important; + #addsearch-results-bottom { + height: auto !important; + background: none !important; + padding-top: 0 !important; - #addsearch-rp-paging { - margin-bottom: 10px; + #addsearch-rp-paging { + margin-bottom: 10px; - a { - color: @ol-green !important; + a { + color: @ol-green !important; - &.currentResultPage { - color: @ol-blue-gray-5 !important; - } - } - } - } + &.currentResultPage { + color: @ol-blue-gray-5 !important; + } + } + } + } - #addsearch-logo { - display: none !important; - } + #addsearch-logo { + display: none !important; + } } From 518ae83e486aa181e8c2e2cd2bd509536b38a814 Mon Sep 17 00:00:00 2001 From: Alasdair Smith Date: Fri, 12 Oct 2018 09:53:22 +0100 Subject: [PATCH 3/3] Override search result title to use sans-serif --- services/web/public/stylesheets/app/templates-v2.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/web/public/stylesheets/app/templates-v2.less b/services/web/public/stylesheets/app/templates-v2.less index 537d93d3a6..45d850847a 100644 --- a/services/web/public/stylesheets/app/templates-v2.less +++ b/services/web/public/stylesheets/app/templates-v2.less @@ -133,6 +133,10 @@ background: none !important; border-bottom: none !important; + h2 { + font-family: @font-family-sans-serif; + } + // Unfortunately AddSearch doesn't add very useful classes, so have to use // some horrible nesting :/ & > div {