From 71b66754b94b65287f6b89a48d51327da1bf374b Mon Sep 17 00:00:00 2001 From: Severyn Kozak Date: Thu, 12 Jun 2014 23:30:18 -0400 Subject: [PATCH] Move adv-search form buttons. Close #65. Add: templates/index.html, static/sass/index.sass -Move the "add group" and "remove group" buttons inside the advanced-search form to a different location. static/img/index/ -Following convention established by the "about" page, all page-specific images should be located in a subdirectory of `static/img/` named after the page. Add `index` dir. --- static/img/about/bg4.png | Bin 526239 -> 526239 bytes .../{ => index}/search_bar_magnifying_glass.png | Bin static/img/search_bar_gear.png | Bin 5159 -> 0 bytes static/sass/index.sass | 62 +++++++++------------ templates/index.html | 20 ++++--- 5 files changed, 36 insertions(+), 46 deletions(-) rename static/img/{ => index}/search_bar_magnifying_glass.png (100%) delete mode 100644 static/img/search_bar_gear.png diff --git a/static/img/about/bg4.png b/static/img/about/bg4.png index bb6d9a28c600739e135977d2a68dcdd01577b196..37d6a4d4cd004fc1c33f4fddef880351e44903d3 100644 GIT binary patch delta 45 zcmbQ=uQ0z~VL~tmFSDfe#&(wHjnS>qjIGg3t(t AVE_OC diff --git a/static/img/search_bar_magnifying_glass.png b/static/img/index/search_bar_magnifying_glass.png similarity index 100% rename from static/img/search_bar_magnifying_glass.png rename to static/img/index/search_bar_magnifying_glass.png diff --git a/static/img/search_bar_gear.png b/static/img/search_bar_gear.png deleted file mode 100644 index 22ebcdc0a5ffca81fe52a7dac18a53dcaaecfc6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5159 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 a1f%ble=8i)F0nrV0V{K)S^Wj~r2hkEQT#dp diff --git a/static/sass/index.sass b/static/sass/index.sass index 596a58d..ecf4af6 100644 --- a/static/sass/index.sass +++ b/static/sass/index.sass @@ -202,6 +202,31 @@ div#advanced-search &#col2 width: 75% + button + border: none + color: white + float: right + font-size: 80% + font-weight: bold + padding-left: 4% + padding-right: 4% + + &:hover + cursor: pointer + + &#add-group + background-color: #7FAFFC + margin-right: 1% + + &:hover + background-color: #609AF8 + + &#remove-group + background-color: #E74C4C + + &:hover + background-color: #D63636 + >div @include vendor(box-sizing, border-box) @@ -250,43 +275,6 @@ div#advanced-search color: white width: 90% - button#add-group - background-color: $lightBlue - border: none - color: white - display: block - height: 40px - margin-bottom: 2% - overflow: hidden - white-space: nowrap - width: 40px - - span - font-size: 150% - font-weight: bold - margin-left: 6px - margin-right: 14px - - &:hover - @extend .t3 - - background-color: $blue - cursor: pointer - width: 90% - - button#remove-group - @extend button#add-group - - background-color: #D82D48 - - span - padding-left: 3px - - &:hover - @extend .t3 - - background-color: #F11437 - #search-groups margin-top: 1% max-height: 87% diff --git a/templates/index.html b/templates/index.html index 7de4ff9..47e9a9c 100644 --- a/templates/index.html +++ b/templates/index.html @@ -18,7 +18,7 @@ = endblock = block body -