diff options
author | Sandip Trivedi <trivedi.sandip@gmail.com> | 2015-05-29 05:20:52 +0300 |
---|---|---|
committer | Jonne Haß <me@jhass.eu> | 2015-05-29 12:41:57 +0300 |
commit | b026a2afe8d6215c79054be612d91f7aafcb0089 (patch) | |
tree | 115ce659c29ceb46b94474b7f77d7bcb209f193c /app | |
parent | 604ffb445a6c922972feba918744d57e34ab6c7a (diff) |
Replaces facebox vendored asset with rails gem #5194
closes #6005
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/images/facebox/closelabel.png | bin | 168 -> 0 bytes | |||
-rw-r--r-- | app/assets/images/facebox/loading.gif | bin | 2767 -> 0 bytes | |||
-rw-r--r-- | app/assets/javascripts/main.js | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/application.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/vendor/facebox.css | 72 |
5 files changed, 2 insertions, 74 deletions
diff --git a/app/assets/images/facebox/closelabel.png b/app/assets/images/facebox/closelabel.png Binary files differdeleted file mode 100644 index cd0445580..000000000 --- a/app/assets/images/facebox/closelabel.png +++ /dev/null diff --git a/app/assets/images/facebox/loading.gif b/app/assets/images/facebox/loading.gif Binary files differdeleted file mode 100644 index f864d5fd3..000000000 --- a/app/assets/images/facebox/loading.gif +++ /dev/null diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 7114600e6..58f9db688 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -12,7 +12,7 @@ //= require jquery.charcount //= require jquery-placeholder //= require rails-timeago -//= require facebox +//= require jquery.facebox //= require browser_detection //= require jquery.events.input //= require jakobmattsson-jquery-elastic diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index a4f8ce423..3638522c2 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -47,7 +47,7 @@ /* conversations */ @import 'conversations'; -@import 'vendor/facebox'; +@import 'jquery.facebox'; @import 'facebox'; /* publisher */ diff --git a/app/assets/stylesheets/vendor/facebox.css b/app/assets/stylesheets/vendor/facebox.css deleted file mode 100644 index 511a9ef36..000000000 --- a/app/assets/stylesheets/vendor/facebox.css +++ /dev/null @@ -1,72 +0,0 @@ -#facebox { - position: absolute; - top: 0; - left: 0; - z-index: 100; - text-align: left; -} - -#facebox .popup{ - position:relative; - border:1px solid #999; - border-radius:2px; - box-shadow:0 0 10px rgba(0,0,0,0.8), 0 2px 200px rgba(255,255,255,0.2);; -} - -#facebox .content { - display:table; - width: 370px; - padding: 20px; - background: #fff; - border-radius:2px; -} - -#facebox .content > p:first-child{ - margin-top:0; -} -#facebox .content > p:last-child{ - margin-bottom:0; -} - -#facebox .close{ - position:absolute; - top:15px; - right:20px; - padding:2px; -} -#facebox .close img{ - opacity:0.3; -} -#facebox .close:hover img{ - opacity:1.0; -} - -#facebox .loading { - text-align: center; -} - -#facebox .image { - text-align: center; -} - -#facebox img { - border: 0; - margin: 0; -} - -#facebox_overlay { - position: fixed; - top: 0px; - left: 0px; - height:100%; - width:100%; -} - -.facebox_hide { - z-index:-100; -} - -.facebox_overlayBG { - background-color: #000; - z-index: 99; -} |