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

150 — addressing issues that kept changes from deploying last time #166

Merged
merged 8 commits into from
Nov 10, 2020
Merged

150 — addressing issues that kept changes from deploying last time #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6d04cdc
Added starter code, pointed out where CSS styles should go
hs4man21 Oct 21, 2020
bc8c244
created pull quote with three options
abilxpez Oct 26, 2020
7135ee6
finished basic blockquote
abilxpez Nov 1, 2020
b2fa6bf
Tweaking spacing and sizing; fixed issue where first letter in quote …
hs4man21 Nov 10, 2020
f2bfce2
Removed extra commas in ContentViewStyles
hs4man21 Nov 10, 2020
85e8588
Removed attempted import of 'logo' from .gif file and instead provide…
hs4man21 Nov 10, 2020
83d2b25
Merge from main
hs4man21 Nov 10, 2020
48a18ed
Merge branch 'main' into 150-standard-pullquote-style
hs4man21 Nov 10, 2020
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
Binary file modified .DS_Store
View file
Open in desktop
Binary file not shown.
57 changes: 26 additions & 31 deletions components/ContentViewStyles.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,47 +71,42 @@ export default {
},
blockquote: {
display: "block !important",
width: "200px !important",
padding: "5px 0 0 5px !important",
//right align
float: "right !important",
width: "350px !important",
padding: "5px 0 0 0px !important",
borderLeft: "3px solid #820000 !important",

/*//left align
float: "left !important",
borderRight: "3px solid #820000 !important",*/

cite: {
width: "200px !important",
width: "350px !important",
padding: "5px 0 0 0 !important",
borderLeft: "3px solid #820000 !important",
fontSize: "1.3em !important",
textAlign: "center",
},
p: {
width: "200px !important",
width: "350px !important",
fontSize: "1.6em !important",
lineHeight: "normal",
textAlign: "left",
overflowWrap: "break-word",
padding: "20px 15px 0 25px !important",
backgroundImage: `url(${quote})`,
backgroundSize: "25%",
padding: "25px 25px 0 25px !important",
backgroundImage: `url(${"../static/pullquote.gif"})`,
backgroundSize: "20%",
backgroundRepeat: "no-repeat !important",

//first letter code not working
/*'&::firstLetter': { // firstLetter: { also doesn't work
"&::first-letter": {
fontSize: "2em !important",
fontWeight: "bold !important",
},*/
fontWeight: "bold !important",
},
},
table: {
width: "100%",
borderCollapse: "collapse",
textAlign: "center",
border: `1px solid ${STANFORD_COLORS.COOL_GREY}`,
fontSize: "1.3rem",
},
td: {
border: `1px solid ${STANFORD_COLORS.COOL_GREY}`,
padding: "10px",
},
},
};
table: {
width: "100%",
borderCollapse: "collapse",
textAlign: "center",
border: `1px solid ${STANFORD_COLORS.COOL_GREY}`,
fontSize: "1.3rem",
},
td: {
border: `1px solid ${STANFORD_COLORS.COOL_GREY}`,
padding: "10px",
}
}
};
1 change: 0 additions & 1 deletion components/pages/ArticleListPage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,4 +194,3 @@ export default class ArticleListPage extends React.Component<
);
}
}

Binary file added static/pullquote.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.