diff -r 02c6aa9a99d7 -r 9d083636bd99 cms/app-client/app/styles/app.scss --- a/cms/app-client/app/styles/app.scss Mon Jun 20 15:55:51 2016 +0200 +++ b/cms/app-client/app/styles/app.scss Mon Jun 20 17:04:59 2016 +0200 @@ -1,75 +1,94 @@ #corpus-app { - font-family: sans-serif; - font-size: 12px; + font-family: sans-serif; + font-size: 12px; } #corpus-app { - border: 1px solid; - width: 1108px; - height: 600px; - display: block; - margin-left: auto; - margin-right: auto; - margin-bottom: 10px; + border: 1px solid; + width: 1108px; + height: 600px; + display: block; + margin-left: auto; + margin-right: auto; + margin-bottom: 10px; - @import 'tabs/chrono'; - @import 'tabs/carto'; - @import 'tabs/langues'; - @import 'tabs/discours'; - @import 'tabs/thematiques'; - @import 'tabs/detail'; + @import 'tabs/chrono'; + @import 'tabs/carto'; + @import 'tabs/langues'; + @import 'tabs/discours'; + @import 'tabs/thematiques'; + @import 'tabs/detail'; - @import 'components/sorting-component'; - @import 'components/filtering-component'; + @import 'components/sorting-component'; + @import 'components/filtering-component'; } -.corpus-app-container { - background-color: #becfd4; - padding: 0 20px; - color: #687a84; +h1, h2, h3, h4, h5, h6 { + margin: 0; + padding: 0; + font-weight: normal; + font-size: inherit; } -.corpus-app-wrapper { - background-color: #253946; +h2 { + color: #ffffff; + text-transform: uppercase; + font-size: 14px; + text-align: center; } .corpus-app-container { -overflow: hidden; -display: block; -width: 50%; -height: 600px; -float: left; -border-top: none; + background-color: #becfd4; + padding: 0 20px; + color: #687a84; + box-sizing: border-box; +} + +body.tabs-chrono .corpus-app-container { + padding: 20px; } .corpus-app-wrapper { -height: 600px; -display : flex; -flex-flow: column; -border: none; -padding: 0 0 0 10px; + background-color: #253946; +} + +.corpus-app-container { + overflow: hidden; + display: block; + width: 50%; + height: 600px; + float: left; + border-top: none; +} + +.corpus-app-wrapper { + height: 600px; + display : flex; + flex-flow: column; + border: none; + padding: 0 0 0 10px; } .mapdiv{ - width: 470px; - background-color: #FFFFFF; - height: 500px; + width: 470px; + background-color: #FFFFFF; + height: 500px; } .corpus-app { - @at-root { - @import 'player'; - @import 'results'; - @import 'modal'; + @at-root { + @import 'player'; + @import 'results'; + @import 'modal'; - &-player{ - flex: 0 1 auto; - float: left; - border-left: none; - border-top: none; - margin-bottom: 10px; - background-color: #eeeeee; - padding: 0 10px; + &-player{ + flex: 0 1 auto; + float: left; + border-left: none; + border-top: none; + margin-bottom: 10px; + background-color: #eeeeee; + padding: 0 10px; + } } - } }