From d833a19e4abe3f6e2bde873dfe91eaaa5bc7741b Mon Sep 17 00:00:00 2001
From: Leonardo Merlin <leonardo.merlin@gmail.com>
Date: Wed, 19 Aug 2015 09:07:28 -0300
Subject: [PATCH] Small improvements at program-box

---
 src/app/components/programa/programa.html   |  4 +++-
 src/app/components/programa/programa.scss   | 43 +++++++++++++++++++++++++++++++++++--------
 src/app/partials/article/article.service.js | 20 ++++++++++----------
 src/app/partials/programas/programa.html    | 42 +++++++++++++++++++++++-------------------
 src/app/partials/programas/programas.scss   |  4 +++-
 5 files changed, 74 insertions(+), 39 deletions(-)

diff --git a/src/app/components/programa/programa.html b/src/app/components/programa/programa.html
index 1eb0876..f71a65e 100644
--- a/src/app/components/programa/programa.html
+++ b/src/app/components/programa/programa.html
@@ -6,7 +6,9 @@
         <!-- <img class="program-box--image img-responsive" ng-src="{{::vm.getImageUrl()}}" alt="{{::vm.getImageAlt()}}" /> -->
         <div class="program-box--image" ng-style="{'background-image':'url( {{::vm.getImageUrl()}} )'}"></div>
       </div>
-      <h1 class="program-box--title">{{::vm.program.title}}</h1>
+      <div class="program-box--title">
+        <h1>{{::vm.program.title}}</h1>
+      </div>
       <div class="program-box--abstract" ng-bind-html="vm.program.abstract"></div>
       <div class="program-box--button">
         <button class="btn btn-block">
diff --git a/src/app/components/programa/programa.scss b/src/app/components/programa/programa.scss
index a58e7e4..c420ec1 100644
--- a/src/app/components/programa/programa.scss
+++ b/src/app/components/programa/programa.scss
@@ -1,7 +1,7 @@
 // Variables
 $program-box-space: 20px;
 $scale: 1.1;
-$time: .3s;
+$time: .2s;
 $darken: 15%;
 
 // sandbox
@@ -10,6 +10,8 @@ $darken: 15%;
     background-color: #fff;
     margin-top: $program-box-space;
     margin-bottom: $program-box-space;
+    border-radius: 3px;
+    overflow: hidden;
 
     .contraste & {
         color: #fff;
@@ -39,10 +41,16 @@ $darken: 15%;
     }
 
     &--title {
-        font-size: 18px;
-        font-weight: bold;
+
         padding: 0 $program-box-space;
         margin: 0 0 10px 0;
+        h1 {
+            font-size: 18px;
+            font-weight: bold;
+            height: 60px;
+            display: table-cell;
+            vertical-align: middle;
+        }
     }
 
     &--abstract {
@@ -60,6 +68,11 @@ $darken: 15%;
             border-top: 0;
             border-radius: 6px;
 
+            -webkit-transition: all $time ease-in-out;
+            -moz-transition: all $time ease-in-out;
+            -o-transition: all $time ease-in-out;
+            transition: all $time ease-in-out;
+
             @each $category, $color in $categories {
                 .#{$category} & {
                     background-color: $color;
@@ -67,6 +80,15 @@ $darken: 15%;
                 }
             }
 
+            &:hover,
+            &:focus {
+                @each $category, $color in $categories {
+                    .#{$category} & {
+                        background-color: darken($color, $darken);
+                    }
+                }
+            }
+
             .contraste & {
                 color: #262626;
                 background-color: #fff;
@@ -97,10 +119,15 @@ $darken: 15%;
         transition: all $time ease-in-out;
     }
 
-    &:hover .program-box--image {
-        -webkit-transform: scale($scale); /* prefixo para browsers webkit */
-        -moz-transform: scale($scale); /* prefixo para browsers gecko */
-        -o-transform: scale($scale); /* prefixo para opera */
-        transform: scale($scale);
+    &:hover {
+        background-color: #d9d9d9;
+
+        .program-box--image {
+            -webkit-transform: scale($scale); /* prefixo para browsers webkit */
+            -moz-transform: scale($scale); /* prefixo para browsers gecko */
+            -o-transform: scale($scale); /* prefixo para opera */
+            transform: scale($scale);
+        }
     }
+
 }
diff --git a/src/app/partials/article/article.service.js b/src/app/partials/article/article.service.js
index 0ee2855..8ec64d7 100644
--- a/src/app/partials/article/article.service.js
+++ b/src/app/partials/article/article.service.js
@@ -88,16 +88,16 @@
       var darkFactor = 0.15;
 
       return function (data) {
-        if(data.categories){
-          var categories = data.categories;
-
-          for (var i = categories.length - 1; i >= 0; i--) {
-            var category = categories[i];
-            if(category.color && !category.bgColor){
-              category.colorDarker = window.ColorLuminance(category.color, 0.15);
-            }
-          };
-        }
+        // if(data.article.categories){
+        //   var categories = data.article.categories;
+
+        //   for (var i = categories.length - 1; i >= 0; i--) {
+        //     var category = categories[i];
+        //     if(category.color && !category.bgColor){
+        //       category.colorDarker = $window.ColorLuminance(category.color, 0.15);
+        //     }
+        //   };
+        // }
         cbSuccess(data);
       };
     }
diff --git a/src/app/partials/programas/programa.html b/src/app/partials/programas/programa.html
index 222e5d7..db6e821 100644
--- a/src/app/partials/programas/programa.html
+++ b/src/app/partials/programas/programa.html
@@ -1,24 +1,28 @@
 <div class="container">
 
-  <div class="article-bar" ng-class="programa.program.categories[0].slug">
-    <div class="navbar">
-      <div class="navbar-header">
-        <button class="article-bar--item btn btn-link" ng-click="programa.goBack()">
-          <!-- <span class="glyphicon glyphicon-share-alt" aria-hidden="true"></span> -->
-          <span class="glyphicon glyphicon-arrow-left" aria-hidden="true"></span>
-          Voltar
-        </button>
-      </div>
-      <div class="navbar-left">
-        <button class="article-bar--item btn btn-link">
-          <span class="glyphicon glyphicon-refresh"></span>
-          <span class="category-name">{{::programa.program.categories[0].name}}</span>
-        </button>
-      </div>
-      <div class="navbar-right">
-        <select name="selectCategory" id="selectCategory-{{::programa.program.categories[0].id}}" class="article-bar--item form-control">
-          <option value="">-- Selectione um Tema --</option>
-        </select>
+  <div class="row">
+    <div class="col-xs-12">
+      <div class="article-bar" ng-class="programa.program.categories[0].slug">
+        <div class="navbar">
+          <div class="navbar-header">
+            <button class="article-bar--item btn btn-link" ng-click="programa.goBack()">
+              <!-- <span class="glyphicon glyphicon-share-alt" aria-hidden="true"></span> -->
+              <span class="glyphicon glyphicon-arrow-left" aria-hidden="true"></span>
+              Voltar
+            </button>
+          </div>
+          <div class="navbar-left">
+            <button class="article-bar--item btn btn-link">
+              <span class="glyphicon glyphicon-refresh"></span>
+              <span class="category-name">{{::programa.program.categories[0].name}}</span>
+            </button>
+          </div>
+          <div class="navbar-right">
+            <select name="selectCategory" id="selectCategory-{{::programa.program.categories[0].id}}" class="article-bar--item form-control">
+              <option value="">-- Selectione um Tema --</option>
+            </select>
+          </div>
+        </div>
       </div>
     </div>
   </div>
diff --git a/src/app/partials/programas/programas.scss b/src/app/partials/programas/programas.scss
index a08cfdb..48de84e 100644
--- a/src/app/partials/programas/programas.scss
+++ b/src/app/partials/programas/programas.scss
@@ -9,7 +9,9 @@
         margin: 8px 0;
     }
 
-
+    .navbar-right {
+        margin-right: 15px;
+    }
 
     @each $category, $color in $categories {
         &.#{$category} {
--
libgit2 0.21.2