# HG changeset patch # User rougeronj # Date 1441711883 -7200 # Node ID b2489bd8eff42158db457415c9172fb239ef987e # Parent 7f824cabdd3be67a6fd65d044397bc8855809a28 add design for filter in teacher scenario small fix diff -r 7f824cabdd3b -r b2489bd8eff4 server/src/remie/static/remie/css/style.css --- a/server/src/remie/static/remie/css/style.css Tue Sep 08 11:12:56 2015 +0200 +++ b/server/src/remie/static/remie/css/style.css Tue Sep 08 13:31:23 2015 +0200 @@ -314,7 +314,7 @@ color: #848484; } -.Ldt-AnnotationsList-Description{ +.Ldt-AnnotationsList-li.Ldt-TraceMe .Ldt-AnnotationsList-Description{ white-space: nowrap; overflow: hidden; text-overflow: ellipsis; @@ -333,18 +333,6 @@ margin-right: 20px } -.Ldt-AnnotationsListWidget .Ldt-AnnotationsList-Filters{ - margin-top: 10px; - display: block; - padding-bottom: 30px; -} - -.Ldt-AnnotationsList-Filters .Ldt-AnnotationsList-filter-text{ - position: relative; - float: right; - top: 30px; -} - /* ----------------------------------------------- */ /* ----------------- Media Panel ----------------- */ /* ----------------------------------------------- */ diff -r 7f824cabdd3b -r b2489bd8eff4 server/src/remie/static/remie/css/teacher.css --- a/server/src/remie/static/remie/css/teacher.css Tue Sep 08 11:12:56 2015 +0200 +++ b/server/src/remie/static/remie/css/teacher.css Tue Sep 08 13:31:23 2015 +0200 @@ -21,4 +21,55 @@ .Ldt-CurrentSegmentInfobox-Element.Ldt-CurrentSegmentInfobox-Tags { margin-left: 0; +} + +/* ----- Filter style ----- */ + +.Ldt-AnnotationsListWidget .Ldt-AnnotationsList-Filters{ + margin-top: 10px; + display: block; + padding-bottom: 38px; +} + +.Ldt-AnnotationsList-Filters .Ldt-AnnotationsList-filter-dropdown{ + border: 1px solid grey; + height: 25px; + float: left; + margin: 0 1px; + width: 150px; + text-align: left; + text-indent: 5px; +} + +.Ldt-AnnotationsList-Filters .Ldt-AnnotationsList-filter-date { + background: rgba(0, 0, 0, 0) url("../metadataplayer/img/calendar.png") no-repeat scroll left center / 26px auto; + overflow: scroll; + text-indent: -100%; + white-space: nowrap; + display: inline-flex; + padding-top: 1px; + height: 25px; +} + +.Ldt-AnnotationsList-Filters .Ldt-AnnotationsList-filter-date .Ldt-AnnotationsList-dateFilter{ + width: 100px; +} + +.Ldt-AnnotationsList-Filters .Ldt-AnnotationsList-filter-text{ + position: relative; + float: right; + top: 35px; + background: rgba(0, 0, 0, 0) url("../metadataplayer/img/search.png") no-repeat scroll right center / 17px auto; + border: 1px solid grey; + height: 25px; + width: 150px; +} + +.Ldt-AnnotationsList-Filters .Ldt-AnnotationsList-filter-checkbox { + float: left; + margin: 18px 0 0; +} + +.Ldt-AnnotationsList-filter-checkbox #Ldt-AnnotationsList-ignoreSegmentsFilter{ + margin-left: 0; } \ No newline at end of file diff -r 7f824cabdd3b -r b2489bd8eff4 server/src/remie/static/remie/metadataplayer/img/calendar.png Binary file server/src/remie/static/remie/metadataplayer/img/calendar.png has changed diff -r 7f824cabdd3b -r b2489bd8eff4 server/src/remie/static/remie/metadataplayer/img/search.png Binary file server/src/remie/static/remie/metadataplayer/img/search.png has changed