Download as
Browse Code »

Commit 22ef0b3b9b9cc7fbeb062e03cd62b1c8a2baa059

Authored by Sidney Ricardo
2 parents 12041e4f af8aac87
Exists in master and in 12 other branches adding_css_from_plugin, comments-opacity, design_template, fix_catalog_classes, fix_javascript, fix_text_display_content, format_highlight_block_#85, news_page_css, page_catalog, restructuring_css, stable, tooltips

Merge branch 'master' of https://gitlab.com/softwarepublico/noosfero-spb-theme

Showing 3 changed files with 45 additions and 17 deletions   Show diff stats
cabecalho-cinza-theme.css
  Diff comments   View file @22ef0b3
... ... @@ -3,7 +3,7 @@
3 3 #theme-header{}
4 4  
5 5 #header {
6   - padding: 13px 0 0 0;/*(azul-claro)*/
  6 + padding: 15px 0 0 0; /*13px 0 0 0;*/
7 7 color: #000;
8 8 background-color: rgb(236,237,241);
9 9 }
... ... @@ -42,7 +42,7 @@
42 42 margin-right: 8px;
43 43 }
44 44 #accessibility a:hover {
45   - color: #d0d9ff;
  45 + color: #969696; /*#d0d9ff;*/
46 46 }
47 47  
48 48 #accessibility span {
... ... @@ -58,9 +58,9 @@ background-repeat: no-repeat;
58 58  
59 59 /* Barra do Brasil */
60 60  
61   -#barra-brasil, #wrapper-barra-brasil, #wrap-1 {
  61 +/*#barra-brasil, #wrapper-barra-brasil, #wrap-1 {
62 62 min-width: 960px;
63   -}
  63 +}*/
64 64  
65 65 /* logo */
66 66 #logo {
... ... @@ -116,7 +116,7 @@ background-repeat: no-repeat;
116 116 display: block;
117 117 float: right;
118 118 clear: left;
119   - border-bottom: 1px dotted #d0d9ff;
  119 + border-bottom: 1px dotted #969696; /*#d0d9ff;*/
120 120 padding-bottom: 2px;
121 121 margin-top: -15px;
122 122 font-size: 10px;
... ... @@ -141,7 +141,7 @@ background-repeat: no-repeat;
141 141 }
142 142  
143 143 #portal-siteactions li a:hover {
144   - color: #d0d9ff;
  144 + color: #969696; /*#d0d9ff;*/
145 145 }
146 146 #portal-siteactions li a {
147 147 padding: 4px 0px;
... ... @@ -150,7 +150,7 @@ background-repeat: no-repeat;
150 150 #social-icons {
151 151 float: right;
152 152 clear: right;
153   - margin: 0px;
  153 + margin: 0px 0px 17px;
154 154 }
155 155  
156 156 #social-icons ul {
... ... @@ -169,7 +169,7 @@ background-repeat: no-repeat;
169 169 #siteaction-accessibility,
170 170 #siteaction-contraste,
171 171 li#siteaction-mapadosite {
172   - margin: 0px 15px 0px 0px;
  172 + margin: 0px 48px 0px 0px; /*era 15*/
173 173 }
174 174  
175 175 /* */
... ... @@ -185,8 +185,9 @@ li#siteaction-mapadosite {
185 185 }
186 186  
187 187 #theme-header #sobre {
188   - line-height: 20px;
  188 + line-height: 30px;
189 189 font-size: 12px;
  190 + height: 30px;
190 191 }
191 192  
192 193  
... ... @@ -197,6 +198,7 @@ li#siteaction-mapadosite {
197 198 clear: both;
198 199 max-width: 100% !important;
199 200 margin: 0;
  201 + background-color: #999999;
200 202 /*background: #0d4094;/*azul-mais-escuro*/
201 203 padding: 5px 0;
202 204 }
... ... @@ -209,7 +211,7 @@ li#siteaction-mapadosite {
209 211 }
210 212  
211 213 #sobre a {
212   - color: rgb(96,96,96);
  214 + color: #ffffff; /*rgb(96,96,96);*/
213 215 font-family: 'Open Sans', Arial, Helvetica, sans-serif;
214 216 }
215 217 #navbar a{
... ... @@ -232,6 +234,14 @@ li#siteaction-mapadosite {
232 234  
233 235 }
234 236  
  237 +#links-rapidos{
  238 + width: 960px;
  239 + margin: 0 auto;
  240 + font-color:#fff;
  241 +
  242 +}
  243 +
  244 +
235 245 /* Searchbox */
236 246 .LSBox {
237 247 margin: 0;
... ... @@ -247,7 +257,7 @@ input.searchField {
247 257 clear: right;
248 258 float: right;
249 259 font-size: 80%;
250   - margin: 30px 0 14px;
  260 + margin: 30px 0 15px; /*30px 0 14px*/
251 261 /*margin: 3.12em 0px 3px 0px;*/
252 262 text-align: right;
253 263 border-radius: 5px;
... ... @@ -262,7 +272,7 @@ input.searchField {
262 272 padding: 0.45em;
263 273 border-right: none;
264 274 border: none;
265   - width: 210px; /*170px;*/
  275 + width: 171px; /*210px;170px;*/
266 276 }
267 277  
268 278 #portal-searchbox form {
... ... @@ -331,6 +341,8 @@ background-size: 100% 100%;
331 341 /* */
332 342  
333 343 /* Social Buttons */
  344 +
  345 +
334 346 #social-buttons a {
335 347 width: 18px;
336 348 height: 20px;
... ...
header.html.erb
  Diff comments   View file @22ef0b3
... ... @@ -90,7 +90,7 @@
90 90 </ul>
91 91 </div>
92 92  
93   - <div id="sobre">
  93 + <!-- <div id="sobre">
94 94 <ul>
95 95 <li id="link-faq">
96 96 <a href="/ajuda/ajuda/duvidas-frequentes">Perguntas frequentes</a>
... ... @@ -99,11 +99,23 @@
99 99 <a href="/contact/portal/new">Contato</a>
100 100 </li>
101 101 </ul>
102   - </div>
  102 + </div>
103 103  
104   - </div>
  104 + </div> -->
105 105  
106 106 </div>
  107 +
  108 + <div id="sobre">
  109 + <ul id="links-rapidos">
  110 + <li id="link-faq">
  111 + <a href="/ajuda/ajuda/duvidas-frequentes">Perguntas frequentes</a>
  112 + </li>
  113 + <li id="link-contact">
  114 + <a href="/contact/portal/new">Contato</a>
  115 + </li>
  116 + </ul>
  117 + </div>
  118 +
107 119 </div>
108 120  
109 121  
... ...
style.css
  Diff comments   View file @22ef0b3
... ... @@ -54,7 +54,7 @@
54 54 margin: auto;
55 55 width: 100%;
56 56 }
57   -
  57 +/*
58 58 #barra-brasil {
59 59 z-index: 99;
60 60 width: 100%;
... ... @@ -65,7 +65,7 @@ div#wrapper-barra-brasil {
65 65 width: 960px;
66 66 font-family: Arial, Helvetica, sans-serif !important;
67 67 }
68   -
  68 +*/
69 69  
70 70 /****************** Estilos basicos ******************/
71 71  
... ... @@ -1304,6 +1304,10 @@ input.button.with-text {
1304 1304 }
1305 1305  
1306 1306 /*track list nos blocos laterais*/
  1307 +.box-2{
  1308 + width:150px;
  1309 +}
  1310 +
1307 1311 .box-2 .track_list .item_card,
1308 1312 .box-3 .track_list .item_card {
1309 1313 margin: 10px 0px;
... ...