Browse Source

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.
tags/v1.0^2
Severyn Kozak 10 years ago
parent
commit
71b66754b9
5 changed files with 36 additions and 46 deletions
  1. BIN
     
  2. +0
    -0
      static/img/index/search_bar_magnifying_glass.png
  3. BIN
     
  4. +25
    -37
      static/sass/index.sass
  5. +11
    -9
      templates/index.html

BIN
View File


static/img/search_bar_magnifying_glass.png → static/img/index/search_bar_magnifying_glass.png View File


BIN
View File


+ 25
- 37
static/sass/index.sass View File

@@ -202,6 +202,31 @@ div#advanced-search
&#col2 &#col2
width: 75% 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 >div
@include vendor(box-sizing, border-box) @include vendor(box-sizing, border-box)


@@ -250,43 +275,6 @@ div#advanced-search
color: white color: white
width: 90% 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 #search-groups
margin-top: 1% margin-top: 1%
max-height: 87% max-height: 87%


+ 11
- 9
templates/index.html View File

@@ -18,7 +18,7 @@
= endblock = endblock


= block body = block body
<div id="search-field">
<div id="search-field" class="partly-visible">
<a id="title" href="/"> <a id="title" href="/">
<div id="title"> <div id="title">
<span id="title-bit">bit</span <span id="title-bit">bit</span
@@ -30,13 +30,21 @@
<form id="search-bar"> <form id="search-bar">
<input type="text" name="query" <input type="text" name="query"
><button id="advanced-search" title="advanced search" type="button"> ><button id="advanced-search" title="advanced search" type="button">
<img src="static/img/search_bar_magnifying_glass.png">
<img src="img/index/search_bar_magnifying_glass.png">
</button> </button>


<div id="advanced-search"> <div id="advanced-search">
<div id="heading"> <div id="heading">
<div id="col1">Fields</div <div id="col1">Fields</div
><div id="col2">Search groups</div>
><div id="col2">
Search groups
<button id="add-group">
<div><span>+</span> Add</div>
</button>
<button id="remove-group">
<div><span>-</span> Remove</div>
</button>
</div>
</div> </div>
<div id="sidebar"> <div id="sidebar">
<ul> <ul>
@@ -73,12 +81,6 @@
<label for="variable"><div>variables</div></label> <label for="variable"><div>variables</div></label>
</li> </li>
</ul> </ul>
<button id="add-group">
<div><span>+</span> Add</div>
</button>
<button id="remove-group">
<div><span>-</span> Remove</div>
</button>
</div> </div>
<div id="search-groups"> <div id="search-groups">
<div class="search-group" id="selected"> <div class="search-group" id="selected">


Loading…
Cancel
Save