Commit 824fdd6dce229149c0943d0bfdba0a51e8e8bb3c

Authored by Melissa Wen
1 parent a11b751e

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

src/noosfero-spb/noosfero-spb-theme/css/community-pages.css
@@ -1157,7 +1157,7 @@ float: left; @@ -1157,7 +1157,7 @@ float: left;
1157 overflow: hidden; 1157 overflow: hidden;
1158 } 1158 }
1159 1159
1160 -/*** Events ***/ 1160 +/*** Events internal page ***/
1161 1161
1162 #content .article-body-event .event-card{ 1162 #content .article-body-event .event-card{
1163 border-top: 1px dotted #D3D6D3; 1163 border-top: 1px dotted #D3D6D3;
@@ -1195,7 +1195,7 @@ float: left; @@ -1195,7 +1195,7 @@ float: left;
1195 letter-spacing: 0.48px; 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 text-decoration: underline; 1199 text-decoration: underline;
1200 } 1200 }
1201 1201
@@ -1213,24 +1213,26 @@ float: left; @@ -1213,24 +1213,26 @@ float: left;
1213 line-height: 22px; 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 border: 1px solid #D3D6DE; 1219 border: 1px solid #D3D6DE;
1218 border-radius: 8px; 1220 border-radius: 8px;
1219 width: 100%; 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 border-bottom: 1px dotted #D3D6DE; 1225 border-bottom: 1px dotted #D3D6DE;
1224 font-size: 14px; 1226 font-size: 14px;
1225 padding: 7px 0px; 1227 padding: 7px 0px;
1226 padding-left: 16px; 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 background-image: url("../images/calendar-icon.png"); 1236 background-image: url("../images/calendar-icon.png");
1235 background-repeat: no-repeat; 1237 background-repeat: no-repeat;
1236 width: 14px; 1238 width: 14px;
@@ -1239,10 +1241,48 @@ li.software-events-list-item:last-child{ @@ -1239,10 +1241,48 @@ li.software-events-list-item:last-child{
1239 margin-top: 2px; 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 padding-left: 5px; 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 padding-left: 1px; 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 +}