Download as
Browse Code »

Commit c35aa74f4a39ba6f29b2c2c32d235fd6a69216c8

Authored by Daniela Feitosa
1 parent 86573111
Exists in master and in 5 other branches fix_forms_for_create_and_edit_contents, fix_people_elements, fix_search_pages, production, staging

Changes for Participa theme

Showing 24 changed files with 270 additions and 93 deletions   Show diff stats
README.md
  Diff comments   View file @c35aa74
1   -Conference Theme Noosfero
2   -=========================
  1 +Participa.gov Theme for Noosfero
  2 +================================
3 3  
4   -Noosfero theme for the Conference environment.
  4 +Noosfero theme for the Participa.gov environment.
5 5  
6   -Install on /public/designs/themes/conference
  6 +Install on /public/designs/themes/participa
... ...
footer.rhtml
  Diff comments   View file @c35aa74
1 1 <div id="footer-content">
  2 + <div id="footer-logos">
  3 + <div>
  4 + <a class="logo-acesso" href="http://www.acessoainformacao.gov.br/" target="_blank"><span>Acesso a Informação</span></a>
  5 + <div class="institucionais">
  6 + <a class="logo-sgpr" href="http://www.secretariageral.gov.br/" target="_blank"><span>Secretaria-geral da Presidência da República</span></a>
  7 + <a class="logo-brasil" href="http://www.brasil.gov.br/" target="_blank"><span>Brasil - Governo Federal</span></a>
  8 + </div>
  9 + </div>
  10 + </div><!-- end id="footer-logos" -->
  11 +
  12 + <div id="footer-license">
  13 + <p>
  14 + Este site utiliza o software livre <a href="http://noosfero.org" target="_blank">Noosfero</a>, licenciado pela <a href="http://www.gnu.org/licenses/agpl.html" target="_blank">GNU Affero General Public License, versão 3 ou superior.<a>
  15 + </p>
  16 + </div><!-- end id="footer-license" -->
2 17 </div>
  18 +
3 19 <script type="text/javascript" src="http://barra.brasil.gov.br/barra.js?cor=verde"></script>
... ...
header.rhtml
  Diff comments   View file @c35aa74
1 1 <div id="barra-brasil">
2 2 </div>
3   -<div id="barra-psocial">
4   -<div id="assets-menu">
5   - <ul>
6   - <%= generate_assets_menu %>
7   - </ul>
8   -</div><!-- fim id="assets-menu" -->
9   -
10   -<script type="text/javascript">
11   - jQuery(function($) {
12   - $("#site-title, #assets-menu").mouseover(function() {
13   - clearTimeout( window.closeAssetsTimeout );
14   - $("#assets-menu").slideDown(400);
15   - });
16   - $("#site-title, #assets-menu").mouseout(function() {
17   - window.closeAssetsTimeout =
18   - setTimeout( function() { $("#assets-menu").slideUp(400); }, 500 );
19   - });
20   - });
21   -</script>
  3 +<div class="header-content">
  4 + <div id="search-button">
  5 + <a id="sb_search" href="/search"><span>Search</span></a>
  6 + </div>
  7 + <div id="social-buttons">
  8 + <a id="sb_tweet" href="http://twitter.com/participa"><span>Twitter</span></a>
  9 + <a id="sb_youtb" href="http://youtube.com/user/participa"><span>Youtube</span></a>
  10 + <a id="sb_face" href="http://www.facebook.com/participa"><span>Facebook</span></a>
  11 + <a id="sb_flickr" href="#"><span>Flickr</span></a>
  12 + </div>
  13 + <div id="top-links">
  14 + <a id="link-faq" href="/portal/faq"><span>Perguntas frequentes</span></a>
  15 + <a id="link-contact" href="/contact/portal/new"><span>Contato</span></a>
  16 + </div>
22 17 </div>
23   -
24   -<div id="search-header">
25   - <%= render :partial => 'shared/profile_search_form' %>
  18 +<div id="barra-psocial">
  19 + <div id="categories_menu">
  20 + <%= render :file => 'categories.rhtml' %>
  21 + </div>
26 22 </div>
27   -
... ...
images/acesso-a-informacao.png 0 → 100644
View file @c35aa74

3.75 KB
images/barra-psocial-bg.png 0 → 100644
View file @c35aa74

173 Bytes
images/barra-psocial.png 0 → 100644
View file @c35aa74

14.3 KB
images/brasil.png 0 → 100644
View file @c35aa74

14 KB
images/buttons.png 0 → 100644
View file @c35aa74

3.42 KB
images/facebook.png
View file @c35aa74

1.59 KB | W: | H:

624 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
images/facebook.svg
View file @8657311
... ... @@ -1,9 +0,0 @@
1   -<?xml version="1.0" encoding="iso-8859-1"?>
2   -<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
3   -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
4   -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
5   - width="32px" height="32px" viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
6   -<circle style="fill:#3E5B97;" cx="16" cy="16" r="16"/>
7   -<path style="fill:#FFFFFF;" d="M17.961,11.406h2.615V8.168h-2.615c-2.162,0-3.921,1.906-3.921,4.25v1.633h-2.615v3.25h2.615v7.865
8   - h3.27v-7.865h3.267v-3.25H17.31v-1.664C17.31,11.826,17.653,11.406,17.961,11.406z"/>
9   -</svg>
images/flickr.png 0 → 100644
View file @c35aa74

642 Bytes
images/media-icons.png
View file @8657311

3.79 KB
images/read-more-home.png 0 → 100644
View file @c35aa74

181 Bytes
images/search.png 0 → 100644
View file @c35aa74

1002 Bytes
images/sgpr.png 0 → 100644
View file @c35aa74

4.13 KB
images/site-footer.png 0 → 100644
View file @c35aa74

157 Bytes
images/site-top.png 0 → 100644
View file @c35aa74

387 Bytes
images/site-top2.png 0 → 100644
View file @c35aa74

252 Bytes
images/twitter.png
View file @c35aa74

1.6 KB | W: | H:

754 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
images/twitter.svg
View file @8657311
... ... @@ -1,14 +0,0 @@
1   -<?xml version="1.0" encoding="iso-8859-1"?>
2   -<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
3   -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
4   -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
5   - width="32px" height="32px" viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
6   -<circle style="fill:#2AA7DE;" cx="16" cy="16" r="16"/>
7   -<path style="fill:#FFFFFF;" d="M24.535,11.723c-0.566,0.252-1.178,0.422-1.814,0.498c0.65-0.391,1.152-1.01,1.389-1.748
8   - c-0.611,0.363-1.287,0.625-2.008,0.768c-0.574-0.613-1.396-0.998-2.305-0.998c-1.744,0-3.161,1.414-3.161,3.158
9   - c0,0.248,0.029,0.49,0.082,0.721c-2.625-0.131-4.953-1.389-6.512-3.299c-0.273,0.465-0.426,1.008-0.426,1.586
10   - c0,1.098,0.555,2.064,1.404,2.631c-0.52-0.018-1.004-0.16-1.432-0.396c0,0.014,0,0.027,0,0.039c0,1.531,1.09,2.808,2.533,3.097
11   - c-0.264,0.074-0.543,0.111-0.83,0.111c-0.205,0-0.402-0.02-0.596-0.057c0.402,1.256,1.57,2.168,2.951,2.195
12   - c-1.082,0.846-2.443,1.352-3.924,1.352c-0.254,0-0.506-0.016-0.754-0.045c1.398,0.896,3.059,1.42,4.844,1.42
13   - c5.811,0,8.989-4.814,8.989-8.988c0-0.137-0.004-0.273-0.01-0.41C23.574,12.915,24.109,12.358,24.535,11.723z"/>
14   -</svg>
images/youtube.png 0 → 100644
View file @c35aa74

983 Bytes
site_title.rhtml
  Diff comments   View file @c35aa74
1   -<%= link_to(image_tag("/designs/themes/conference/images/thin-logo.png"), environment.top_url) %>
  1 +<%= link_to(_('Participa.gov.br'), environment.top_url) %>
... ...
style.css
  Diff comments   View file @c35aa74
... ... @@ -6,14 +6,16 @@ body {
6 6 }
7 7  
8 8 #wrap-1 {
9   - width: auto;
  9 + width: 100%;
10 10 margin: 0px;
  11 + background: url(images/site-top2.png) repeat-x;
11 12 }
12 13  
13 14 #wrap-2 {
14   - width: 960px;
  15 + max-width: 960px;
15 16 margin: auto;
16 17 border: 0px;
  18 + margin-top: 40px;
17 19 }
18 20  
19 21 #main-content-wrapper-1,
... ... @@ -31,28 +33,33 @@ body {
31 33 /* Bar Psocial Style */
32 34  
33 35 #theme-header {
34   - height: 40px;
35   - background-image: linear-gradient(bottom, #E8E8E8 20%, #FEFEFE 80%);
36   - background-image: -o-linear-gradient(bottom, #E8E8E8 20%, #FEFEFE 80%);
37   - background-image: -moz-linear-gradient(bottom, #E8E8E8 20%, #FEFEFE 80%);
38   - background-image: -webkit-linear-gradient(bottom, #E8E8E8 20%, #FEFEFE 80%);
39   - background-image: -ms-linear-gradient(bottom, #E8E8E8 20%, #FEFEFE 80%);
40   - background-image: -webkit-gradient(
41   - linear,
42   - left bottom,
43   - left top,
44   - color-stop(0.2, #E8E8E8),
45   - color-stop(0.8, #FEFEFE)
46   - );
  36 + height: 100px;
  37 + margin: auto;
  38 + text-align: right;
  39 +}
  40 +
  41 +#theme-header .header-content {
  42 + max-width: 960px;
  43 + margin: auto;
47 44 }
48 45  
49 46 #profile-header {
50 47 min-height: 150px;
51 48 }
52 49  
53   -#site-title { top: -40px; }
  50 +#site-title {
  51 + top: -130px;
  52 + height: 57px;
  53 + width: 372px;
  54 +}
  55 +
  56 +#site-title a {
  57 + color: #FFF;
  58 + text-decoration: none;
  59 + font-size: 48px;
  60 +}
54 61  
55   -#user { top: -30px; }
  62 +#user { top: 0px; }
56 63  
57 64 #barra-brasil {
58 65 box-shadow: 0px 0px 10px #DFDFDF inset;
... ... @@ -63,9 +70,16 @@ body {
63 70  
64 71 #barra-psocial {
65 72 position: relative;
66   - width: 960px;
  73 + width: 1800px;
  74 + height: 40px;
67 75 margin: auto;
  76 + background: url(images/barra-psocial-bg.png) repeat-x;
68 77 }
  78 +
  79 +#barra-psocial li {
  80 + float: left;
  81 +}
  82 +
69 83 #assets-menu {
70 84 background: #E8E8E8;
71 85 top: 35px;
... ... @@ -103,20 +117,33 @@ body {
103 117 border-radius: 5px;
104 118 }
105 119  
106   -/* Social Buttons */
107   -#social-buttons {
108   - float: right;
109   - text-align: right;
110   - width: 200px;
111   - margin-top: -30px;
112   - height: 30px;
  120 +/* Search Button */
  121 +#search-button a {
  122 + display: inline-block;
  123 + width: 29px;
  124 + height: 25px;
  125 + margin-right: 3px;
  126 + margin-top: 10px;
  127 +}
  128 +
  129 +#search-button a:hover {
  130 + opacity: 0.6;
  131 +}
  132 +
  133 +#search-button #sb_search {
  134 +background-image: url(images/search.png);
  135 +background-size: 100% 100%;
113 136 }
114 137  
  138 +#search-button span { display: none; }
  139 +
  140 +/* Social Buttons */
115 141 #social-buttons a {
116 142 display: inline-block;
117   - width: 24px;
118   - height: 24px;
  143 + width: 18px;
  144 + height: 20px;
119 145 margin-right: 3px;
  146 + margin-top: 10px;
120 147 }
121 148  
122 149 #social-buttons a:hover {
... ... @@ -125,24 +152,54 @@ body {
125 152  
126 153 #social-buttons #sb_face {
127 154 background-image: url(images/facebook.png);
128   -background: none,url(images/facebook.svg);
  155 +Xbackground: none,url(images/facebook.svg);
129 156 background-size: 100% 100%;
130 157 }
131 158  
132 159 #social-buttons #sb_tweet {
133 160 background-image: url(images/twitter.png);
134   -background: none,url(images/twitter.svg);
  161 +Xbackground: none,url(images/twitter.svg);
  162 +background-size: 100% 100%;
  163 +}
  164 +
  165 +#social-buttons #sb_youtb {
  166 +background-image: url(images/youtube.png);
  167 +Xbackground: none,url(images/youtube.svg);
135 168 background-size: 100% 100%;
136 169 }
137 170  
138   -#social-buttons #sb_feed {
139   -background-image: url(images/rss.png);
140   -background: none,url(images/rss.svg);
  171 +#social-buttons #sb_flickr {
  172 +background-image: url(images/flickr.png);
  173 +Xbackground: none,url(images/flickr.svg);
141 174 background-size: 100% 100%;
142 175 }
143 176  
144 177 #social-buttons span { display: none; }
145 178  
  179 +/* Top links */
  180 +#top-links {
  181 + padding-bottom: 3px;
  182 +}
  183 +
  184 +#top-links a {
  185 + display: inline-block;
  186 + font-size: 10px;
  187 + margin-right: 3px;
  188 + margin-top: 15px;
  189 + color: #E7F1E9;
  190 + text-decoration: none;
  191 + text-transform:uppercase;
  192 +}
  193 +
  194 +#top-links a:hover {
  195 + opacity: 0.6;
  196 +}
  197 +
  198 +#top-links #link-faq {
  199 + border-right: 1px solid #E7F1E9;
  200 + padding-right:5px;
  201 +}
  202 +
146 203 /* Title Header */
147 204  
148 205 #content .main-block h1,
... ... @@ -244,16 +301,14 @@ div#article-parent {
244 301 /* Blocks main style */
245 302  
246 303 #content .box-1 .block {
247   - background: #eeefff;
248 304 width: 48%;
249 305 float: left;
250 306 margin-right: 10px;
251 307 }
252 308  
253 309 #content .box-1 .block-title {
254   - background: #757575;
255 310 padding: 0.6em 1.5em;
256   - color: #FFF;
  311 + color: #444;
257 312 text-transform: uppercase;
258 313 font-variant: normal;
259 314 }
... ... @@ -274,7 +329,7 @@ div#article-parent {
274 329  
275 330 /* Box styles */
276 331 .box-1 {
277   - margin: 0 0 0 170px;
  332 + Xmargin: 0 0 0 170px;
278 333 }
279 334  
280 335 .box-2 {
... ... @@ -332,6 +387,58 @@ div#article-parent {
332 387 margin: 0px;
333 388 }
334 389  
  390 +/* Block Display Content style */
  391 +
  392 +#content .box-1 .display-content-block {
  393 + width: 300px;
  394 +}
  395 +
  396 +.box-1 .display-content-block ul {
  397 + list-style: none;
  398 + margin: 0px;
  399 +}
  400 +
  401 +.box-1 .display-content-block {
  402 + font-size: 14px;
  403 +}
  404 +
  405 +.box-1 .display-content-block h2 {
  406 + font-size: 24px;
  407 + font-weight: bold;
  408 +}
  409 +
  410 +/* Block Article style */
  411 +
  412 +#content .box-1 .article-block {
  413 + width: 100%;
  414 + font-size: 14px;
  415 +}
  416 +
  417 +#content .box-1 .article-block .block-title {
  418 + display: none;
  419 +}
  420 +
  421 +#content .box-1 .article-block h2 {
  422 + font-size: 34px;
  423 + font-weight: bold;
  424 +}
  425 +
  426 +#content .box-1 .article-block .read-more {
  427 + float: right;
  428 +}
  429 +
  430 +#content .box-1 .article-block .read-more a {
  431 + display: block;
  432 + height: 30px;
  433 + text-align: center;
  434 + padding: 7px;
  435 + background: url(images/read-more-home.png) repeat-x;
  436 +}
  437 +
  438 +#content .box-1 .article-block .read-more a:first-child {
  439 + display: none;
  440 +}
  441 +
335 442 /* Block My Network style */
336 443  
337 444 #content .my-network-block {
... ... @@ -399,6 +506,12 @@ div#article-parent {
399 506 margin-left: 15px;
400 507 }
401 508  
  509 +#content .people-block .vcard a.profile_link {
  510 + height: 52px;
  511 + margin: 0;
  512 + width: 52px;
  513 +}
  514 +
402 515 .box-1 .block-footer-content {
403 516 clear: both;
404 517 text-align: right;
... ... @@ -406,16 +519,42 @@ div#article-parent {
406 519 color: #000;
407 520 position: relative;
408 521 padding: 5px;
409   - background: #DFDFDF;
410   - border-top: 3px solid #545454;
  522 + Xbackground: #DFDFDF;
  523 + Xborder-top: 3px solid #545454;
411 524 }
412 525  
413 526 #content .box-1 .block-footer-content a {
414 527 position: relative;
415 528 }
416 529  
417   -#content .box-1 .display-content-block {
418   - width: 250px;
  530 +/* Blocks tags */
  531 +.action-home-index #content .box-1 .block.tags-block {
  532 + background: #034811;
  533 + min-height: 50px;
  534 + padding: 20px 0;
  535 + width: 100%;
  536 +}
  537 +
  538 +.action-home-index #content .box-1 .block.tags-block {
  539 + margin-bottom: 0px;
  540 +}
  541 +
  542 +.action-home-index #content .box-1 .block.tags-block .block-title {
  543 + display: none;
  544 +}
  545 +
  546 +.action-home-index #content .box-1 .tags-block .block-footer-content a {
  547 + color: #FFFFFF;
  548 +}
  549 +
  550 +.action-home-index .box-1 .block.tags-block a,
  551 +.action-home-index .box-1 .block.tags-block a:visited,
  552 +.action-home-index .box-1 .block.tags-block a:hover {
  553 + color: #E7F1E9;
  554 +}
  555 +
  556 +.action-home-index .box-1 .block.tags-block a:hover {
  557 + text-decoration: underline;
419 558 }
420 559  
421 560 /* Menu List footer */
... ... @@ -481,7 +620,6 @@ div#article-parent {
481 620 .box-2 .link-list-block ul li .icon-eyes,
482 621 .box-2 .link-list-block ul li .icon-edit,
483 622 .box-2 .link-list-block ul li .icon-photos {
484   - background-image: url('images/media-icons.png');
485 623 background-position: 0px -325px !important;
486 624 height: 27px;
487 625 padding: 13px 0px 0px 45px !important;
... ... @@ -499,4 +637,55 @@ div#article-parent {
499 637 background-position: 0px -245px !important;
500 638 }
501 639  
  640 +/* Footer */
  641 +
  642 +#theme-footer {
  643 + width: 100%;
  644 +}
  645 +
  646 +#footer-logos {
  647 + background: #00420C;
  648 + max-width: 100%;
  649 + padding: 2em 0;
  650 + height: 49px;
  651 +}
502 652  
  653 +#footer-logos div,
  654 +#footer-license {
  655 + max-width: 960px;
  656 + margin: 0 auto;
  657 +}
  658 +
  659 +#footer-logos a {
  660 + display: block;
  661 + height: 49px;
  662 + float: left;
  663 +}
  664 +
  665 +#footer-logos span {
  666 + display: none;
  667 +}
  668 +
  669 +#footer-logos .logo-acesso {
  670 + background: transparent url(images/acesso-a-informacao.png) center center no-repeat;
  671 + width: 107px;
  672 +}
  673 +
  674 +#footer-logos .logo-brasil {
  675 + background: transparent url(images/brasil.png) center center no-repeat;
  676 + width: 153px;
  677 +}
  678 +
  679 +#footer-logos .logo-sgpr {
  680 + background: transparent url(images/sgpr.png) center center no-repeat;
  681 + width: 187px;
  682 + margin-right: 30px;
  683 +}
  684 +
  685 +#footer-logos .institucionais {
  686 + float: right;
  687 +}
  688 +
  689 +#footer-license {
  690 + text-align: left;
  691 +}
... ...
theme.yml
  Diff comments   View file @c35aa74
1   -name: "Conference"
  1 +name: "Participa"
2 2 layout: "application-ng"
3 3 icon_theme: [default, pidgin]
... ...