From f497cb1c9674f326af8e509a21ec0e0ad4d75a90 Mon Sep 17 00:00:00 2001 From: augustoalmeida Date: Tue, 2 Jun 2015 20:04:33 -0300 Subject: [PATCH] Proposal-box fixed --- js/handlebars-helpers.js | 2 +- novo.css | 26 ++++++++++++++++---------- sass/novo.sass | 24 +++++++++++++++--------- 3 files changed, 32 insertions(+), 20 deletions(-) diff --git a/js/handlebars-helpers.js b/js/handlebars-helpers.js index 2bff822..b6f35ce 100644 --- a/js/handlebars-helpers.js +++ b/js/handlebars-helpers.js @@ -35,7 +35,7 @@ define(['handlebars'], function(Handlebars){ if(element == ''){ continue; } - category = category + '' + '
' + 'Imagem de apresentação do programa.' + proposal.title + (proposal.abstract ? proposal.abstract : '') + '
'; + category = category + '' + '
' + 'Imagem de apresentação do programa.' + proposal.title + (proposal.abstract ? proposal.abstract : '') + 'OPINE NESTE PROGRAMA
'; // element = element + options.fn(proposal); element = element + category; diff --git a/novo.css b/novo.css index b4a5e6a..0766821 100644 --- a/novo.css +++ b/novo.css @@ -51,7 +51,8 @@ blockquote { display: none; } .button, .button-cancela, .login input.button, .signup input.button { - border-bottom: 3px solid #000; + background-color: #387bf9; + border-bottom: 3px solid #0751de; border-left: 0; border-right: 0; border-top: 0; @@ -59,7 +60,7 @@ blockquote { color: #fff; cursor: pointer; display: block; - font-size: 16px; + font-size: 14px; font-weight: 700; padding-bottom: 15px; padding-left: 0; @@ -68,7 +69,7 @@ blockquote { text-align: center; transition: all 400ms; } .button:hover, .button-cancela:hover, .login input.button:hover, .signup input.button:hover { - background-color: black; + background-color: #0751de; text-decoration: none; } .button:hover, .button-cancela:hover, .login input.button:hover, .signup input.button:hover, .button:focus, .button-cancela:focus, .login input.button:focus, .signup input.button:focus { color: #fff; } @@ -308,9 +309,8 @@ h1 { border-radius: 3px; color: #000; display: block; - height: 200px; margin-top: 30px; - overflow: auto; + overflow: hidden; transition: all 400ms; transition: all 400ms; } .box:hover { @@ -319,7 +319,6 @@ h1 { .box:hover { text-decoration: none; } .box p { - border-bottom: 1px dotted #000; padding-bottom: 15px; } .box-propostas { height: auto; @@ -337,14 +336,21 @@ h1 { border-bottom: 0; padding-bottom: inherit; } .box-header { - color: #335277; - font-family: asap, sans; - font-size: 24px; + color: #000; + font-size: 18px; font-weight: 700; } .box-header p { - font-size: 14px; } + font-size: 14px; + font-weight: 500; + margin-top: 10px; } .box-body { padding: 20px; } + .box-body img { + margin-left: -20px; + margin-right: -20px; + margin-top: -20px; + margin-bottom: 20px; + max-width: 120%; } .box-category { font-size: 14px; font-weight: 700; diff --git a/sass/novo.sass b/sass/novo.sass index ce737a1..d6c99b3 100644 --- a/sass/novo.sass +++ b/sass/novo.sass @@ -139,7 +139,8 @@ blockquote display: none .button - border-bottom: 3px solid #000 + background-color: #387bf9 + border-bottom: 3px solid darken(#387bf9, $darken) border-left: 0 border-right: 0 border-top: 0 @@ -147,14 +148,14 @@ blockquote color: #fff cursor: pointer display: block - font-size: $font-size-base + font-size: $font-size-small font-weight: 700 padding-bottom: $gutter * 0.75 padding-left: 0 padding-right: 0 padding-top: $gutter * 0.75 text-align: center - +hover(#000,$darken) + +hover(#387bf9,$darken) &:hover, &:focus color: #fff &-inline @@ -390,15 +391,13 @@ h1 border-radius: $radius color: #000 display: block - height: 200px margin-top: $gutter * 1.5 - overflow: auto + overflow: hidden transition: all 400ms +hover(#fff,$darken) &:hover text-decoration: none p - border-bottom: 1px dotted #000 padding-bottom: $gutter * 0.75 &-propostas height: auto @@ -418,14 +417,21 @@ h1 border-bottom: 0 padding-bottom: inherit &-header - color: $link-color - font-family: asap, sans - font-size: $theme-size-header + color: #000 + font-size: $font-size-big font-weight: 700 p font-size: $font-size-small + font-weight: 500 + margin-top: $gutter * 0.5 &-body padding: $gutter + img + margin-left: $gutter * (-1) + margin-right: $gutter * (-1) + margin-top: $gutter * (-1) + margin-bottom: $gutter + max-width: 120% &-category font-size: $font-size-small font-weight: 700 -- libgit2 0.21.2