Download as
Browse Code »

Commit 078e02ebd20f3bcbbce9c4ee6c9ef90623cbf584

Authored by Leandro Santos
2 parents ca4b7063 20e0403f
Exists in bug_fix_vote_action_style

Merge branch 'homepage' into 'master' 

Adding article page style

See merge request !2
Showing 11 changed files with 259 additions and 17 deletions   Show diff stats
@@ -82,7 +82,7 @@ @@ -82,7 +82,7 @@
82 font-family: 'Open Sans' 82 font-family: 'Open Sans'
83 .links-uteis 83 .links-uteis
84 margin: auto 84 margin: auto
85 - padding: 15px 85 + padding: 15px 0px
86 width: 980px 86 width: 980px
87 span 87 span
88 border-right: 1px solid #eee 88 border-right: 1px solid #eee
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 3
4 .header-content 4 .header-content
5 background: #F6F6F6 url('images/faixa_header_internal.png') center center repeat-x 5 background: #F6F6F6 url('images/faixa_header_internal.png') center center repeat-x
6 - height: 227px 6 + height: 277px
7 .action-home-index & 7 .action-home-index &
8 background: #F6F6F6 url('images/banner_header.jpg') center center repeat-x 8 background: #F6F6F6 url('images/banner_header.jpg') center center repeat-x
9 height: 480px 9 height: 480px
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 #header 12 #header
13 #participa-ma-header 13 #participa-ma-header
14 margin: 0 auto 14 margin: 0 auto
15 - max-width: 960px 15 + max-width: 980px
16 16
17 .header-content 17 .header-content
18 #header 18 #header
@@ -64,13 +64,21 @@ @@ -64,13 +64,21 @@
64 display: none 64 display: none
65 .or 65 .or
66 display: none 66 display: none
  67 + .signup a
  68 + padding-right: 0
67 a 69 a
68 border-left: 1px solid #000 70 border-left: 1px solid #000
69 margin: 0 71 margin: 0
70 padding: 0 10px 72 padding: 0 10px
71 text-decoration: none 73 text-decoration: none
72 &#pending-tasks-count 74 &#pending-tasks-count
73 - margin: 0 75 + margin: 0 10px 0 0
  76 + border: none
  77 + padding: 0 5px
  78 + &#logout
  79 + padding-right: 0
  80 + &:nth-last-child(2)
  81 + padding-right: 5px
74 i 82 i
75 display: none 83 display: none
76 strong 84 strong
@@ -106,7 +114,7 @@ @@ -106,7 +114,7 @@
106 li 114 li
107 border-right: 1px solid #000 115 border-right: 1px solid #000
108 display: inline 116 display: inline
109 - &:last-child 117 + &#link-contact
110 border: none 118 border: none
111 a 119 a
112 color: #fff 120 color: #fff
@@ -188,21 +196,22 @@ @@ -188,21 +196,22 @@
188 a 196 a
189 background-repeat: no-repeat 197 background-repeat: no-repeat
190 border: none 198 border: none
191 - height: 20px 199 + border-radius: 4px
  200 + height: 19px
192 opacity: .85 201 opacity: .85
193 padding: 0px 202 padding: 0px
194 display: inline-block 203 display: inline-block
195 - width: 25px 204 + width: 19px
196 span 205 span
197 display: none 206 display: none
198 #sb_face 207 #sb_face
199 background: url('images/icone-branco-facebook.png') left top no-repeat 208 background: url('images/icone-branco-facebook.png') left top no-repeat
200 &:hover, &:focus 209 &:hover, &:focus
201 - background: url('images/icone-branco-facebook.png') left bottom no-repeat 210 + background: url('images/icone-branco-facebook.png') left -20px no-repeat
202 #sb_youtb 211 #sb_youtb
203 background: url('images/icone-branco-youtube.png') left top no-repeat 212 background: url('images/icone-branco-youtube.png') left top no-repeat
204 &:hover, &:focus 213 &:hover, &:focus
205 - background: url('images/icone-branco-youtube.png') left bottom no-repeat 214 + background: url('images/icone-branco-youtube.png') left -20px no-repeat
206 #top-menu 215 #top-menu
207 float: left 216 float: left
208 margin: 0px auto auto 217 margin: 0px auto auto
@@ -217,7 +226,7 @@ @@ -217,7 +226,7 @@
217 float: left 226 float: left
218 font-family: 'Open Sans Bold' 227 font-family: 'Open Sans Bold'
219 font-size: 12px 228 font-size: 12px
220 - padding: 15px 28px 229 + padding: 15px 31px
221 text-decoration: none 230 text-decoration: none
222 text-transform: uppercase 231 text-transform: uppercase
223 &:hover 232 &:hover
@@ -234,7 +243,7 @@ @@ -234,7 +243,7 @@
234 display: none 243 display: none
235 float: right 244 float: right
236 height: 200px 245 height: 200px
237 - margin-top: 40px 246 + margin-top: 60px
238 width: 315px 247 width: 315px
239 .action-home-index & 248 .action-home-index &
240 display: block 249 display: block
_home_page.sass
  Diff comments   View file @078e02e
@@ -28,9 +28,9 @@ @@ -28,9 +28,9 @@
28 font-size: 15px 28 font-size: 15px
29 height: 225px 29 height: 225px
30 left: 60% 30 left: 60%
31 - padding: 0px 50px 31 + padding: 130px 50px
32 position: absolute 32 position: absolute
33 - top: 40% 33 + top: 0
34 width: 331px 34 width: 331px
35 .highlights-block-pager 35 .highlights-block-pager
36 bottom: 30px 36 bottom: 30px
@@ -95,7 +95,7 @@ @@ -95,7 +95,7 @@
95 h2 95 h2
96 margin-bottom: 30px 96 margin-bottom: 30px
97 margin-top: 5px 97 margin-top: 5px
98 - max-height: 62px 98 + max-height: 66px
99 overflow: hidden 99 overflow: hidden
100 padding: 0 20px 100 padding: 0 20px
101 .post-title 101 .post-title
@@ -146,6 +146,7 @@ @@ -146,6 +146,7 @@
146 img 146 img
147 max-width: 235px 147 max-width: 235px
148 max-height: 100px 148 max-height: 100px
  149 + border-radius: 50px
149 .org 150 .org
150 color: #B21B1A 151 color: #B21B1A
151 height: 100px 152 height: 100px
@@ -183,7 +184,7 @@ @@ -183,7 +184,7 @@
183 &:last-child 184 &:last-child
184 margin-right: 0 185 margin-right: 0
185 .title 186 .title
186 - height: 45px 187 + height: 66px
187 overflow: hidden 188 overflow: hidden
188 a 189 a
189 color: #000 190 color: #000
@@ -194,9 +195,18 @@ @@ -194,9 +195,18 @@
194 .published-at 195 .published-at
195 color: #aaa 196 color: #aaa
196 .lead 197 .lead
197 - height: 97px 198 + height: 93px
  199 + font-family: 'Open Sans' !important
  200 + font-size: 14px !important
  201 + font-weight: 300 !important
  202 + line-height: 21px !important
198 overflow: hidden 203 overflow: hidden
199 word-break: break-word 204 word-break: break-word
  205 + em
  206 + font-size: 14px !important
  207 + font-style: normal !important
  208 + font-weight: 300 !important
  209 + line-height: 21px
200 .read_more 210 .read_more
201 text-align: right 211 text-align: right
202 padding-top: 10px 212 padding-top: 10px
@@ -221,6 +231,9 @@ @@ -221,6 +231,9 @@
221 font-family: 'Open Sans' 231 font-family: 'Open Sans'
222 .title 232 .title
223 font-family: 'Open Sans Bold' 233 font-family: 'Open Sans Bold'
  234 + &.toobig::after
  235 + background: none
  236 + color: #FFF
224 a 237 a
225 padding: 5px 0 238 padding: 5px 0
226 &:hover 239 &:hover
@@ -249,7 +262,7 @@ @@ -249,7 +262,7 @@
249 font-family: 'Open Sans Bold' 262 font-family: 'Open Sans Bold'
250 font-size: 24px 263 font-size: 24px
251 font-variant: normal 264 font-variant: normal
252 - margin-bottom: 0px 265 + margin-bottom: 8px
253 a 266 a
254 color: #FFF 267 color: #FFF
255 text-decoration: none 268 text-decoration: none
_internal_page.sass 0 → 100644
  Diff comments   View file @078e02e
@@ -0,0 +1,135 @@ @@ -0,0 +1,135 @@
  1 +#content
  2 + .box-2
  3 + .link-list-block
  4 + background: #FFF
  5 + padding: 15px
  6 + a
  7 + background: none
  8 + color: #777
  9 + font-family: 'Open Sans'
  10 + font-size: 13px
  11 + font-weight: 700
  12 + line-height: 20px
  13 + padding: 3px 5px
  14 + &:hover
  15 + background: none
  16 + color: #b62221
  17 + .block-outer
  18 + &:first-child
  19 + .link-list-block
  20 + margin: 0
  21 + padding-bottom: 1px
  22 + &:nth-of-type(2)
  23 + .link-list-block
  24 + .block-inner-1
  25 + border-top: 1px solid #eee
  26 + padding-top: 10px
  27 + .main-content
  28 + width: 550px
  29 + margin: auto
  30 + padding-top: 0px
  31 + h1
  32 + border-bottom: 1px solid #ddd
  33 + color: #0083CB
  34 + font-family: 'Open Sans Bold'
  35 + font-size: 32px
  36 + margin-top: 0
  37 + margin-bottom: 7px
  38 + padding-bottom: 8px
  39 + .publishing-info
  40 + color: #999
  41 + font-family: 'Open Sans'
  42 + font-size: 12px
  43 + a
  44 + color: #999
  45 + #article
  46 + .article-body
  47 + font-family: 'Open Sans'
  48 + h1, h2, h3, h4
  49 + color: #999
  50 + font-family: 'Open Sans Bold'
  51 + font-size: 18px
  52 + margin-top: 37px
  53 + p
  54 + color: #999
  55 + font-size: 13px
  56 + .vote-actions
  57 + position: absolute
  58 + .action
  59 + &.like-action .like-action-counter
  60 + color: #89ba3f
  61 + font-size: 14px
  62 + font-family: 'Open Sans'
  63 + padding: 0 16px 0 6px
  64 + &.dislike-action .like-action-counter
  65 + border: none
  66 + color: #F68686
  67 + font-size: 14px
  68 + font-family: 'Open Sans'
  69 + .action-icon.like, .action-icon.dislike
  70 + background: url('images/voto_icon1.png') top left no-repeat
  71 + display: block
  72 + float: left
  73 + height: 18px
  74 + width: 17px
  75 + &::before
  76 + content: ''
  77 + .action-icon.dislike
  78 + background: url('images/voto_icon2.png') bottom right no-repeat
  79 + border-left: 1px solid rgba(75,83,94,0.1)
  80 + padding: 4px 6px 0 0
  81 + .event-plugin_event-block
  82 + margin-right: 0
  83 + .block-title
  84 + color: #999
  85 + font-family: 'Open Sans Bold'
  86 + font-size: 18px
  87 + margin-bottom: 10px
  88 + .events
  89 + border-bottom: 1px solid #ddd
  90 + li
  91 + border-top: 1px solid #ddd
  92 + padding: 10px 0
  93 + .date
  94 + background: none
  95 + height: auto
  96 + width: 100%
  97 + span
  98 + background: none
  99 + color: #999
  100 + display: block
  101 + float: left
  102 + font-family: 'Open Sans'
  103 + font-size: 13px
  104 + font-weight: 300
  105 + line-height: 12px
  106 + margin-bottom: 5px
  107 + &.week-day::after
  108 + content: ' - '
  109 + margin: 0 3px
  110 + &.month::after
  111 + content: '.'
  112 + &.day::after
  113 + content: '.'
  114 + .title
  115 + color: #89ba3f
  116 + float: left
  117 + font-family: 'Open Sans Bold'
  118 + font-size: 15px
  119 + margin-bottom: 5px
  120 + max-height: 48px
  121 + &.toobig::after
  122 + background: none
  123 + color: #89ba3f
  124 + position: relative
  125 + .duration
  126 + display: none
  127 + .address
  128 + color: #999
  129 + float: left
  130 + font-size: 13px
  131 +.controller-cms
  132 + #content
  133 + .main-content
  134 + width: auto
  135 +
images/faixa_header_internal.png
View file @078e02e

209 KB | W: | H:

257 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
images/voto_icon1.png 0 → 100644
View file @078e02e

1.13 KB
images/voto_icon2.png 0 → 100644
View file @078e02e

1.15 KB
raw-html-blocks/right-side-bar.html 0 → 100644
  Diff comments   View file @078e02e
@@ -0,0 +1,44 @@ @@ -0,0 +1,44 @@
  1 +<div id="banner-button">
  2 +<h2>Consultas Públicas</h2> <h3>2015-2016</h3>
  3 +<a class="button-read" href="/consultas-publicas-2015-2016"><span>Leia mais!</span></a>
  4 +</div>
  5 +
  6 +<style>
  7 +#banner-button{
  8 + background: #FFF;
  9 + padding: 10px;
  10 +}
  11 +
  12 +#content #banner-button h2{
  13 + color: #000;
  14 + font-family: 'Open Sans Bold';
  15 + font-size: 22px;
  16 + line-height: 28px;
  17 + margin: 0 5px;
  18 +}
  19 +
  20 +#content #banner-button h3{
  21 + color: #000;
  22 + font-family: 'Open Sans Light';
  23 + font-size: 20px;
  24 + font-weight: 100;
  25 + margin: 3px 5px 10px;
  26 +}
  27 +
  28 +#content #banner-button a.button-read{
  29 + background: #89ba3f;
  30 + border-radius: 5px;
  31 + border: none;
  32 + color: #FFF;
  33 + display: block;
  34 + font-family: 'Open Sans Extrabold';
  35 + font-size: 16px;
  36 + padding: 15px;
  37 + text-decoration: none;
  38 + text-align: center;
  39 +}
  40 +
  41 +#banner-button a.button-read span{
  42 + display: block;
  43 +}
  44 +</style>
raw-html-blocks/see-all.html 0 → 100644
  Diff comments   View file @078e02e
@@ -0,0 +1,24 @@ @@ -0,0 +1,24 @@
  1 +v class="read-more-news">
  2 +<a href="/portal/blog">Ver todas</a>
  3 +</div>
  4 +
  5 +<style>
  6 +#content .read-more-news{
  7 + float: right;
  8 + margin-right: 10px;
  9 +}
  10 +#content .read-more-news a{
  11 + color: #89ba3f;
  12 + display: block;
  13 + font-family: "Open Sans Bold";
  14 + font-size: 14px;
  15 + text-decoration: none;
  16 + padding-top: 10px;
  17 +}
  18 +</style>
  19 +
  20 +<script>
  21 +jQuery(function($) {
  22 +$('.read-more-news').appendTo('#content .main-block h1');
  23 +});
  24 +</script>
@@ -61,6 +61,9 @@ body @@ -61,6 +61,9 @@ body
61 #content 61 #content
62 margin-top: 10px 62 margin-top: 10px
63 @import home_page 63 @import home_page
  64 +
  65 +.profile-type-is-community
  66 + @import internal_page
64 67
65 #footer 68 #footer
66 background: url('images/faixa_cores.png') center bottom repeat 69 background: url('images/faixa_cores.png') center bottom repeat
theme.js 0 → 100644
  Diff comments   View file @078e02e
@@ -0,0 +1,14 @@ @@ -0,0 +1,14 @@
  1 +jQuery( document ).ready(function( $ ) {
  2 + // Run code
  3 + if($.cookie("high_contrast") === 'true'){
  4 + $( "body" ).toggleClass( "contraste" );
  5 + }
  6 + $( "#siteaction-contraste a" ).click(function() {
  7 + $( "body" ).toggleClass( "contraste" );
  8 + if($('body').hasClass('contraste')){
  9 + $.cookie('high_contrast', 'true', {path: '/'});
  10 + } else {
  11 + $.cookie('high_contrast', null, { path: '/' });
  12 + }
  13 + });
  14 +});