From 3cff83b7a5c6af03dfd3db8e533a2c5849aa0729 Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 12 Sep 2014 14:42:58 +1000 Subject: [PATCH] Kill the outside modal close button styling once and for all --- .../templates/partials/close.html.haml | 2 +- .../stylesheets/darkswarm/modals.css.sass | 33 ++----------------- app/views/modals/_producer.html.haml | 2 +- 3 files changed, 5 insertions(+), 32 deletions(-) diff --git a/app/assets/javascripts/templates/partials/close.html.haml b/app/assets/javascripts/templates/partials/close.html.haml index 1facd8edeb..a02ae410a8 100644 --- a/app/assets/javascripts/templates/partials/close.html.haml +++ b/app/assets/javascripts/templates/partials/close.html.haml @@ -1,2 +1,2 @@ -%a.close-reveal-modal.outside{"ng-click" => "$close()"} +%a.close-reveal-modal{"ng-click" => "$close()"} %i.ofn-i_009-close diff --git a/app/assets/stylesheets/darkswarm/modals.css.sass b/app/assets/stylesheets/darkswarm/modals.css.sass index 0d33841286..c9c3d4e8c8 100644 --- a/app/assets/stylesheets/darkswarm/modals.css.sass +++ b/app/assets/stylesheets/darkswarm/modals.css.sass @@ -7,16 +7,17 @@ dialog, .reveal-modal padding: 1rem overflow-y: scroll - // Reveal.js + // Reveal.js break point: // @media only screen and (max-width: 40.063em) + // Small - when modal IS full screen @media only screen and (max-width: 640px) max-height: auto position: absolute !important top: 0 left: 0 - // Medium and up - when modal is NOT full screen + // Medium and up - when modal IS NOT full screen @media only screen and (min-width: 641px) top: 10% max-height: 80% @@ -35,31 +36,3 @@ dialog .close-reveal-modal, .reveal-modal .close-reveal-modal &:hover, &:active, &:focus background-color: rgba(235,235,235,1) color: #333 - -// dialog .close-reveal-modal.outside, .reveal-modal .close-reveal-modal.outside -// top: -2.5rem -// right: -2.5rem -// font-size: 2rem -// color: white -// text-shadow: none -// padding: 0.25rem -// @include border-radius(999999) -// border: 1px solid transparent -// &:hover, &:active, &:focus -// text-shadow: 0 1px 3px #333 -// border: 1px solid white - -// @media all and (max-width: 640px) -// top: 0.5rem -// right: 0.5rem -// font-size: 2rem -// color: white -// text-shadow: none -// padding: 0.25rem -// background-color: rgba(150,150,150,0.85) -// @include border-radius(999999) -// border: 1px solid transparent -// &:hover, &:active, &:focus -// text-shadow: 0 1px 3px #333 -// border: 1px solid white - diff --git a/app/views/modals/_producer.html.haml b/app/views/modals/_producer.html.haml index 5d2d342f6d..51a45cfe5f 100644 --- a/app/views/modals/_producer.html.haml +++ b/app/views/modals/_producer.html.haml @@ -50,7 +50,7 @@ %a{"ng-href" => "http://instagram.com/{{enterprise.instagram}}", target: "_blank"} %i.ofn-i_043-instagram - %a.close-reveal-modal.outside{"ng-click" => "$close()"} + %a.close-reveal-modal{"ng-click" => "$close()"} %i.ofn-i_009-close