small tweaks to merge in hearting

mdeiters · mdeiters · commit f45647214b6f · 2016-02-17T17:12:31.000-08:00
diff --git a/app/assets/javascripts/components/heart.es6.jsx b/app/assets/javascripts/components/heart.es6.jsx
@@ -1,13 +1,13 @@
 class Heart extends React.Component {
   render() {
     let classes = {
-      root: 'heart left ml1 mr2 pointer',
+      root: 'heart left ml1 mr2',
       icon: 'highlight center',
       count: 'diminish center font-tiny'
     }
     if (this.props.layout === 'inline') {
       classes = {
-        root: 'heart left ml1 mr2 pointer flat',
+        root: 'heart left ml1 mr2 flat',
         icon: 'highlight mr1',
         count: 'diminish inline'
       }
@@ -26,11 +26,11 @@ class Heart extends React.Component {
 
   renderHeartState(classes) {
     if (!this.props.hearted) {
-      return <div className={classes}>
+      return <div className={classes + ' pointer'}>
         <i className="fa fa-heart-o" />
       </div>
     }
-    return <div className={classes + ' hearted'}>
+    return <div className={classes + ' hearted default-cursor'}>
       <i className="fa fa-heart" />
     </div>
   }
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -51,10 +51,6 @@ $highlight-color: $red;
 	border-bottom: solid 3px $blue;
 }
 
-.pointer {
-	cursor: pointer;
-}
-
 $h3: 18px;
 
 h1, h3 {
@@ -114,6 +110,14 @@ $placeholder: darken($silver, 20%);
 	}
 }
 
+.default-cursor{
+	cursor: default !important;
+}
+
+.pointer {
+	cursor: pointer;
+}
+
 a.heart {
   padding-top: 4px;
   font-size: $font-sm;
diff --git a/app/views/protips/index.html.haml b/app/views/protips/index.html.haml
@@ -1,6 +1,9 @@
 -content_for :title do
   Coderwall : A community space for developers.
 
+-if signed_in?
+  #signed-in-user-liked-payload.hide=current_user.liked
+
 .continer
   -if protips_view_breadcrumbs.present?
     .mxn1.mb3
diff --git a/config/database.yml b/config/database.yml
@@ -23,7 +23,8 @@ default: &default
 
 development:
   <<: *default
-  url: <%= ENV['DATABASE_URL'] %>
+  database: coderwall-next_development
+  url: <%= ENV['DATABASE_URL'] %> # when set overrides all other configurations
 
   # The specified database role being used to connect to postgres.
   # To create additional roles in postgres see `$ createuser --help`.
