Commit e13e253f82307422c5109196e734336165655009
Exists in
master
and in
3 other branches
Merge branch 'master' of https://gitlab.com/participa/participa-theme
Conflicts: theme.js
Showing
11 changed files
with
121 additions
and
23 deletions
Show diff stats
... | ... | @@ -0,0 +1,24 @@ |
1 | +@import url(../base/errors.css); | |
2 | + | |
3 | +body { | |
4 | + background-image: radial-gradient(ellipse at center center , #FCDD4E 1%, #F9C404 100%); | |
5 | + font-family: 'Open Sans',Arial,Helvetica,sans-serif; | |
6 | +} | |
7 | +#logo { | |
8 | + background: url(images/503-logo.jpg) 20px 0px no-repeat; | |
9 | +} | |
10 | + | |
11 | +#header { | |
12 | + background: #ccc url(imgs/menu-top-bg-right.png) top right no-repeat; | |
13 | + height: 42px; | |
14 | + margin-top: 48px; | |
15 | + position: relative; | |
16 | +} | |
17 | + | |
18 | + | |
19 | +#wrap { | |
20 | + margin: 20px 20px 0px 20px; | |
21 | + border: 1px solid #d3d7cf; | |
22 | + background: white url(images/503.jpg) 100% 100% no-repeat; | |
23 | + height: 680px; | |
24 | +} | |
0 | 25 | \ No newline at end of file | ... | ... |
9.42 KB
70.1 KB
174 KB
567 Bytes
548 Bytes
images/bg-palacio-do-planalto.jpg
2.89 KB
4.96 KB
style.css
... | ... | @@ -160,6 +160,35 @@ p { |
160 | 160 | /*font-size: x-small;*/ |
161 | 161 | } |
162 | 162 | |
163 | +/*Registro de usuário*/ | |
164 | + | |
165 | +.action-account-signup .no-boxes form { | |
166 | + margin: 0px; | |
167 | +} | |
168 | + | |
169 | +.action-account-signup .singup_text { | |
170 | + display: inline-block; | |
171 | + float: left; | |
172 | + margin-right: 5%; | |
173 | + margin-top: 70px; | |
174 | + width: 30%; | |
175 | +} | |
176 | + | |
177 | +.action-account-signup #signup-form-header, | |
178 | +.action-account-signup #signup-form-profile { | |
179 | + display: inline-block; | |
180 | + float: right; | |
181 | + width: 60%; | |
182 | +} | |
183 | + | |
184 | +.action-account-signup form>p { | |
185 | + clear: both; | |
186 | +} | |
187 | + | |
188 | + | |
189 | + | |
190 | +/*Fim Registro de usuário*/ | |
191 | + | |
163 | 192 | /* Menu List left */ |
164 | 193 | /*Estilo nos blocos laterais*/ |
165 | 194 | |
... | ... | @@ -2263,7 +2292,35 @@ input.button.with-text { |
2263 | 2292 | |
2264 | 2293 | /* Fim Bloco Estatistica */ |
2265 | 2294 | |
2295 | +/*bloco de conteúdo relevante*/ | |
2296 | + | |
2297 | +.relevant-content-plugin_relevant-content-block{} | |
2298 | + | |
2299 | +.action-home-index #content .block-outer .block .block{ | |
2300 | + display: inline-block; | |
2301 | + left: 0; | |
2302 | + margin-bottom: 14px; | |
2303 | + margin-left: 0; | |
2304 | + margin-top: 0; | |
2305 | + position: relative; | |
2306 | + vertical-align: top; | |
2307 | + width: 19%; | |
2308 | +} | |
2309 | + | |
2310 | +.relevant-content-plugin_relevant-content-block ul{ | |
2311 | + padding: 0; | |
2312 | +} | |
2266 | 2313 | |
2314 | +.relevant-content-plugin_relevant-content-block li { | |
2315 | +} | |
2316 | +.relevant-content-plugin_relevant-content-block li:hover { | |
2317 | + background-color: #eee; | |
2318 | +} | |
2319 | +.relevant-content-plugin_relevant-content-block li a{ | |
2320 | + color: #333; | |
2321 | + display: block; | |
2322 | + padding: 0.5em 1em; | |
2323 | +} | |
2267 | 2324 | /*Pairwise*/ |
2268 | 2325 | |
2269 | 2326 | #pairwise_main { |
... | ... | @@ -2335,9 +2392,18 @@ input.button.with-text { |
2335 | 2392 | } |
2336 | 2393 | |
2337 | 2394 | #pairwise_main .prompt:hover { |
2338 | - background: url("images/prompt_bg_hover.png") no-repeat 51% top #548A1C; | |
2395 | + background: url("images/prompt_bg_hover.png") no-repeat 50% top #548A1C; | |
2396 | +} | |
2397 | + | |
2398 | +#pairwise_main .prompt.left{ | |
2399 | + background-position: 51% top; | |
2339 | 2400 | } |
2340 | 2401 | |
2402 | +#pairwise_main .prompt.right{ | |
2403 | + background-position: 50% top; | |
2404 | +} | |
2405 | + | |
2406 | + | |
2341 | 2407 | #pairwise_main .prompt a{ |
2342 | 2408 | color: #2a2d28 !important; |
2343 | 2409 | /*font-size: 14px;*/ |
... | ... | @@ -2361,35 +2427,27 @@ input.button.with-text { |
2361 | 2427 | |
2362 | 2428 | #pairwise_main .skip_vote { |
2363 | 2429 | width: 100% !important; |
2364 | - background-color: #7D8874 !important; | |
2430 | + text-align: center; | |
2431 | +/* background-color: #7D8874 !important; | |
2365 | 2432 | font-size: 15px !important; |
2366 | 2433 | color: #fff; |
2367 | 2434 | padding: 1em 0 !important; |
2368 | 2435 | border-width: 0px !important; |
2369 | - border-radius: 7px 7px 0px 0px !important; | |
2370 | - | |
2436 | + border-radius: 7px 7px 0px 0px !important;*/ | |
2437 | +} | |
2438 | + | |
2439 | +#pairwise_main .skip_vote a { | |
2440 | + background: url("images/btn_duvida_pairwise.png") no-repeat center center #fff !important; | |
2371 | 2441 | |
2372 | -/*cópia do css do plugin*/ | |
2373 | -/* | |
2374 | 2442 | background-color: #CCCCCC; |
2375 | - border-color: #CCCCCC; | |
2376 | - border-radius: 7px 7px 7px 7px; | |
2377 | - border-style: solid; | |
2378 | - border-width: 1px; | |
2379 | 2443 | color: white; |
2380 | - float: none; | |
2381 | - font-size: 12pt; | |
2382 | - height: auto; | |
2383 | - margin-left: auto; | |
2384 | - margin-right: auto; | |
2385 | - margin-top: 12px; | |
2386 | - min-height: 18px; | |
2387 | - padding: 0.5em; | |
2388 | - text-align: center; | |
2389 | - vertical-align: top; | |
2390 | - word-wrap: break-word; | |
2391 | -*/ | |
2392 | - | |
2444 | + display: inline-block; | |
2445 | + height: 1px; | |
2446 | + line-height: 0; | |
2447 | + padding: 1em 0; | |
2448 | + text-decoration: none; | |
2449 | + width: 150px; | |
2450 | + | |
2393 | 2451 | } |
2394 | 2452 | |
2395 | 2453 | #pairwise_main .skip_vote_reasons {background-color: #7D8874;padding-top: 0 !important;} |
... | ... | @@ -2453,6 +2511,9 @@ input.button.with-text { |
2453 | 2511 | border-width: 0; |
2454 | 2512 | } |
2455 | 2513 | |
2514 | +div.pairwise_group_list_container .arrow span.active { | |
2515 | + background-position: center top; | |
2516 | +} | |
2456 | 2517 | |
2457 | 2518 | /*Fim Pairwise*/ |
2458 | 2519 | |
... | ... | @@ -2745,6 +2806,9 @@ body.contraste #social-icons #sb_flickr:hover { |
2745 | 2806 | } |
2746 | 2807 | |
2747 | 2808 | /* Plugin para curtir artigos e comentários */ |
2809 | +.pairwise-plugin_pairwise-content .vote-actions { | |
2810 | + display: none; | |
2811 | +} | |
2748 | 2812 | |
2749 | 2813 | .action .dislike:before { |
2750 | 2814 | content: url(images/negative-hand.png); | ... | ... |
theme.js
... | ... | @@ -39,7 +39,17 @@ function alignBlocks(containerIndex){ |
39 | 39 | $( ".action-home-index #content .communities-block .block-inner-2>div" ).prepend( "<span class='msg_block'>Participe dos dialogos entre governo e sociedade em comunidades temáticas...</span>" ); |
40 | 40 | $( ".action-home-index #content .communities-block .block-inner-2>div.block-footer-content .msg_block" ).remove(); |
41 | 41 | //Alinha os blocos do tipo container lado a lado |
42 | +<<<<<<< HEAD | |
42 | 43 | $('.container-block-plugin_container-block').each(alignBlocks); |
44 | +======= | |
45 | + $('.container-block-plugin_container-block').each(igualarBlocos); | |
46 | + | |
47 | + | |
48 | + //insere a mensagem na página de registro// | |
49 | + $( ".action-account-signup #content form" ).prepend( "<div class='singup_text'><p>Registre-se. Crie sua conta no Participa Brasil! Este é mais um espaço de diálogo entre governo e sociedade civil. Depois que você se registrar será possível fazer comentários e/ou contribuições, participar de consultas públicas, criar blogs, participar e/ou criar comunidades, etc.</p><p>A gestão pública nunca esteve tão próxima das pessoas como agora. Faça parte desta mudança!</p><p>Seja bem vind@!</p></div>" ); | |
50 | + | |
51 | + | |
52 | +>>>>>>> 5193986b5bfbe35a01ce0c10961d605a7a7b862e | |
43 | 53 | })(jQuery); |
44 | 54 | |
45 | 55 | (function(){var e='<div id="wrapper-barra-brasil"><div class="brasil-flag"><a href="http://brasil.gov.br" class="link-barra">Brasil</a></div><span class="acesso-info"><a href="http://brasil.gov.br/barra#acesso-informacao" class="link-barra">Acesso à informação</a></span><ul class="list"><li class="list-item first"><a href="http://brasil.gov.br/barra#participe" class="link-barra">Participe</a></li><li class="list-item"><a href="http://www.servicos.gov.br/" class="link-barra">Serviços</a></li><li class="list-item"><a href="http://www.planalto.gov.br/legislacao" class="link-barra">Legislação</a></li><li class="list-item last last-item"><a href="http://brasil.gov.br/barra#orgaos-atuacao-canais" class="link-barra">Canais</a></li></ul></div>',t,n,r,i,s,o,u;n=document.getElementById("barra-brasil"),n&&n.parentNode.removeChild(n),r=document.getElementsByTagName("head")[0],t=document.getElementsByTagName("body")[0],o=document.createElement("link"),i=document.createAttribute("href"),u=document.createElement("div"),s=document.createAttribute("id"),s.nodeValue="barra-brasil",u.setAttributeNode(s),u.innerHTML=e,t.insertBefore(u,t.childNodes[0]),window._barrabrasil={insere_css:function(e){var t,n,i;return n=document.createElement("style"),i=document.createAttribute("type"),i.nodeValue="text/css",t=document.createAttribute("media"),t.nodeValue="all",n.setAttributeNode(i),n.setAttributeNode(t),n.styleSheet?n.styleSheet.cssText=e:n.appendChild(document.createTextNode(e)),r.appendChild(n)}};var r,a,f,l;r=document.getElementsByTagName("head")[0],a=document.createElement("script"),l=document.createAttribute("type"),l.nodeValue="text/javascript",f=document.createAttribute("src"),f.nodeValue="https://coletajavascript.serpro.gov.br/estatistica.js",a.setAttributeNode(l),a.setAttributeNode(f),r.appendChild(a)})(),window._barrabrasil.insere_css('#barra-brasil div,#barra-brasil a,#barra-brasil ul,#barra-brasil li{margin:0;padding:0;border:0;font-size:100%;font-family:inherit;vertical-align:baseline}#barra-brasil ul{list-style:none}@font-face{font-family:"Open Sans";font-style:normal;font-weight:700;src:local("Open Sans Bold"),local("OpenSans-Bold"),url("https://themes.googleusercontent.com/static/fonts/opensans/v6/k3k702ZOKiLJc3WVjuplzHhCUOGz7vYGh680lGh-uXM.woff") format("woff")}#barra-brasil{height:32px;background:#f1f1f1;font-weight:bold;font-size:12px;line-height:32px;font-family:"Open Sans",Arial,Helvetica,sans-serif}#barra-brasil a{text-decoration:none}div#wrapper-barra-brasil{position:relative;overflow:hidden;margin:0 auto;width:100%;max-width:960px}#barra-brasil .brasil-flag{float:left;padding:7px 0 6px;width:115px;height:19px;border-right:2px solid #dfdfdf}#barra-brasil .brasil-flag .link-barra{display:block;padding-left:42px;width:43px;background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAATCAIAAAABJ4pRAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABINJREFUeNqUVFtsFFUYPrfdmdnLbLe021baQqWUtdJKL5QiASPiNVqC0TYqUWLShJQmRH3RqPHFRKJvQqIPQNSAAcMDptGEiKjYpLZIkSqGXqjdFlppd3vb7c7Ozpxz/M+2wZD44snszOzJnP//vv///g9XnNiXtNISI1gYq4eUEu4CC7SyiLpJgtSOIJKg/1ySB3x+NmsvJLNpgVUwlAu08iIkzi2pUhHIAa/q1L9p7l6YWmmHEOSBWJD6LixwJ7DDAKR06c6imQOVYxoRyEV4BR3JBYfvqNqBtILrSGNEKgoCsVxWDMmxgAOADeDjQsP+oHbo1egk7B+Mju/vq7kwVYhohsAxoiogiIM5hBaSUIBFfS21WRcOSwUHOwgTqoJR+O0pv31u56XmUKrvt4o/RyNrjVRHw40iLdU9Hck4DPBQxOQKK/XQqQa7nGNb8UICSUoE4y4rCyweqh164b7Jk12N737x2NjtfMAeCDit268e7jj7yOqfX++p+ebvQk5coAB8BQIMroqaf7xt3p4TUATgxj0Y0wOVN96uHomE3I+Ob37zSJvUHURshjySIZ4JPLhp+IcPj3h1eSZ2zxu/R8cXDeThuSLJkGZSY/fGjGOrenG9xlz8vPnK/g0xEwprl52PH9ryUGRLk1lfXWqGCcE0lUqOjxeHVy01141V+5Mvlk+lOLmcAOwC6OpMo8FnqlOCh2j2taqRE1sHKk2LuFJq6NveumNd9f0Dt2IjC1aGVKwzdz1cUryaxSasW9Oo/dFfoaEB6jxdOl2Xt3BtwYw7Xh/VmQNNcNHj5fH3N40CQgnNAAUQMjgh+y/dpIblN9j14fHuHqEFvPUP5L3Svp4mHNtGmgbaVF1oWZNIi8GXextALUpEhLqnJ0o3f9fcEw9iD3RFCaUiMmvmG/lhI50VBQX6ujX5ju3+dHHm1Mmb9dGsxyRKSwylHNLRt2HvL42O4C5IhsLsgEII74+Hd1zY+s5AdMklguMnmkaLwn9RGgr7dSfLk5ZreGhJUdD0+oz0ZxSOMNQ1VdB4fscnw5VCiOUBpb7d91vcklBJJpDwXpwOn50qKdXs2tLZpoqJU99XxVPBbMayXRnOK/Dp5p5tZzpbu0cT+sErG9/6o2rW9iLKQbOget2jQbgay3UIJrlhlJSK6Yz3dKx4dD74Ut3Ivu2X5xe8CSvopdm1kdh7e7/sfO7Ho4PlrT0NvTMhTISaaRhUoImITr244Njz8WwSVKOMhBI1hdIBMQuXlARShxuvPbt+3k0gx9GMsDVp0c7emq8nSiSFjzkVlCuKfHl+Q0aQai21Gb4E7SA59wDWGLLBg+Kk6/lqrKw/4dtWOLfKn/74+r2t3fVX5/IwcyExIBAKFFWOhskyWVx4tG3GmUfKCFRbOHYBNjiC6hBkBTrQRl+mSLeHZkOYOXeMRxIFCb6SME5gYJiGvH7MPn0q5wBCgqkgF4xBEVfdhksTyMmNpFT/chJQJQbkgitE8o73gRe4HsRYe/RJy86IFYtU1pVzSqxC/J8F5fMz/z8CDAAkCSSg0qSX5AAAAABJRU5ErkJggg==") 8px center no-repeat;text-transform:uppercase;line-height:19px}#barra-brasil .acesso-info{position:absolute;left:130px}#barra-brasil .list{position:absolute;top:0;right:0}#barra-brasil .list .first{border-left:2px solid #dfdfdf}#barra-brasil .list-item{display:inline-block;padding:0 15px 0 13px;height:32px;border-right:2px solid #dfdfdf}#barra-brasil .link-barra{color:#606060}@media screen and (max-width: 668px){#barra-brasil .list{top:-100px}}@media screen and (min-width: 960px){#wrapper-barra-brasil{width:960px}}'); | ... | ... |