# HG changeset patch # User nowmad@23.1.168.192.in-addr.arpa # Date 1450350957 -3600 # Node ID 69977e2aa39eb88abf30b33c23ba30c266ccc5cc # Parent e93ef2636e06fc721bf385e823e2b781ee231784 improve general design of components diff -r e93ef2636e06 -r 69977e2aa39e cms/app-client/app/styles/app.scss --- a/cms/app-client/app/styles/app.scss Thu Dec 17 12:15:22 2015 +0100 +++ b/cms/app-client/app/styles/app.scss Thu Dec 17 12:15:57 2015 +0100 @@ -1,13 +1,19 @@ +$base-url: "/corpus/"; + #corpus-app { border: 1px solid; width: 1108px; - height: 900px; + height: 600px; display: block; margin-left: auto; margin-right: auto; margin-bottom: 10px; - @import 'chrono'; + @import 'tabs/chrono'; + @import 'tabs/carto'; + @import 'tabs/langues'; + @import 'tabs/discours'; + @import 'tabs/thematiques'; } .mapdiv{ @@ -25,13 +31,13 @@ &-container{ display: block; width: 50%; - height: 900px; + height: 600px; float: left; border-top: none; border-right: 1px solid grey; } &-wrapper{ - height: 900px; + height: 600px; display : flex; flex-flow: column; border: none; diff -r e93ef2636e06 -r 69977e2aa39e cms/app-client/app/styles/chrono.scss --- a/cms/app-client/app/styles/chrono.scss Thu Dec 17 12:15:22 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -#our_table ul { - margin: 0; -} - -#our_table li { - width:30px; - height:30px; - text-align:center; - vertical-align:middle; - background-color:#B0D1D3; - display: inline-block; - margin: 1px -1px; - line-height: 30px; - cursor: pointer; -} - -#our_table li.highlighted { - background-color:#2D7073; -} diff -r e93ef2636e06 -r 69977e2aa39e cms/app-client/app/styles/player.scss --- a/cms/app-client/app/styles/player.scss Thu Dec 17 12:15:22 2015 +0100 +++ b/cms/app-client/app/styles/player.scss Thu Dec 17 12:15:57 2015 +0100 @@ -0,0 +1,4 @@ +#audio-player{ + display: block; + margin: 10px auto; +} diff -r e93ef2636e06 -r 69977e2aa39e cms/app-client/app/styles/results.scss --- a/cms/app-client/app/styles/results.scss Thu Dec 17 12:15:22 2015 +0100 +++ b/cms/app-client/app/styles/results.scss Thu Dec 17 12:15:57 2015 +0100 @@ -22,5 +22,32 @@ .result-item { border: 1px solid black; margin-bottom: 1px; - min-height: 50px; + height: 64px; + cursor: pointer; + padding: 5px; + overflow: hidden; +} +.result-item:hover { + box-shadow: inset -1px -1px 5px 0px rgba(0,0,0,0.75); +} +.result-item.details { + height: inherit; +} + +.result-item .description{ + margin-top: 10px; } + +.result-item .play-icon { + float: right; + background: url($base_url + 'assets/images/play-button.png') no-repeat; + background-size: 20px; + height: 20px; + width: 20px; + cursor: pointer; + margin: 4px 7px 0 0; +} +.result-item.playing .play-icon { + background: url($base-url + 'assets/images/playing.gif') no-repeat; + margin: 6px 5px 0 0; +} diff -r e93ef2636e06 -r 69977e2aa39e cms/app-client/app/styles/tabs/carto.scss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/styles/tabs/carto.scss Thu Dec 17 12:15:57 2015 +0100 @@ -0,0 +1,4 @@ +#mapdiv{ + width: 100%; + height: 500px; +} diff -r e93ef2636e06 -r 69977e2aa39e cms/app-client/app/styles/tabs/chrono.scss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/styles/tabs/chrono.scss Thu Dec 17 12:15:57 2015 +0100 @@ -0,0 +1,19 @@ +#our_table ul { + margin: 0; +} + +#our_table li { + width:40px; + height:40px; + text-align:center; + vertical-align:middle; + background-color:#B0D1D3; + display: inline-block; + margin: 1px -1px; + line-height: 30px; + cursor: pointer; +} + +#our_table li.highlighted { + background-color:#2D7073; +} diff -r e93ef2636e06 -r 69977e2aa39e cms/app-client/app/styles/tabs/discours.scss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/styles/tabs/discours.scss Thu Dec 17 12:15:57 2015 +0100 @@ -0,0 +1,9 @@ +.left{ + float: left; + margin-left: 50px; +} + +.right{ + float: right; + margin-right: 50px; +} diff -r e93ef2636e06 -r 69977e2aa39e cms/app-client/app/styles/tabs/langues.scss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/styles/tabs/langues.scss Thu Dec 17 12:15:57 2015 +0100 @@ -0,0 +1,4 @@ +#chart_div{ + width: 560px; + height: 540px; +} diff -r e93ef2636e06 -r 69977e2aa39e cms/app-client/app/styles/tabs/thematiques.scss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cms/app-client/app/styles/tabs/thematiques.scss Thu Dec 17 12:15:57 2015 +0100 @@ -0,0 +1,48 @@ +input[type="text"] { + display: block; + margin: auto; + width: 250px; + font-family: sans-serif; + font-size: 18px; + appearance: none; + box-shadow: none; + border-radius: none; +} +input[type="text"]:focus { + outline: none; +} + +.search-box{ + display: block; + height: 100px; + width: 400px; + margin: auto; + padding-top: 25px; +} + +.search-box input[type="text"] { + padding: 10px; + border: none; + border-bottom: solid 2px #c9c9c9; + transition: border 0.3s; + outline: 30px solid #efefef; +} +.search-box input[type="text"]:focus, +.search-box input[type="text"].focus { + border-bottom: solid 2px #969696; +} + +.tag-cloud{ + margin: 15px; + text-align: justify; +} + +.not-popular{ + font-size: 1em; +} +.popular{ + font-size: 1.3em; +} +.very-popular{ + font-size: 1.6em; +} diff -r e93ef2636e06 -r 69977e2aa39e cms/app-client/public/assets/images/play-button.png Binary file cms/app-client/public/assets/images/play-button.png has changed diff -r e93ef2636e06 -r 69977e2aa39e cms/app-client/public/assets/images/playing.gif Binary file cms/app-client/public/assets/images/playing.gif has changed