Skip to content

Commit 8b5732c

Browse files
authored
Merge pull request #1571 from Timo-Breumelhof/feature/1568-subscribe-button
FIX: subscribe button styling
2 parents 8503b4a + 6287797 commit 8b5732c

File tree

16 files changed

+41
-15
lines changed

16 files changed

+41
-15
lines changed

Dnn.CommunityForums/module.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1438,7 +1438,6 @@ div.dcf-mod-edit-wrap {
14381438
/* subscription pager */
14391439

14401440
.dcf-pager * {
1441-
font-size: 14px;
14421441
display: inline-block;
14431442
text-align: center;
14441443
color: #000;

Dnn.CommunityForums/themes/community-bootstrap/_src/scss/_variables.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ $spacer-xs: (0.25 * $spacer);
77
$spacer-sm: (0.25 * $spacer);
88
$spacer-md: (0.75 * $spacer);
99

10+
1011
$grey-300: #ddd;
1112
$grey-500: #aaa;
1213
$grey-700: #888;

Dnn.CommunityForums/themes/community-bootstrap/_src/scss/parts/_bootstrap.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,9 @@
99
thead th{
1010
border-bottom-width: 1px !important
1111
}
12+
}
13+
14+
// Faalback for Bootstrap4
15+
.gap-1{
16+
gap: $spacer-sm;
1217
}

Dnn.CommunityForums/themes/community-bootstrap/_src/scss/parts/_pager.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
.afpager{
2+
23
td{
34

45
padding: $spacer-sm;
56
}
67

78
.af_pager{
89

9-
padding: $spacer-sm;
10+
padding: $spacer-sm 0 $spacer-sm $spacer-sm;
11+
&:after{
12+
13+
content: " / "
14+
}
1015

1116
}
1217
}

Dnn.CommunityForums/themes/community-bootstrap/_src/scss/parts/_topic-view.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,11 @@
8686
cursor:pointer;
8787
}
8888

89+
.dcf-subscribe-topic{
90+
padding: 0;
91+
}
8992

90-
91-
.dcf-quick-reply {
93+
.dcf-quick-reply {
9294
.dcf-subscribe{
9395
.amaf-chk-subs{
9496
margin-right: $spacer-xs;

Dnn.CommunityForums/themes/community-bootstrap/templates/TopicView.ascx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,9 @@
152152
</div>
153153
</div>
154154

155-
<div class="dcf-tools dcf-tools-bottom">
155+
<div class="dcf-tools dcf-tools-bottom d-flex align-items-top gap-1">
156156
<div class="dcf-button-reply">[ADDREPLY]</div>
157-
<div class="dcf-subscribe-topic">[TOPICSUBSCRIBE]</div>
157+
<div class="dcf-subscribe-topic flex-grow-1">[TOPICSUBSCRIBE]</div>
158158
<div class="dcf-pager">[PAGER2]</div>
159159
</div>
160160

Binary file not shown.

Dnn.CommunityForums/themes/community-bootstrap/theme.css

Lines changed: 10 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dnn.CommunityForums/themes/community-bootstrap/theme.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dnn.CommunityForums/themes/community-bootstrap/theme.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)