diff --git a/src/app/components/breadcrumb/breadcrumb.scss b/src/app/components/breadcrumb/breadcrumb.scss index 13853a4..e9eacb3 100644 --- a/src/app/components/breadcrumb/breadcrumb.scss +++ b/src/app/components/breadcrumb/breadcrumb.scss @@ -2,7 +2,7 @@ .breadcrumb { background: none; - padding: 15px 0; + padding: 0; margin: 0; } diff --git a/src/app/components/event-list/event-list.html b/src/app/components/event-list/event-list.html index 0694e93..a1a12c6 100644 --- a/src/app/components/event-list/event-list.html +++ b/src/app/components/event-list/event-list.html @@ -1,109 +1,124 @@
-
-
-
- + +
+ +
+
+
+
+

+ + Agenda Dialoga Brasil +

+
+
+

+ 18 bate papos agendados + +

+
+
-
Bate-Papo com ministr@s
- -
+ -
-
-
- -
-

Bate-papo com ministr@s

-
-
+
diff --git a/src/app/components/event-list/event-list.scss b/src/app/components/event-list/event-list.scss index 2bc0ddb..4116fce 100644 --- a/src/app/components/event-list/event-list.scss +++ b/src/app/components/event-list/event-list.scss @@ -1,14 +1,16 @@ .event-list { position: relative; - background-color: #eeeeee; .contraste & { background-color: #262626; } + .section-table { + background-color: #e1e1e1; + } + .event-list--panel { height: 310px; - border: 1px solid #333333; padding: 20px; margin: 20px 0; line-height: 20px; @@ -19,25 +21,25 @@ line-height: 0px; } - .event-list--header { - border-bottom: 1px solid #333333; - } + // .event-list--header { + // border-bottom: 1px solid #333333; + // } - .event-list--icon { - font-size: 25px; - display: inline-block; - } + // .event-list--icon { + // font-size: 25px; + // display: inline-block; + // } - .event-list--title { - margin: 0 10px; - display: inline-block; - } + // .event-list--title { + // margin: 0 10px; + // display: inline-block; + // } - .event-list--minimize { - display: inline-block; - float: right; - width: 100px; - } + // .event-list--minimize { + // display: inline-block; + // float: right; + // width: 100px; + // } } .event-tab--trigger { @@ -68,14 +70,51 @@ } } + .event-bar--trigger { + color: #fff; + + h1 { + margin-bottom: 20px; + } + + .icon-circle { + font-size: 28px; + border-radius: 100%; + padding: 8px 8px 8px 10px; + background-color: #fff; + } + + &-toggle { + .glyphicon { + position: relative; + top: 5px; + } + } + } + .table-responsive { - height: 250px; + width: 100%; + height: 240px; overflow-y: scroll; + + .btn { + color: #fff; + text-transform: uppercase; + font-weight: bold; + } + + tr > td { + border-top: 1px solid #ccc; + } + tr:last-child > td { + border-bottom: 1px solid #ccc; + } } .event-tab--icon { font-size: 25px; } + .event-tab--title { font-weight: bold; } diff --git a/src/app/components/navbar/navbar.scss b/src/app/components/navbar/navbar.scss index 585f612..b071a51 100644 --- a/src/app/components/navbar/navbar.scss +++ b/src/app/components/navbar/navbar.scss @@ -1,7 +1,7 @@ .app-navbar { border-bottom: 2px solid #f1f1f1; - margin-bottom: 40px; + margin-bottom: 20px; .navbar { margin-bottom: 0; diff --git a/src/app/pages/inicio/inicio.html b/src/app/pages/inicio/inicio.html index 4753d7e..5f7ec2a 100644 --- a/src/app/pages/inicio/inicio.html +++ b/src/app/pages/inicio/inicio.html @@ -1,50 +1,54 @@ -
-
-
-
-
-
-
-
- - +
+
+
+
+
+
+
+
+
+
+ + +
+
-
- -
+
+ +
-
- + -
-
-
-
-
Carregando conteúdo...
-
+ +
-
-
-
-
- -
-
- +
+
+
+
+ +
+
+ +
-
-
+ +
diff --git a/src/app/pages/inicio/inicio.scss b/src/app/pages/inicio/inicio.scss index a76bb92..d7f111e 100644 --- a/src/app/pages/inicio/inicio.scss +++ b/src/app/pages/inicio/inicio.scss @@ -1,3 +1,7 @@ +.page--inicio { + margin-top: 20px; +} + .section-gray { background-color: $gray; -- libgit2 0.21.2