Download as
Browse Code »

Commit 47d99aeb30382c3520cfe98069c6edf35d182a40

Authored by Tomáz Martins
2 parents a649b860 3e5dbb66
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

Merge branch 'fix_box_3' into restructuring_css

Showing 1 changed file with 120 additions and 13 deletions   Show diff stats
css/software-pages.css
  Diff comments   View file @47d99ae
... ... @@ -221,22 +221,24 @@
221 221  
222 222 /*** Right bar ***/
223 223  
  224 +/*** WARNING - WHITOUT BOX-4 ***/
  225 +
224 226 /* Link-list block */
225   -#content .box-3 .block-title {
  227 +.template-default #content .box-3 .block-title {
226 228 border-top: 4px solid #4562b1;
227 229 line-height: 15px;
228 230 background: #eee;
229 231 color: #4562b1;
230 232 }
231 233  
232   -#content .box-3 .link-list-block li {
  234 +.template-default #content .box-3 .link-list-block li {
233 235 margin: 0px;
234 236 padding: 0px;
235 237 border-bottom: 1px solid #ddd;
236 238 border-top: none;
237 239 }
238 240  
239   -#content .box-3 .link-list-block li a {
  241 +.template-default #content .box-3 .link-list-block li a {
240 242 border-right: none;
241 243 border-top: 0px solid #64946E;
242 244 border-radius: 0px 0px 0px 0px;
... ... @@ -250,21 +252,21 @@
250 252 font-size: 14px;
251 253 }
252 254  
253   -#content .box-3 .link-list-block h3.empty + ul {
  255 +.template-default #content .box-3 .link-list-block h3.empty + ul {
254 256 border-top: 1px solid #ddd;
255 257 }
256 258  
257   -#content .box-3 .link-list-block li a.link-this-page,
258   -#content .box-3 .link-list-block li a.link-this-page:hover {
  259 +.template-default #content .box-3 .link-list-block li a.link-this-page,
  260 +.template-default #content .box-3 .link-list-block li a.link-this-page:hover {
259 261 border-right: none;
260 262 }
261 263  
262   -#content .box-3 .link-list-block li a:hover {
  264 +.template-default #content .box-3 .link-list-block li a:hover {
263 265 background-color: #FFFFFF;
264 266 color: #000;
265 267 }
266 268  
267   -#content .box-3 .link-list-block li a.link-this-page {
  269 +.template-default #content .box-3 .link-list-block li a.link-this-page {
268 270 margin-left: 0px;
269 271 width: auto;
270 272 background-color: #ffffff;
... ... @@ -272,9 +274,9 @@
272 274 }
273 275  
274 276 /* Repository block */
275   -.box-3 #bt_repositorio,
276   -.box-3 #bt_repositorio:active,
277   -.box-3 #bt_repositorio:visited {
  277 +.template-default .box-3 #bt_repositorio,
  278 +.template-default .box-3 #bt_repositorio:active,
  279 +.template-default .box-3 #bt_repositorio:visited {
278 280 border-radius: 4px;
279 281 padding: 12px 10px;
280 282 background: #EAEBEE;
... ... @@ -284,7 +286,7 @@
284 286 position: relative;
285 287 }
286 288  
287   -.box-3 #bt_repositorio::after {
  289 +.template-default .box-3 #bt_repositorio::after {
288 290 margin-top: -2px;
289 291 padding: 4px 0px 4px 2px;
290 292 border-radius: 4px;
... ... @@ -299,13 +301,118 @@
299 301 content: url('../images/right-arrow.png');
300 302 }
301 303  
302   -.box-3 #content #bt_repositorio:hover {
  304 +.template-default .box-3 #content #bt_repositorio:hover {
303 305 color: #FFF;
304 306 background: #2C66CE;
305 307 text-decoration: none;
306 308 }
  309 +/*** END - WARNING - WHITOUT BOX-4 ***/
  310 +
307 311 /*** end of right bar ***/
308 312  
  313 +/************ DUPLICATE ************/
  314 +
  315 +/*
  316 + This part of the code is duplicated because, if there is
  317 + a change of layout from template-default to lefttopright
  318 + the CSS fit without many complication.
  319 + */
  320 +
  321 +/*** Right bar ***/
  322 +
  323 +/*** WARNING - WITH BOX-4 ***/
  324 +
  325 +/* Link-list block */
  326 +.template-lefttopright #content .box-2 .block-title {
  327 + border-top: 4px solid #4562b1;
  328 + line-height: 15px;
  329 + background: #eee;
  330 + color: #4562b1;
  331 +}
  332 +
  333 +.template-lefttopright #content .box-2 .link-list-block li {
  334 + margin: 0px;
  335 + padding: 0px;
  336 + border-bottom: 1px solid #ddd;
  337 + border-top: none;
  338 +}
  339 +
  340 +.template-lefttopright #content .box-2 .link-list-block li a {
  341 + border-right: none;
  342 + border-top: 0px solid #64946E;
  343 + border-radius: 0px 0px 0px 0px;
  344 + padding: 6px 5px 8px 18px;
  345 + width: auto;
  346 + line-height: 17px;
  347 + background-color: #fff;
  348 + background-position: 0px 50%;
  349 + color: #2C66CE;
  350 + font-weight: normal;
  351 + font-size: 14px;
  352 +}
  353 +
  354 +.template-lefttopright #content .box-2 .link-list-block h3.empty + ul {
  355 + border-top: 1px solid #ddd;
  356 +}
  357 +
  358 +.template-lefttopright #content .box-2 .link-list-block li a.link-this-page,
  359 +.template-lefttopright #content .box-2 .link-list-block li a.link-this-page:hover {
  360 + border-right: none;
  361 +}
  362 +
  363 +.template-lefttopright #content .box-2 .link-list-block li a:hover {
  364 + background-color: #FFFFFF;
  365 + color: #000;
  366 +}
  367 +
  368 +.template-lefttopright #content .box-2 .link-list-block li a.link-this-page {
  369 + margin-left: 0px;
  370 + width: auto;
  371 + background-color: #ffffff;
  372 + font-weight: bold;
  373 +}
  374 +
  375 +/* Repository block */
  376 +.template-lefttopright .box-2 #bt_repositorio,
  377 +.template-lefttopright .box-2 #bt_repositorio:active,
  378 +.template-lefttopright .box-2 #bt_repositorio:visited {
  379 + border-radius: 4px;
  380 + padding: 12px 10px;
  381 + background: #EAEBEE;
  382 + font: normal normal bold 12px 'open_sansbold', arial, helvetica, sans-serif;
  383 + text-transform: uppercase;
  384 + display: block;
  385 + position: relative;
  386 +}
  387 +
  388 +.template-lefttopright .box-2 #bt_repositorio::after {
  389 + margin-top: -2px;
  390 + padding: 4px 0px 4px 2px;
  391 + border-radius: 4px;
  392 + width: 18px;
  393 + right: 10px;
  394 + line-height: 20px;
  395 + position: absolute;
  396 + background: #2C66CE;
  397 + color: #FFF;
  398 + font-size: 16px;
  399 + text-align: center;
  400 + content: url('../images/right-arrow.png');
  401 +}
  402 +
  403 +.template-lefttopright .box-2 #content #bt_repositorio:hover {
  404 + color: #FFF;
  405 + background: #2C66CE;
  406 + text-decoration: none;
  407 +}
  408 +
  409 +/*** WARNING - WITH BOX-4 ***/
  410 +
  411 +/*** end of right bar ***/
  412 +
  413 +/************ END DUPLICATE ************/
  414 +
  415 +
309 416 /*** Software internal pages ***/
310 417  
311 418 /* FAQ page */
... ...