Skip to content

Commit cd4b373

Browse files
jmgasperjmgasper
authored
Merge pull request #22 from topcoder-platform/issues-384
Issues-377:design tweaks
2 parents 0984c08 + 7d4d862 commit cd4b373

File tree

14 files changed

+188
-53
lines changed

14 files changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@
2525
}
2626
}
2727

28-
.Search, .Vanilla {
28+
.Search, .Groups, .Vanilla {
2929
h1.H,
30+
h1.Group-Title,
3031
h1.HomepageTitle,
3132
h1 {
3233
@include barlowcondensed-medium;

‎src/scss/base/_button.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
font-size: 14px !important;
66
font-weight: bold !important;
77
letter-spacing: 0.8px !important;
8-
line-height: 40px;
9-
height: 40px;
8+
height: 30px;
109
text-transform: uppercase;
1110
border-radius: 20px !important;
1211
padding: 0 20px !important;

‎src/scss/base/_categories.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
.status-container {
66
.RSS,
77
.DiscussionCount,
8+
.MiddleDot,
89
.CommentCount {
910
display: none;
1011
}

‎src/scss/base/_drafts.scss

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -41,32 +41,3 @@
4141
}
4242
}
4343
}
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/_group.scss

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
.Section-GroupList {
2+
.MainContent {
3+
.H {
4+
text-align: left;
5+
}
6+
}
7+
}
8+
.Group {
9+
font-family: $global-body_fontFamily !important;
10+
.Group-Description {
11+
color: $global-color_black_light;
12+
font-size: $global-large_fontSize;
13+
margin-bottom: 27px;
14+
}
15+
.Group-Header {
16+
.Group-Info {
17+
padding-left: 0px;
18+
19+
.Table {
20+
width: 100%;
21+
.TableRow {
22+
.TableCell {
23+
padding: 10px;
24+
border-top: 1px solid #D4D4D4;
25+
color: $global-color_black_light;
26+
font-size: $global-medium_fontSize;
27+
}
28+
.Cell1 {
29+
width: 10%;
30+
}
31+
32+
.Cell2 {
33+
color: $global-color_grey;
34+
width: 90%;
35+
}
36+
}
37+
.TableRow.Last {
38+
.TableCell {
39+
border-bottom: 1px solid #D4D4D4;
40+
}
41+
}
42+
43+
}
44+
}
45+
}
46+
}

‎src/scss/base/_index.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,5 @@
2121
@import 'drafts';
2222
@import 'mebox';
2323
@import 'editor';
24+
@import 'table';
25+
@import 'group';

‎src/scss/base/_messageList.scss

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
.DataList.DataList-Search,
1818
.DataList.CategoryList,
19+
.DataList.GroupList,
1920
.MessageList.DataList.Comments {
2021
li.Item {
2122
border-bottom: none;
@@ -78,7 +79,7 @@
7879
}
7980
}
8081

81-
.DataList.CategoryList {
82+
.DataList.CategoryList, .DataList.GroupList {
8283
li.Item {
8384
padding: 18px 20px 17px 25px !important;
8485

@@ -100,6 +101,17 @@
100101
}
101102
}
102103

104+
.DataList.GroupList {
105+
li.Item {
106+
.Description {
107+
font-family: $global-body_fontFamily;
108+
color: $global-color_grey;
109+
font-size: 13px;
110+
}
111+
}
112+
}
113+
114+
103115
.ReactButton.Quote.js-quoteButton {
104116
font-size: 12px;
105117
font-weight: 400;
@@ -144,20 +156,6 @@
144156
.DataList.CategoryList,
145157
.MessageList.DataList.Comments {
146158
li.Item {
147-
border-bottom: none;
148-
border-top: 1px solid $global-grey-bg;
149-
background-color: transparent;
150-
border-radius: 0;
151-
padding-left: 0 !important;
152-
153-
&:last-child {
154-
border-bottom: 1px solid $global-grey-bg;
155-
}
156-
157-
&:first-child {
158-
border-top: none;
159-
}
160-
161159
.PhotoWrap {
162160
left: 0;
163161
}

‎src/scss/base/_table.scss

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
.Table {
2+
display: table;
3+
4+
.Title {
5+
display: table-caption;
6+
text-align: center;
7+
font-weight: bold;
8+
font-size: larger;
9+
}
10+
11+
.TableHeading,.TableRow {
12+
display: table-row;
13+
border-top: 1px solid #D4D4D4;;
14+
15+
.TableCell {
16+
display: table-cell;
17+
padding-left: 12px;
18+
}
19+
20+
}
21+
22+
.TableHeading {
23+
font-weight: bold;
24+
text-align: center;
25+
}
26+
27+
28+
}

‎src/scss/pages/_group.scss

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
@media screen and (max-width: 768px) {
2+
.Frame-body {
3+
.Frame-content {
4+
.Frame-contentWrap {
5+
.Frame-details {
6+
.Frame-row {
7+
.Content.MainContent {
8+
width: 100%;
9+
overflow: hidden;
10+
11+
h1.H,
12+
h1.HomepageTitle,
13+
h1 {
14+
margin-top: 0px;
15+
}
16+
}
17+
}
18+
}
19+
}
20+
}
21+
}
22+
}
23+
24+
.Section-Group .H {
25+
text-align: left;
26+
}
27+
body.Group {
28+
.FormWrapper {
29+
.Buttons {
30+
display: flex;
31+
flex-direction: row-reverse;
32+
}
33+
34+
}
35+
}
36+
37+
.Group-Header.NoBanner {
38+
min-height: 1px;
39+
display: flex;
40+
.Group-Info {
41+
margin: 0px 0px 30px 0px;
42+
padding-left: 0;
43+
}
44+
}
45+
46+
.Group-Header.HasBanner {
47+
min-height: 1px;
48+
display: flex;
49+
.GroupOptions {
50+
top: 0px;
51+
}
52+
.Group-Info {
53+
margin: 20px 0px 30px 0px;
54+
padding-left: 0;
55+
}
56+
}

‎src/scss/pages/_groups.scss

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,36 @@
1010
}
1111
}
1212
}
13+
}
14+
15+
.Section-GroupList .MainContent .H {
16+
text-align: left;
17+
}
18+
19+
@media screen and (max-width: 768px) {
20+
.Section-GroupList .DataList .Item .Options {
21+
margin-top: 0px;
22+
}
23+
}
24+
25+
.Group-MembersPreview {
26+
.PhotoWrap.PhotoWrap.PhotoWrap img {
27+
margin: 0;
28+
width: 42px;
29+
height: 42px;
30+
}
31+
}
32+
33+
.Group-Header.NoBanner {
34+
min-height: 1px;
35+
display: flex;
36+
.Group-Header-Info {
37+
padding-left: 0;
38+
}
39+
}
40+
41+
Group-Header.HasBanner {
42+
.Group-Header-Info {
43+
margin: 20px;
44+
}
1345
}

‎src/scss/pages/_index.scss

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

‎views/default.master.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
{asset name="Content"}
140140
</main>
141141
<aside class="Panel Panel-main">
142-
{if !$SectionGroups && !$DataDrivenTitleBar && !inSection(["SearchResults"])}
142+
{if !$DataDrivenTitleBar && !inSection(["SearchResults"])}
143143
<div class="SearchBox js-sphinxAutoComplete" role="search">
144144
{searchbox}
145145
</div>

0 commit comments

Comments
 (0)