Skip to content

Commit 0984c08

Browse files
authored
Merge pull request #21 from topcoder-platform/issues-384
Issues-376: design tweaks, Issues-380
2 parents 10bd7c4 + 5551ca1 commit 0984c08

20 files changed

+255
-25
lines changed

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

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/_body.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
}
2626
}
2727

28-
.Vanilla {
28+
.Search, .Vanilla {
2929
h1.H,
3030
h1.HomepageTitle,
3131
h1 {

src/scss/base/_breadcrumbs.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
}
1010
.CrumbLabel {
1111
a {
12+
text-decoration: none;
1213
span {
1314
color: $global-blue;
1415
font-size: 14px;
@@ -19,6 +20,7 @@
1920

2021
&.Last {
2122
a {
23+
text-decoration: none;
2224
span {
2325
color: $global-color_grey;
2426
}

src/scss/base/_common.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
justify-content: center;
1313
}
1414

15+
.fill-remaining-space {
16+
flex: auto;
17+
}
18+
1519
@media screen and (max-width: 768px) {
1620
.hide-mobile {
1721
display: none !important;

src/scss/base/_discussions.scss

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,28 @@
55
background-color: $global-grey-very-dark-bg;
66
margin-top: 16px;
77
border-radius: 10px;
8-
padding: 19px 20px 18px 26px;
8+
padding: 24px 20px 17px 26px;
99

1010
.Meta.Meta-Discussion {
11-
display: flex;
1211
align-items: center;
1312

1413
.MItem {
1514
font-size: 13px;
1615
font-weight: 400;
1716
line-height: 16px;
17+
18+
.HasNew.HasNew {
19+
font-size: $global-small_fontSize;
20+
font-family: $global-body_fontFamily;
21+
text-transform: capitalize;
22+
background: $global-color_white;
23+
color: $global-color_black_light;
24+
border: 1px solid $global-color_black_light;
25+
margin-bottom: 0px;
26+
}
1827
}
28+
29+
1930
}
2031

2132
.MItem.Category {
@@ -26,12 +37,13 @@
2637

2738
.ItemContent.Discussion {
2839
.Title {
29-
margin-bottom: 17px;
40+
margin-bottom: 14px;
3041

3142
a {
3243
color: $global-color_black_light;
33-
font-size: 20px;
34-
font-weight: 400;
44+
font-family: $global-body_fontFamily ;
45+
font-size: $global-large_fontSize;
46+
font-weight: bold;
3547
line-height: 30px;
3648
}
3749
}
@@ -59,6 +71,10 @@
5971
font-weight: 400;
6072
line-height: 16px;
6173
}
74+
75+
.MiddleDot{
76+
font-weight: bold;
77+
}
6278
}
6379
}
6480

src/scss/base/_drafts.scss

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
.DataList.Drafts {
2+
li.Draft {
3+
border-top: none;
4+
border-bottom: none;
5+
background-color: $global-grey-very-dark-bg;
6+
margin-top: 16px;
7+
border-radius: 10px;
8+
padding: 19px 20px 18px 26px;
9+
10+
.Options {
11+
a.Delete {
12+
color: #555555;
13+
font-family: $global-image_fontFamily;
14+
font-size: 32px;
15+
font-weight: $global-image_fontWeight;
16+
}
17+
}
18+
19+
.ItemContent {
20+
.Title {
21+
margin-bottom: 17px;
22+
color: $global-color_black_light;
23+
24+
a {
25+
color: $global-color_black_light;
26+
font-size: 20px;
27+
font-weight: 400;
28+
line-height: 30px;
29+
}
30+
}
31+
32+
.Excerpt {
33+
font-weight: 400;
34+
line-height: 16px;
35+
36+
a {
37+
color: $global-color_grey;
38+
font-size: 13px;
39+
}
40+
}
41+
}
42+
}
43+
}
44+
45+
@media screen and (max-width: 768px) {
46+
.DataList.Drafts {
47+
li.Draft {
48+
border-top: 1px solid $global-grey-bg;
49+
background-color: transparent;
50+
border-radius: 10px;
51+
padding: 19px 0 18px 0;
52+
border-radius: 0;
53+
margin-top: 0;
54+
position: relative;
55+
56+
&:first-child {
57+
border-top: none;
58+
}
59+
60+
&:last-child {
61+
border-bottom: 1px solid $global-grey-bg;
62+
}
63+
64+
.Options {
65+
position: absolute;
66+
top: 20px;
67+
right: 0;
68+
}
69+
70+
}
71+
}
72+
}

src/scss/base/_editor.scss

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
.EasyMDEContainer {
2+
3+
.CodeMirror {
4+
box-sizing: border-box;
5+
height: auto;
6+
border-right: 1px solid #aaa;
7+
border-left: 1px solid #aaa;
8+
border-bottom: 1px solid #aaa;
9+
border-bottom-left-radius: 8px;
10+
border-bottom-right-radius: 8px;
11+
}
12+
13+
.editor-toolbar {
14+
border-top-left-radius:8px;
15+
border-top-right-radius:8px;
16+
border-top: 1px solid #aaa;
17+
border-left: 1px solid #aaa;
18+
border-right: 1px solid #aaa;
19+
}
20+
21+
.editor-statusbar {
22+
font-size: 13px;
23+
padding: 8px 0px;
24+
display: flex;
25+
overflow: hidden;
26+
27+
span {
28+
min-width:4em;
29+
margin-left: 20px;
30+
}
31+
.upload-image {
32+
margin-left: 0px;
33+
margin-right: auto;
34+
}
35+
36+
.autosave {
37+
38+
}
39+
}
40+
}

src/scss/base/_filterMenu.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
a {
3838
height: 26px;
39-
padding: 0 22px;
39+
padding: 2px 22px;
4040
font-size: 16px;
4141

4242
span {

src/scss/base/_formField.scss

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.FormTitleWrapper {
2-
max-width: 765px;
2+
/* max-width: 765px;*/
33
}
44

55
.richEditor {
@@ -52,6 +52,12 @@ form {
5252
color: $global-color_primary;
5353
}
5454

55+
.Button.PreviewButton {
56+
border-color: $global-color_primary;
57+
color: $global-color_primary;
58+
59+
}
60+
5561
.Button.DraftButton {
5662
background-color: $global-color_grey_dark;
5763
border-color: $global-color_grey_dark;
@@ -60,6 +66,7 @@ form {
6066

6167
.Button {
6268
margin-left: 7px !important;
69+
height: 21px;
6370
}
6471
}
6572

@@ -139,23 +146,39 @@ form {
139146
}
140147
}
141148

149+
150+
.selectBox-label {
151+
margin-right: 10px;
152+
font-family: $global-body_fontFamily;
153+
font-size: $global-medium_fontSize;
154+
}
155+
142156
.FlyoutButton.selectBox-toggle {
143157
height: 30px;
144158
padding: 0 5px;
159+
background-color: #FBFBFB;
145160
border: 1px solid $global-grey-bg;
146161
border-radius: 6px;
147162
display: flex;
148163
align-items: center;
149164

150165
span {
151166
color: $global-color_black_light;
152-
font-size: 13px;
167+
font-size: $global-medium_fontSize;
153168
font-weight: bold;
154169

155170
&:first-child {
156171
margin-right: 5px;
172+
width: 140px;
157173
}
158174
}
175+
176+
span.vanillaDropDown-arrow {
177+
color: $color-turquoise-tc-turquoise-dark-3;
178+
}
179+
180+
181+
159182
}
160183

161184
// mobile

src/scss/base/_guess.scss

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,28 @@
11
.Box.GuestBox {
22
h4 {
3+
@include barlowcondensed-medium;
34
padding: 0;
45
color: $global-color_black_light;
56
font-size: 34px;
67
font-weight: 400;
78
line-height: 38px;
89
margin-bottom: 10px;
10+
text-transform: uppercase!important;
11+
white-space: nowrap
912
}
1013

1114
p {
1215
color: $global-color_black_light;
13-
font-size: 16px;
16+
font-family: $global-body_fontFamily;
17+
font-size: $global-large_fontSize;
1418
font-weight: 400;
1519
line-height: 26px;
1620
}
21+
22+
div {
23+
a.SignIn {
24+
margin-top: 24px;
25+
}
26+
}
27+
1728
}

src/scss/base/_header.scss

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,28 @@
3636
font-weight: 700;
3737
text-transform: uppercase;
3838

39+
a {
40+
border: none;
41+
font-size: 18px;
42+
font-weight: bold;
43+
}
44+
45+
a:hover, a:focus {
46+
background-color: transparent;
47+
}
48+
3949
.SignInPopup {
4050
font-size: 18px;
4151
font-weight: 700;
4252
margin-left: 10px;
4353
border: none;
4454
}
4555
}
56+
.Search {
57+
img {
58+
vertical-align: middle;
59+
}
60+
}
4661
}
4762
}
4863
}

src/scss/base/_index.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,6 @@
1818
@import 'guess';
1919
@import 'common';
2020
@import 'newDiscussion';
21+
@import 'drafts';
22+
@import 'mebox';
23+
@import 'editor';

src/scss/base/_mebox.scss

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
.MeButton.FlyoutButton.MeButton-user.TopcoderMeButton {
2+
width: fit-content;
3+
.Username {
4+
line-height: 28px;
5+
vertical-align: middle;
6+
margin: 0px 10px 0px 5px;
7+
font-size: 14px;
8+
}
9+
10+
.icon-chevron-down {
11+
font-weight: normal;
12+
font-size: 10px;
13+
}
14+
}
15+
16+

0 commit comments

Comments
 (0)