From 04efb67f42b9ce5dd88fed29b32da9e44e5ace8c Mon Sep 17 00:00:00 2001 From: Chris Montoro Date: Wed, 18 Mar 2015 13:52:53 -0400 Subject: [PATCH] remove packery; update project list, cards --- bower.json | 1 - client/app/app.js | 1 - client/app/app.scss | 1 + client/app/projects/card/projects.card.scss | 41 +++++++++++++++---- .../projects/list/projects.list.controller.js | 2 - client/app/projects/list/projects.list.html | 21 ++++++++-- client/index.html | 15 ------- 7 files changed, 51 insertions(+), 31 deletions(-) diff --git a/bower.json b/bower.json index 7b5d407..9ff9e1b 100644 --- a/bower.json +++ b/bower.json @@ -22,7 +22,6 @@ "moment-timezone": "~0.3.0", "angular-momentjs": "~0.1.9", "animate.css": "~3.2.3", - "angular-packery": "~1.0.3", "ng-underscore": "~0.1.0" }, "devDependencies": { diff --git a/client/app/app.js b/client/app/app.js index a2e9fd4..5de1578 100644 --- a/client/app/app.js +++ b/client/app/app.js @@ -9,7 +9,6 @@ angular.module('espnCreativeworksShowcaseApp', [ 'ui.bootstrap', 'cloudinary', 'angular-momentjs', - 'angular-packery', 'ngUnderscore' ]) .constant('jQuery', window.jQuery) diff --git a/client/app/app.scss b/client/app/app.scss index bbe0e21..9b9e09c 100644 --- a/client/app/app.scss +++ b/client/app/app.scss @@ -5,6 +5,7 @@ $fa-font-path: "/bower_components/font-awesome/fonts"; $espn-red: #f14237; $espn-light: #fff; $espn-dark: #000000; +$espn-neutral: #b7b7b7; $espn-font-family-sans-serif: "proxima-nova"; $espn-font-family-headings: "octin-college"; diff --git a/client/app/projects/card/projects.card.scss b/client/app/projects/card/projects.card.scss index 2298893..86db974 100644 --- a/client/app/projects/card/projects.card.scss +++ b/client/app/projects/card/projects.card.scss @@ -1,21 +1,44 @@ -.packery-sizer, .packery-object{ - width: 100%; - max-width: 467px; - height: auto; +.project-card-container { + $card-min-height: 300px; + $card-image-min-height: 208px; + + min-height: $card-min-height; padding: 10px; -} + + .card { + width: 100%; + margin: 0 auto; + } + + .card-image-link { + display: block; + width: 100%; + min-height: $card-image-min-height; + } + + .card-image.fallback .card-image-link { + line-height: $card-image-min-height; + background-color: darken($espn-light, 15%); + background-image: url($image-path + 'bg_project_execution.png'); + background-size: 32px 32px; + } -.card { .card-header { font-family: $espn-font-family-headings; - color: #000; text-transform: uppercase; margin: 5px 0 0 0 !important; } + .card-desc { - font-family: $font-family-sans-serif; - color: #b7b7b7; + color: $espn-neutral; font-style: italic; font-size: 12px; + margin-bottom: 0; + } +} + +@media (min-width: $screen-sm-min){ + .project-card-container .card { + max-width: 467px; } } \ No newline at end of file diff --git a/client/app/projects/list/projects.list.controller.js b/client/app/projects/list/projects.list.controller.js index 63f108e..d13eb58 100644 --- a/client/app/projects/list/projects.list.controller.js +++ b/client/app/projects/list/projects.list.controller.js @@ -11,8 +11,6 @@ angular.module('espnCreativeworksShowcaseApp') $scope.$watch('filteredProjects', function (newProjects, oldProjects){ if ($scope.projects.$resolved && angular.isDefined(newProjects) && angular.isDefined(oldProjects) && !_.isEqual(newProjects, oldProjects) ){ - console.log('New Projects', newProjects); - console.log('New Old Projects', newProjects); $scope.$broadcast('projects:filtered', newProjects); } }, true); diff --git a/client/app/projects/list/projects.list.html b/client/app/projects/list/projects.list.html index 3741009..4c8af52 100644 --- a/client/app/projects/list/projects.list.html +++ b/client/app/projects/list/projects.list.html @@ -11,9 +11,24 @@

Work

-
+
- +
+
+ +
+

{{project.tagline}}

+

{{project.title}}

+
+
+
+
diff --git a/client/index.html b/client/index.html index 9b22920..f9a6f4a 100644 --- a/client/index.html +++ b/client/index.html @@ -87,21 +87,6 @@ - - - - - - - - - - - - - - -