Skip to content
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.

Sign up for GitHub

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

Jump to bottom

match ios styles #1067

Merged
merged 2 commits into from Jul 17, 2019
Merged

match ios styles #1067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e26c1b4
match ios styles
webb04 Jul 15, 2019
cf63810
comments layout
webb04 Jul 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 17 additions & 8 deletions ArticleTemplates/assets/scss/modules/_comments.scss
View file
Open in desktop
Expand Up @@ -94,7 +94,7 @@

&__header {
position: relative;
margin: base-px(1, 1, 3, 1);
margin: 6px 8px 36px 8px;

@include mq($from: col2) {
margin: base-px(1, 1, 1.5, 1);
Expand Down Expand Up @@ -146,8 +146,7 @@
&__title {
font-family: 'Guardian Headline', 'Guardian Egyptian Web', Georgia, serif;
font-weight: 700;
font-size: 1.9rem;
line-height: 1.9rem;
font-size: 24px;
padding-bottom: 0;

@include mq($from: col2) {
Expand All @@ -163,8 +162,8 @@
&__link:active,
.comments__link {
color: color(brightness-7);
font-size: 1.9rem;
line-height: 1.9rem;
font-size: 24px;
vertical-align: top;
}

&__count {
Expand Down Expand Up @@ -198,8 +197,8 @@
}

&__post {
padding: 12px;
margin: -12px;
padding: 8px;
margin: -6px;
position: absolute;
right: 0;

Expand Down Expand Up @@ -299,19 +298,24 @@
}

.block {
margin: base-px(1);
margin: 12px 8px;
border: solid 1px color(tone-sandy-light);
border-top: 1px solid color(brightness-60);
border-bottom: 2px solid color(tone-sandy-light);

@include mq($from: col4) {
margin-right: 0;
margin-left: 12px;
}
}

&__footer {
overflow: hidden;
margin: base-px(2, 1, 0, 0);

@include mq($from: col4) {
margin-right: 0;
}
}

&__viewmore {
Expand Down Expand Up @@ -369,4 +373,9 @@
}
}
}

@include mq($from: col3, $to: col4) {
padding-left: 4px;
padding-right: 4px;
}
}
7 changes: 6 additions & 1 deletion ArticleTemplates/assets/scss/modules/_commentsHighlighted.scss
View file
Open in desktop
@@ -1,6 +1,6 @@
.comments {
.block--highlighted {
margin: 12px 12px 24px;
margin: 12px 8px 24px 8px;

.comment__container {
padding: 12px;
Expand Down Expand Up @@ -76,5 +76,10 @@
white-space: nowrap;
overflow: hidden;
}

@include mq($from: col4) {
margin-right: 0;
margin-left: 12px;
}
}
}
2 changes: 1 addition & 1 deletion ArticleTemplates/assets/scss/modules/_figure.scss
View file
Open in desktop
Expand Up @@ -197,7 +197,7 @@ figure {
color: color(brightness-46);
font-family: $guardian-sans;
margin: 0;
padding: 3px 0;
padding: 2px 0;
display: inline-block;
}

Expand Down
4 changes: 0 additions & 4 deletions ArticleTemplates/assets/scss/modules/_tags.scss
View file
Open in desktop
Expand Up @@ -52,10 +52,6 @@
display: block;
padding: base-px(.4, 1, 1.7, .7);

@include mq($from: col2) {
padding: base-px(2, 1, 2, 0);
}

@include mq($from: col4) {
margin-left: 232px; // 240 - 4 (item padding offset) - 4 (visually offset rounded items);
width: 940px;
Expand Down
6 changes: 6 additions & 0 deletions ArticleTemplates/assets/scss/type/_live.scss
View file
Open in desktop
Expand Up @@ -198,5 +198,11 @@
.more--live-blogs, .more--live-blogs-blocks {
border: 0;
}

.tags__inline-list:not(:empty) {
@include mq($from: col2) {
padding: base-px(2, 1, 2, 0);
}
}
}
}