Skip to content

Feature/styling #53

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

Open
angelinalblyth wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Feature/styling #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d10b12b
Put article title to top of picture
angelinalblyth Jul 18, 2018
3a95277
Changed some article css
angelinalblyth Jul 18, 2018
727f861
Fixed image article issue changed vw
angelinalblyth Jul 18, 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
10 changes: 7 additions & 3 deletions src/main/resources/public/articles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,14 @@ div.polaroid-container{


div.polaroid {
width: 30%;
width: 22vw;
background-color: white;
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
margin:0.5%;
/*margin-bottom: 25px;*/
text-align: center;
/*display: flex;*/
flex-grow: 2;
flex: 1 0 20%;

}

div.polaroid-article-header {
Expand All @@ -117,6 +116,11 @@ div.polaroid-article-header {
margin-left:0.5em;
}

img{
width: 1000px;
height: 1000px;
}



@media screen and (max-width: 600px) {
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/templates/journalists/show.vtl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@
<div class ="article_section">

#foreach($article in $articles)
<img src="$article.getImagePath()" alt="article image">
<h3>$article.getTitle()</h3>
<img src="$article.getImagePath()" alt="article image">

#end
</div>
</section>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/layout.vtl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<!--<a href="/categories">Categories</a>-->
<div class="search-container">

<!--Need to figure out where the search bar will take you too. -->

<form action="/search" method="post">
<input type="text" placeholder="Search articles.." name="search" id="search" required="true">
<button type="submit">Submit</button>
Expand Down
Loading