diff --git a/src/app/components/article-box/article-box.scss b/src/app/components/article-box/article-box.scss index 4f93d93..17d0dd9 100644 --- a/src/app/components/article-box/article-box.scss +++ b/src/app/components/article-box/article-box.scss @@ -129,6 +129,10 @@ $article-box-space: 20px; transition: all $time ease-in-out; } + .button--themed { + padding: 20px; + } + &:hover { background-color: #d9d9d9; diff --git a/src/app/components/article-content/article-content.directive.js b/src/app/components/article-content/article-content.directive.js deleted file mode 100644 index e69de29..0000000 --- a/src/app/components/article-content/article-content.directive.js +++ /dev/null diff --git a/src/app/components/article-content/article-content.scss b/src/app/components/article-content/article-content.scss deleted file mode 100644 index 6568688..0000000 --- a/src/app/components/article-content/article-content.scss +++ /dev/null @@ -1,15 +0,0 @@ -.article-content { - h2 { - font-size: 38px; - font-weight: 500; - margin-bottom: 40px; - padding-bottom: 20px; - - small { - display: block; - font-size: 16px; - padding-top: 5px; - text-transform: none; - } - } -} diff --git a/src/app/components/category-list/category-list.scss b/src/app/components/category-list/category-list.scss index dcb03a0..b64a21c 100644 --- a/src/app/components/category-list/category-list.scss +++ b/src/app/components/category-list/category-list.scss @@ -37,7 +37,7 @@ top: 10px; left: 10px; // border: 1px solid #fff; - border-radius: 48px; + border-radius: 100%; -webkit-transition: -webkit-transform 0.2s ease-in-out; -moz-transition: -moz-transform 0.2s ease-in-out; diff --git a/src/app/components/proposal-ranking/proposal-ranking.directive.js b/src/app/components/proposal-ranking/proposal-ranking.directive.js new file mode 100644 index 0000000..e3985c6 --- /dev/null +++ b/src/app/components/proposal-ranking/proposal-ranking.directive.js @@ -0,0 +1,59 @@ +(function() { + 'use strict'; + + angular + .module('dialoga') + .directive('proposalRanking', proposalRanking); + + /** @ngInject */ + function proposalRanking($rootScope) { + + /** @ngInject */ + function ProposalRankingController(ArticleService, $scope, $log) { + $log.debug('ProposalRankingController'); + + var vm = this; + vm.ArticleService = ArticleService; + vm.$scope = $scope; + vm.$log = $log; + + vm.init(); + } + + ProposalRankingController.prototype.init = function () { + // initial values + var vm = this; + + vm.loadData(); + }; + + ProposalRankingController.prototype.loadData = function () { + // async values + // var vm = this; + + }; + + ProposalRankingController.prototype.showProposals = function () { + var vm = this; + + // notify parents + vm.$scope.$emit('see-proposals'); + }; + + var directive = { + restrict: 'E', + templateUrl: 'app/components/proposal-ranking/proposal-ranking.html', + scope: { + limit: '=', + display: '=' + }, + controller: ProposalRankingController, + controllerAs: 'vm', + bindToController: true + }; + + + return directive; + } + +})(); diff --git a/src/app/components/proposal-ranking/proposal-ranking.html b/src/app/components/proposal-ranking/proposal-ranking.html new file mode 100644 index 0000000..97f188f --- /dev/null +++ b/src/app/components/proposal-ranking/proposal-ranking.html @@ -0,0 +1,27 @@ +
+
+
+
+ 1º + Lugar +
+
+
    +
  • +
  • +
  • +
+
+
+
+
+

Lorem ipsum dolor sit amet, an qui alia constituam. Forensibus scripserit pri at, sit et dolorum ancillae. Ad sea quas utamur salutandi, illud veritus propriae mea ut. Ius no timeam intellegat liberavisse, eum suscipit pertinax ad. Illum graeci postulant et pro, at clita facete quo, cibo liber ad pri.

+
+
+
+
+ +
+
+
+
diff --git a/src/app/components/proposal-ranking/proposal-ranking.scss b/src/app/components/proposal-ranking/proposal-ranking.scss new file mode 100644 index 0000000..f497d2e --- /dev/null +++ b/src/app/components/proposal-ranking/proposal-ranking.scss @@ -0,0 +1,14 @@ +.proposal-ranking { + // both: carousel and list +} + +.proposal-ranking--carousel { + background-color: #eee; + + .proposal-ranking--carousel-top { + color: #fff; + font-weight: bold; + font-size: 18px; + padding: 5px 10px; + } +} diff --git a/src/app/index.run.js b/src/app/index.run.js index 65821bf..03de84b 100644 --- a/src/app/index.run.js +++ b/src/app/index.run.js @@ -9,6 +9,7 @@ .run(runHistory) .run(runPath) .run(runColorUtils) + .run(runUtils) .run(runBlock); /** @ngInject */ @@ -147,6 +148,13 @@ } /** @ngInject */ + function runUtils($rootScope) { + $rootScope.stripHtml = function (text) { + return String(text).replace(/<[^>]+>/gm, ''); + }; + } + + /** @ngInject */ function runBlock($log) { $log.debug('[RUN] Block end.'); } diff --git a/src/app/index.scss b/src/app/index.scss index e4bf1ea..46436cf 100644 --- a/src/app/index.scss +++ b/src/app/index.scss @@ -49,7 +49,7 @@ body { // Commons .button--themed { - padding: 20px; + // padding: 20px; .btn { color: #fff; font-weight: bold; @@ -132,6 +132,25 @@ body { } } +.icon-wrapper-rounded { + padding: 3px; + border-radius: 100%; +} + +// Theme +@each $category, $color in $categories { + .#{$category} { + .color-theme-fg { + color: $color; + } + + .color-theme-bg { + background-color: $color; + } + } +} + + // Hack to fix "Barra do Brasil" #barra-brasil .brasil-flag { height: 33px !important; diff --git a/src/app/pages/programas/programa-content.controller.js b/src/app/pages/programas/programa-content.controller.js index 41c4aa1..9fa3431 100644 --- a/src/app/pages/programas/programa-content.controller.js +++ b/src/app/pages/programas/programa-content.controller.js @@ -25,25 +25,31 @@ var vm = this; var params = vm.$state.params; - var slug = params.slug; vm.article = null; - vm.categories = null; - vm.currentCategory = null; + vm.category = null; vm.loading = true; vm.error = false; + vm.slug = params.slug; - vm.ArticleService.getCategories(function(categories){ - vm.categories = categories; - }, function (error) { - vm.error = error; - vm.$log.error(error); - }); + vm.loadData(); + }; - vm.ArticleService.getArticleBySlug(slug, function(article){ + ProgramaContentPageController.prototype.loadData = function () { + var vm = this; + + vm.ArticleService.getArticleBySlug(vm.slug, function(article){ vm.article = article; + vm.category = vm.article.categories[0]; + vm.$rootScope.contentTitle = vm.article.title; - vm.currentCategory = vm.article.categories[0]; + + if(!vm.banner){ + vm.banner = { + src: vm.$rootScope.basePath + vm.article.image.url, + alt: 'Imagem de destaque do conteúdo' + }; + } vm.loadContent(); @@ -70,13 +76,9 @@ vm.loading = false; }; - ProgramaContentPageController.prototype.goToPreview = function () { + ProgramaContentPageController.prototype.makeProposal = function () { var vm = this; - vm.$state.go('programa', { - slug: vm.article.slug - }, { - location: true - }); + vm.$log.warn('Not implemented yet: "makeProposal"'); }; })(); diff --git a/src/app/pages/programas/programa.html b/src/app/pages/programas/programa.html index ca012d4..1d08091 100644 --- a/src/app/pages/programas/programa.html +++ b/src/app/pages/programas/programa.html @@ -8,9 +8,59 @@ -
+
+
+
+
+

{{::pageProgramaContent.article.title}}

+
+
+
+
+
+
+ +
+
+

{{::stripHtml(pageProgramaContent.article.abstract)}}

+
+
+

Lorem ipsum dolor sit amet, ea veniam mucius ocurreret vix, ius ex nisl vidisse partiendo. Blandit nominavi cum ei, paulo quaestio his ei, eum minim salutandi in. Civibus albucius in quo, et eam posse facilisis. Debet suavitate sea ut, his ei feugiat fastidii eleifend. Quo ex quando maiestatis voluptatum, mel te perpetua maiestatis, sit ceteros legendos deserunt ea. Enim dolores moderatius eu pro, ad quo ignota aliquid meliore.

+
+ +
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+

Propostas mais votadas

+ +
+
+

Propostas nesse programa

+ +
+
+
+
+
-
+
diff --git a/src/app/pages/programas/programas.scss b/src/app/pages/programas/programas.scss index 95808ac..0d7712f 100644 --- a/src/app/pages/programas/programas.scss +++ b/src/app/pages/programas/programas.scss @@ -7,3 +7,52 @@ } } +.program-preview { + + .program-preview--box { + position: relative; + background: #eee; + } + + .program-preview--banner { + width: 100%; + height: 400px; + + background-position: center; + background-size: cover; + background-repeat: no-repeat; + } + + .program-preview--icon { + $icon-size: 98px; + $icon-scale: 0.7; + position: absolute; + top: (-1) * ($icon-size / 2); + left: 40px; + + width: $icon-size * $icon-scale + 20px; + height: $icon-size * $icon-scale + 20px; + + .icon { + display: block; + position: relative; + top: -8px; + left: -6px; + transform: scale($icon-scale); + } + } + + .program-preview--box--content-wrapper { + padding: 40px; + position: relative; + } + + h2, + h3{ + font-weight: bold; + } + + h3 { + margin-top: 0; + } +} -- libgit2 0.21.2