Mirrors
/
Vestride_Shuffle
mirror of https://github.com/Vestride/Shuffle.git
2
0
Fork 0
Code Issues Releases Wiki Activity

Update dependencies

Browse Source
pull/56/head
Glen Cheney 10 years ago
parent 6af401825d
commit da0029900a
6 changed files with 622 additions and 1296 deletions
Show Stats Download Patch File Download Diff File

2
bower.json
Unescape Escape View File

@ -47,6 +47,6 @@
"modernizr": "^2.6.2"
},
"devDependencies": {
"jasmine-jquery": "~2.0.3"
"jasmine-jquery": "~2.0.5"
}
}

100
css/gallery.css
Unescape Escape View File

@ -1,138 +1,111 @@
.filter-options {
margin-top: 20px;
margin-bottom: 40px;
}
margin-bottom: 40px; }
.filter-group .filter-group__label {
margin: 0 0 5px;
}
margin: 0 0 5px; }
.filter-group button {
width: 40px;
height: 40px;
padding: 0;
}
padding: 0; }
.filter-group label {
cursor: pointer;
}
cursor: pointer; }
.shape-up {
position: relative;
overflow: hidden;
}
overflow: hidden; }
.shape {
position: relative;
margin-left: 0;
margin-top: 10px;
}
margin-top: 10px; }
.shape .shape__inner {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
}
left: 0; }
.shape .shape__space {
width: 100%;
height: 100%;
background-color: black;
border-style: solid;
border-width: 0;
border-color: transparent;
}
border-color: transparent; }
.shape--blue .shape__space {
background-color: #3498db;
border-bottom-color: #3498db;
}
background-color: #3498DB;
border-bottom-color: #3498DB; }
.shape--red .shape__space {
background-color: #e74c3c;
border-bottom-color: #e74c3c;
}
background-color: #E74C3C;
border-bottom-color: #E74C3C; }
.shape--orange .shape__space {
background-color: #f39c12;
border-bottom-color: #f39c12;
}
background-color: #F39C12;
border-bottom-color: #F39C12; }
.shape--green .shape__space {
background-color: #2ecc71;
border-bottom-color: #2ecc71;
}
background-color: #2ECC71;
border-bottom-color: #2ECC71; }
.shape--circle .shape__space {
border-radius: 50%;
}
border-radius: 50%; }
.shape--diamond .shape__space {
-webkit-transform: rotate(45deg) scale(0.70711);
-ms-transform: rotate(45deg) scale(0.70711);
transform: rotate(45deg) scale(0.70711);
}
-ms-transform: rotate(45deg) scale(0.70711);
transform: rotate(45deg) scale(0.70711); }
.shape--triangle .shape__space {
padding-top: 14.5px;
height: 0;
width: 0;
border-width: 0 110px 191px 110px;
background-color: transparent;
}
background-color: transparent; }
.lt-ie9 .shape .keep-ratio {
position: static;
width: 100%;
height: 250px;
overflow: visible;
padding-bottom: 0;
}
padding-bottom: 0; }
.lt-ie9 .shape .shape__inner {
position: static;
width: 100%;
height: 100%;
}
height: 100%; }
@media (min-width: 1200px) {
.shape--triangle .shape__space {
padding-top: 18px;
height: 0;
width: 0;
border-width: 0 135px 234px 135px;
}
}
border-width: 0 135px 234px 135px; } }
@media (min-width: 768px) and (max-width: 979px) {
.shape--triangle .shape__space {
padding-top: 11px;
height: 0;
width: 0;
border-width: 0 83px 144px 83px;
}
}
border-width: 0 83px 144px 83px; } }
@media (max-width: 767px) {
.shape--triangle .shape__space {
padding-top: 40px;
height: 0;
width: 0;
border-width: 0 300px 520px 300px;
margin: auto;
}
}
margin: auto; } }
@media (max-width: 600px) {
.shape--triangle .shape__space {
padding-top: 32px;
height: 0;
width: 0;
border-width: 0 240px 416px 240px;
}
}
border-width: 0 240px 416px 240px; } }
@media (max-width: 480px) {
.shape--triangle .shape__space {
padding-top: 21.5px;
height: 0;
width: 0;
border-width: 0 160px 277px 160px;
}
}
border-width: 0 160px 277px 160px; } }
body::before {
content: 'Default - 940px';
position: fixed;
@ -143,30 +116,21 @@ body::before {
height: 25px;
background-color: rgba(119, 204, 102, 0.6);
-webkit-transition: background .2s ease;
transition: background .2s ease;
}
transition: background .2s ease; }
@media (min-width: 1200px) {
body::before {
content: 'Large Desktop - 1200px+';
background-color: rgba(204, 119, 102, 0.6);
}
}
background-color: rgba(204, 119, 102, 0.6); } }
@media (min-width: 768px) and (max-width: 979px) {
body::before {
content: 'Portrait tablet to landscape and desktop - > 768px && < 979px';
background-color: rgba(204, 187, 102, 0.6);
}
}
background-color: rgba(204, 187, 102, 0.6); } }
@media (max-width: 767px) {
body::before {
content: 'Phones to Tablets - < 767px';
background-color: rgba(102, 153, 204, 0.6);
}
}
background-color: rgba(102, 153, 204, 0.6); } }
@media (max-width: 480px) {
body::before {
content: 'Phones - < 480px';
background-color: rgba(204, 102, 204, 0.6);
}
}
background-color: rgba(204, 102, 204, 0.6); } }

82
css/shuffle-styles.css
Unescape Escape View File

@ -3,16 +3,13 @@
\*=============================================*/
.picture-item {
height: 220px;
margin-top: 24px;
}
margin-top: 24px; }
.picture-item.shuffle-item {
margin-left: 0;
/* shuffle items shouldn't have a left margin*/
}
/* shuffle items shouldn't have a left margin*/ }
.picture-item.picture-item--h2 {
height: 464px;
/* 2x the height + 1 gutter */
}
/* 2x the height + 1 gutter */ }
.picture-item.span6:not(.picture-item--h2) .picture-item__details {
position: absolute;
bottom: 0;
@ -20,33 +17,25 @@
width: 100%;
background-color: #333;
background-color: rgba(0, 0, 0, 0.6);
color: white;
}
color: white; }
.picture-item.span6:not(.picture-item--h2) .picture-item__description {
display: none;
}
display: none; }
.picture-item .picture-item__inner {
background: #ecf0f1;
background: #ECF0F1;
height: 100%;
overflow: hidden;
}
overflow: hidden; }
.picture-item img {
display: block;
width: 100%;
height: auto;
}
.picture-item .picture-item__details,
.picture-item .picture-item__description {
padding: 1em;
}
height: auto; }
.picture-item .picture-item__details, .picture-item .picture-item__description {
padding: 1em; }
.picture-item .picture-item__description {
margin: 0;
padding-top: 0;
padding-right: 2em;
}
padding-right: 2em; }
.picture-item .picture-item__tags {
margin: 0;
}
margin: 0; }
/*
Shuffle needs either relative or absolute positioning on the container
@ -55,63 +44,48 @@
*/
.shuffle--container {
position: relative;
overflow: hidden;
}
overflow: hidden; }
.shuffle--fluid .shuffle__sizer {
position: absolute;
opacity: 0;
visibility: hidden;
}
visibility: hidden; }
/* Animate in styles */
.shuffle--animatein {
overflow: visible;
}
overflow: visible; }
.shuffle--animatein .picture-item__inner {
opacity: 0;
-webkit-transform: translate(0, 220px);
-ms-transform: translate(0, 220px);
transform: translate(0, 220px);
}
-ms-transform: translate(0, 220px);
transform: translate(0, 220px); }
.shuffle--animatein .picture-item__inner--transition {
-webkit-transition: all .6s ease;
transition: all .6s ease;
}
transition: all .6s ease; }
.shuffle--animatein .picture-item.in .picture-item__inner {
opacity: 1;
-webkit-transform: translate(0, 0);
-ms-transform: translate(0, 0);
transform: translate(0, 0);
}
-ms-transform: translate(0, 0);
transform: translate(0, 0); }
@media (max-width: 47.9375em) {
.picture-item {
height: auto;
margin-top: 20px;
}
margin-top: 20px; }
.picture-item.picture-item--h2 {
height: auto;
}
.picture-item .picture-item__details,
.picture-item .picture-item__description {
height: auto; }
.picture-item .picture-item__details, .picture-item .picture-item__description {
font-size: .875em;
padding: .625em;
}
padding: .625em; }
.picture-item .picture-item__description {
padding-right: .875em;
padding-bottom: 1.25em;
}
padding-bottom: 1.25em; }
.filter > .row-fluid,
.filter > .row-fluid > div {
margin: 10px 0;
}
.filter > .row-fluid, .filter > .row-fluid > div {
margin: 10px 0; }
.m-nofloat {
float: none;
}
}
float: none; } }

1717
css/style.css
View File

File diff suppressed because it is too large Load Diff

16
package.json
Unescape Escape View File

@ -29,14 +29,14 @@
},
"homepage": "https://github.com/Vestride/Shuffle",
"devDependencies": {
"grunt": "^0.4.4",
"grunt-contrib-concat": "^0.4.0",
"grunt-contrib-uglify": "^0.4.0",
"grunt-shell": "^0.6.4",
"load-grunt-tasks": "^0.4.0",
"grunt-contrib-sass": "^0.7.3",
"grunt": "^0.4.5",
"grunt-autoprefixer": "^1.0.1",
"grunt-contrib-concat": "^0.5.0",
"grunt-contrib-jasmine": "^0.7.0",
"grunt-contrib-sass": "^0.8.1",
"grunt-contrib-uglify": "^0.5.1",
"grunt-contrib-watch": "^0.6.1",
"grunt-autoprefixer": "^0.7.2",
"grunt-contrib-jasmine": "^0.6.4"
"grunt-shell": "^1.0.1",
"load-grunt-tasks": "^0.6.0"
}
}

1
test/_SpecRunner.html
Unescape Escape View File

@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<title>Jasmine Spec Runner</title>
<link rel="shortcut icon" type="image/png" href=".grunt/grunt-contrib-jasmine/jasmine_favicon.png">
<link rel="stylesheet" type="text/css" href="../.grunt/grunt-contrib-jasmine/jasmine.css">

Write Preview
Loading…
Cancel
Save