Download as
Browse Code »

Commit 824fdd6dce229149c0943d0bfdba0a51e8e8bb3c

Authored by Melissa Wen
1 parent a11b751e
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

solve conflicts - that was only redundancy - on event block style

Showing 1 changed file with 49 additions and 9 deletions   Show diff stats
src/noosfero-spb/noosfero-spb-theme/css/community-pages.css
  Diff comments   View file @824fdd6
... ... @@ -1157,7 +1157,7 @@ float: left;
1157 1157 overflow: hidden;
1158 1158 }
1159 1159  
1160   -/*** Events ***/
  1160 +/*** Events internal page ***/
1161 1161  
1162 1162 #content .article-body-event .event-card{
1163 1163 border-top: 1px dotted #D3D6D3;
... ... @@ -1195,7 +1195,7 @@ float: left;
1195 1195 letter-spacing: 0.48px;
1196 1196 }
1197 1197  
1198   -#content .article-body-event .event-link a{
  1198 +#content .box-1 .article-body-event .event-link a{
1199 1199 text-decoration: underline;
1200 1200 }
1201 1201  
... ... @@ -1213,24 +1213,26 @@ float: left;
1213 1213 line-height: 22px;
1214 1214 }
1215 1215  
1216   -ul.software-community-events-list {
  1216 +/*software-events-block box-1*/
  1217 +
  1218 +.box-1 .software-events-block ul.software-community-events-list {
1217 1219 border: 1px solid #D3D6DE;
1218 1220 border-radius: 8px;
1219 1221 width: 100%;
1220 1222 }
1221 1223  
1222   -li.software-events-list-item {
  1224 +.box-1 .software-events-block li.software-events-list-item {
1223 1225 border-bottom: 1px dotted #D3D6DE;
1224 1226 font-size: 14px;
1225 1227 padding: 7px 0px;
1226 1228 padding-left: 16px;
1227 1229 }
1228 1230  
1229   -li.software-events-list-item:last-child{
1230   - border: none;
  1231 +.box-1 .software-events-block li.software-events-list-item:last-child{
  1232 + border:none;
1231 1233 }
1232 1234  
1233   -.software-events-list-item-calendar {
  1235 +.box-1 .software-events-block .software-events-list-item-calendar {
1234 1236 background-image: url("../images/calendar-icon.png");
1235 1237 background-repeat: no-repeat;
1236 1238 width: 14px;
... ... @@ -1239,10 +1241,48 @@ li.software-events-list-item:last-child{
1239 1241 margin-top: 2px;
1240 1242 }
1241 1243  
1242   -.software-events-list-item-date {
  1244 +.box-1 .software-events-block .software-events-list-item-date {
1243 1245 padding-left: 5px;
  1246 + font-weight: 700;
1244 1247 }
1245 1248  
1246   -.software-events-list-item-title {
  1249 +.box-1 .software-events-block .software-events-list-item-title {
1247 1250 padding-left: 1px;
1248 1251 }
  1252 +
  1253 +/*software-events-block - sidebar - box2*/
  1254 +
  1255 +#content .box-2 .software-events-block .software-community-events-block{
  1256 + border:1px solid #C0C1C1;
  1257 + border-radius:4px;
  1258 + background-color:#ECEDF1;
  1259 +}
  1260 +
  1261 +#content .box-2 .software-events-block .software-events-list-item{
  1262 + padding:10px 15px;
  1263 + border-bottom:1px dotted #C0C1C1;
  1264 + color:#2C4B6B;
  1265 + font-size: 15px;
  1266 + font-weight: 500;
  1267 +}
  1268 +
  1269 +#content .box-2 .software-events-block .software-events-list-item-date{
  1270 + font-weight: 800;
  1271 +}
  1272 +
  1273 +#content .box-2 .software-events-block .software-events-list-item-title a,
  1274 +#content .box-2 .software-events-block .software-events-list-item-title a:visited{
  1275 + color:#2C4B6B;
  1276 +}
  1277 +
  1278 +#content .box-2 .software-events-block .software-events-list-item:first-child{
  1279 + color:#172738;
  1280 + font-weight: 800;
  1281 + text-transform: uppercase;
  1282 + border-bottom: 1px solid #C0C1C1;
  1283 + padding:10px 15px;
  1284 +}
  1285 +
  1286 +#content .box-2 .software-events-block .software-events-list-item:last-child{
  1287 + border:none;
  1288 +}
... ...