Skip to content

Commit d3cd4ba

Browse files
committed
Removed right margin in every third span4 footer content block in 768px - 979px breakpoint
Fixed #312
1 parent c70a7dd commit d3cd4ba

4 files changed

Lines changed: 27 additions & 23 deletions

File tree

css/open_framework.css

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1399,19 +1399,21 @@ ul.primary {
13991399
width: 30.6%;
14001400
}
14011401

1402-
/* line 1272, ../sass/includes/_base.scss */
1402+
/* line 1273, ../sass/includes/_base.scss */
14031403
.footer-content .block.span2:nth-child(3n+1),
1404-
.footer-content .block.span3:nth-child(3n+1) {
1404+
.footer-content .block.span3:nth-child(3n+1),
1405+
.footer-content .block.span4:nth-child(3n+1) {
14051406
clear: both;
14061407
}
14071408

1408-
/* line 1276, ../sass/includes/_base.scss */
1409+
/* line 1278, ../sass/includes/_base.scss */
14091410
.footer-content .block.span2:nth-child(3n),
1410-
.footer-content .block.span3:nth-child(3n) {
1411+
.footer-content .block.span3:nth-child(3n),
1412+
.footer-content .block.span4:nth-child(3n) {
14111413
margin-right: 0;
14121414
}
14131415

1414-
/* line 1282, ../sass/includes/_base.scss */
1416+
/* line 1284, ../sass/includes/_base.scss */
14151417
.sidebar-first .content-row3 .span4,
14161418
.sidebar-first .content-col3.row-fluid .span4,
14171419
.sidebar-first .content-row4 .span3,
@@ -1423,22 +1425,22 @@ ul.primary {
14231425
width: 49%;
14241426
}
14251427

1426-
/* line 1292, ../sass/includes/_base.scss */
1428+
/* line 1294, ../sass/includes/_base.scss */
14271429
.sidebar-first .content-row3 .span4:nth-child(odd),
14281430
.sidebar-first .content-col3.row-fluid .span4:nth-child(odd),
14291431
.sidebar-first .content-row4 .span3:nth-child(odd),
14301432
.sidebar-first .content-col4.row-fluid .span3:nth-child(odd) {
14311433
margin-right: 2%;
14321434
}
14331435

1434-
/* line 1297, ../sass/includes/_base.scss */
1436+
/* line 1299, ../sass/includes/_base.scss */
14351437
.sidebar-first .content-col3.row-fluid [class*="span"]:nth-child(2n),
14361438
.sidebar-first .content-row4 [class*="span"]:nth-child(2n),
14371439
.sidebar-first .content-col4.row-fluid [class*="span"]:nth-child(2n) {
14381440
margin-right: 0;
14391441
}
14401442

1441-
/* line 1305, ../sass/includes/_base.scss */
1443+
/* line 1307, ../sass/includes/_base.scss */
14421444
.sidebar-first .content-row2 [class*="span"]:nth-child(2n+1),
14431445
.sidebar-first .content-col2.row-fluid [class*="span"]:nth-child(2n+1),
14441446
.sidebar-first .content-row3 [class*="span"]:nth-child(2n+1),
@@ -1449,7 +1451,7 @@ ul.primary {
14491451
margin-left: 0;
14501452
}
14511453

1452-
/* line 1312, ../sass/includes/_base.scss */
1454+
/* line 1314, ../sass/includes/_base.scss */
14531455
.two-sidebars .content-row3 .span4,
14541456
.two-sidebars .content-col3.row-fluid .span4,
14551457
.two-sidebars .content-row4 .span3,
@@ -1461,22 +1463,22 @@ ul.primary {
14611463
width: 49%;
14621464
}
14631465

1464-
/* line 1322, ../sass/includes/_base.scss */
1466+
/* line 1324, ../sass/includes/_base.scss */
14651467
.two-sidebars .content-row3 .span4:nth-child(odd),
14661468
.two-sidebars .content-col3.row-fluid .span4:nth-child(odd),
14671469
.two-sidebars .content-row4 .span3:nth-child(odd),
14681470
.two-sidebars .content-col4.row-fluid .span3:nth-child(odd) {
14691471
margin-right: 2%;
14701472
}
14711473

1472-
/* line 1327, ../sass/includes/_base.scss */
1474+
/* line 1329, ../sass/includes/_base.scss */
14731475
.two-sidebars .content-col3.row-fluid [class*="span"]:nth-child(2n),
14741476
.two-sidebars .content-row4 [class*="span"]:nth-child(2n),
14751477
.two-sidebars .content-col4.row-fluid [class*="span"]:nth-child(2n) {
14761478
margin-right: 0;
14771479
}
14781480

1479-
/* line 1335, ../sass/includes/_base.scss */
1481+
/* line 1337, ../sass/includes/_base.scss */
14801482
.two-sidebars .content-row2 [class*="span"]:nth-child(2n+1),
14811483
.two-sidebars .content-col2.row-fluid [class*="span"]:nth-child(2n+1),
14821484
.two-sidebars .content-row3 [class*="span"]:nth-child(2n+1),
@@ -1487,7 +1489,7 @@ ul.primary {
14871489
margin-left: 0;
14881490
}
14891491

1490-
/* line 1342, ../sass/includes/_base.scss */
1492+
/* line 1344, ../sass/includes/_base.scss */
14911493
.no-sidebars .content-row3 .span4,
14921494
.no-sidebars .content-col3.row-fluid .span4,
14931495
.no-sidebars .content-row4 .span3,
@@ -1499,22 +1501,22 @@ ul.primary {
14991501
width: 49%;
15001502
}
15011503

1502-
/* line 1352, ../sass/includes/_base.scss */
1504+
/* line 1354, ../sass/includes/_base.scss */
15031505
.no-sidebars .content-row3 .span4:nth-child(odd),
15041506
.no-sidebars .content-col3.row-fluid .span4:nth-child(odd),
15051507
.no-sidebars .content-row4 .span3:nth-child(odd),
15061508
.no-sidebars .content-col4.row-fluid .span3:nth-child(odd) {
15071509
margin-right: 2%;
15081510
}
15091511

1510-
/* line 1357, ../sass/includes/_base.scss */
1512+
/* line 1359, ../sass/includes/_base.scss */
15111513
.no-sidebars .content-col3.row-fluid [class*="span"]:nth-child(2n),
15121514
.no-sidebars .content-row4 [class*="span"]:nth-child(2n),
15131515
.no-sidebars .content-col4.row-fluid [class*="span"]:nth-child(2n) {
15141516
margin-right: 0;
15151517
}
15161518

1517-
/* line 1365, ../sass/includes/_base.scss */
1519+
/* line 1367, ../sass/includes/_base.scss */
15181520
.no-sidebars .content-row2 [class*="span"]:nth-child(2n+1),
15191521
.no-sidebars .content-col2.row-fluid [class*="span"]:nth-child(2n+1),
15201522
.no-sidebars .content-row3 [class*="span"]:nth-child(2n+1),
@@ -1525,7 +1527,7 @@ ul.primary {
15251527
margin-left: 0;
15261528
}
15271529

1528-
/* line 1371, ../sass/includes/_base.scss */
1530+
/* line 1373, ../sass/includes/_base.scss */
15291531
.sidebar-second .content-row2 [class*="span"]:nth-child(2n+1),
15301532
.sidebar-second .content-row3 [class*="span"]:nth-child(3n+1),
15311533
.sidebar-second .content-row4 [class*="span"]:nth-child(4n+1) {
@@ -1535,7 +1537,7 @@ ul.primary {
15351537
}
15361538
/* large desktop */
15371539
@media (min-width: 980px) {
1538-
/* line 1383, ../sass/includes/_base.scss */
1540+
/* line 1385, ../sass/includes/_base.scss */
15391541
.content-row2 [class*="span"]:nth-child(2n+1),
15401542
.content-row3 [class*="span"]:nth-child(3n+1),
15411543
.content-row4 [class*="span"]:nth-child(4n+1) {
@@ -1545,7 +1547,7 @@ ul.primary {
15451547
}
15461548
/* desktop */
15471549
@media (min-width: 980px) and (max-width: 1199px) {
1548-
/* line 1395, ../sass/includes/_base.scss */
1550+
/* line 1397, ../sass/includes/_base.scss */
15491551
.two-sidebars .content .callout,
15501552
.two-sidebars .content .bracket,
15511553
.two-sidebars .content .topline {

sass/includes/_base.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1269,11 +1269,13 @@ ul.primary {
12691269
width: 30.6%;
12701270
}
12711271
.footer-content .block.span2:nth-child(3n+1),
1272-
.footer-content .block.span3:nth-child(3n+1) {
1272+
.footer-content .block.span3:nth-child(3n+1),
1273+
.footer-content .block.span4:nth-child(3n+1) {
12731274
clear: both;
12741275
}
12751276
.footer-content .block.span2:nth-child(3n),
1276-
.footer-content .block.span3:nth-child(3n) {
1277+
.footer-content .block.span3:nth-child(3n),
1278+
.footer-content .block.span4:nth-child(3n) {
12771279
margin-right: 0;
12781280
}
12791281
.sidebar-first .content-row3 .span4,

sass/open_framework.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
"includes/module-theme-options",
66
"includes/module-views-grid",
77
"includes/module-bootstrap-overrides",
8-
"includes/module-ie";
8+
"includes/module-ie";

sass/open_framework_print.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
@import
22
"compass/css3",
33
"includes/variables",
4-
"includes/print";
4+
"includes/print";

0 commit comments

Comments
 (0)