From cd9dd7a8b18a80aae6b46ef97c429b0ac73ce8c6 Mon Sep 17 00:00:00 2001 From: Leonardo Merlin Date: Mon, 14 Sep 2015 15:24:28 -0300 Subject: [PATCH] Fix styles at event-list --- src/app/components/event-list/event-list.html | 36 ++++++++++++++++++++++++++---------- src/app/components/event-list/event-list.scss | 44 ++++++++++++++++++++++++-------------------- 2 files changed, 50 insertions(+), 30 deletions(-) diff --git a/src/app/components/event-list/event-list.html b/src/app/components/event-list/event-list.html index 0f9e4e1..275120a 100644 --- a/src/app/components/event-list/event-list.html +++ b/src/app/components/event-list/event-list.html @@ -29,19 +29,23 @@
-
- - {{event.start_date | date : "dd/MM/yyyy"}} - - - - {{event.start_date | date : "HH:mm"}} - - +
+ + + {{event.start_date | date : "dd/MM/yyyy"}} + + + + {{event.start_date | date : "HH:mm"}} + +
+
{{::event.title}}
-
+ +
@@ -62,5 +66,17 @@
+
+
+
+
+ +
+
+ +
+
+
+
diff --git a/src/app/components/event-list/event-list.scss b/src/app/components/event-list/event-list.scss index 3141e97..44bf4c5 100644 --- a/src/app/components/event-list/event-list.scss +++ b/src/app/components/event-list/event-list.scss @@ -30,7 +30,7 @@ } .row-level-1 { - height: 48px; + // height: 48px; line-height: 30px; padding: 5px 0; border-bottom: 1px solid #ccc; @@ -40,25 +40,11 @@ border-bottom: none; } - // .event-list--header { - // border-bottom: 1px solid #333333; - // } - - // .event-list--icon { - // font-size: 25px; - // display: inline-block; - // } - - // .event-list--title { - // margin: 0 10px; - // display: inline-block; - // } - - // .event-list--minimize { - // display: inline-block; - // float: right; - // width: 100px; - // } + + @media screen and (max-width: $screen-sm) { + height: auto; + overflow: visible; + } } &--table{ @@ -105,6 +91,7 @@ .icon-circle { font-size: 28px; + line-height: 33px; border-radius: 100%; padding: 8px 8px 8px 10px; background-color: #fff; @@ -124,6 +111,9 @@ } .event-list--panel { + .date-wrapper {margin-left: 16px; } + .time-wrapper {margin-left: 22px; } + // .description {margin-left: 22px; } } .event-tab--icon { @@ -141,4 +131,18 @@ width: 100%; white-space: normal; } + + .minimize { + cursor: pointer; + + .btn, + .glyphicon { + color: #fff; + font-weight: bold; + } + + .glyphicon { + line-height: 32px; + } + } } -- libgit2 0.21.2