Merge pull request #129 from AyuntamientoMadrid/votes

Adds styles for debates voted and no voted

app/assets/stylesheets/debates.scss

@@ -255,6 +255,7 @@ header {
       border-color: white;
       color: white;
       cursor: pointer;
+      opacity: 1 !important;
     }
 
     &:active {
@@ -278,6 +279,7 @@ header {
       border-color: white;
       color: white;
       cursor: pointer;
+      opacity: 1 !important;
     }
 
     &:active {
@@ -304,6 +306,28 @@ header {
     @extend .like;
   }
 
+  .voted {
+    .icon-like {
+      @extend .icon-like;
+      background: $votes-like;
+      border-color: white;
+      color: white;
+    }
+
+    .icon-unlike {
+      @extend .icon-unlike;
+      background: $votes-unlike;
+      border-color: white;
+      color: white;
+    }
+  }
+
+  .no-voted {
+    .icon-like, .icon-unlike {
+      opacity: .5;
+    }
+  }
+
   .total-votes {
     color: $votes-text;
     float: right;
@@ -388,6 +412,10 @@ header {
       margin-top: $line-height;
       overflow: hidden;
       position: relative;
+
+      a {
+        color: $text-color;
+      }
     }
 
     .truncate {
@@ -489,8 +517,8 @@ header {
 // - - - - - - - - - - - -
 
 .debate-show {
-  margin-top: $line-height;
-  padding: 0 rem-calc(12);
+  background: white;
+  padding: rem-calc(24) rem-calc(12) 0 rem-calc(12);
 
   .back {
     @include back;
@@ -542,9 +570,9 @@ header {
   }
 
   h3 {
-    border-bottom: 1px solid $border;
+    border-bottom: 2px solid $votes-border;
     font-size: rem-calc(18);
-    margin: 0 0 $line-height 0;
+    margin: 0;
     text-transform: uppercase;
   }
 

app/assets/stylesheets/variables.scss

@@ -26,7 +26,7 @@ $comments-info:     #A5B2B9;
 $comments-text:     #3F4549;
 
 $header-color:      #292B33;
-$link:              #2895F1;//#0077B9;
+$link:              #2895F1;
 $link-hover: 		#2178BF;
 
 $tags-bg:           #FAFAFA;
@@ -38,8 +38,8 @@ $text-medium:       #999999;
 $text-light:        #A3A6AD;
 
 $votes:             #31708f;
-$votes-background:  #26AEEE;//#0081B3;
-$votes-border:      #1F94CB;//#005b80;
+$votes-background:  #26AEEE;
+$votes-border:      #1F94CB;
 $votes-like:        #7BD2A8;
 $votes-like-act:    #5D9E7F;
 $votes-neutral:     #CCCCCC;

db/schema.rb

@@ -62,18 +62,18 @@ ActiveRecord::Schema.define(version: 20150806163142) do
   add_index "tags", ["name"], name: "index_tags_on_name", unique: true, using: :btree
 
   create_table "users", force: :cascade do |t|
-    t.string   "email",                  default: "",    null: false
-    t.string   "encrypted_password",     default: "",    null: false
+    t.string   "email",                   default: "",    null: false
+    t.string   "encrypted_password",      default: "",    null: false
     t.string   "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          default: 0,     null: false
+    t.integer  "sign_in_count",           default: 0,     null: false
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip"
     t.string   "last_sign_in_ip"
-    t.datetime "created_at",                             null: false
-    t.datetime "updated_at",                             null: false
+    t.datetime "created_at",                              null: false
+    t.datetime "updated_at",                              null: false
     t.string   "first_name"
     t.string   "last_name"
     t.string   "confirmation_token"
@@ -81,7 +81,7 @@ ActiveRecord::Schema.define(version: 20150806163142) do
     t.datetime "confirmation_sent_at"
     t.string   "unconfirmed_email"
     t.string   "nickname"
-    t.boolean  "use_nickname",           default: false, null: false
+    t.boolean  "use_nickname",            default: false, null: false
     t.boolean  "email_on_debate_comment", default: false
     t.boolean  "email_on_comment_reply",  default: false
   end