Skip to content

v1.5 #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 9, 2021
Merged

v1.5 #37

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions design/custom.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion design/custom.css.map

Large diffs are not rendered by default.

19 changes: 19 additions & 0 deletions design/images/icon-close-2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 1 addition & 10 deletions src/scss/base/_categories.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,7 @@
position: relative;

&::after {
content: '';
width: 3px;
height: 3px;
border-radius: 50%;
background: $global-color_grey;
position: absolute;
display: block;
right: -8px;
margin-top: -2px;
top: 50%;
content: none
}
}
}
Expand Down
41 changes: 11 additions & 30 deletions src/scss/base/_discussions.scss
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,12 @@
@media screen and (max-width: 768px) {
.DataList.Discussions {
li.ItemDiscussion {
border-top: 1px solid $global-grey-bg;
background-color: transparent;
border-bottom: none;
border-top: none;
background-color: #f4f4f4;
margin-bottom: 16px;
padding: 18px 20px 0 25px!important;
border-radius: 10px;
padding: 19px 0 18px 0;
border-radius: 0;
margin-top: 0;
position: relative;

&:first-child {
border-top: none;
Expand All @@ -100,7 +99,7 @@
.Options {
position: absolute;
top: 20px;
right: 0;
right: 5px;
}

.Meta.Meta-Discussion {
Expand All @@ -119,31 +118,22 @@

&.status-container {
.MCount,
.Tag {
.Tag, .MiddleDot {
display: none;
}

.MItem.Category {
position: relative;
display: none;

&::before {
content: "";
width: 3px;
height: 3px;
border-radius: 50%;
background: $global-color_grey;
position: absolute;
display: block;
left: -7px;
margin-top: -2px;
top: 50%;
content: none;
}
}

}

&.view-comment-container {
.MItem:not(.MCount),
.MItem:not(.MCount,.MiddleDot),
.Tag {
display: none;
}
Expand All @@ -152,16 +142,7 @@
position: relative;

&::after {
content: "";
width: 3px;
height: 3px;
border-radius: 50%;
background: $global-color_grey;
position: absolute;
display: block;
right: -8px;
margin-top: -2px;
top: 50%;
content: none;
}

&.CommentCount {
Expand Down
41 changes: 36 additions & 5 deletions src/scss/base/_editor.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,54 @@
border-right: 1px solid #aaa;
}

.editor-statusbar {
.editor-statusbar, {
font-size: 13px;
padding: 8px 0px;
display: flex;
overflow: hidden;

span {
min-width:4em;
margin-left: 20px;
margin-left: 0px;
min-width: 0px;
}
.upload-image {
margin-left: 0px;
.message, .upload-image {
margin-left: 0px;
margin-right: auto;
}

.message {
display: none;
}
.autosave {

}
}
}

.EasyMDEContainer.error{
.message {
margin-left: 0px;
color: #EF476F;
text-align: left;
display: inline;
}
.upload-image {
display: none;
}
.CodeMirror {
border-right: 2px solid #EF476F;
border-left: 2px solid #EF476F;
border-bottom: 2px solid #EF476F;
}

.editor-toolbar {
border-top: 2px solid #EF476F;
border-left: 2px solid #EF476F;
border-right: 2px solid #EF476F;
}
}
.DiscussionForm {
.countOfRemainingChars {
display: none;
}
}
11 changes: 11 additions & 0 deletions src/scss/base/_formField.scss
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,17 @@ form {
margin-left: 7px !important;
height: 21px;
}

.Button.Primary[disabled=disabled], .Button:disabled {
background-color: $global-color_grey_dark;
border: 1px solid $global-color_grey_dark;
}

a.Button.Disabled, a.Button.Disabled:hover,a.Button.Disabled:focus {
border: 1px solid $global-color_grey_dark;
color: $global-color_grey_dark;

}
}

li,
Expand Down
71 changes: 70 additions & 1 deletion src/scss/base/_messageList.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
.DataList.DataList-Search,
.DataList.CategoryList,
.DataList.GroupList,
.DataList.CategoryAccordion,
.MessageList.DataList.Comments {
li.Item {
border-bottom: none;
Expand Down Expand Up @@ -99,6 +100,74 @@
}
}



.CategoryAccordion {
.CategoryAccordionItem {
margin-bottom: 20px;
}

.ui-accordion-header-icon {
float: right;
top: 12px;
background: no-repeat;
margin-right: 25px;
}

.icon-chevron-down:before, .icon-chevron-up:before {
content: " ";
background-size: cover;
background-image: url("/themes/topcoder/design/images/icon-chevron-down.svg");
position: absolute;
margin-top: 12px;
color: #fff!important;
height: 12px;
width: 20px;
display: inline-block;
}

.icon-chevron-down:before{

}
.icon-chevron-up:before {
transform: rotate(-180deg);
}

.CategoryAccordionHeader {
border-radius: 10px;
padding: 15px 20px 15px 26px !important;
background-color: $global-grey-very-dark-bg;

&.ui-state-active {
border-radius: 10px 10px 0px 0px;
}

a {
@include barlowcondensed-medium;
text-transform: uppercase;
color: $global-color_black_light !important;
font-size: $global-mediumTitle_fontSize !important;
}
}

.DataList.CategoryList {
li.Item {
border-radius: 0px ;
padding: 20px 20px 19px 26px!important;
margin: 0px;

&.Depth2 {
border-right: solid 1px #E9E9E9;
border-left: solid 1px #E9E9E9;
border-bottom: solid 1px #E9E9E9;
background: transparent;
}
}

}

}

.DataList.CategoryList, .DataList.GroupList {
li.Item {
padding: 18px 20px 17px 25px !important;
Expand Down Expand Up @@ -195,7 +264,7 @@
.Content.MainContent,
.CommentsWrap {
.DataList.DataList-Search,
.DataList.CategoryList,
.DataList.CategoryList, .DataList.CategoryAccordion
.MessageList.DataList.Comments {
li.Item {
.PhotoWrap {
Expand Down
1 change: 1 addition & 0 deletions src/scss/base/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ $global-small_fontSize: 12px !default;
$global-very_small_fontSize: 9px !default;

$global-title_fontSize: 32px !default;
$global-mediumTitle_fontSize: 24px !default;
$global-smallTitle_fontSize: 20px !default;
$global-title_mobile_fontSize: 26px !default;
$global-subTitle_fontSize: 18px !default;
Expand Down
9 changes: 9 additions & 0 deletions src/scss/components/_breadcrumbs.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#plugins\/groups_groups_mine, #vanilla_drafts_index, #plugins\/topcoder_watching_index {
.BreadcrumbsBox {
display: none;
}
}

#vanilla_categories_index .BreadcrumbsBox .HomeCrumb.Last {
display: none;
}
15 changes: 2 additions & 13 deletions src/scss/components/_easymde.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,13 @@
justify-content: flex-end;
flex-wrap: wrap;

span {
}
.upload-image {
.message, .upload-image {
text-align: left;
order: 0;
}
.autosave {
.countOfRemainingChars {
order: 1;
}
.lines {
order: 2;
}
.words {
order: 3;
}
.cursor {
order: 4;
}
}
}

4 changes: 3 additions & 1 deletion src/scss/components/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@
@import 'mebox';
@import "lists";
@import "easymde";
@import "searchbox";
@import "searchbox";
@import "popup";
@import "breadcrumbs";
Loading