Commit 5a5a895b2b8c8385a8c4f90bc10870a99ba851cc

Authored by Melissa Wen
Committed by Thiago Ribeiro
1 parent c611b051

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

(cherry picked from commit 824fdd6dce229149c0943d0bfdba0a51e8e8bb3c)
src/noosfero-spb/noosfero-spb-theme/css/community-pages.css
@@ -1151,7 +1151,7 @@ float: left; @@ -1151,7 +1151,7 @@ float: left;
1151 overflow: hidden; 1151 overflow: hidden;
1152 } 1152 }
1153 1153
1154 -/*** Events ***/ 1154 +/*** Events internal page ***/
1155 1155
1156 #content .article-body-event .event-card{ 1156 #content .article-body-event .event-card{
1157 border-top: 1px dotted #D3D6D3; 1157 border-top: 1px dotted #D3D6D3;
@@ -1189,7 +1189,7 @@ float: left; @@ -1189,7 +1189,7 @@ float: left;
1189 letter-spacing: 0.48px; 1189 letter-spacing: 0.48px;
1190 } 1190 }
1191 1191
1192 -#content .article-body-event .event-link a{ 1192 +#content .box-1 .article-body-event .event-link a{
1193 text-decoration: underline; 1193 text-decoration: underline;
1194 } 1194 }
1195 1195
@@ -1207,24 +1207,26 @@ float: left; @@ -1207,24 +1207,26 @@ float: left;
1207 line-height: 22px; 1207 line-height: 22px;
1208 } 1208 }
1209 1209
1210 -ul.software-community-events-list { 1210 +/*software-events-block box-1*/
  1211 +
  1212 +.box-1 .software-events-block ul.software-community-events-list {
1211 border: 1px solid #D3D6DE; 1213 border: 1px solid #D3D6DE;
1212 border-radius: 8px; 1214 border-radius: 8px;
1213 width: 100%; 1215 width: 100%;
1214 } 1216 }
1215 1217
1216 -li.software-events-list-item { 1218 +.box-1 .software-events-block li.software-events-list-item {
1217 border-bottom: 1px dotted #D3D6DE; 1219 border-bottom: 1px dotted #D3D6DE;
1218 font-size: 14px; 1220 font-size: 14px;
1219 padding: 7px 0px; 1221 padding: 7px 0px;
1220 padding-left: 16px; 1222 padding-left: 16px;
1221 } 1223 }
1222 1224
1223 -li.software-events-list-item:last-child{  
1224 - border: none; 1225 +.box-1 .software-events-block li.software-events-list-item:last-child{
  1226 + border:none;
1225 } 1227 }
1226 1228
1227 -.software-events-list-item-calendar { 1229 +.box-1 .software-events-block .software-events-list-item-calendar {
1228 background-image: url("../images/calendar-icon.png"); 1230 background-image: url("../images/calendar-icon.png");
1229 background-repeat: no-repeat; 1231 background-repeat: no-repeat;
1230 width: 14px; 1232 width: 14px;
@@ -1233,10 +1235,48 @@ li.software-events-list-item:last-child{ @@ -1233,10 +1235,48 @@ li.software-events-list-item:last-child{
1233 margin-top: 2px; 1235 margin-top: 2px;
1234 } 1236 }
1235 1237
1236 -.software-events-list-item-date { 1238 +.box-1 .software-events-block .software-events-list-item-date {
1237 padding-left: 5px; 1239 padding-left: 5px;
  1240 + font-weight: 700;
1238 } 1241 }
1239 1242
1240 -.software-events-list-item-title { 1243 +.box-1 .software-events-block .software-events-list-item-title {
1241 padding-left: 1px; 1244 padding-left: 1px;
1242 } 1245 }
  1246 +
  1247 +/*software-events-block - sidebar - box2*/
  1248 +
  1249 +#content .box-2 .software-events-block .software-community-events-block{
  1250 + border:1px solid #C0C1C1;
  1251 + border-radius:4px;
  1252 + background-color:#ECEDF1;
  1253 +}
  1254 +
  1255 +#content .box-2 .software-events-block .software-events-list-item{
  1256 + padding:10px 15px;
  1257 + border-bottom:1px dotted #C0C1C1;
  1258 + color:#2C4B6B;
  1259 + font-size: 15px;
  1260 + font-weight: 500;
  1261 +}
  1262 +
  1263 +#content .box-2 .software-events-block .software-events-list-item-date{
  1264 + font-weight: 800;
  1265 +}
  1266 +
  1267 +#content .box-2 .software-events-block .software-events-list-item-title a,
  1268 +#content .box-2 .software-events-block .software-events-list-item-title a:visited{
  1269 + color:#2C4B6B;
  1270 +}
  1271 +
  1272 +#content .box-2 .software-events-block .software-events-list-item:first-child{
  1273 + color:#172738;
  1274 + font-weight: 800;
  1275 + text-transform: uppercase;
  1276 + border-bottom: 1px solid #C0C1C1;
  1277 + padding:10px 15px;
  1278 +}
  1279 +
  1280 +#content .box-2 .software-events-block .software-events-list-item:last-child{
  1281 + border:none;
  1282 +}