Skip to content

Commit

Permalink
NHUB-38
Browse files Browse the repository at this point in the history
  • Loading branch information
darconny committed Dec 2, 2021
1 parent d503d8c commit f02fe2b
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 19 deletions.
8 changes: 4 additions & 4 deletions assets/styles/breakpoints.scss
Original file line number Diff line number Diff line change
Expand Up @@ -50,25 +50,25 @@
}

@mixin small_phone {
@media only screen and (orientation: portrait) and (max-width: 375px), (orientation: landscape) and (max-width: 576px) {
@media only screen and (orientation: portrait) and (max-width: 374px), (orientation: landscape) and (max-width: 575px) {
@content;
}
}

@mixin phone {
@media only screen and (orientation: portrait) and (max-width: 576px), (orientation: landscape) and (max-width: 992px) {
@media only screen and (orientation: portrait) and (max-width: 575px), (orientation: landscape) and (max-width: 991px) {
@content;
}
}

@mixin tablet {
@media only screen and (orientation: portrait) and (min-width: 577px) and (max-width: 1440px), (orientation: landscape) and (min-width: 993px) and (max-width: 1440px) {
@media only screen and (orientation: portrait) and (min-width: 576px) and (max-width: 1439px), (orientation: landscape) and (min-width: 992px) and (max-width: 1439px) {
@content;
}
}

@mixin pc {
@media only screen and (orientation: landscape) and (min-width: 1441px) {
@media only screen and (orientation: landscape) and (min-width: 1440px) {
@content;
}
}
24 changes: 21 additions & 3 deletions assets/styles/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1500,6 +1500,9 @@ article.list {
margin-bottom: 0;
}
}
.wire-articles__item-headline-inner {
align-items: center;
}
.wire-articles__item__versions-btn {
@include md {
margin-left: auto;
Expand Down Expand Up @@ -1815,6 +1818,7 @@ article.list {
font-weight: 700;
margin-bottom: 0;
line-height: 1.3;
display: flex;

@include sm {
font-size: 1rem;
Expand All @@ -1825,6 +1829,13 @@ article.list {
margin: 0 4px 0 2px;
}
}
.wire-articles__item-headline-inner {
margin-bottom: 4px;
@include sm {
display: flex;
margin-bottom: 0;
}
}
.wire-articles__item-headline--indent {
display: inline-block;
text-indent: 30px;
Expand Down Expand Up @@ -1887,10 +1898,12 @@ article.list {
flex-wrap: nowrap;
margin-bottom: 0;
margin-top: 0;
margin-left: 32px;

@include sm {
flex-wrap: wrap;
margin-top: 10px;
margin-left: 0;
}
@include lg {
margin-top: 0;
Expand Down Expand Up @@ -2123,9 +2136,14 @@ article.list {
font-size: 1rem !important;
}
}

.wire-articles__item__versions-btn button {
cursor: pointer;
.wire-articles__item__versions-btn {
margin-left: 24px;
@include sm {
margin-left: 0;
}
button {
cursor: pointer;
}
}

.wire-articles__item__versions-btn--open {
Expand Down
26 changes: 14 additions & 12 deletions assets/wire/components/WireListItem.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ class WireListItem extends React.Component {
);
const selectClassName = classNames('no-bindable-select', {
'wire-articles__item-select-visible': !LIST_ANIMATIONS,
'wire-articles__item-select float-left float-sm-none': LIST_ANIMATIONS,
'wire-articles__item-select': LIST_ANIMATIONS,
});
const picture = getPicture(item);
const videos = getVideos(item);
Expand Down Expand Up @@ -188,17 +188,19 @@ class WireListItem extends React.Component {
<i></i>
</label>
</div>
{!isExtended && (
<WireListItemIcons
item={item}
picture={picture}
videos={videos}
divider={false}
/>
)}
<Embargo item={item} />
<UrgencyLabel item={item} listConfig={listConfig} />
{item.headline}
<div className="wire-articles__item-headline-inner">
{!isExtended && (
<WireListItemIcons
item={item}
picture={picture}
videos={videos}
divider={false}
/>
)}
<Embargo item={item} />
<UrgencyLabel item={item} listConfig={listConfig} />
{item.headline}
</div>
</h4>

{isExtended && !isMarketPlace && (
Expand Down

0 comments on commit f02fe2b

Please sign in to comment.