Skip to content

Added image thumbnails #111

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

Closed
AntonyFenton wants to merge 3 commits into from
Closed

Added image thumbnails #111

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1115b64
Added image thumbnails
AntonyFenton Oct 14, 2017
35df4a5
Replaced placeholder images
AntonyFenton Oct 17, 2017
c09fa4a
Merge branch 'master' into feature/image-thumbnail
AntonyFenton Oct 28, 2017
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 added assets/image-example.jpg
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.
0 logo.png → assets/logo.png
View file
Open in desktop
File renamed without changes
17 changes: 17 additions & 0 deletions examples/images.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<div id="images">
<div class="row">
<div class="twelve-large potatoes">
<h1>Images</h1>
</div>
</div>
<div class="row">
<div class="six-large potatoes">
<p>Image thumbnail</p>
<img src="./assets/image-example.jpg" class="img-thumb" alt="Image example"/>
</div>
<div class="six-large potatoes">
<p>Image thumbnail rounded</p>
<img src="./assets/image-example.jpg" class="img-thumb round" alt="Image example"/>
</div>
</div>
</div>
23 changes: 22 additions & 1 deletion examples/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<div id="header">
<div class="row">
<div class="text-center twelve-large potatoes">
<img src="logo.png" />
<img src="./assets/logo.png" />
<h1>PotatoCSS</h1>
<h3>Simple CSS framework for hackers. Simple as potato.</h3>
</div>
Expand All @@ -82,6 +82,7 @@ <h4>Features</h4>
<li><a href="#code">Code</a></li>
<li><a href="#labels">Labels</a></li>
<li><a href="#panels">Panels</a></li>
<li><a href="#images">Images</a></li>
</ul>
</div>
</div>
Expand Down Expand Up @@ -568,6 +569,26 @@ <h3>Panel Warning</h3>
</div>
</div>

<hr>

<div id="images">
<div class="row">
<div class="twelve-large potatoes">
<h1>Images</h1>
</div>
</div>
<div class="row">
<div class="six-large potatoes">
<p>Image thumbnail</p>
<img src="./assets/image-example.jpg" class="img-thumb" alt="Image example"/>
</div>
<div class="six-large potatoes">
<p>Image thumbnail rounded</p>
<img src="./assets/image-example.jpg" class="img-thumb round" alt="Image example"/>
</div>
</div>
</div>

<div id="footer">
<div class="row">
<div class="text-center twelve-large potatoes">
Expand Down
2 changes: 1 addition & 1 deletion js/potato.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion js/potato.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions stylesheets/css/potato.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,3 +751,17 @@ kbd {
color: #e74c3c;
border: 1px solid #e74c3c;
}

/* Images */

img {
max-width: 100%;
}

.img-thumb {
border: 1px solid #333;
}

.img-thumb.round {
border-radius: 4px;
}
14 changes: 14 additions & 0 deletions stylesheets/less/_partials/_images.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
//* Images *//

img {
max-width: 100%;

&.img-thumb {
border: 1px solid $primary-color;
}

&.round {
border-radius: 4px;
}

}
3 changes: 2 additions & 1 deletion stylesheets/less/potato.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@
@import "@{DIRECTORY}_tables";
@import "@{DIRECTORY}_forms";
@import "@{DIRECTORY}_lists";
@import "@{DIRECTORY}_util";
@import "@{DIRECTORY}_util";
@import "@{DIRECTORY}_images";
14 changes: 14 additions & 0 deletions stylesheets/sass/_partials/_images.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
//* Images *//

img {
max-width: 100%;

&.img-thumb {
border: 1px solid $primary-color;
}

&.round {
border-radius: 4px;
}

}
1 change: 1 addition & 0 deletions stylesheets/sass/potato.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@
@import "_partials/_forms";
@import "_partials/_lists";
@import "_partials/_util";
@import "_partials/_images";