Skip to content

Commit 11225ec

Browse files
committed
Issues-553: Fixed 'New Discussion' button
1 parent 215ad2e commit 11225ec

File tree

12 files changed

+99
-27
lines changed

12 files changed

+99
-27
lines changed

design/custom.css

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

design/custom.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.

src/scss/base/_button.scss

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,31 @@
11
.Button.Primary,
22
.Button,
33
.Button.Primary.SignInPopup,
4-
.Button.Primary.Action.BigButton {
5-
font-size: 14px !important;
6-
font-weight: bold !important;
7-
letter-spacing: 0.8px !important;
4+
.Button.Primary.Action.BigButton,
5+
.Button:not(.GroupOptionsTitle), .Buttons .btn-primary,
6+
.BoxButtons.BoxNewDiscussion .Button.Primary,
7+
.PageControls .Button-Controls .Button.Primary,
8+
.Form-BodyWrap .FormTitleWrapper .Buttons .Button.Primary,
9+
.Form-BodyWrap .FormWrapper .Buttons .Button.Primary
10+
{
11+
font-size: $global-small_fontSize !important;
12+
font-weight: $global-medium_fontWeight !important;
13+
letter-spacing: 0.69px !important;
814
height: 30px;
15+
line-height: 34px;
916
text-transform: uppercase;
1017
border-radius: 20px !important;
1118
padding: 0 20px !important;
1219
}
1320

1421

15-
.Button.Primary.SignInPopup {
22+
.Button.Primary.SignIn.BigButton{
23+
font-size: $global-medium_fontSize !important;
1624
background: $global-color_primary;
1725
border: 1px solid $global-color_primary;
18-
color: white;
26+
color: #FAFAFB;
1927
width: 100%;
28+
height: 40px;
2029
}
2130

2231

src/scss/base/_group.scss

Lines changed: 49 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,57 @@
66
}
77
}
88
.Group {
9-
font-family: $global-body_fontFamily !important;
9+
font-family: $global-body_fontFamily !important;
10+
11+
.Group-Archived{
12+
margin-top: 6px;
13+
.Archived {
14+
background: $global-pink;
15+
border: 1px solid $global-pink;
16+
color: white;
17+
font-family: $global-body_fontFamily !important;
18+
font-size: $global-small_fontSize !important;
19+
font-weight: bold !important;
20+
letter-spacing: 0.69px !important;
21+
height: 30px;
22+
text-transform: uppercase;
23+
border-radius: 15px !important;
24+
padding: 6px 17px !important;
25+
margin-right: 10px ;
26+
}
27+
}
28+
1029
.Group-Description {
30+
31+
}
32+
33+
.Group-Header.NoBanner {
34+
.Group-Info {
35+
padding-left: 0px;
1136
color: $global-color_black_light;
12-
font-size: $global-large_fontSize;
1337
margin-bottom: 33px;
14-
a {
15-
color: $global-blue;
16-
}
17-
> br {
18-
line-height: 0px;
19-
display: inline-block;
20-
content: '';
38+
39+
.Group-Description {
40+
margin-bottom: 0px;
41+
}
42+
.Group-Archived, .Group-Description {
43+
* {
44+
font-size: $global-large_fontSize;
45+
}
46+
a {
47+
color: $global-blue;
48+
}
49+
}
2150
}
2251
}
2352

24-
.Group-Header {
53+
.Group-Footer {
2554
.Group-Info {
2655
padding-left: 0px;
56+
color: $global-color_black_light;
57+
margin-bottom: 33px;
2758

28-
.Table {
59+
.Table {
2960
width: calc(100% + 46px);
3061
display: table;
3162
border-collapse: separate;
@@ -59,15 +90,20 @@
5990
border-bottom: 1px solid #D4D4D4;
6091
}
6192
}
62-
6393
}
6494
}
6595
}
6696
}
6797

6898
@media screen and (max-width: 768px) {
6999
.Group {
70-
.Group-Header {
100+
.Group-Archived{
101+
span:not(.Archived) {
102+
display: block;
103+
padding-top:10px;
104+
}
105+
}
106+
.Group-Footer {
71107
.Group-Info {
72108
padding-left: 0px;
73109
.Table {

src/scss/base/_index.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,5 @@
2323
@import 'editor';
2424
@import 'table';
2525
@import 'group';
26-
@import "lists";
26+
@import 'lists';
27+
@import 'utilities';

src/scss/base/_pageControls.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
a {
99
border-color: transparent;
1010
border-radius: 15px;
11-
font-size: 14px;
11+
font-size: $global-small_fontSize;
1212
font-weight: 400;
1313
line-height: 30px;
1414
height: 30px;

src/scss/base/_utilities.scss

Whitespace-only changes.

src/scss/base/_variables.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ $global-grey-bg-dark: #d4d4d4;
2222
$global-grey-very-dark-bg: #f4f4f4;
2323
$global-color_whitesmoke: #bcbec1;
2424
$global-blue: #0d61bf;
25+
$global-pink: #EF476F;
2526

2627
$global-color_black: #000;
2728
$global-color_black_light: #2a2a2a;

src/scss/components/_index.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
@import "easymde";
55
@import "searchbox";
66
@import "popup";
7-
@import "breadcrumbs";
7+
@import "breadcrumbs";
8+
@import "pager";

src/scss/components/_pager.scss

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
.PageControls.PageControls {
2+
.BoxNewDiscussion {
3+
display: inline-block;
4+
}
5+
}
6+
7+
@media screen and (max-width: 960px) {
8+
.PageControls.PageControls {
9+
.BoxNewDiscussion {
10+
display: none;
11+
}
12+
}
13+
}

src/scss/pages/_categories.scss

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
.Section-DiscussionList{
2+
.PageControls.Top {
3+
.ToggleFlyout.selectBox {
4+
float: left;
5+
}
6+
.BoxButtons.BoxNewDiscussion{
7+
float: right;
8+
}
9+
}
10+
}

src/scss/pages/_index.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@import 'home';
22
@import 'search';
33
@import 'groups';
4-
@import 'group';
4+
@import 'group';
5+
@import 'categories';

0 commit comments

Comments
 (0)