Download as
Browse Code »

Commit 83de26da454ff38ba97fb6585d0aa04348c7e73a

Authored by Melissa Wen
2 parents 353a9563 01abb668
Exists in master and in 51 other branches add_sisp_to_chef, add_super_archives_plugin, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, 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_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, header_fix, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, refactor_download_block, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, review_message, signals_user_noosfero, sisp_catalog_header, sisp_dev_master, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_to_rails4, stable-4.1, stable-4.2, theme_header, theme_javascript_refactory, thread_dropdown, update_search_by_categories, update_softwares_boxes

Merge branch 'design_42' into 'master' 

Design 42

ping @melissawen

Segue MR dos commits referentes à Sprint 42, como conversamos.

Obrigado!

Att, Álvaro Fernando.

See merge request !85
Showing 1 changed file with 74 additions and 9 deletions   Show diff stats
src/noosfero-spb/noosfero-spb-theme/css/community-pages.css
  Diff comments   View file @83de26d
... ... @@ -547,6 +547,31 @@ float: left;
547 547 }
548 548  
549 549 /*Block with Community information - Need to develop solution - Only display on profile page */
  550 +#agenda-toolbar a.button{
  551 + opacity: 1.0;
  552 +}
  553 +
  554 +#content .software-events-block{
  555 + display: none;
  556 +}
  557 +
  558 +.action-profile_design-index #content .software-events-block,
  559 +.profile-type-is-community .action-profile-index #content .software-events-block{
  560 + display: block;
  561 +}
  562 +
  563 +/*** Right bar ***/
  564 +
  565 +.template-default.profile-type-is-community .action-profile-index #content .box-3 .software-events-block,
  566 +.template-lefttopright.profile-type-is-community .action-profile-index #content .box-2 .software-events-block{
  567 + display: none;
  568 +}
  569 +
  570 +.template-lefttopright.profile-type-is-community .action-content_viewer-view_page #content .box-2 .software-events-block{
  571 + display: block;
  572 +}
  573 +
  574 +/*Block with Community information - Need to develop solution - Only display on profile page */
550 575  
551 576 .profile-type-is-community .block.community-block{
552 577 display: none;
... ... @@ -1157,7 +1182,7 @@ float: left;
1157 1182 overflow: hidden;
1158 1183 }
1159 1184  
1160   -/*** Events ***/
  1185 +/*** Events internal page ***/
1161 1186  
1162 1187 #content .article-body-event .event-card{
1163 1188 border-top: 1px dotted #D3D6D3;
... ... @@ -1195,7 +1220,7 @@ float: left;
1195 1220 letter-spacing: 0.48px;
1196 1221 }
1197 1222  
1198   -#content .article-body-event .event-link a{
  1223 +#content .box-1 .article-body-event .event-link a{
1199 1224 text-decoration: underline;
1200 1225 }
1201 1226  
... ... @@ -1213,24 +1238,26 @@ float: left;
1213 1238 line-height: 22px;
1214 1239 }
1215 1240  
1216   -ul.software-community-events-list {
  1241 +/*software-events-block box-1*/
  1242 +
  1243 +.box-1 .software-events-block ul.software-community-events-list {
1217 1244 border: 1px solid #D3D6DE;
1218 1245 border-radius: 8px;
1219 1246 width: 100%;
1220 1247 }
1221 1248  
1222   -li.software-events-list-item {
  1249 +.box-1 .software-events-block li.software-events-list-item {
1223 1250 border-bottom: 1px dotted #D3D6DE;
1224 1251 font-size: 14px;
1225 1252 padding: 7px 0px;
1226 1253 padding-left: 16px;
1227 1254 }
1228 1255  
1229   -li.software-events-list-item:last-child{
1230   - border: none;
  1256 +.box-1 .software-events-block li.software-events-list-item:last-child{
  1257 + border:none;
1231 1258 }
1232 1259  
1233   -.software-events-list-item-calendar {
  1260 +.box-1 .software-events-block .software-events-list-item-calendar {
1234 1261 background-image: url("../images/calendar-icon.png");
1235 1262 background-repeat: no-repeat;
1236 1263 width: 14px;
... ... @@ -1239,10 +1266,48 @@ li.software-events-list-item:last-child{
1239 1266 margin-top: 2px;
1240 1267 }
1241 1268  
1242   -.software-events-list-item-date {
  1269 +.box-1 .software-events-block .software-events-list-item-date {
1243 1270 padding-left: 5px;
  1271 + font-weight: 700;
1244 1272 }
1245 1273  
1246   -.software-events-list-item-title {
  1274 +.box-1 .software-events-block .software-events-list-item-title {
1247 1275 padding-left: 1px;
1248 1276 }
  1277 +
  1278 +/*software-events-block - sidebar - box2*/
  1279 +
  1280 +#content .box-2 .software-events-block .software-community-events-block{
  1281 + border:1px solid #C0C1C1;
  1282 + border-radius:4px;
  1283 + background-color:#ECEDF1;
  1284 +}
  1285 +
  1286 +#content .box-2 .software-events-block .software-events-list-item{
  1287 + padding:10px 15px;
  1288 + border-bottom:1px dotted #C0C1C1;
  1289 + color:#2C4B6B;
  1290 + font-size: 15px;
  1291 + font-weight: 500;
  1292 +}
  1293 +
  1294 +#content .box-2 .software-events-block .software-events-list-item-date{
  1295 + font-weight: 800;
  1296 +}
  1297 +
  1298 +#content .box-2 .software-events-block .software-events-list-item-title a,
  1299 +#content .box-2 .software-events-block .software-events-list-item-title a:visited{
  1300 + color:#2C4B6B;
  1301 +}
  1302 +
  1303 +#content .box-2 .software-events-block .software-events-list-item:first-child{
  1304 + color:#172738;
  1305 + font-weight: 800;
  1306 + text-transform: uppercase;
  1307 + border-bottom: 1px solid #C0C1C1;
  1308 + padding:10px 15px;
  1309 +}
  1310 +
  1311 +#content .box-2 .software-events-block .software-events-list-item:last-child{
  1312 + border:none;
  1313 +}
... ...