status-im/ETHReport
2
0
Fork 0
mirror of https://github.com/status-im/ETHReport.git synced 2025-02-27 05:00:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of github.com:Nona-Creative/ETHPrize into feat/headroom-scroll

Browse Source
This commit is contained in:
Sharyn 2018-07-20 10:54:03 +02:00
commit 6bc94c6c35
8 changed files with 68 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
assets/styles/base/forms.scss
View File

@ -4,3 +4,8 @@ input,
button { button {
font-family: $primary-font; font-family: $primary-font;
} }
input[type="search"] {
-webkit-appearance: none;
border-radius: 0;
}

9
components/browseArchives/style.scss
View File

@ -28,14 +28,17 @@
.browse-content-right { .browse-content-right {
@media (min-width: $monitor) { @media (min-width: $desktop) {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
width: calculateRem($container-width);
padding: 0 calculateRem($container-padding);
.interviews-wrap { .interviews-wrap {
order: 1; order: 1;
} }
} }
@media (min-width: $monitor) {
width: calculateRem($container-width);
padding: 0 calculateRem($container-padding);
}
} }

2
components/interviews/interviewsList/style.scss
View File

@ -3,7 +3,7 @@
.mob-interviews-link { .mob-interviews-link {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin-bottom: calculateRem(24); margin-bottom: calculateRem(32);
@media (min-width: $desktop) { @media (min-width: $desktop) {
display: none; display: none;

1
components/interviews/singleInterview/style.scss
View File

@ -49,6 +49,7 @@
p { p {
padding-left: calculateRem(16); padding-left: calculateRem(16);
position: relative; position: relative;
margin-bottom: calculateRem(10);
&::before { &::before {
content: '\00B7'; content: '\00B7';

8
components/modal/style.scss
View File

@ -12,7 +12,10 @@
height: 100vh; height: 100vh;
z-index: 3; z-index: 3;
background-color: $navy-dark; background-color: $navy-dark;
overflow: auto;
/* enable smooth scrolling on mobile devices */
overflow-y: scroll;
-webkit-overflow-scrolling: touch;
} }
&.modal-on-mobile-only { &.modal-on-mobile-only {
@ -42,7 +45,6 @@
.modal-inner { .modal-inner {
width: 100%; width: 100%;
height: 100%;
padding-top: calculateRem(24); padding-top: calculateRem(24);
position: relative; position: relative;
@ -54,7 +56,7 @@
.modal-close { .modal-close {
position: fixed; position: fixed;
top: calculateRem(16); top: calculateRem(16);
right: calculateRem(16); right: calculateRem(12);
z-index: 4; z-index: 4;
@media (min-width: $desktop) { @media (min-width: $desktop) {

5
components/searchBar/index.js
View File

@ -6,7 +6,10 @@ import './style.scss';
const { publicRuntimeConfig } = getConfig(); const { publicRuntimeConfig } = getConfig();
const SearchBar = props => ( const SearchBar = props => (
<div className="search-bar" style={{ backgroundImage: `url(${publicRuntimeConfig.subDirPath}/static/img/header-bg.jpg)` }}> <div
className={`search-bar ${props.isSearchActive ? 'search-active' : ''}`}
style={{ backgroundImage: `url(${publicRuntimeConfig.subDirPath}/static/img/header-bg.jpg)` }}
>
<div className="container"> <div className="container">
<h3 className="main-heading" style={{ backgroundImage: `url(${publicRuntimeConfig.subDirPath}/static/img/heading-textured-bg.jpg)` }}> <h3 className="main-heading" style={{ backgroundImage: `url(${publicRuntimeConfig.subDirPath}/static/img/heading-textured-bg.jpg)` }}>
Archives Archives

6
components/searchBar/style.scss
View File

@ -5,7 +5,7 @@
background-image: url('/static/img/header-bg.jpg'); background-image: url('/static/img/header-bg.jpg');
background-position: center; background-position: center;
background-size: cover; background-size: cover;
margin-bottom: calculateRem(56); margin-bottom: calculateRem(40);
height: calculateRem(164); height: calculateRem(164);
padding-top: calculateRem(52); padding-top: calculateRem(52);
@ -21,6 +21,10 @@
margin-bottom: calculateRem(32); margin-bottom: calculateRem(32);
} }
} }
&.search-active {
margin-bottom: calculateRem(92);
}
} }
.search-form { .search-form {

86
components/searchResults/style.scss
View File

@ -1,61 +1,57 @@
@import './assets/styles/global.scss'; @import './assets/styles/global.scss';
.search-results { .search-results li {
margin-top: calculateRem(32); margin-bottom: calculateRem(32);
li { button {
margin-bottom: calculateRem(32); text-align: left;
width: 100%;
padding: 0;
button { &:hover h3 {
text-align: left; text-decoration: underline;
width: 100%;
padding: 0;
&:hover h3 { &.matched-name::before {
text-decoration: underline; display: none;
&.matched-name::before {
display: none;
}
} }
}
h3 { h3 {
color: #fff; color: #fff;
font-size: calculateRem(24); font-size: calculateRem(24);
display: inline-block; display: inline-block;
margin-bottom: calculateRem(12); margin-bottom: calculateRem(12);
&.matched-name { &.matched-name {
@include hasRedUnderline; @include hasRedUnderline;
position: relative; position: relative;
}
} }
}
h5 { h5 {
color: #fff; color: #fff;
font-size: calculateRem(16); font-size: calculateRem(16);
margin-bottom: calculateRem(8); margin-bottom: calculateRem(8);
} }
p { p {
color: hsla(0, 0, 100, .6); color: hsla(0, 0, 100, .6);
font-size: calculateRem(14); font-size: calculateRem(14);
line-height: 1.6; line-height: 1.6;
span { span {
position: relative; position: relative;
&::before { &::before {
content: ''; content: '';
position: absolute; position: absolute;
top: -10%; top: -10%;
left: -2%; left: -2%;
height: 120%; height: 120%;
width: 104%; width: 104%;
background-color: $red; background-color: $red;
color: $navy; color: $navy;
z-index: -1; z-index: -1;
}
} }
} }
} }