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.

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

glitches with new css #811

Merged
merged 35 commits into from
Apr 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
1c3a161
:space_invader: hello world postcss + sass \o/
mgiraldo Apr 6, 2018
7db1a2b
:space_invader: header and footer in scss
mgiraldo Apr 6, 2018
305b024
:space_invader: added scss folder
mgiraldo Apr 6, 2018
fa521cf
:space_invader: removed comments
mgiraldo Apr 6, 2018
b220bfb
:space_invader: object.entries polyfill for ie11
mgiraldo Apr 7, 2018
6c38f5b
:space_invader: remove onAppUpdated since it is deprecated in next5
mgiraldo Apr 7, 2018
00901da
Merge branch 'master' into next5
mgiraldo Apr 9, 2018
fcd2842
Merge branch 'master' into next5
mgiraldo Apr 10, 2018
7cff4db
:space_invader: refactored error, pages, some components
mgiraldo Apr 10, 2018
35f469b
:space_invader: done with utils.css
mgiraldo Apr 10, 2018
0d4c9d5
:space_invader: a whole new batch of migrated css
mgiraldo Apr 11, 2018
030a49e
:space_invader: another batch of migrations
mgiraldo Apr 12, 2018
ac067d6
:space_invader: refresh?
mgiraldo Apr 12, 2018
64f2b56
:space_invader: back with lint
mgiraldo Apr 12, 2018
e45fb30
:space_invader: utilfunctions is back
mgiraldo Apr 12, 2018
5d5c4ef
:space_invader: removed titlecase (unused)
mgiraldo Apr 12, 2018
6526491
:space_invader: test is back
mgiraldo Apr 12, 2018
0e03c51
:space_invader: selenium lib is back
mgiraldo Apr 12, 2018
f7d5cd6
:space_invader: with source maps / minor fixes / no extra packages
mgiraldo Apr 12, 2018
99482ef
:space_invader: upgraded react-slick / minor fixes
mgiraldo Apr 12, 2018
2082159
Merge branch 'master' into next5
mgiraldo Apr 12, 2018
3e2ebdb
:space_invader: added scss linter
mgiraldo Apr 12, 2018
a8f9cd1
:space_invader: fixed precommit hook
mgiraldo Apr 12, 2018
2344b51
:space_invader: fixed precommit hook
mgiraldo Apr 12, 2018
ea0329a
:space_invader: linted all scss
mgiraldo Apr 12, 2018
a8b5739
:space_invader: removed stylelint-config-standard because https://git…
mgiraldo Apr 12, 2018
be81f82
:space_invader: conflict resolution
mgiraldo Apr 12, 2018
ee8523e
:space_invader: fixed remnant css var / fixed breadcrumb alignment
mgiraldo Apr 12, 2018
c716a09
:space_invader: version bump
mgiraldo Apr 13, 2018
36cbe4e
:space_invader: added yarn step to analyzer
mgiraldo Apr 13, 2018
b3c8e7c
:space_invader: with next bundle analyzer
mgiraldo Apr 13, 2018
abc3fad
:space_invader: now with separate printable guide
mgiraldo Apr 13, 2018
1d43441
:space_invader: eliminated some globals
mgiraldo Apr 13, 2018
433f897
:space_invader: conflict resolution
mgiraldo Apr 13, 2018
ebad1fa
:space_invader: removed unused classes
mgiraldo Apr 13, 2018
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
11 changes: 3 additions & 8 deletions components/HomePageComponents/HomePageSlider/HomePageSlider.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@
}
}

/* overrides for react-slick css*/
:global .slick-slide {
width: 20rem;
}

.heading {
display: flex;
justify-content: space-between;
Expand Down Expand Up @@ -129,7 +124,7 @@
z-index: 1;
top: 40%;
background-color: rgba(255, 255, 255, 0.95);
box-shadow: 0px 0 15px 0px rgba(0, 0, 0, 0.25);
box-shadow: 0 0 15px 0 rgba(0, 0, 0, 0.25);
transition: box-shadow 0.5s ease-out, background-color 0.5s ease-out;
width: 3rem;
height: 3rem;
Expand All @@ -145,7 +140,7 @@

&:hover, &:focus {
background-color: white;
box-shadow: 0px 0 20px 0px rgba(0, 0, 0, 0.3);
box-shadow: 0 0 20px 0 rgba(0, 0, 0, 0.3);

@media (min-width: $largeRem) {
background-color: rgba(0, 0, 0, 0.05);
Expand Down Expand Up @@ -222,7 +217,7 @@
content: none;
}

& :global .slick-disabled {
:global .slick-disabled {
display: none;
}
}
20 changes: 14 additions & 6 deletions components/MainLayout/components/MinimalLayout/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,27 @@ import GaWrapper from "shared/GaWrapper";

import { SITE_ENV } from "constants/env";

const MinimalLayout = ({ children, route, headLinks, pageTitle, seoType }) =>
const MinimalLayout = ({
children,
route,
headLinks,
pageTitle,
seoType,
isPrintable
}) =>
<div>
<Helmet htmlAttributes={{ lang: "en" }} />
<DPLAHead
additionalLinks={headLinks}
pageTitle={pageTitle}
seoType={seoType}
/>
<SkipToContent />
<PageHeader
searchQuery={route ? route.query.q : ""}
hideSearchBar={SITE_ENV === "pro"}
/>
{!isPrintable && <SkipToContent />}
{!isPrintable &&
<PageHeader
searchQuery={route ? route.query.q : ""}
hideSearchBar={SITE_ENV === "pro"}
/>}
{children}
</div>;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
@media (min-width: $mediumRem) {
display: none;
}

@media print {
display: none;
}
}

.header {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class ResourcesTabs extends React.Component {
const { currentTab, route } = this.props;
return (
<div id="tabs" className={`${css.wrapper}`}>
<div className={`${css.tabsWrapper} sourceSetTabsWrapper`}>
<div className={css.tabsWrapper}>
<ul role="tablist" className={`${css.tabs} ${utils.container}`}>
<li
id="tab-sourceset"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

.tools {
margin: 1rem 0 0;

@media print {
display: none;
}
Expand Down Expand Up @@ -137,6 +138,7 @@

@media print {
color: black;
padding-left: 1rem;
}
}

Expand Down Expand Up @@ -191,6 +193,7 @@
padding: 0;
margin-bottom: 2rem;
}

@media (min-width: $mediumRem) {
margin-bottom: 0;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ class SourceSetInfo extends React.Component {
<ReactMarkdown
id="dpla-description"
source={set.hasPart.find(item => item.name === "Overview").text}
className={`${css.description} sourceSetDescription ${css.description} ${this
.state.isOpen
className={`${css.description} ${css.description} ${this.state
.isOpen
? css.open
: ""}`}
/>
Expand All @@ -87,7 +87,7 @@ class SourceSetInfo extends React.Component {
</div>
</div>
<div className={`${css.removeScroll} col-xs-12 col-md-4`}>
<div className={`${css.sidebar} sourceSetSidebar`}>
<div className={css.sidebar}>
<div className={css.metadata}>
<div className={css.metadatum}>
<h2 className={css.metadataHeader}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,38 @@
.set {
flex-basis: calc(50% - 0.25rem);
margin-right: 0.25rem;

&:nth-child(2n) {
margin-right: 0;
}

margin-bottom: 28px;

@media (min-width: $xSmallRem) {
flex-basis: calc(33% - 15px);
margin-right: 29px;

&:nth-child(2n) {
margin-right: 20px;
}

&:nth-child(3n) {
margin-right: 0;
}
}

@media (min-width: $smallRem) {
flex-basis: calc(25% - 15px);
margin-right: 20px;

&:nth-child(2n) {
margin-right: 20px;
}

&:nth-child(3n) {
margin-right: 20px;
}

&:nth-child(4n) {
margin-right: 0;
}
Expand All @@ -51,6 +60,7 @@
margin-bottom: 9px;
position: relative;
height: 180px;

@media (min-width: $smallRem) {
}
}
Expand All @@ -69,6 +79,7 @@

.title {
font-size: 0.75rem;

@media (min-width: $smallRem) {
font-size: 0.875rem;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,22 +129,3 @@
.additionalToolWrapper {
margin-bottom: 0.5rem;
}

/* things to hide in print view only in teachers guide */
:global .sourceSetSidebar {
@media print {
display: none;
}
}

:global .sourceSetDescription {
@media print {
display: none;
}
}

:global .sourceSetTabsWrapper {
@media print {
display: none;
}
}
Loading