From c7ea54a36432fc40bed460532fa9931186e067c7 Mon Sep 17 00:00:00 2001 From: Emily Gosti Date: Tue, 10 Apr 2018 19:08:16 -0700 Subject: [PATCH 1/4] added stayconnected and post pages --- src/css/post.scss | 5 ++++ src/css/stayconnected.scss | 5 ++++ src/pages/post.js | 49 ++++++++++++++++++++++++++++++++++++++ src/pages/stayconnected.js | 49 ++++++++++++++++++++++++++++++++++++++ static/bootstrap.css | 4 ++-- 5 files changed, 110 insertions(+), 2 deletions(-) create mode 100644 src/css/post.scss create mode 100644 src/css/stayconnected.scss create mode 100644 src/pages/post.js create mode 100644 src/pages/stayconnected.js diff --git a/src/css/post.scss b/src/css/post.scss new file mode 100644 index 0000000..482f065 --- /dev/null +++ b/src/css/post.scss @@ -0,0 +1,5 @@ +.BlueBox { + background-color: #264D68; + width: 100%; + height: 50%; +} \ No newline at end of file diff --git a/src/css/stayconnected.scss b/src/css/stayconnected.scss new file mode 100644 index 0000000..482f065 --- /dev/null +++ b/src/css/stayconnected.scss @@ -0,0 +1,5 @@ +.BlueBox { + background-color: #264D68; + width: 100%; + height: 50%; +} \ No newline at end of file diff --git a/src/pages/post.js b/src/pages/post.js new file mode 100644 index 0000000..5b93e0e --- /dev/null +++ b/src/pages/post.js @@ -0,0 +1,49 @@ +import React from 'react' +import Link from 'gatsby-link' +// import '../css/bootstrap.css' +import '../css/post.scss' + +class PostPage extends React.Component { + render() { + return ( +
+
+
Post Page
+
+ As the independent publication serving the UC Berkeley campus and the + city of Berkeley, The Daily Californian has a print circulation of 10,000 + and additionally reaches more 36,000 students and 22,000 faculty and staff + on campus. The online version, dailycal.org, averages over 800,000 monthly + hits. Stay connected through our events and by liking our Facebook page. + + The Daily Californian Alumni Association was created to bring alumni of the + newspaper together as well as to provide mentorship and financial support to + the current student staff. +
+
+
Like us on Facebook!
+
+
+
Follow us on Twitter!
+
+
+
Subscribe to the alumni newsletter!
+
+ Want to stay connected and up to date on what your fellow Daily Cal Alumni + are up to? Sign up for our free monthly online alumni newsletter below. + + If you would like to contribute to the newsletter by sharing work you have + done recently or if you would like us to profile you and your work please + contact alumni-newsletter@dailycal.org. +
+
(probably a form react component?)
+
SIGN UP NOW
+
+ Go to page 2 +
+
+ ); + } +} + +export default PostPage \ No newline at end of file diff --git a/src/pages/stayconnected.js b/src/pages/stayconnected.js new file mode 100644 index 0000000..5a76614 --- /dev/null +++ b/src/pages/stayconnected.js @@ -0,0 +1,49 @@ +import React from 'react' +import Link from 'gatsby-link' +// import '../css/bootstrap.css' +import '../css/stayconnected.scss' + +class StayConnectedPage extends React.Component { + render() { + return ( +
+
+
Stay Connected
+
+ As the independent publication serving the UC Berkeley campus and the + city of Berkeley, The Daily Californian has a print circulation of 10,000 + and additionally reaches more 36,000 students and 22,000 faculty and staff + on campus. The online version, dailycal.org, averages over 800,000 monthly + hits. Stay connected through our events and by liking our Facebook page. + + The Daily Californian Alumni Association was created to bring alumni of the + newspaper together as well as to provide mentorship and financial support to + the current student staff. +
+
+
Like us on Facebook!
+
+
+
Follow us on Twitter!
+
+
+
Subscribe to the alumni newsletter!
+
+ Want to stay connected and up to date on what your fellow Daily Cal Alumni + are up to? Sign up for our free monthly online alumni newsletter below. + + If you would like to contribute to the newsletter by sharing work you have + done recently or if you would like us to profile you and your work please + contact alumni-newsletter@dailycal.org. +
+
(probably a form react component?)
+
SIGN UP NOW
+
+ Go to page 2 +
+
+ ); + } +} + +export default StayConnectedPage diff --git a/static/bootstrap.css b/static/bootstrap.css index 6167622..244e0f6 100644 --- a/static/bootstrap.css +++ b/static/bootstrap.css @@ -260,7 +260,7 @@ th { border: 1px solid #ddd !important; } } -@font-face { +/*@font-face { font-family: 'Glyphicons Halflings'; src: url('../fonts/glyphicons-halflings-regular.eot'); @@ -1064,7 +1064,7 @@ th { } .glyphicon-menu-up:before { content: "\e260"; -} +}*/ * { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; From 3b20df06d7617b4e7cab13dad25d71e2300a4011 Mon Sep 17 00:00:00 2001 From: Emily Gosti Date: Tue, 10 Apr 2018 19:09:53 -0700 Subject: [PATCH 2/4] added stayconnected and post pages --- static/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/static/bootstrap.css b/static/bootstrap.css index 244e0f6..6167622 100644 --- a/static/bootstrap.css +++ b/static/bootstrap.css @@ -260,7 +260,7 @@ th { border: 1px solid #ddd !important; } } -/*@font-face { +@font-face { font-family: 'Glyphicons Halflings'; src: url('../fonts/glyphicons-halflings-regular.eot'); @@ -1064,7 +1064,7 @@ th { } .glyphicon-menu-up:before { content: "\e260"; -}*/ +} * { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; From 943b31254cc521800be42575d6c400fa10dbca53 Mon Sep 17 00:00:00 2001 From: Emily Gosti Date: Mon, 16 Apr 2018 23:26:33 -0700 Subject: [PATCH 3/4] implemented bootstrap outline for post and stay connected pages --- src/pages/post.js | 59 +++++++++++---------------- src/pages/stayconnected.js | 81 ++++++++++++++++++++++++-------------- 2 files changed, 76 insertions(+), 64 deletions(-) diff --git a/src/pages/post.js b/src/pages/post.js index 5b93e0e..9683c3e 100644 --- a/src/pages/post.js +++ b/src/pages/post.js @@ -1,46 +1,35 @@ import React from 'react' -import Link from 'gatsby-link' -// import '../css/bootstrap.css' +// import Link from 'gatsby-link' +import '../css/bootstrap.css' import '../css/post.scss' +import Button from 'react-bootstrap/lib/Button'; +import PageHeader from 'react-bootstrap/lib/PageHeader'; +import Panel from 'react-bootstrap/lib/Panel'; class PostPage extends React.Component { render() { return (
-
-
Post Page
-
- As the independent publication serving the UC Berkeley campus and the - city of Berkeley, The Daily Californian has a print circulation of 10,000 - and additionally reaches more 36,000 students and 22,000 faculty and staff - on campus. The online version, dailycal.org, averages over 800,000 monthly - hits. Stay connected through our events and by liking our Facebook page. - - The Daily Californian Alumni Association was created to bring alumni of the - newspaper together as well as to provide mentorship and financial support to - the current student staff. -
-
-
Like us on Facebook!
-
-
-
Follow us on Twitter!
-
-
-
Subscribe to the alumni newsletter!
-
- Want to stay connected and up to date on what your fellow Daily Cal Alumni - are up to? Sign up for our free monthly online alumni newsletter below. + + + Article Title Here +

+ February 15, 2018 + + + + article content Here + Lorem ipsum dolor sit amet, et pro purto putant, nam sonet suscipit ea. Te iuvaret dissentias ius, te facer eripuit nam. At choro meliore dissentiet vim. Eu vix reprimique liberavisse. - If you would like to contribute to the newsletter by sharing work you have - done recently or if you would like us to profile you and your work please - contact alumni-newsletter@dailycal.org. -
-
(probably a form react component?)
-
SIGN UP NOW
-
- Go to page 2 -
+ Quem equidem habemus per an. Ad tale mandamus molestiae usu, ut assum laoreet splendide eam. Mundi habemus suscipiantur eu usu, mel dicit vulputate ex. Qui atomorum definitionem ne, ex vero eripuit denique vel. + + Eirmod adversarium vis ex, deleniti perpetua signiferumque sit ad. Ad sed menandri erroribus forensibus, ex quas viris ornatus vis, ei odio minimum consetetur has. In eius adipiscing nam, inani commune expetendis ad vim, enim partem deserunt ea pri. An vix vidisse liberavisse, aliquip aliquid erroribus mei at, no senserit elaboraret mel. Esse ponderum definitiones ne his. + + Ne usu nulla homero persius. Pri eu quis aliquam, eius debet debitis ei cum. Sea ea autem recteque. Ut per tale blandit explicari. Vel no sensibus gubergren, no sea quot invidunt oporteat, mel dico offendit sententiae no. + + Vel ne autem simul reformidans. Eum ne homero percipitur. An usu mollis consequat interpretaris, quo aliquip dolorem et. Dicat semper duo ei, in unum facete salutandi eam, ut choro mucius nostro usu. Qui in choro dissentiet, denique sapientem vituperatoribus cu vel. + +
); } diff --git a/src/pages/stayconnected.js b/src/pages/stayconnected.js index 5a76614..3b7d8c6 100644 --- a/src/pages/stayconnected.js +++ b/src/pages/stayconnected.js @@ -1,46 +1,69 @@ import React from 'react' import Link from 'gatsby-link' -// import '../css/bootstrap.css' +import '../css/bootstrap.css' import '../css/stayconnected.scss' +import Button from 'react-bootstrap/lib/Button'; +import PageHeader from 'react-bootstrap/lib/PageHeader'; +import Panel from 'react-bootstrap/lib/Panel'; +import FormGroup from 'react-bootstrap/lib/FormGroup'; +import FormControl from 'react-bootstrap/lib/FormControl'; +import ControlLabel from 'react-bootstrap/lib/ControlLabel'; +import HelpBlock from 'react-bootstrap/lib/HelpBlock'; class StayConnectedPage extends React.Component { render() { return (
-
Stay Connected
-
- As the independent publication serving the UC Berkeley campus and the - city of Berkeley, The Daily Californian has a print circulation of 10,000 - and additionally reaches more 36,000 students and 22,000 faculty and staff - on campus. The online version, dailycal.org, averages over 800,000 monthly - hits. Stay connected through our events and by liking our Facebook page. - - The Daily Californian Alumni Association was created to bring alumni of the - newspaper together as well as to provide mentorship and financial support to - the current student staff. -
-
-
Like us on Facebook!
-
-
-
Follow us on Twitter!
-
-
-
Subscribe to the alumni newsletter!
-
- Want to stay connected and up to date on what your fellow Daily Cal Alumni + + Stay Connected + + + + As the independent publication serving the UC Berkeley campus and the + city of Berkeley, The Daily Californian has a print circulation of 10,000 + and additionally reaches more 36,000 students and 22,000 faculty and staff + on campus. The online version, dailycal.org, averages over 800,000 monthly + hits. Stay connected through our events and by liking our Facebook page. + + The Daily Californian Alumni Association was created to bring alumni of the + newspaper together as well as to provide mentorship and financial support to + the current student staff. + + + + + + Subscribe to the alumni newsletter! + + Want to stay connected and up to date on what your fellow Daily Cal Alumni are up to? Sign up for our free monthly online alumni newsletter below. If you would like to contribute to the newsletter by sharing work you have done recently or if you would like us to profile you and your work please contact alumni-newsletter@dailycal.org. -
-
(probably a form react component?)
-
SIGN UP NOW
-
- Go to page 2 -
+ + NAME + + + + + + PHONE + + + + +
); } From 93c545e6227b782838c5395c712b038699c9ac2e Mon Sep 17 00:00:00 2001 From: Emily Gosti Date: Tue, 17 Apr 2018 19:06:04 -0700 Subject: [PATCH 4/4] start styling --- src/css/bootstrap.css | 16 +++++----- src/css/post.scss | 6 ++-- src/css/stayconnected.scss | 16 ++++++++-- src/pages/post.js | 2 +- src/pages/stayconnected.js | 60 ++++++++++++++++++++++++++++++++++---- static/bootstrap.css | 20 ++++++------- 6 files changed, 89 insertions(+), 31 deletions(-) diff --git a/src/css/bootstrap.css b/src/css/bootstrap.css index c419774..cfcff8c 100644 --- a/src/css/bootstrap.css +++ b/src/css/bootstrap.css @@ -260,7 +260,7 @@ th { border: 1px solid #ddd !important; } } -@font-face { +/*@font-face { font-family: 'Glyphicons Halflings'; src: url('../../../static/fonts/glyphicons-halflings-regular.eot'); @@ -1064,7 +1064,7 @@ th { } .glyphicon-menu-up:before { content: "\e260"; -} +}*/ * { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; @@ -6354,9 +6354,9 @@ button.close { outline: 0; opacity: .9; } -.carousel-control .icon-prev, -.carousel-control .icon-next, -.carousel-control .glyphicon-chevron-left, +/*.carousel-control .icon-prev, +.carousel-control .icon-next,*/ +/*.carousel-control .glyphicon-chevron-left, .carousel-control .glyphicon-chevron-right { position: absolute; top: 50%; @@ -6373,7 +6373,7 @@ button.close { .carousel-control .glyphicon-chevron-right { right: 50%; margin-right: -10px; -} +}*/ .carousel-control .icon-prev, .carousel-control .icon-next { width: 20px; @@ -6432,7 +6432,7 @@ button.close { text-shadow: none; } @media screen and (min-width: 768px) { - .carousel-control .glyphicon-chevron-left, + /*.carousel-control .glyphicon-chevron-left, .carousel-control .glyphicon-chevron-right, .carousel-control .icon-prev, .carousel-control .icon-next { @@ -6448,7 +6448,7 @@ button.close { .carousel-control .glyphicon-chevron-right, .carousel-control .icon-next { margin-right: -10px; - } + }*/ .carousel-caption { right: 20%; left: 20%; diff --git a/src/css/post.scss b/src/css/post.scss index 482f065..6a15104 100644 --- a/src/css/post.scss +++ b/src/css/post.scss @@ -1,5 +1,3 @@ -.BlueBox { - background-color: #264D68; - width: 100%; - height: 50%; +.article_title { + color: green; } \ No newline at end of file diff --git a/src/css/stayconnected.scss b/src/css/stayconnected.scss index 482f065..ea24626 100644 --- a/src/css/stayconnected.scss +++ b/src/css/stayconnected.scss @@ -1,5 +1,17 @@ -.BlueBox { +.blue_box { background-color: #264D68; width: 100%; - height: 50%; + height: 400px; + position: fixed; + z-index: -1; +} + +.page_title { + color: white; + width: 100%; + text-align: center; +} + +.button_title { + color: #264D68; } \ No newline at end of file diff --git a/src/pages/post.js b/src/pages/post.js index 9683c3e..252d007 100644 --- a/src/pages/post.js +++ b/src/pages/post.js @@ -12,7 +12,7 @@ class PostPage extends React.Component {
- Article Title Here +

Article Title Here



February 15, 2018 diff --git a/src/pages/stayconnected.js b/src/pages/stayconnected.js index 3b7d8c6..ec8b173 100644 --- a/src/pages/stayconnected.js +++ b/src/pages/stayconnected.js @@ -9,13 +9,15 @@ import FormGroup from 'react-bootstrap/lib/FormGroup'; import FormControl from 'react-bootstrap/lib/FormControl'; import ControlLabel from 'react-bootstrap/lib/ControlLabel'; import HelpBlock from 'react-bootstrap/lib/HelpBlock'; +import DropdownButton from 'react-bootstrap/lib/DropdownButton'; +import MenuItem from 'react-bootstrap/lib/MenuItem'; class StayConnectedPage extends React.Component { render() { return (
-
- +
+ Stay Connected @@ -31,8 +33,8 @@ class StayConnectedPage extends React.Component { the current student staff. - - + + Subscribe to the alumni newsletter! @@ -46,12 +48,12 @@ class StayConnectedPage extends React.Component { NAME @@ -60,6 +62,52 @@ class StayConnectedPage extends React.Component { type="text" placeholder="(xxx)xxx-xxxx" /> + + + EMAIL + + + + ADDRESS + + + + + + + + + + + + Action + Another action + Something else here + + Separated link + diff --git a/static/bootstrap.css b/static/bootstrap.css index 6167622..aa88443 100644 --- a/static/bootstrap.css +++ b/static/bootstrap.css @@ -260,7 +260,7 @@ th { border: 1px solid #ddd !important; } } -@font-face { +/*@font-face { font-family: 'Glyphicons Halflings'; src: url('../fonts/glyphicons-halflings-regular.eot'); @@ -532,8 +532,8 @@ th { content: "\e079"; } .glyphicon-chevron-right:before { - content: "\e080"; -} + content: "\e080";*/ +/*} .glyphicon-plus-sign:before { content: "\e081"; } @@ -1064,7 +1064,7 @@ th { } .glyphicon-menu-up:before { content: "\e260"; -} +}*/ * { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; @@ -6354,9 +6354,9 @@ button.close { outline: 0; opacity: .9; } -.carousel-control .icon-prev, -.carousel-control .icon-next, -.carousel-control .glyphicon-chevron-left, +/*.carousel-control .icon-prev, +.carousel-control .icon-next,*/ +/*.carousel-control .glyphicon-chevron-left, .carousel-control .glyphicon-chevron-right { position: absolute; top: 50%; @@ -6373,7 +6373,7 @@ button.close { .carousel-control .glyphicon-chevron-right { right: 50%; margin-right: -10px; -} +}*/ .carousel-control .icon-prev, .carousel-control .icon-next { width: 20px; @@ -6432,7 +6432,7 @@ button.close { text-shadow: none; } @media screen and (min-width: 768px) { - .carousel-control .glyphicon-chevron-left, + /*.carousel-control .glyphicon-chevron-left, .carousel-control .glyphicon-chevron-right, .carousel-control .icon-prev, .carousel-control .icon-next { @@ -6448,7 +6448,7 @@ button.close { .carousel-control .glyphicon-chevron-right, .carousel-control .icon-next { margin-right: -10px; - } + }*/ .carousel-caption { right: 20%; left: 20%;