From c85cfeceaef11bbca60011c3a25a04b9c21e1573 Mon Sep 17 00:00:00 2001 From: Leandro Nunes dos Santos Date: Fri, 5 Jun 2015 08:14:08 -0300 Subject: [PATCH] adding top bar menu --- index.html | 21 +++++++-------------- js/main.js | 1 + sass/style.sass | 2 +- sass/style.scss | 297 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- 4 files changed, 9 insertions(+), 312 deletions(-) delete mode 100755 sass/style.scss diff --git a/index.html b/index.html index 15d9fbb..589fb81 100644 --- a/index.html +++ b/index.html @@ -104,7 +104,13 @@ Entrar Sair -

{{article.title}}

+

+ +
+ Sobre + Programas +
+

{{#social_share "Dialoga Brasil" "Aqui suas ideias viram propostas e você ajuda a melhorar as ações do governo" "#"}}{{/social_share}}
@@ -121,19 +127,6 @@ - -
diff --git a/js/main.js b/js/main.js index 066cf14..00aa0ed 100644 --- a/js/main.js +++ b/js/main.js @@ -271,6 +271,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F // this.randomProposalByTheme(['category-saude', 'category-seguranca-publica', 'category-educacao', 'category-reducao-da-pobreza']); $('.proposal-item').show(); /* Show all programs */ $('#proposal-group').show(); + $('#proposal-categories').show(); $('.proposal-category-items').hide(); $('#nav-proposal-group a').addClass('active'); $('#nav-proposal-categories a').removeClass('active'); diff --git a/sass/style.sass b/sass/style.sass index d26fb83..922e927 100644 --- a/sass/style.sass +++ b/sass/style.sass @@ -337,7 +337,7 @@ td // 6.2 - logo h1 float: left - a + .logo background: url(images/logo.png) no-repeat center display: inline-block height: 80px diff --git a/sass/style.scss b/sass/style.scss deleted file mode 100755 index f78e46d..0000000 --- a/sass/style.scss +++ /dev/null @@ -1,297 +0,0 @@ -@import 'utilities/variables'; - -@import 'nav'; -@import 'header'; -@import 'proposal_categories'; -@import 'proposal_group'; -@import 'proposal_detail'; -@import 'login'; -@import 'footer'; -@import 'accessibility'; -@import 'slick'; -@import 'slick-theme'; -@import 'share'; -@import 'article'; - -@import 'proposal_detail/proposal-detail-base'; -@import 'proposal_detail/urgencia-e-emergencia'; -@import 'proposal_detail/mais-medicos'; -@import 'proposal_detail/brasil-sem-miseria'; - -// Prevent text size change on orientation change. -html { - -webkit-text-size-adjust: 100%; -} - -html, body { - color: #000; - margin: 0; - padding: 0; - height: 100%; - font-family: asap, sans; -} - -h1 { - position: absolute; - bottom: 0; - left: 0; - color: #03316f; - font-size: 28px; - padding: 20px 0; - margin: 0; - display: block; - width: 100%; - text-transform: uppercase; - border-bottom: 1px solid #d6dcd7; - a { - text-decoration: none; - color: #03316f; - } -} - -// #proposal-result { -// width: 90%; -// margin: 0 auto 40px auto; -// } - -#content { - padding-bottom: 50px; - p { - text-align: inherit; - margin: 0; - line-height: inherit; - font-size: inherit; - - font{ - weight: lighter; - size: 14px; - } - } -} - -.hide { - display: none; -} - -.mobile nav { - position: absolute; - bottom: 0; -} - -form { - input, div.label, textarea { - // width: 90%; - margin: 0 auto; - font-size: 14px; - display: block; - padding: 5px; - } - - input, textarea { - color: #000; - border: 1px solid #18376C; - width: 100%; - margin-bottom: 20px; - } - - textarea { - margin-bottom: 10px; - } - - a { - font-size: 14px; - font-weight: bold; - color: #000; - font-weight: bold; - text-decoration: none; - // margin: 10px 20px; - } - - .actions, .oauth { - // text-align: center; - // font-size: 12px; - // margin-top: 10px; - } -} - -// TO_REFACT: -.btn { - display: inline-block; - padding: 0 12px; - margin-bottom: 0; - font-size: 14px; - font-weight: 400; - // line-height: 3.1; - text-align: center; - white-space: nowrap; - vertical-align: middle; - -ms-touch-action: manipulation; - touch-action: manipulation; - cursor: pointer; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - background-image: none; - border: 0; - vertical-align: middle; - /* border-radius: 4px; */ -} - -.btn-default { - color: #fff; - background-color: transparent; - border-color: #ccc; -} - -.ui-helper-hidden-accessible{ - display: none; -} - -// shame hack for issue #72 -@media (max-width: 992px) { - .col-md-6 > img { - margin-bottom: 20px; - } -} - -.captcha{ - display: table; - margin: 20px 0; - position: relative; - width: 100%; - z-index: 1; -} - -@media (max-width: 480px) { - header { - height: auto; - h1 { - border-bottom: 0; - padding-bottom: 0; - padding-top: 0; - position: absolute; - margin-bottom: 0; - top: 2em; - z-index: 1; - } - #display-contrast { - display: inline-block; - margin-bottom: 20px; - margin-top: 10px; - position: relative; - top: 0; - } - } - .social { - &.top { - border-bottom: 1px solid #d6dcd7; - float: none; - margin-top: 3.5em; - margin-bottom: 0; - padding: 0 0 20px; - z-index: 2; - } - } - .select { - .proposal-category { - &:after { - content: ""; - display: block; - clear: both; - } - } - .proposal-selection { - float: none; - margin: 4px 0 0 !important; - width: auto; - } - } - .proposal-header { - .show_body { - a { - display: block !important; - line-height: 1; - } - span { - display: inline !important; - } - } - .abstract { - p { - padding-bottom: 5px !important; - } - } - } -} - -.footable { - &-loaded { - td { - font-weight: 500 !important; - } - } - &-detail { - &-show { - td { - background-color: #ddd !important; - .footable-toggle { - background-color: #ccc - } - } - } - } - &-row { - &-detail { - &-cell { - border-top: 1px solid #ccc !important; - padding: 0 !important; - } - &-inner { - background-color: #ccc; - display: block; - padding: 10px; - width: 100%; - } - &-row { - display: inline-block; - } - &-row:nth-child(2) { - div:nth-child(1) { - background: url(images/icons/icon-afavor.png) no-repeat center top; - text-indent: -99999px; - } - } - &-row:nth-child(3) { - div:nth-child(1) { - background: url(images/icons/icon-contra.png) no-repeat center top; - text-indent: -99999px; - } - } - &-name { - display: block; - padding: 2px 15px; - text-transform: uppercase; - font-size: 16px; - } - &-value { - display: block; - } - } - } - &.breakpoint { - > tbody { - > tr { - > td { - > span { - &.footable-toggle { - float: right; - margin: -10px; - padding: 12px; - } - } - } - } - } - } -} -- libgit2 0.21.2