Commit 1b81cbd7e7329161ca6362c16c7df51ebe360b80

Authored by Ábner Silva de Oliveira
2 parents 6a131a25 39bfa74c

merge with remote

footer.rhtml
... ... @@ -17,3 +17,5 @@
17 17 </div>
18 18  
19 19 <!-- <script type="text/javascript" src="http://barra.brasil.gov.br/barra.js?cor=verde"></script> -->
  20 +<script src="http://barra.brasil.gov.br/barra.js" type="text/javascript"></script>
  21 +
... ...
header.rhtml
1 1 <div id="barra-brasil">
2 2 <a href="http://brasil.gov.br" style="background:#7F7F7F; height: 20px; padding:4px 0 4px 10px; display: block; font-family:sans,sans-serif; text-decoration:none; color:white; ">Portal do Governo Brasileiro</a>
3 3 </div>
  4 +
  5 +
4 6 <div class="header-content">
5 7 <div role="banner" id="header">
6 8 <div>
... ... @@ -89,4 +91,8 @@
89 91 <div id="categories_menu">
90 92 <%= theme_include 'categories' %>
91 93 </div>
  94 + <div id="participa-languages">
  95 + <a href="?lang=pt" class="flag-pt" title="Português"><span>Português</span></a>
  96 + <a href="?lang=en" class="flag-en" title="English"><span>English</span></a>
  97 + </div>
92 98 </div>
... ...
images/bg-titulo-interno.png 0 → 100644

142 Bytes

images/bg-titulo-login.png 0 → 100644

216 Bytes

images/btn_cancelar_login.png 0 → 100644

333 Bytes

images/btn_duvida_pairwise.png

2.89 KB | W: | H:

2.85 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
images/btn_duvida_pairwise_hover.png 0 → 100644

3.12 KB

images/btn_entrar_login.png 0 → 100644

445 Bytes

images/btn_entrar_login_hover.png 0 → 100644

448 Bytes

images/flag-en.png 0 → 100644

2.09 KB

images/flag-pt_br.png 0 → 100644

1.71 KB

images/hub-arrow-right.png 0 → 100644

349 Bytes

images/hub-not-pinned-icon.png 0 → 100644

772 Bytes

images/hub-not-promote-icon.png 0 → 100644

674 Bytes

images/hub-pinned-icon.png 0 → 100644

772 Bytes

images/hub-promote-icon.png 0 → 100644

674 Bytes

images/hub-remove-icon.png 0 → 100644

567 Bytes

images/hub-samarelo-a.png 0 → 100644

424 Bytes

images/hub-samarelo-b.png 0 → 100644

426 Bytes

images/hub-samarelo.gif 0 → 100644

357 Bytes

images/hub-sverde-a.png 0 → 100644

438 Bytes

images/hub-sverde-b.png 0 → 100644

438 Bytes

images/hub-svermelho-a.png 0 → 100644

373 Bytes

images/hub-svermelho-b.png 0 → 100644

374 Bytes

images/hub-time-bg.gif 0 → 100644

807 Bytes

images/img_login_popUp.png 0 → 100644

19.5 KB

images/logo_facebook_50x50.png 0 → 100644

905 Bytes

images/logo_twitter_50x50.png 0 → 100644

1.73 KB

images/logo_twitter_bird_blue_50x50.png 0 → 100644

1.08 KB

images/logo_twitter_bird_white_50x50.png 0 → 100644

1.02 KB

style.css
... ... @@ -40,7 +40,7 @@
40 40 #barra-brasil {
41 41 z-index: 99;
42 42 width: 100%;
43   - border-bottom: 1px solid #CCCCCC;
  43 + border-bottom: 1px solid #eee;
44 44 }
45 45  
46 46 div#wrapper-barra-brasil {
... ... @@ -185,9 +185,127 @@ p {
185 185 clear: both;
186 186 }
187 187  
  188 +/*Fim Registro de usuário*/
188 189  
  190 +/* PopUp Login*/
189 191  
190   -/*Fim Registro de usuário*/
  192 +#TB_window {
  193 + left: -350px;
  194 + margin-left: 50% !important;
  195 + width: 700px !important;
  196 +}
  197 +
  198 +#TB_ajaxContent.TB_modal {
  199 + padding: 15px;
  200 + position: relative;
  201 + width: auto !important;
  202 + height: auto !important;
  203 +}
  204 +
  205 +#TB_window .login-box{
  206 + width: 100%;
  207 + background: url("images/img_login_popUp.png") no-repeat scroll 90% 30% #FFFFFF;
  208 +}
  209 +
  210 +#TB_window .login-box h2{
  211 + background: url("images/bg-titulo-login.png") no-repeat scroll 70px 7px #FFFFFF;
  212 + color: #757575;
  213 + font-size: 20px;
  214 + font-style: italic;
  215 + font-weight: normal;
  216 + width: 45%;
  217 +}
  218 +
  219 +#TB_window .login-box form {
  220 + margin: 0;
  221 + width: 45%;
  222 + /*background: url("images/img_login_popUp.png") no-repeat scroll 70% 30% #FFFFFF;*/
  223 +}
  224 +
  225 +#TB_window .login-box .formfieldline input {
  226 + width: 95%;
  227 +}
  228 +
  229 +#TB_window .login-box .button-bar input.icon-login {
  230 + background: url("images/btn_entrar_login.png") no-repeat scroll 0 0 #FFFFFF;
  231 + border: 0px none;
  232 + font-family: arial,sans-serif;
  233 + font-size: 16px;
  234 + font-weight: bold;
  235 + height: 50px !important;
  236 + max-height: 50px !important;
  237 + padding: 0;
  238 + text-transform: uppercase;
  239 + width: 145px;
  240 + cursor: pointer;
  241 +}
  242 +
  243 +#TB_window .login-box .button-bar input.icon-login:hover {
  244 + background-image: url("images/btn_entrar_login_hover.png");
  245 +}
  246 +
  247 +#TB_window .login-box .button-bar a.icon-close {
  248 + /*background: url("images/btn_cancelar_login.png") repeat-x scroll 0 0 #FFFFFF;*/
  249 + background-color: #FCE9E8;
  250 + background-image: none;
  251 + border: 0 none;
  252 + border-radius: 5px 5px 5px 5px;
  253 + color: #CE5E5E;
  254 + font-size: 16px;
  255 + font-weight: bold;
  256 + height: 35px;
  257 + padding: 14px 13px 0;
  258 + text-align: center;
  259 + text-transform: uppercase;
  260 + width: 115px;
  261 +}
  262 +#TB_window .login-box .button-bar a.icon-close:hover {
  263 + background-color: #FFD1CF;
  264 +}
  265 +
  266 +#TB_window .login-box .button-bar input.submit,
  267 +#TB_window .login-box .button-bar a.icon-close {
  268 + border: 0px none;
  269 +}
  270 +
  271 +#TB_window .login-box .button-bar {
  272 + float: none;
  273 + margin-bottom: 1em;
  274 + margin-top: 1em;
  275 + width: 100%;
  276 +}
  277 +
  278 +#TB_window .login-box .button-bar .icon-add{
  279 + background-color: #F7E074;
  280 + background-image: none;
  281 + color: #004B82;
  282 + float: right;
  283 + font-size: 16px;
  284 + font-weight: bold;
  285 + margin-right: 75px;
  286 + padding: 10px;
  287 + position: relative;
  288 + text-align: center;
  289 + top: -3em;
  290 + width: 30%;
  291 +}
  292 +
  293 +#TB_window .login-box .button-bar .icon-add span{
  294 + border-bottom: 1px solid #F7E074;
  295 +}
  296 +
  297 +#TB_window .login-box .button-bar .icon-help{
  298 +
  299 +}
  300 +
  301 +#TB_window .login-box form .button-bar {
  302 + float: none;
  303 + width: 100%
  304 +}
  305 +
  306 +
  307 +
  308 +/*Fim PopUp Login*/
191 309  
192 310 /* Menu List left */
193 311 /*Estilo nos blocos laterais*/
... ... @@ -539,6 +657,12 @@ p {
539 657  
540 658 }
541 659  
  660 +/*tamanho da fonte dentro dos artigos*/
  661 +.article-body p{
  662 + font-size:13px;
  663 + line-height:26px;
  664 +}
  665 +/* fim tamanho da fonte dentro dos artigos*/
542 666  
543 667  
544 668 /*comentário*/
... ... @@ -663,6 +787,13 @@ p {
663 787 margin-top: 5px;
664 788 }
665 789  
  790 +
  791 +#page-comment-form .post_comment_box {
  792 + display: inline-block;
  793 + padding: 5px;
  794 + text-align: left;
  795 +}
  796 +
666 797 /* fim de comentário*/
667 798  
668 799 /*paginação*/
... ... @@ -1248,6 +1379,7 @@ input.button.with-text {
1248 1379 #content form input.button.submit {
1249 1380 height: 32px;
1250 1381 max-height: 32px;
  1382 + margin-right: 5px;
1251 1383 }
1252 1384  
1253 1385 #content #article-actions input.button:hover,
... ... @@ -2323,12 +2455,17 @@ input.button.with-text {
2323 2455 padding: 0.5em 1em;
2324 2456 }
2325 2457 /*Pairwise*/
  2458 +.action-home-index div.pairwise_main .spinner {
  2459 + width: 94%;
  2460 +}
  2461 +
2326 2462 .pairwise-plugin_pairwise-content #article-header .title {
2327 2463 display: none;
2328 2464 }
2329 2465  
2330 2466 #pairwise_main {
2331 2467 text-align: center;
  2468 + width: auto;
2332 2469 }
2333 2470  
2334 2471 #pairwise_main ul.pairwise_menu {
... ... @@ -2368,6 +2505,7 @@ input.button.with-text {
2368 2505 #pairwise_main .pairwise_content {
2369 2506 background-color: #ECF2E7;
2370 2507 padding: 1em;
  2508 + overflow: hidden;
2371 2509 }
2372 2510  
2373 2511 #pairwise_main .pairwise_body {
... ... @@ -2393,6 +2531,7 @@ input.button.with-text {
2393 2531 height: 170px !important;
2394 2532 padding: 10px 0;
2395 2533 border-width: 0 !important;
  2534 + border-radius: 10px;
2396 2535 }
2397 2536  
2398 2537 #pairwise_main .prompt:hover {
... ... @@ -2401,21 +2540,22 @@ input.button.with-text {
2401 2540  
2402 2541 #pairwise_main .prompt.left{
2403 2542 background-position: 51% top;
  2543 + float: left;
2404 2544 }
2405 2545  
2406 2546 #pairwise_main .prompt.right{
2407 2547 background-position: 50% top;
  2548 + float: right;
2408 2549 }
2409 2550  
2410   -
2411 2551 #pairwise_main .prompt a{
2412 2552 color: #2a2d28 !important;
2413 2553 /*font-size: 14px;*/
2414 2554 font-size: 12px;/*REDUZIDO PARA CABER 160 CARACTERES.*/
2415 2555 display: block;
2416 2556 /*height: 170px;*/
2417   - max-width: 369px;
2418   - padding: 10px 0;
  2557 + max-width: 349px;
  2558 + padding: 10px;
2419 2559 height: 100%;
2420 2560 }
2421 2561  
... ... @@ -2430,7 +2570,7 @@ input.button.with-text {
2430 2570  
2431 2571  
2432 2572 #pairwise_main .skip_vote {
2433   - width: 100% !important;
  2573 + width: 200px !important;
2434 2574 text-align: center;
2435 2575 padding: 0;
2436 2576 border-width: 0px;
... ... @@ -2445,16 +2585,17 @@ input.button.with-text {
2445 2585  
2446 2586 #pairwise_main .skip_vote a {
2447 2587 background: url("images/btn_duvida_pairwise.png") no-repeat center center #fff !important;
2448   -
2449   - background-color: #CCCCCC;
2450 2588 color: transparent !important;
2451 2589 display: inline-block;
2452 2590 height: 1px;
2453 2591 line-height: 0;
2454 2592 padding: 1em 0;
2455 2593 text-decoration: none;
2456   - width: 150px;
2457   -
  2594 + width: 200px;
  2595 +}
  2596 +
  2597 +#pairwise_main .skip_vote a:hover {
  2598 + background: url("images/btn_duvida_pairwise_hover.png") no-repeat center center #fff !important;
2458 2599 }
2459 2600  
2460 2601 #pairwise_main .skip_vote_reasons {background-color: #7D8874;padding-top: 0 !important;}
... ... @@ -2880,7 +3021,6 @@ body.action-embed-index {
2880 3021 width: 100%;
2881 3022 height: 100%;
2882 3023 display: table;
2883   - /*position: absolute;*/
2884 3024 }
2885 3025  
2886 3026 #embed #content {
... ... @@ -3008,3 +3148,74 @@ body.action-embed-index {
3008 3148 }
3009 3149  
3010 3150 /* }}} */
  3151 +
  3152 +/*estilos do HUB*/
  3153 +
  3154 +.hub .post{
  3155 + background: url("images/hub-time-bg.gif") repeat-y left top #fff;
  3156 +}
  3157 +
  3158 +.hub .remove{
  3159 + background: url("images/hub-remove-icon.png") no-repeat center center #fff;
  3160 +}
  3161 +
  3162 +/*
  3163 +.hub .promote{
  3164 + background: url("images/hub-promote-icon.png") no-repeat center center #fff;
  3165 +}
  3166 +
  3167 +.hub .pin{
  3168 + background: url("images/hub-pin-icon.png") no-repeat center center #fff;
  3169 +}
  3170 +*/
  3171 +
  3172 +.hub ul.settings li{
  3173 + position: relative;
  3174 + background: url("images/hub-arrow-right.png") no-repeat scroll 98% 50% #ED8E01;
  3175 + overflow: hidden;
  3176 + z-index:999;
  3177 +}
  3178 +
  3179 +.hub ul.settings li.twitter:hover{
  3180 + background: url("images/hub-arrow-up.png") no-repeat scroll 95% 50% #ED8E01;
  3181 + min-height: 50px;
  3182 + height: auto;
  3183 +}
  3184 +
  3185 +.hub ul.settings li.twitter label{
  3186 + color: white;
  3187 + display: block;
  3188 + font-style: oblique;
  3189 + line-height: 1.5em;
  3190 + margin-bottom: 5px;
  3191 +}
  3192 +
  3193 +.hub ul.settings li.twitter input{margin-bottom: 10px; margin-right: 5px;}
  3194 +
  3195 +.hub ul.settings li.twitter input.btn-ok {}
  3196 +
  3197 +/* * Internacionalização * */
  3198 +
  3199 +#participa-languages {
  3200 + position: absolute;
  3201 + top: 12px;
  3202 + right: 10px;
  3203 + padding: 0px;
  3204 + z-index: 100;
  3205 +}
  3206 +
  3207 +#participa-languages a {
  3208 + color: #333;
  3209 + text-decoration: none;
  3210 + cursor: pointer;
  3211 + background-repeat: no-repeat;
  3212 + display: inline-block;
  3213 + height: 17px;
  3214 + width: 25px;
  3215 + margin-left: 5px;
  3216 +}
  3217 +
  3218 +.flag-en { background-image: url(images/flag-en.png) }
  3219 +.flag-pt { background-image: url(images/flag-pt_br.png) }
  3220 +
  3221 +#participa-languages a span{ display: none }
... ...
theme.js
... ... @@ -48,7 +48,3 @@ function alignBlocks(containerIndex){
48 48 $('.container-block-plugin_container-block').each(alignBlocks);
49 49  
50 50 })(jQuery);
51   -
52   -(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 &agrave; informa&ccedil;&atilde;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&ccedil;os</a></li><li class="list-item"><a href="http://www.planalto.gov.br/legislacao" class="link-barra">Legisla&ccedil;&atilde;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}}');
53   -
54   -
... ...