From 6033bde0d58a9ff25e6e42cc62e8b3987576edad Mon Sep 17 00:00:00 2001 From: Mo Bitar Date: Tue, 17 Oct 2017 13:55:38 -0500 Subject: [PATCH] Note menu bar height --- app/assets/stylesheets/app/_notes.scss | 2 +- app/controllers/application_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/app/_notes.scss b/app/assets/stylesheets/app/_notes.scss index 6e0dcd9fd..9d1918318 100644 --- a/app/assets/stylesheets/app/_notes.scss +++ b/app/assets/stylesheets/app/_notes.scss @@ -6,7 +6,7 @@ max-width: 350px; min-width: 170px; - $notes-title-bar-height: 147px; + $notes-title-bar-height: 148px; #notes-title-bar { color: rgba(black, 0.40); diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 43b6f0688..19c58168c 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -3,7 +3,7 @@ class ApplicationController < ActionController::Base protect_from_forgery with: :null_session after_action :set_csrf_cookie - after_action :allow_iframe + after_filter :allow_iframe layout :false