--- a/cms/app-client/app/styles/app.scss Mon Jun 20 17:04:59 2016 +0200
+++ b/cms/app-client/app/styles/app.scss Tue Jun 21 14:24:30 2016 +0200
@@ -1,3 +1,7 @@
+body {
+ background-color: #f5f5f5;
+}
+
#corpus-app {
font-family: sans-serif;
font-size: 12px;
@@ -21,6 +25,8 @@
@import 'components/sorting-component';
@import 'components/filtering-component';
+ @import 'components/filter-component';
+ @import 'components/playlist-component';
}
h1, h2, h3, h4, h5, h6 {
@@ -52,21 +58,22 @@
background-color: #253946;
}
+.corpus-app-container,
+.corpus-app-wrapper {
+ box-sizing: border-box;
+ height: 600px;
+ width: 50%;
+}
+
.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;
+ float: right;
}
.mapdiv{
@@ -75,20 +82,16 @@
height: 500px;
}
+.corpus-app-content {
+ background-color: #13212d;
+ overflow: hidden;
+ height: 80px;
+}
+
.corpus-app {
@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;
- }
}
}