diff options
45 files changed, 23 insertions, 21 deletions
diff --git a/public/cover/EverWorld.gif b/public/cover/EverWorld.gif Binary files differdeleted file mode 100644 index b17001a..0000000 --- a/public/cover/EverWorld.gif +++ /dev/null diff --git a/public/cover/Le Livre de Perle.jpg b/public/cover/Le Livre de Perle.jpg Binary files differnew file mode 100644 index 0000000..25f0b52 --- /dev/null +++ b/public/cover/Le Livre de Perle.jpg diff --git a/public/cover/Le Manoir.jpg b/public/cover/Le Manoir.jpg Binary files differnew file mode 100644 index 0000000..c74bd65 --- /dev/null +++ b/public/cover/Le Manoir.jpg diff --git a/public/cover/Le Monde Secret de Sombreterre.jpg b/public/cover/Le Monde Secret de Sombreterre.jpg Binary files differnew file mode 100644 index 0000000..f312821 --- /dev/null +++ b/public/cover/Le Monde Secret de Sombreterre.jpg diff --git a/public/cover/Le Monde dans la main.jpg b/public/cover/Le Monde dans la main.jpg Binary files differnew file mode 100644 index 0000000..bdf18db --- /dev/null +++ b/public/cover/Le Monde dans la main.jpg diff --git a/public/cover/Le Passage du diable.jpg b/public/cover/Le Passage du diable.jpg Binary files differnew file mode 100644 index 0000000..92ddb53 --- /dev/null +++ b/public/cover/Le Passage du diable.jpg diff --git a/public/cover/Le Premier qui pleure a perdu.jpg b/public/cover/Le Premier qui pleure a perdu.jpg Binary files differnew file mode 100644 index 0000000..a9ecc7e --- /dev/null +++ b/public/cover/Le Premier qui pleure a perdu.jpg diff --git a/public/cover/Le Retour de Martin GUERRE.jpg b/public/cover/Le Retour de Martin GUERRE.jpg Binary files differnew file mode 100644 index 0000000..2e76f1b --- /dev/null +++ b/public/cover/Le Retour de Martin GUERRE.jpg diff --git a/public/cover/Le Singe de Hartlepool.jpg b/public/cover/Le Singe de Hartlepool.jpg Binary files differnew file mode 100644 index 0000000..91294b9 --- /dev/null +++ b/public/cover/Le Singe de Hartlepool.jpg diff --git a/public/cover/Le Suivant sur la liste.jpg b/public/cover/Le Suivant sur la liste.jpg Binary files differnew file mode 100644 index 0000000..5b9fde3 --- /dev/null +++ b/public/cover/Le Suivant sur la liste.jpg diff --git a/public/cover/Le Temps des miracles.jpg b/public/cover/Le Temps des miracles.jpg Binary files differnew file mode 100644 index 0000000..d67cd4e --- /dev/null +++ b/public/cover/Le Temps des miracles.jpg diff --git a/public/cover/Le Temps des mitaines.jpg b/public/cover/Le Temps des mitaines.jpg Binary files differnew file mode 100644 index 0000000..92baccb --- /dev/null +++ b/public/cover/Le Temps des mitaines.jpg diff --git a/public/cover/Le Voyage de Samson.jpg b/public/cover/Le Voyage de Samson.jpg Binary files differnew file mode 100644 index 0000000..21ba83c --- /dev/null +++ b/public/cover/Le Voyage de Samson.jpg diff --git a/public/cover/Les Mondes de l’Alliance.jpg b/public/cover/Les Mondes de l’Alliance.jpg Binary files differnew file mode 100644 index 0000000..b1a77b3 --- /dev/null +++ b/public/cover/Les Mondes de l’Alliance.jpg diff --git a/public/cover/Les Mystères de LARISPEM.jpg b/public/cover/Les Mystères de LARISPEM.jpg Binary files differnew file mode 100644 index 0000000..744f01a --- /dev/null +++ b/public/cover/Les Mystères de LARISPEM.jpg diff --git a/public/cover/Les Petites reines.jpg b/public/cover/Les Petites reines.jpg Binary files differnew file mode 100644 index 0000000..8de417b --- /dev/null +++ b/public/cover/Les Petites reines.jpg diff --git a/public/cover/Là où naissent les nuages.jpg b/public/cover/Là où naissent les nuages.jpg Binary files differnew file mode 100644 index 0000000..c069fde --- /dev/null +++ b/public/cover/Là où naissent les nuages.jpg diff --git a/public/cover/Ma Raison de vivre.jpg b/public/cover/Ma Raison de vivre.jpg Binary files differnew file mode 100644 index 0000000..850b227 --- /dev/null +++ b/public/cover/Ma Raison de vivre.jpg diff --git a/public/cover/Maestro !.jpg b/public/cover/Maestro !.jpg Binary files differnew file mode 100644 index 0000000..4c499e6 --- /dev/null +++ b/public/cover/Maestro !.jpg diff --git a/public/cover/Maestro !.png b/public/cover/Maestro !.png Binary files differnew file mode 100644 index 0000000..b93ceb7 --- /dev/null +++ b/public/cover/Maestro !.png diff --git a/public/cover/Malenfer.jpg b/public/cover/Malenfer.jpg Binary files differnew file mode 100644 index 0000000..283b7a1 --- /dev/null +++ b/public/cover/Malenfer.jpg diff --git a/public/cover/Max.jpg b/public/cover/Max.jpg Binary files differnew file mode 100644 index 0000000..b11d1b5 --- /dev/null +++ b/public/cover/Max.jpg diff --git a/public/cover/Maïté Coiffure.jpg b/public/cover/Maïté Coiffure.jpg Binary files differnew file mode 100644 index 0000000..b006ac8 --- /dev/null +++ b/public/cover/Maïté Coiffure.jpg diff --git a/public/cover/Mon Cher VOLTAIRE.jpg b/public/cover/Mon Cher VOLTAIRE.jpg Binary files differnew file mode 100644 index 0000000..fcf5659 --- /dev/null +++ b/public/cover/Mon Cher VOLTAIRE.jpg diff --git a/public/cover/Mots rumeurs, mots cutter.jpg b/public/cover/Mots rumeurs, mots cutter.jpg Binary files differnew file mode 100644 index 0000000..e417c38 --- /dev/null +++ b/public/cover/Mots rumeurs, mots cutter.jpg diff --git a/public/cover/Naruto.jpg b/public/cover/Naruto.jpg Binary files differnew file mode 100644 index 0000000..68fefb3 --- /dev/null +++ b/public/cover/Naruto.jpg diff --git a/public/cover/Oh, boy !.jpg b/public/cover/Oh, boy !.jpg Binary files differnew file mode 100644 index 0000000..790ed23 --- /dev/null +++ b/public/cover/Oh, boy !.jpg diff --git a/public/cover/One Piece.jpg b/public/cover/One Piece.jpg Binary files differnew file mode 100644 index 0000000..6611d4c --- /dev/null +++ b/public/cover/One Piece.jpg diff --git a/public/cover/Platinum End.jpg b/public/cover/Platinum End.jpg Binary files differnew file mode 100644 index 0000000..5675124 --- /dev/null +++ b/public/cover/Platinum End.jpg diff --git a/public/cover/Refuges.jpg b/public/cover/Refuges.jpg Binary files differnew file mode 100644 index 0000000..c48969c --- /dev/null +++ b/public/cover/Refuges.jpg diff --git a/public/cover/Robin des graffs.jpg b/public/cover/Robin des graffs.jpg Binary files differnew file mode 100644 index 0000000..f4b0d08 --- /dev/null +++ b/public/cover/Robin des graffs.jpg diff --git a/public/cover/Sauveur et fils.jpg b/public/cover/Sauveur et fils.jpg Binary files differnew file mode 100644 index 0000000..1abe075 --- /dev/null +++ b/public/cover/Sauveur et fils.jpg diff --git a/public/cover/Skeleton Creek.jpg b/public/cover/Skeleton Creek.jpg Binary files differnew file mode 100644 index 0000000..48fb28e --- /dev/null +++ b/public/cover/Skeleton Creek.jpg diff --git a/public/cover/Susan HOPPER.jpg b/public/cover/Susan HOPPER.jpg Binary files differnew file mode 100644 index 0000000..32081b5 --- /dev/null +++ b/public/cover/Susan HOPPER.jpg diff --git a/public/cover/Tabou.jpg b/public/cover/Tabou.jpg Binary files differnew file mode 100644 index 0000000..6b63cfd --- /dev/null +++ b/public/cover/Tabou.jpg diff --git a/public/cover/Terrienne.jpg b/public/cover/Terrienne.jpg Binary files differnew file mode 100644 index 0000000..6350a30 --- /dev/null +++ b/public/cover/Terrienne.jpg diff --git a/public/cover/Tous les héros s’appellent Phénix.jpg b/public/cover/Tous les héros s’appellent Phénix.jpg Binary files differnew file mode 100644 index 0000000..7c2e287 --- /dev/null +++ b/public/cover/Tous les héros s’appellent Phénix.jpg diff --git a/public/cover/Tout revivre.jpg b/public/cover/Tout revivre.jpg Binary files differnew file mode 100644 index 0000000..a1aec10 --- /dev/null +++ b/public/cover/Tout revivre.jpg diff --git a/public/cover/Tu ne sais rien de l’amour.jpg b/public/cover/Tu ne sais rien de l’amour.jpg Binary files differnew file mode 100644 index 0000000..c4bc5e4 --- /dev/null +++ b/public/cover/Tu ne sais rien de l’amour.jpg diff --git a/public/cover/Une Preuve d’amour.jpg b/public/cover/Une Preuve d’amour.jpg Binary files differnew file mode 100644 index 0000000..2b85eed --- /dev/null +++ b/public/cover/Une Preuve d’amour.jpg diff --git a/src/main/scala/reading/Books.scala b/src/main/scala/reading/Books.scala index b86a008..0c40f79 100644 --- a/src/main/scala/reading/Books.scala +++ b/src/main/scala/reading/Books.scala @@ -1587,7 +1587,7 @@ object Books { ), Book( - title = "Une preuve d’amour", + title = "Une Preuve d’amour", author = "Valentine GOBY", year = "xxx", period = Some(Contemporain), @@ -1902,7 +1902,7 @@ object Books { ), Book( - title = "Tous les héros s'appellent Phénix", + title = "Tous les héros s’appellent Phénix", author = "Nastasia RUGANI", year = "2014", period = Some(Contemporain), @@ -1968,7 +1968,7 @@ object Books { ), Book( - title = "Oh, boy !", + title = "Oh, boy !", author = "Marie-Aude MURAIL", year = "2000", period = Some(Contemporain), @@ -2080,7 +2080,7 @@ object Books { ), Book( - title = "Les Mondes de l'Alliance", + title = "Les Mondes de l’Alliance", author = "David MOITET", year = "2014-2015", parts = 3, diff --git a/src/main/scala/reading/component/index/style/Books.scala b/src/main/scala/reading/component/index/style/Books.scala index f5deb53..ca52328 100644 --- a/src/main/scala/reading/component/index/style/Books.scala +++ b/src/main/scala/reading/component/index/style/Books.scala @@ -4,6 +4,8 @@ import scalacss.Defaults._ import reading.Media +import reading.component.style.{ Color => C } + object Books extends StyleSheet.Inline { import dsl._ @@ -21,6 +23,9 @@ object Books extends StyleSheet.Inline { ) val cover = style( + display.inlineBlock, + backgroundColor(C.gray.lighten(90).value), + cursor.pointer, Media.desktop( height(250.px), maxWidth(200.px) @@ -28,7 +33,6 @@ object Books extends StyleSheet.Inline { Media.mobile( height(150.px), maxWidth(120.px) - ), - cursor.pointer + ) ) } diff --git a/src/main/scala/reading/component/index/style/Header.scala b/src/main/scala/reading/component/index/style/Header.scala index c29bd56..d2149a7 100644 --- a/src/main/scala/reading/component/index/style/Header.scala +++ b/src/main/scala/reading/component/index/style/Header.scala @@ -38,7 +38,7 @@ object Header extends StyleSheet.Inline { padding(15.px), marginRight(20.px), borderRadius(2.px), - border(1.px, solid, C.gray.lighten(80).value), + border(1.px, solid, C.gray.lighten(60).value), fontSize(18.px), &.hover(cursor.pointer) ) @@ -47,12 +47,12 @@ object Header extends StyleSheet.Inline { box, backgroundColor(C.mickado.value), color(C.white.value), - &.hover(backgroundColor(C.mickado.lighten(20).value)) + &.hover(backgroundColor(C.mickado.lighten(30).value)) ) val filter = style( box, - &.hover(borderColor(C.gray.lighten(50).value)) + &.hover(borderColor(C.gray.lighten(80).value)) ) val name = style( diff --git a/src/main/scala/reading/component/style/Color.scala b/src/main/scala/reading/component/style/Color.scala index 1f44eb5..ed2041f 100644 --- a/src/main/scala/reading/component/style/Color.scala +++ b/src/main/scala/reading/component/style/Color.scala @@ -7,19 +7,14 @@ import scalacss.internal.{ ValueT, Color => ScalaCssColor } case class Color(red: Int, green: Int, blue: Int, alpha: Double = 1.0) { val value: ValueT[ValueT.Color] = ScalaCssColor.rgba(red, green, blue, alpha) - def lighten(n: Int): Color = - Color( - red = Color.bound(red + n), - green = Color.bound(green + n), - blue = Color.bound(blue + n), - alpha = alpha - ) + def lighten(pct: Int): Color = ratio(1.0 + pct / 100.0) + def darken(pct: Int): Color = ratio(1.0 - pct / 100.0) - def darken(n: Int): Color = + private def ratio(r: Double): Color = Color( - red = Color.bound(red - n), - green = Color.bound(green - n), - blue = Color.bound(blue - n), + red = Color.bound(red * r), + green = Color.bound(green * r), + blue = Color.bound(blue * r), alpha = alpha ) } @@ -44,4 +39,5 @@ object Color { ) def bound(n: Int): Int = Math.max(0, Math.min(255, n)) + def bound(d: Double): Int = bound(d.toInt) } diff --git a/src/main/scala/reading/models/Compare.scala b/src/main/scala/reading/models/Compare.scala index dd763fe..b59d2f2 100644 --- a/src/main/scala/reading/models/Compare.scala +++ b/src/main/scala/reading/models/Compare.scala @@ -11,7 +11,9 @@ object Compare { .replaceAll("^à ", "") .replaceAll("^au ", "") .replaceAll("^aux ", "") - .replaceAll("^années ", "") + .replaceAll("^ma ", "") + .replaceAll("^mon ", "") + .replaceAll("^mes ", "") .replaceAll("é", "e") .replaceAll("è", "e") } |
