Skip to content

Commit e3dd026

Browse files
jmgasperjmgasper
authored
Merge pull request #37 from topcoder-platform/develop
v1.5
2 parents c93377d + 1382d38 commit e3dd026

13 files changed

+248
-64
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.

‎design/images/icon-close-2.svg

Lines changed: 19 additions & 0 deletions
Loading

‎src/scss/base/_categories.scss

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,7 @@
2121
position: relative;
2222

2323
&::after {
24-
content: '';
25-
width: 3px;
26-
height: 3px;
27-
border-radius: 50%;
28-
background: $global-color_grey;
29-
position: absolute;
30-
display: block;
31-
right: -8px;
32-
margin-top: -2px;
33-
top: 50%;
24+
content: none
3425
}
3526
}
3627
}

‎src/scss/base/_discussions.scss

Lines changed: 11 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,12 @@
8181
@media screen and (max-width: 768px) {
8282
.DataList.Discussions {
8383
li.ItemDiscussion {
84-
border-top: 1px solid $global-grey-bg;
85-
background-color: transparent;
84+
border-bottom: none;
85+
border-top: none;
86+
background-color: #f4f4f4;
87+
margin-bottom: 16px;
88+
padding: 18px 20px 0 25px!important;
8689
border-radius: 10px;
87-
padding: 19px 0 18px 0;
88-
border-radius: 0;
89-
margin-top: 0;
90-
position: relative;
9190

9291
&:first-child {
9392
border-top: none;
@@ -100,7 +99,7 @@
10099
.Options {
101100
position: absolute;
102101
top: 20px;
103-
right: 0;
102+
right: 5px;
104103
}
105104

106105
.Meta.Meta-Discussion {
@@ -119,31 +118,22 @@
119118

120119
&.status-container {
121120
.MCount,
122-
.Tag {
121+
.Tag, .MiddleDot {
123122
display: none;
124123
}
125124

126125
.MItem.Category {
127-
position: relative;
126+
display: none;
128127

129128
&::before {
130-
content: "";
131-
width: 3px;
132-
height: 3px;
133-
border-radius: 50%;
134-
background: $global-color_grey;
135-
position: absolute;
136-
display: block;
137-
left: -7px;
138-
margin-top: -2px;
139-
top: 50%;
129+
content: none;
140130
}
141131
}
142132

143133
}
144134

145135
&.view-comment-container {
146-
.MItem:not(.MCount),
136+
.MItem:not(.MCount,.MiddleDot),
147137
.Tag {
148138
display: none;
149139
}
@@ -152,16 +142,7 @@
152142
position: relative;
153143

154144
&::after {
155-
content: "";
156-
width: 3px;
157-
height: 3px;
158-
border-radius: 50%;
159-
background: $global-color_grey;
160-
position: absolute;
161-
display: block;
162-
right: -8px;
163-
margin-top: -2px;
164-
top: 50%;
145+
content: none;
165146
}
166147

167148
&.CommentCount {

‎src/scss/base/_editor.scss

Lines changed: 36 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,54 @@
1818
border-right: 1px solid #aaa;
1919
}
2020

21-
.editor-statusbar {
21+
.editor-statusbar, {
2222
font-size: 13px;
2323
padding: 8px 0px;
2424
display: flex;
2525
overflow: hidden;
2626

2727
span {
28-
min-width:4em;
29-
margin-left: 20px;
28+
margin-left: 0px;
29+
min-width: 0px;
3030
}
31-
.upload-image {
32-
margin-left: 0px;
31+
.message, .upload-image {
32+
margin-left: 0px;
3333
margin-right: auto;
3434
}
3535

36+
.message {
37+
display: none;
38+
}
3639
.autosave {
3740

3841
}
3942
}
43+
}
44+
45+
.EasyMDEContainer.error{
46+
.message {
47+
margin-left: 0px;
48+
color: #EF476F;
49+
text-align: left;
50+
display: inline;
51+
}
52+
.upload-image {
53+
display: none;
54+
}
55+
.CodeMirror {
56+
border-right: 2px solid #EF476F;
57+
border-left: 2px solid #EF476F;
58+
border-bottom: 2px solid #EF476F;
59+
}
60+
61+
.editor-toolbar {
62+
border-top: 2px solid #EF476F;
63+
border-left: 2px solid #EF476F;
64+
border-right: 2px solid #EF476F;
65+
}
66+
}
67+
.DiscussionForm {
68+
.countOfRemainingChars {
69+
display: none;
70+
}
4071
}

‎src/scss/base/_formField.scss

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,17 @@ form {
6868
margin-left: 7px !important;
6969
height: 21px;
7070
}
71+
72+
.Button.Primary[disabled=disabled], .Button:disabled {
73+
background-color: $global-color_grey_dark;
74+
border: 1px solid $global-color_grey_dark;
75+
}
76+
77+
a.Button.Disabled, a.Button.Disabled:hover,a.Button.Disabled:focus {
78+
border: 1px solid $global-color_grey_dark;
79+
color: $global-color_grey_dark;
80+
81+
}
7182
}
7283

7384
li,

‎src/scss/base/_messageList.scss

Lines changed: 70 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
.DataList.DataList-Search,
1818
.DataList.CategoryList,
1919
.DataList.GroupList,
20+
.DataList.CategoryAccordion,
2021
.MessageList.DataList.Comments {
2122
li.Item {
2223
border-bottom: none;
@@ -99,6 +100,74 @@
99100
}
100101
}
101102

103+
104+
105+
.CategoryAccordion {
106+
.CategoryAccordionItem {
107+
margin-bottom: 20px;
108+
}
109+
110+
.ui-accordion-header-icon {
111+
float: right;
112+
top: 12px;
113+
background: no-repeat;
114+
margin-right: 25px;
115+
}
116+
117+
.icon-chevron-down:before, .icon-chevron-up:before {
118+
content: " ";
119+
background-size: cover;
120+
background-image: url("/themes/topcoder/design/images/icon-chevron-down.svg");
121+
position: absolute;
122+
margin-top: 12px;
123+
color: #fff!important;
124+
height: 12px;
125+
width: 20px;
126+
display: inline-block;
127+
}
128+
129+
.icon-chevron-down:before{
130+
131+
}
132+
.icon-chevron-up:before {
133+
transform: rotate(-180deg);
134+
}
135+
136+
.CategoryAccordionHeader {
137+
border-radius: 10px;
138+
padding: 15px 20px 15px 26px !important;
139+
background-color: $global-grey-very-dark-bg;
140+
141+
&.ui-state-active {
142+
border-radius: 10px 10px 0px 0px;
143+
}
144+
145+
a {
146+
@include barlowcondensed-medium;
147+
text-transform: uppercase;
148+
color: $global-color_black_light !important;
149+
font-size: $global-mediumTitle_fontSize !important;
150+
}
151+
}
152+
153+
.DataList.CategoryList {
154+
li.Item {
155+
border-radius: 0px ;
156+
padding: 20px 20px 19px 26px!important;
157+
margin: 0px;
158+
159+
&.Depth2 {
160+
border-right: solid 1px #E9E9E9;
161+
border-left: solid 1px #E9E9E9;
162+
border-bottom: solid 1px #E9E9E9;
163+
background: transparent;
164+
}
165+
}
166+
167+
}
168+
169+
}
170+
102171
.DataList.CategoryList, .DataList.GroupList {
103172
li.Item {
104173
padding: 18px 20px 17px 25px !important;
@@ -195,7 +264,7 @@
195264
.Content.MainContent,
196265
.CommentsWrap {
197266
.DataList.DataList-Search,
198-
.DataList.CategoryList,
267+
.DataList.CategoryList, .DataList.CategoryAccordion
199268
.MessageList.DataList.Comments {
200269
li.Item {
201270
.PhotoWrap {

‎src/scss/base/_variables.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ $global-small_fontSize: 12px !default;
6969
$global-very_small_fontSize: 9px !default;
7070

7171
$global-title_fontSize: 32px !default;
72+
$global-mediumTitle_fontSize: 24px !default;
7273
$global-smallTitle_fontSize: 20px !default;
7374
$global-title_mobile_fontSize: 26px !default;
7475
$global-subTitle_fontSize: 18px !default;

‎src/scss/components/_breadcrumbs.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#plugins\/groups_groups_mine, #vanilla_drafts_index, #plugins\/topcoder_watching_index {
2+
.BreadcrumbsBox {
3+
display: none;
4+
}
5+
}
6+
7+
#vanilla_categories_index .BreadcrumbsBox .HomeCrumb.Last {
8+
display: none;
9+
}

‎src/scss/components/_easymde.scss

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,13 @@
1111
justify-content: flex-end;
1212
flex-wrap: wrap;
1313

14-
span {
15-
}
16-
.upload-image {
14+
.message, .upload-image {
1715
text-align: left;
1816
order: 0;
1917
}
20-
.autosave {
18+
.countOfRemainingChars {
2119
order: 1;
2220
}
23-
.lines {
24-
order: 2;
25-
}
26-
.words {
27-
order: 3;
28-
}
29-
.cursor {
30-
order: 4;
31-
}
3221
}
3322
}
3423

‎src/scss/components/_index.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
22
@import 'mebox';
33
@import "lists";
44
@import "easymde";
5-
@import "searchbox";
5+
@import "searchbox";
6+
@import "popup";
7+
@import "breadcrumbs";

0 commit comments

Comments
 (0)