aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoris2017-02-01 10:11:09 +0100
committerJoris2017-02-01 10:11:09 +0100
commit0ff761a286886404f97e29e2fca9163985e79891 (patch)
tree948f0459913ab4554d56383e4aef066cfdde64a2
parentdf001586359c99c2dea3f0ae1e034271e897a28a (diff)
downloadreading-0ff761a286886404f97e29e2fca9163985e79891.tar.gz
reading-0ff761a286886404f97e29e2fca9163985e79891.tar.bz2
reading-0ff761a286886404f97e29e2fca9163985e79891.zip
Add covers
-rw-r--r--public/cover/EverWorld.gifbin229690 -> 0 bytes
-rw-r--r--public/cover/Le Livre de Perle.jpgbin0 -> 51150 bytes
-rw-r--r--public/cover/Le Manoir.jpgbin0 -> 209232 bytes
-rw-r--r--public/cover/Le Monde Secret de Sombreterre.jpgbin0 -> 43923 bytes
-rw-r--r--public/cover/Le Monde dans la main.jpgbin0 -> 20894 bytes
-rw-r--r--public/cover/Le Passage du diable.jpgbin0 -> 198528 bytes
-rw-r--r--public/cover/Le Premier qui pleure a perdu.jpgbin0 -> 95636 bytes
-rw-r--r--public/cover/Le Retour de Martin GUERRE.jpgbin0 -> 27343 bytes
-rw-r--r--public/cover/Le Singe de Hartlepool.jpgbin0 -> 39688 bytes
-rw-r--r--public/cover/Le Suivant sur la liste.jpgbin0 -> 34755 bytes
-rw-r--r--public/cover/Le Temps des miracles.jpgbin0 -> 25498 bytes
-rw-r--r--public/cover/Le Temps des mitaines.jpgbin0 -> 110401 bytes
-rw-r--r--public/cover/Le Voyage de Samson.jpgbin0 -> 122943 bytes
-rw-r--r--public/cover/Les Mondes de l’Alliance.jpgbin0 -> 114906 bytes
-rw-r--r--public/cover/Les Mystères de LARISPEM.jpgbin0 -> 83010 bytes
-rw-r--r--public/cover/Les Petites reines.jpgbin0 -> 68566 bytes
-rw-r--r--public/cover/Là où naissent les nuages.jpgbin0 -> 75986 bytes
-rw-r--r--public/cover/Ma Raison de vivre.jpgbin0 -> 74322 bytes
-rw-r--r--public/cover/Maestro !.jpgbin0 -> 21313 bytes
-rw-r--r--public/cover/Maestro !.pngbin0 -> 576600 bytes
-rw-r--r--public/cover/Malenfer.jpgbin0 -> 110320 bytes
-rw-r--r--public/cover/Max.jpgbin0 -> 855789 bytes
-rw-r--r--public/cover/Maïté Coiffure.jpgbin0 -> 20742 bytes
-rw-r--r--public/cover/Mon Cher VOLTAIRE.jpgbin0 -> 105331 bytes
-rw-r--r--public/cover/Mots rumeurs, mots cutter.jpgbin0 -> 17750 bytes
-rw-r--r--public/cover/Naruto.jpgbin0 -> 146085 bytes
-rw-r--r--public/cover/Oh, boy !.jpgbin0 -> 40621 bytes
-rw-r--r--public/cover/One Piece.jpgbin0 -> 77778 bytes
-rw-r--r--public/cover/Platinum End.jpgbin0 -> 34616 bytes
-rw-r--r--public/cover/Refuges.jpgbin0 -> 150792 bytes
-rw-r--r--public/cover/Robin des graffs.jpgbin0 -> 24658 bytes
-rw-r--r--public/cover/Sauveur et fils.jpgbin0 -> 11614 bytes
-rw-r--r--public/cover/Skeleton Creek.jpgbin0 -> 45117 bytes
-rw-r--r--public/cover/Susan HOPPER.jpgbin0 -> 38506 bytes
-rw-r--r--public/cover/Tabou.jpgbin0 -> 35841 bytes
-rw-r--r--public/cover/Terrienne.jpgbin0 -> 16075 bytes
-rw-r--r--public/cover/Tous les héros s’appellent Phénix.jpgbin0 -> 86148 bytes
-rw-r--r--public/cover/Tout revivre.jpgbin0 -> 22231 bytes
-rw-r--r--public/cover/Tu ne sais rien de l’amour.jpgbin0 -> 66276 bytes
-rw-r--r--public/cover/Une Preuve d’amour.jpgbin0 -> 42181 bytes
-rw-r--r--src/main/scala/reading/Books.scala8
-rw-r--r--src/main/scala/reading/component/index/style/Books.scala8
-rw-r--r--src/main/scala/reading/component/index/style/Header.scala6
-rw-r--r--src/main/scala/reading/component/style/Color.scala18
-rw-r--r--src/main/scala/reading/models/Compare.scala4
45 files changed, 23 insertions, 21 deletions
diff --git a/public/cover/EverWorld.gif b/public/cover/EverWorld.gif
deleted file mode 100644
index b17001a..0000000
--- a/public/cover/EverWorld.gif
+++ /dev/null
Binary files differ
diff --git a/public/cover/Le Livre de Perle.jpg b/public/cover/Le Livre de Perle.jpg
new file mode 100644
index 0000000..25f0b52
--- /dev/null
+++ b/public/cover/Le Livre de Perle.jpg
Binary files differ
diff --git a/public/cover/Le Manoir.jpg b/public/cover/Le Manoir.jpg
new file mode 100644
index 0000000..c74bd65
--- /dev/null
+++ b/public/cover/Le Manoir.jpg
Binary files differ
diff --git a/public/cover/Le Monde Secret de Sombreterre.jpg b/public/cover/Le Monde Secret de Sombreterre.jpg
new file mode 100644
index 0000000..f312821
--- /dev/null
+++ b/public/cover/Le Monde Secret de Sombreterre.jpg
Binary files differ
diff --git a/public/cover/Le Monde dans la main.jpg b/public/cover/Le Monde dans la main.jpg
new file mode 100644
index 0000000..bdf18db
--- /dev/null
+++ b/public/cover/Le Monde dans la main.jpg
Binary files differ
diff --git a/public/cover/Le Passage du diable.jpg b/public/cover/Le Passage du diable.jpg
new file mode 100644
index 0000000..92ddb53
--- /dev/null
+++ b/public/cover/Le Passage du diable.jpg
Binary files differ
diff --git a/public/cover/Le Premier qui pleure a perdu.jpg b/public/cover/Le Premier qui pleure a perdu.jpg
new file mode 100644
index 0000000..a9ecc7e
--- /dev/null
+++ b/public/cover/Le Premier qui pleure a perdu.jpg
Binary files differ
diff --git a/public/cover/Le Retour de Martin GUERRE.jpg b/public/cover/Le Retour de Martin GUERRE.jpg
new file mode 100644
index 0000000..2e76f1b
--- /dev/null
+++ b/public/cover/Le Retour de Martin GUERRE.jpg
Binary files differ
diff --git a/public/cover/Le Singe de Hartlepool.jpg b/public/cover/Le Singe de Hartlepool.jpg
new file mode 100644
index 0000000..91294b9
--- /dev/null
+++ b/public/cover/Le Singe de Hartlepool.jpg
Binary files differ
diff --git a/public/cover/Le Suivant sur la liste.jpg b/public/cover/Le Suivant sur la liste.jpg
new file mode 100644
index 0000000..5b9fde3
--- /dev/null
+++ b/public/cover/Le Suivant sur la liste.jpg
Binary files differ
diff --git a/public/cover/Le Temps des miracles.jpg b/public/cover/Le Temps des miracles.jpg
new file mode 100644
index 0000000..d67cd4e
--- /dev/null
+++ b/public/cover/Le Temps des miracles.jpg
Binary files differ
diff --git a/public/cover/Le Temps des mitaines.jpg b/public/cover/Le Temps des mitaines.jpg
new file mode 100644
index 0000000..92baccb
--- /dev/null
+++ b/public/cover/Le Temps des mitaines.jpg
Binary files differ
diff --git a/public/cover/Le Voyage de Samson.jpg b/public/cover/Le Voyage de Samson.jpg
new file mode 100644
index 0000000..21ba83c
--- /dev/null
+++ b/public/cover/Le Voyage de Samson.jpg
Binary files differ
diff --git a/public/cover/Les Mondes de l’Alliance.jpg b/public/cover/Les Mondes de l’Alliance.jpg
new file mode 100644
index 0000000..b1a77b3
--- /dev/null
+++ b/public/cover/Les Mondes de l’Alliance.jpg
Binary files differ
diff --git a/public/cover/Les Mystères de LARISPEM.jpg b/public/cover/Les Mystères de LARISPEM.jpg
new file mode 100644
index 0000000..744f01a
--- /dev/null
+++ b/public/cover/Les Mystères de LARISPEM.jpg
Binary files differ
diff --git a/public/cover/Les Petites reines.jpg b/public/cover/Les Petites reines.jpg
new file mode 100644
index 0000000..8de417b
--- /dev/null
+++ b/public/cover/Les Petites reines.jpg
Binary files differ
diff --git a/public/cover/Là où naissent les nuages.jpg b/public/cover/Là où naissent les nuages.jpg
new file mode 100644
index 0000000..c069fde
--- /dev/null
+++ b/public/cover/Là où naissent les nuages.jpg
Binary files differ
diff --git a/public/cover/Ma Raison de vivre.jpg b/public/cover/Ma Raison de vivre.jpg
new file mode 100644
index 0000000..850b227
--- /dev/null
+++ b/public/cover/Ma Raison de vivre.jpg
Binary files differ
diff --git a/public/cover/Maestro !.jpg b/public/cover/Maestro !.jpg
new file mode 100644
index 0000000..4c499e6
--- /dev/null
+++ b/public/cover/Maestro !.jpg
Binary files differ
diff --git a/public/cover/Maestro !.png b/public/cover/Maestro !.png
new file mode 100644
index 0000000..b93ceb7
--- /dev/null
+++ b/public/cover/Maestro !.png
Binary files differ
diff --git a/public/cover/Malenfer.jpg b/public/cover/Malenfer.jpg
new file mode 100644
index 0000000..283b7a1
--- /dev/null
+++ b/public/cover/Malenfer.jpg
Binary files differ
diff --git a/public/cover/Max.jpg b/public/cover/Max.jpg
new file mode 100644
index 0000000..b11d1b5
--- /dev/null
+++ b/public/cover/Max.jpg
Binary files differ
diff --git a/public/cover/Maïté Coiffure.jpg b/public/cover/Maïté Coiffure.jpg
new file mode 100644
index 0000000..b006ac8
--- /dev/null
+++ b/public/cover/Maïté Coiffure.jpg
Binary files differ
diff --git a/public/cover/Mon Cher VOLTAIRE.jpg b/public/cover/Mon Cher VOLTAIRE.jpg
new file mode 100644
index 0000000..fcf5659
--- /dev/null
+++ b/public/cover/Mon Cher VOLTAIRE.jpg
Binary files differ
diff --git a/public/cover/Mots rumeurs, mots cutter.jpg b/public/cover/Mots rumeurs, mots cutter.jpg
new file mode 100644
index 0000000..e417c38
--- /dev/null
+++ b/public/cover/Mots rumeurs, mots cutter.jpg
Binary files differ
diff --git a/public/cover/Naruto.jpg b/public/cover/Naruto.jpg
new file mode 100644
index 0000000..68fefb3
--- /dev/null
+++ b/public/cover/Naruto.jpg
Binary files differ
diff --git a/public/cover/Oh, boy !.jpg b/public/cover/Oh, boy !.jpg
new file mode 100644
index 0000000..790ed23
--- /dev/null
+++ b/public/cover/Oh, boy !.jpg
Binary files differ
diff --git a/public/cover/One Piece.jpg b/public/cover/One Piece.jpg
new file mode 100644
index 0000000..6611d4c
--- /dev/null
+++ b/public/cover/One Piece.jpg
Binary files differ
diff --git a/public/cover/Platinum End.jpg b/public/cover/Platinum End.jpg
new file mode 100644
index 0000000..5675124
--- /dev/null
+++ b/public/cover/Platinum End.jpg
Binary files differ
diff --git a/public/cover/Refuges.jpg b/public/cover/Refuges.jpg
new file mode 100644
index 0000000..c48969c
--- /dev/null
+++ b/public/cover/Refuges.jpg
Binary files differ
diff --git a/public/cover/Robin des graffs.jpg b/public/cover/Robin des graffs.jpg
new file mode 100644
index 0000000..f4b0d08
--- /dev/null
+++ b/public/cover/Robin des graffs.jpg
Binary files differ
diff --git a/public/cover/Sauveur et fils.jpg b/public/cover/Sauveur et fils.jpg
new file mode 100644
index 0000000..1abe075
--- /dev/null
+++ b/public/cover/Sauveur et fils.jpg
Binary files differ
diff --git a/public/cover/Skeleton Creek.jpg b/public/cover/Skeleton Creek.jpg
new file mode 100644
index 0000000..48fb28e
--- /dev/null
+++ b/public/cover/Skeleton Creek.jpg
Binary files differ
diff --git a/public/cover/Susan HOPPER.jpg b/public/cover/Susan HOPPER.jpg
new file mode 100644
index 0000000..32081b5
--- /dev/null
+++ b/public/cover/Susan HOPPER.jpg
Binary files differ
diff --git a/public/cover/Tabou.jpg b/public/cover/Tabou.jpg
new file mode 100644
index 0000000..6b63cfd
--- /dev/null
+++ b/public/cover/Tabou.jpg
Binary files differ
diff --git a/public/cover/Terrienne.jpg b/public/cover/Terrienne.jpg
new file mode 100644
index 0000000..6350a30
--- /dev/null
+++ b/public/cover/Terrienne.jpg
Binary files differ
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
new file mode 100644
index 0000000..7c2e287
--- /dev/null
+++ b/public/cover/Tous les héros s’appellent Phénix.jpg
Binary files differ
diff --git a/public/cover/Tout revivre.jpg b/public/cover/Tout revivre.jpg
new file mode 100644
index 0000000..a1aec10
--- /dev/null
+++ b/public/cover/Tout revivre.jpg
Binary files differ
diff --git a/public/cover/Tu ne sais rien de l’amour.jpg b/public/cover/Tu ne sais rien de l’amour.jpg
new file mode 100644
index 0000000..c4bc5e4
--- /dev/null
+++ b/public/cover/Tu ne sais rien de l’amour.jpg
Binary files differ
diff --git a/public/cover/Une Preuve d’amour.jpg b/public/cover/Une Preuve d’amour.jpg
new file mode 100644
index 0000000..2b85eed
--- /dev/null
+++ b/public/cover/Une Preuve d’amour.jpg
Binary files differ
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")
}