-
Notifications
You must be signed in to change notification settings - Fork 160
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Recherche via Elasticsearch #4096
Changes from 62 commits
afbd1c0
221b5ff
cb01421
e61ffc1
280a4fe
682010f
c68752b
f72b30f
eb8aaed
fcc1cfa
a6f341c
987a7cf
f7439ae
d7addd3
ddd2e72
0e41258
2a8b603
40bee12
a278ef5
1c73993
553fee8
282ff34
1f32be3
c665752
437f913
8a13142
dc96397
0240817
f166f51
bd062bf
2b99fdc
1d7c0a6
2b92ec7
4a25510
0b3f61f
437c961
669954c
32ba8af
d6f4cbe
6104d9f
83d7224
83e662c
14b20a0
5a28679
48af348
3544f3e
22a9b11
4142a93
28215cb
2c22184
13ef3a1
2c14aac
f0ce199
bf36ebb
869df81
944d5a6
c70d210
98f786a
d662c7a
28c3677
79cc588
7feac1b
c1f4745
7adb8fb
422dbc3
964acf9
adebf61
ba6867f
429c8da
92f38ab
f7cab5b
d04b82c
eb0dd5a
aa05f19
bda0ea0
4ff0a26
da373f6
ea150e8
8f6d2c0
1eacfcd
38ebf2d
9671892
76e8748
3f3f28a
9f6192d
01c5890
a5b632e
ae7dec1
e4eeb0e
62e2f9c
e3754a4
0b969e1
1e3f160
38a69d9
fa9f102
55c66d7
7db240f
de57f24
3add954
4b4c6fb
8f02288
df7cd38
451280c
e9fcf7d
1b69595
e804a2f
e415c99
f4b6221
0fda5a8
c03dca7
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,82 @@ | ||
.search-box { | ||
background: white; | ||
|
||
form { | ||
display: flex; | ||
} | ||
|
||
label, input { | ||
box-sizing: border-box; | ||
display: inline-block; | ||
line-height: 50px; | ||
height: 50px; | ||
} | ||
|
||
label { | ||
text-align: right; | ||
padding: 0 5px; | ||
font-size: 2rem; | ||
font-weight: 300; | ||
margin-left: 50px; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. C'est ce truc qui fait le décalage à cause de Clem sur la home. Il faudrait donc mettre cette margin que sur la home. (la home a une classe There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Pataper, c'est @Situphen qui a chipoté à ça. En français, il faut faire quoi pour le corriger ? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Mmmh, je viens de tester, et ça empêche pas la clem' de nowel ou d'halloween de fonctionner :) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ah effectivement j'ai pas du faire très attention aux styles de "label" :D |
||
} | ||
|
||
input { | ||
font-size: 2rem; | ||
border: none; | ||
font-weight: 300; | ||
flex: 1; | ||
} | ||
|
||
button[type=submit] { | ||
background-color: #FFF !important; | ||
width: 50px; | ||
height: 50px; | ||
|
||
&:hover, &:focus { | ||
background-color: #CCC !important; | ||
} | ||
|
||
&:after { | ||
margin: 16px !important; | ||
@include sprite-position($search); | ||
@include sprite-width($search); | ||
@include sprite-height($search); | ||
} | ||
} | ||
|
||
.control-group { | ||
display: inline-flex; | ||
width: 100%; | ||
|
||
.controls { | ||
width: 100%; | ||
} | ||
|
||
input { | ||
padding: 0; | ||
width: 100% !important; | ||
} | ||
} | ||
} | ||
|
||
.search-results { | ||
.content-item { | ||
margin-left: 0; | ||
} | ||
} | ||
|
||
.search-filters { | ||
input[type=checkbox] { | ||
margin-top: 4px; | ||
} | ||
} | ||
|
||
@media only screen and #{$media-mobile} { | ||
.search-box { | ||
padding-left: 40px; | ||
|
||
label { | ||
display: none; | ||
} | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -207,15 +207,10 @@ $content-width: 1145px; | |
} | ||
} | ||
|
||
.home-search-box { | ||
.search-box { | ||
position: relative; | ||
margin: 30px auto 0; | ||
max-width: 820px; | ||
background: white; | ||
|
||
form { | ||
display: flex; | ||
} | ||
|
||
&:before { | ||
content: ''; | ||
|
@@ -229,56 +224,17 @@ $content-width: 1145px; | |
height: 134px; | ||
|
||
@at-root { | ||
body.vc-clem-christmas.home .home-search-box::before { | ||
body.vc-clem-christmas.home .search-box::before { | ||
background-image: url('../images/home-clem-christmas.png'); | ||
} | ||
|
||
body.vc-clem-halloween.home .home-search-box::before { | ||
body.vc-clem-halloween.home .search-box::before { | ||
background-image: url('../images/home-clem-halloween.png'); | ||
width: 160px; | ||
left: -80px; | ||
} | ||
} | ||
} | ||
|
||
label, input { | ||
box-sizing: border-box; | ||
display: inline-block; | ||
line-height: 50px; | ||
height: 50px; | ||
} | ||
|
||
label { | ||
text-align: right; | ||
padding: 0 5px; | ||
font-size: 2rem; | ||
font-weight: 300; | ||
margin-left: 50px; | ||
} | ||
|
||
input { | ||
font-size: 2rem; | ||
border: none; | ||
font-weight: 300; | ||
flex: 1; | ||
} | ||
|
||
button[type=submit] { | ||
background: #FFF; | ||
width: 50px; | ||
height: 50px; | ||
|
||
&:hover, &:focus { | ||
background-color: #CCC !important; | ||
} | ||
|
||
&:after { | ||
margin: 16px; | ||
@include sprite-position($search); | ||
@include sprite-width($search); | ||
@include sprite-height($search); | ||
} | ||
} | ||
} | ||
} | ||
|
||
|
@@ -291,7 +247,7 @@ $content-width: 1145px; | |
.home-description.short { | ||
display: block; | ||
|
||
// Rules to don't be hidden by the .home-search-box::before background-image | ||
// Rules to don't be hidden by the .home .search-box::before background-image | ||
width: auto; | ||
padding: 0 20px; | ||
|
||
|
@@ -311,7 +267,7 @@ $content-width: 1145px; | |
} | ||
} | ||
.home-description.connected { | ||
// Rules to don't be hidden by the .home-search-box::before background-image | ||
// Rules to don't be hidden by the .home .search-box::before background-image | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ici et ligne 250, 338, 373 :
|
||
padding: 0 20px !important; | ||
} | ||
|
||
|
@@ -325,17 +281,12 @@ $content-width: 1145px; | |
} | ||
} | ||
|
||
.home-search-box { | ||
padding-left: 40px; | ||
.search-box { | ||
margin: 30px 0 0!important; | ||
|
||
&:before { | ||
left: -46px; | ||
} | ||
|
||
label { | ||
display: none; | ||
} | ||
} | ||
.featured-resource-row { | ||
.featured-resource-item { | ||
|
@@ -379,12 +330,12 @@ $content-width: 1145px; | |
.home-row { | ||
flex-direction: column; | ||
} | ||
.home-search-box { | ||
.search-box { | ||
margin: 30px 40px 0; | ||
} | ||
.home-description { | ||
&.connected { | ||
// Rules to don't be hidden by the .home-search-box::before background-image | ||
// Rules to don't be hidden by the .home .search-box::before background-image | ||
width: auto; | ||
padding: 0 80px; | ||
} | ||
|
@@ -419,7 +370,7 @@ $content-width: 1145px; | |
} | ||
} | ||
&.connected { | ||
// Rules to don't be hidden by the .home-search-box::before background-image | ||
// Rules to don't be hidden by the .home .search-box::before background-image | ||
max-width: 740px; | ||
margin: 15px auto 0; | ||
} | ||
|
This file was deleted.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
je vois qu'on installe déjà es à la ligne 52, donc pas la peine de le rajouter ici, si ce n'est pour biaiser le comportement
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
J'avoue avoir purement, simplement et méchamment suivi la documentation. J'ai peur que si je change pas ça, Travis oublie de faire un truc en rapport avec elasticsearch, mais je peux me tromper.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
non, c'est juste que l'instruction dans
services
va installer et loader ES pour travis avec la dernière version dispo dans travis. Mais vu que toi tu souhaite la dernière version, tu la réinstalle par la suite.Donc supprimer cette instruction ne changerai pas grand chose au comportement. Et si ça change quelque chose, ça signifie que travis fait quelque chose avant toi, et vaudrait mieux savoir quoi pour la déploiement en prod.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
En effet. De toute façon, ça coute rien de tester :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(enfin, si, ça représente 20 minutes d'attente)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, ça à l'air de marcher :)