From c4e9487ee7aabb7a694f4ba6e6800a70f0af6754 Mon Sep 17 00:00:00 2001 From: Leandro Nunes dos Santos Date: Mon, 20 Apr 2015 12:08:09 -0300 Subject: [PATCH] refactoring proposal detail --- index.html | 6 +++++- js/main.js | 10 ++++++++++ sass/programas/mais-medicos.scss | 3 --- sass/programas/saude-rue.scss | 112 ---------------------------------------------------------------------------------------------------------------- sass/programas/sinesp.scss | 3 --- sass/proposal_detail/_proposal-detail-base.scss | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ sass/proposal_detail/urgencia-e-emergencia.scss | 3 +++ sass/style.scss | 6 ++---- 8 files changed, 132 insertions(+), 123 deletions(-) delete mode 100644 sass/programas/mais-medicos.scss delete mode 100644 sass/programas/saude-rue.scss delete mode 100644 sass/programas/sinesp.scss create mode 100644 sass/proposal_detail/_proposal-detail-base.scss create mode 100644 sass/proposal_detail/urgencia-e-emergencia.scss diff --git a/index.html b/index.html index de26727..0fa41e1 100644 --- a/index.html +++ b/index.html @@ -90,8 +90,12 @@
Conheça o Programa
-
+
{{{body}}} +
+
Agora contribua para a melhoria desse programa +
+
diff --git a/js/main.js b/js/main.js index 8bd27ae..5cee603 100644 --- a/js/main.js +++ b/js/main.js @@ -96,6 +96,9 @@ $.getJSON(noosferoAPI) $( '.show_body a' ).click(function(event){ display_proposal_detail(); }); + $( '.go-to-proposal-button a' ).click(function(event){ + display_proposal(this.href.split('#').pop()); + }); $( '.proposal-selection' ).change(function(event){ display_proposal('proposal-item-' + this.value); }); @@ -254,7 +257,14 @@ function display_proposal(proposal_id){ $('.login-container').hide(); $('.proposal-detail').hide(); + $('.proposal-detail-base').hide(); $('#' + proposal_id).show(); + $('.proposal-header').show(); + $('.make-proposal-container').show(); + $('.support-proposal-container').show(); + $('.results-container').show(); + $('.experience-proposal-container').show(); + $('.talk-proposal-container').show(); var topic_id = proposal_id.split('-').pop(); loadRandomProposal(topic_id, private_token); diff --git a/sass/programas/mais-medicos.scss b/sass/programas/mais-medicos.scss deleted file mode 100644 index 2eff2e3..0000000 --- a/sass/programas/mais-medicos.scss +++ /dev/null @@ -1,3 +0,0 @@ -.mais-medicos{ - background-color: red; -} diff --git a/sass/programas/saude-rue.scss b/sass/programas/saude-rue.scss deleted file mode 100644 index 212512d..0000000 --- a/sass/programas/saude-rue.scss +++ /dev/null @@ -1,112 +0,0 @@ -// @import "../utilities/variables"; - -@each $category, $color in $categories { - .#{$category}{ - font-family: 'Open Sans', sans-serif; - font-size: 16px; - font-weight: 300; - h2 { - border-bottom: 1px solid #eeeff1; - color: $color; - font-size: 38px; - font-weight: 300; - padding-bottom: .5em; - text-transform: uppercase; - small { - display: block; - font-size: 16px; - font-weight: 300; - margin-top: -.5em; - text-transform: none; - } - } - h3 { - color: $color; - font-size: 28px; - font-weight: 300; - text-transform: uppercase; - } - img { - &.pull-left { - margin-right: 20px; - } - &.pull-right { - margin-left: 20px; - } - } - blockquote { - border-bottom: 5px solid $color; - border-top: 5px solid $color; - margin-left: 0; - margin-right: 0; - p { - font-size: 30px; - } - } - ul { - li { - border-bottom: 1px solid #e0e0e0; - color: $color; - font-size: 18px; - font-weight: 700; - padding-bottom: 1em; - padding-top: 1em; - &:last-child { - border-bottom: none; - } - } - &.list-unstyled { - list-style: none; - } - } - .row { - font-size: 0; - &:after { - display: block; - height: 0px; - content: ""; - clear: both; - visibility: hidden; - } - .column { - display: inline-block; - font-size: 1rem; - vertical-align: top; - width: 6.25%; - } - &[class*="two column"] { - .column { - width: 50%; - } - } - } - .slide-01 { - img { - display: block; - margin: auto; - } - } - .grafico { - img { - display: block; - margin: auto; - } - } - .slide-02 { - - } - .btn-envie-proposta a { - background: $color; - border-radius: 3px; - color: #fff; - display: block; - padding: 1em; - text-align: center; - text-decoration: none; - text-transform: uppercase; - .fa-reply { - margin-right: .7em; - } - } - } -} \ No newline at end of file diff --git a/sass/programas/sinesp.scss b/sass/programas/sinesp.scss deleted file mode 100644 index 0350945..0000000 --- a/sass/programas/sinesp.scss +++ /dev/null @@ -1,3 +0,0 @@ -.sinesp{ - background-color: blue; -} diff --git a/sass/proposal_detail/_proposal-detail-base.scss b/sass/proposal_detail/_proposal-detail-base.scss new file mode 100644 index 0000000..f3e1d4f --- /dev/null +++ b/sass/proposal_detail/_proposal-detail-base.scss @@ -0,0 +1,112 @@ +// @import "../utilities/variables"; + +@each $category, $color in $categories { + .#{$category} .proposal-detail-base{ + font-family: 'Open Sans', sans-serif; + font-size: 16px; + font-weight: 300; + h2 { + border-bottom: 1px solid #eeeff1; + color: $color; + font-size: 38px; + font-weight: 300; + padding-bottom: .5em; + text-transform: uppercase; + small { + display: block; + font-size: 16px; + font-weight: 300; + margin-top: -.5em; + text-transform: none; + } + } + h3 { + color: $color; + font-size: 28px; + font-weight: 300; + text-transform: uppercase; + } + img { + &.pull-left { + margin-right: 20px; + } + &.pull-right { + margin-left: 20px; + } + } + blockquote { + border-bottom: 5px solid $color; + border-top: 5px solid $color; + margin-left: 0; + margin-right: 0; + p { + font-size: 30px; + } + } + ul { + li { + border-bottom: 1px solid #e0e0e0; + color: $color; + font-size: 18px; + font-weight: 700; + padding-bottom: 1em; + padding-top: 1em; + &:last-child { + border-bottom: none; + } + } + &.list-unstyled { + list-style: none; + } + } + .row { + font-size: 0; + &:after { + display: block; + height: 0px; + content: ""; + clear: both; + visibility: hidden; + } + .column { + display: inline-block; + font-size: 1rem; + vertical-align: top; + width: 6.25%; + } + &[class*="two column"] { + .column { + width: 50%; + } + } + } + .slide-01 { + img { + display: block; + margin: auto; + } + } + .grafico { + img { + display: block; + margin: auto; + } + } + .slide-02 { + + } + .go-to-proposal-button a { + background: $color; + border-radius: 3px; + color: #fff; + display: block; + padding: 1em; + text-align: center; + text-decoration: none; + text-transform: uppercase; + .fa-reply { + margin-right: .7em; + } + } + } +} diff --git a/sass/proposal_detail/urgencia-e-emergencia.scss b/sass/proposal_detail/urgencia-e-emergencia.scss new file mode 100644 index 0000000..8a7214e --- /dev/null +++ b/sass/proposal_detail/urgencia-e-emergencia.scss @@ -0,0 +1,3 @@ +.urgencia-e-emergencia { + +} diff --git a/sass/style.scss b/sass/style.scss index fec0649..d336d3b 100755 --- a/sass/style.scss +++ b/sass/style.scss @@ -29,10 +29,8 @@ @import 'footer'; @import 'font-awesome/scss/font-awesome'; -//Importando Programas -@import 'programas/mais-medicos'; -@import 'programas/sinesp'; -@import 'programas/saude-rue'; +@import 'proposal_detail/proposal-detail-base'; +@import 'proposal_detail/urgencia-e-emergencia'; html, body { margin: 0; -- libgit2 0.21.2