Download as
Browse Code »

Commit 91b68ef5d81055874d4d5b0d56b6e2b7c41f036a

Authored by Leonardo Merlin
2 parents 8f7ca864 8a538569
Exists in master and in 8 other branches css-list, feature-captcha, feature-proposal-vote, feature-respostas, production, rafael, staging, the_glorious_return_of_piwik

Merge branch 'rafael' into merlin 

Conflicts:
	src/app/components/proposal-list/proposal-list.html
Showing 5 changed files with 203 additions and 8 deletions   Show diff stats
src/app/components/proposal-list/proposal-list.html
  Diff comments   View file @91b68ef
... ... @@ -41,21 +41,19 @@
41 41 </table>
42 42 <nav>
43 43 <ul class="pagination">
44   -
45 44 <li ng-class="{ 'disabled' : vm.currentPageIndex == 0}">
46   - <a href="#" aria-label="Previous" ng-click="vm.showPage(vm.currentPageIndex-1)">
47   - <span aria-hidden="true">&laquo;</span>
  45 + <a class="btn-pagination" href="#" aria-label="Previous" ng-click="vm.showPage(vm.currentPageIndex-1)">
  46 + <span aria-hidden="true" class="glyphicon glyphicon-chevron-left pagination-icon"></span>
48 47 </a>
49 48 </li>
50   - <li ng-repeat="pagina in vm.arraypages track by $index" ng-class="{ 'active' : ($index) == vm.currentPageIndex }" >
51   - <a href="#" ng-click="vm.showPage($index)">{{::($index)+1}}</a>
  49 + <li ng-repeat="paginas in vm.arraypages track by $index" ng-class="{ 'active' : ($index) == vm.currentPageIndex }" >
  50 + <a class="btn-pagination" href="#" ng-click="vm.showPage($index)">{{::($index)+1}}</a>
52 51 </li>
53 52 <li ng-class="{ 'disabled' : vm.currentPageIndex == (vm.arraypages.length -1)}">
54   - <a href="#" aria-label="Next" ng-click="vm.showPage(vm.currentPageIndex+1)">
55   - <span aria-hidden="true">&raquo;</span>
  53 + <a class="btn-pagination" href="#" aria-label="Next" ng-click="vm.showPage(vm.currentPageIndex+1)">
  54 + <span aria-hidden="true" class="glyphicon glyphicon-chevron-right pagination-icon"></span>
56 55 </a>
57 56 </li>
58   -
59 57 </ul>
60 58 </nav>
61 59 </div>
... ...
src/app/components/proposal-list/proposal-list.scss
  Diff comments   View file @91b68ef
... ... @@ -79,4 +79,42 @@
79 79 background-color: #eaeaea;
80 80 }
81 81 }
  82 +
  83 + .btn-pagination {
  84 + background-color: transparent;
  85 + border: none;
  86 + border-radius: 100%;
  87 + font-weight: bold;
  88 + font-size: 20px;
  89 + padding: 0px 8px;
  90 + width: 28px;
  91 + height: 28px;
  92 + text-decoration: underline;
  93 + color: $defaultblue;
  94 + }
  95 +
  96 + .pagination-icon {
  97 + color: $defaultblue;
  98 + }
  99 +
  100 + .pagination > .active > a,
  101 + .pagination > .active > a:hover,
  102 + .pagination > .active > a:focus,
  103 + .pagination > .active > span,
  104 + .pagination > .active > span:hover,
  105 + .pagination > .active > span:focus {
  106 + background-color: $defaultblue;
  107 + text-decoration: none;
  108 +
  109 + }
  110 +
  111 + .pagination > .disabled > span,
  112 + .pagination > .disabled > span:hover,
  113 + .pagination > .disabled > span:focus,
  114 + .pagination > .disabled > a,
  115 + .pagination > .disabled > a:hover,
  116 + .pagination > .disabled > a:focus {
  117 + background-color: transparent;
  118 + }
  119 +
82 120 }
... ...
src/app/index.route.js
  Diff comments   View file @91b68ef
... ... @@ -203,6 +203,15 @@
203 203 'footer': { templateUrl: 'app/pages/footer/footer.html' }
204 204 }
205 205 })
  206 + .state('mapa', {
  207 + url: '/mapa',
  208 + ncyBreadcrumb: {label: 'Mapa'},
  209 + views: {
  210 + 'header': { templateUrl: 'app/pages/header/header.html' },
  211 + 'main': { templateUrl: 'app/pages/mapa/mapa.html' },
  212 + 'footer': { templateUrl: 'app/pages/footer/footer.html' }
  213 + }
  214 + })
206 215 ;
207 216  
208 217 $urlRouterProvider.otherwise('/erro');
... ...
src/app/pages/mapa/mapa.html 0 → 100644
  Diff comments   View file @91b68ef
... ... @@ -0,0 +1,136 @@
  1 +<div class="container">
  2 + <div class="row">
  3 + <div class="col-sm-11 col-sm-offset-1">
  4 + <h2>Mapa do Site</h2>
  5 + <p>Uma visão geral do conteúdo disponível no site.</p>
  6 + </div>
  7 + </div>
  8 +</div>
  9 +
  10 +<div class="page--mapa">
  11 + <div class="container">
  12 + <div class="row margin-mapa">
  13 + <div class="col-sm-11 col-sm-offset-1">
  14 + <h3 class="font-mapa">Sobre o Dialoga</h3>
  15 +
  16 + <div class="row margin-mapa">
  17 + <h3 class="font-mapa">Programas</h3>
  18 + <div class="col-sm-6">
  19 + <h4 class="font-mapa">Ttulo do tema</h4>
  20 + <ul>
  21 + <li>Titulo do programa</li>
  22 + <li>Titulo do programa</li>
  23 + <li>Titulo do programa</li>
  24 + <li>Titulo do programa</li>
  25 + </ul>
  26 + <h4 class="font-mapa">Ttulo do tema</h4>
  27 + <ul>
  28 + <li>Titulo do programa</li>
  29 + <li>Titulo do programa</li>
  30 + <li>Titulo do programa</li>
  31 + <li>Titulo do programa</li>
  32 + </ul>
  33 + <h4 class="font-mapa">Ttulo do tema</h4>
  34 + <ul>
  35 + <li>Titulo do programa</li>
  36 + <li>Titulo do programa</li>
  37 + <li>Titulo do programa</li>
  38 + <li>Titulo do programa</li>
  39 + </ul>
  40 + </div>
  41 + </div>
  42 + <div class="row margin-mapa">
  43 + <h3 class="font-mapa">Propostas</h3>
  44 + <div class="col-sm-6">
  45 + <h4 class="font-mapa"></h4>
  46 + <ul>
  47 + <li></li>
  48 + </ul>
  49 + <h4 class="font-mapa"></h4>
  50 + <ul>
  51 + <li></li>
  52 + </ul>
  53 + <h4 class="font-mapa"></h4>
  54 + <ul>
  55 + <li></li>
  56 + </ul>
  57 + </div>
  58 + </div>
  59 + <div class="row margin-mapa">
  60 + <h3 class="font-mapa">Ranking</h3>
  61 + <div class="col-sm-6">
  62 + <h4 class="font-mapa"></h4>
  63 + <ul>
  64 + <li></li>
  65 + </ul>
  66 + <h4 class="font-mapa"></h4>
  67 + <ul>
  68 + <li></li>
  69 + </ul>
  70 + <h4 class="font-mapa"></h4>
  71 + <ul>
  72 + <li></li>
  73 + </ul>
  74 + </div>
  75 + </div>
  76 + <div class="row margin-mapa">
  77 + <h3 class="font-mapa">Dúvidas e sugestões</h3>
  78 + <div class="col-sm-6">
  79 + <h4 class="font-mapa"></h4>
  80 + <ol>
  81 + <li>O que é o Dialoga Brasil?</li>
  82 + <li>O que são Programas?</li>
  83 + <li>O que são Propostas</li>
  84 + <li>Quem pode criar propostas e votar nelas?</li>
  85 + <li>O que acontece com as melhores propostas?</li>
  86 + </ol>
  87 + </div>
  88 + </div>
  89 + <div class="row margin-mapa">
  90 + <h3 class="font-mapa">Entrar</h3>
  91 + <div class="col-sm-6">
  92 + <h4 class="font-mapa"></h4>
  93 + <ul>
  94 + <li></li>
  95 + </ul>
  96 + <h4 class="font-mapa"></h4>
  97 + <ul>
  98 + <li></li>
  99 + </ul>
  100 + <h4 class="font-mapa"></h4>
  101 + <ul>
  102 + <li></li>
  103 + </ul>
  104 + </div>
  105 + </div>
  106 + <div class="row margin-mapa">
  107 +
  108 +
  109 + <h3 class="font-mapa">Dialoga nas redes</h3>
  110 + <div class="col-sm-6">
  111 + <h4 class="font-mapa"></h4>
  112 + <ul>
  113 + <li>Rede 1</li>
  114 + <li>Rede 2</li>
  115 + <li>Rede 3</li>
  116 + <li>Rede 4</li>
  117 + </ul>
  118 + </div>
  119 + </div>
  120 + <div class="row margin-mapa">
  121 +
  122 + <h3 class="font-mapa">Compartilhar</h3>
  123 + <div class="col-sm-6">
  124 + <h4 class="font-mapa"></h4>
  125 + <ul>
  126 + <li>Rede 1</li>
  127 + <li>Rede 2</li>
  128 + <li>Rede 3</li>
  129 + <li>Rede 4</li>
  130 + </ul>
  131 + </div>
  132 + </div>
  133 +
  134 + </div>
  135 + </div>
  136 + <button type="button" class="btn btn-link" ui-sref="inicio">retornar à página inicial</button>
... ...
src/app/pages/mapa/mapa.scss 0 → 100644
  Diff comments   View file @91b68ef
... ... @@ -0,0 +1,14 @@
  1 +.page--mapa {
  2 + background-color: #f9f9f9;
  3 +
  4 + .font-mapa {
  5 + color: $defaultblue;
  6 + font-weight: 600;
  7 + }
  8 +
  9 + .margin-mapa {
  10 + margin-left: 0px;
  11 + margin-right: 0px;
  12 + }
  13 +
  14 +}
... ...