Skip to content

Commit

Permalink
Merge branch 'jquery-ui-hotfix' with fixes for jQuery UI and ckeditor
Browse files Browse the repository at this point in the history
  • Loading branch information
Patrick Lewis committed Apr 27, 2017
2 parents 4a8f745 + fce1a3f commit b46aba3
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 32 deletions.
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true
source 'http://rubygems.org'

ruby '2.3.3'
ruby '2.3.0'

gem 'acl9', git: 'https://github.com/be9/acl9.git', branch: 'finalist-update-rails'
gem 'actionpack-action_caching', '~> 1.2'
Expand Down Expand Up @@ -38,6 +38,7 @@ gem 'unicorn', '~> 4.9'
gem 'whenever', '~> 0.9'
gem 'will_paginate', '~> 3.1'
gem 'will_paginate-bootstrap', '~> 1.0'
gem 'non-stupid-digest-assets', '~> 1.0', '>= 1.0.9'

group :development do
gem 'drg', '~> 1.5'
Expand Down
7 changes: 5 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,8 @@ GEM
mini_portile2 (~> 2.1.0)
nokogumbo (1.4.10)
nokogiri
non-stupid-digest-assets (1.0.9)
sprockets (>= 2.0)
options (2.3.2)
orm_adapter (0.5.0)
parser (2.4.0.0)
Expand Down Expand Up @@ -425,6 +427,7 @@ DEPENDENCIES
jquery-rails (~> 4.2)
launchy (~> 2.4)
nokogiri (~> 1.7)
non-stupid-digest-assets (~> 1.0, >= 1.0.9)
pg (~> 0.19)
progress_bar (~> 1.1)
protected_attributes_continued (~> 1.2)
Expand Down Expand Up @@ -464,7 +467,7 @@ DEPENDENCIES
will_paginate-bootstrap (~> 1.0)

RUBY VERSION
ruby 2.3.3p222
ruby 2.3.0p0

BUNDLED WITH
1.14.3
1.14.5
2 changes: 1 addition & 1 deletion app/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
@import "bootstrap";
@import "font-awesome";
@import "formtastic-bootstrap";
@import "custom-theme/jquery-ui-1.9.2.custom.css";
@import "custom-theme/jquery-ui-1.9.2.custom";
@import "tagteam";
@import "front";
@import "footer";
Expand Down
1 change: 1 addition & 0 deletions config/initializers/non_digest_assets.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
NonStupidDigestAssets.whitelist += [/ckeditor\/.*/]
42 changes: 21 additions & 21 deletions vendor/assets/stylesheets/custom-theme/jquery-ui-1.9.2.custom.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*! jQuery UI - v1.9.2 - 2014-12-23
/*! jQuery UI - v1.9.2 - 2017-03-31
* http://jqueryui.com
* Includes: jquery.ui.core.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css, jquery.ui.theme.css
* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=%22Roboto%22%2Csans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=0&bgColorHeader=%238ec63f&bgTextureHeader=flat&bgImgOpacityHeader=15&borderColorHeader=%238ec63f&fcHeader=%23ffffff&iconColorHeader=%23ffffff&bgColorContent=%23ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=%23bfbfbf&fcContent=%23000000&iconColorContent=%238ec63f&bgColorDefault=%23dddddd&bgTextureDefault=flat&bgImgOpacityDefault=100&borderColorDefault=%23d8dcdf&fcDefault=%23302825&iconColorDefault=%238ec63f&bgColorHover=%23f6f6f6&bgTextureHover=flat&bgImgOpacityHover=100&borderColorHover=%23cdd5da&fcHover=%23151c21&iconColorHover=%238ec63f&bgColorActive=%23ffffff&bgTextureActive=flat&bgImgOpacityActive=65&borderColorActive=%238ec63f&fcActive=%23000000&iconColorActive=%238ec63f&bgColorHighlight=%23fbf8ee&bgTextureHighlight=flat&bgImgOpacityHighlight=55&borderColorHighlight=%23fcd3a1&fcHighlight=%23444444&iconColorHighlight=%23151c21&bgColorError=%23f3d8d8&bgTextureError=flat&bgImgOpacityError=75&borderColorError=%23a33724&fcError=%23151c21&iconColorError=%23a33724&bgColorOverlay=%23616161&bgTextureOverlay=flat&bgImgOpacityOverlay=50&opacityOverlay=45&bgColorShadow=%23333333&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=10&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=%22Roboto%22%2Csans-serif&fsDefault=1.1em&fwDefault=bold&cornerRadius=0&bgColorHeader=%238ec63f&bgTextureHeader=flat&borderColorHeader=%238ec63f&fcHeader=%23ffffff&iconColorHeader=%23ffffff&bgColorContent=%23ffffff&bgTextureContent=flat&borderColorContent=%23bfbfbf&fcContent=%23000000&iconColorContent=%238ec63f&bgColorDefault=%23dddddd&bgTextureDefault=flat&borderColorDefault=%23d8dcdf&fcDefault=%23302825&iconColorDefault=%238ec63f&bgColorHover=%23f6f6f6&bgTextureHover=flat&borderColorHover=%23cdd5da&fcHover=%23151c21&iconColorHover=%238ec63f&bgColorActive=%23ffffff&bgTextureActive=flat&borderColorActive=%238ec63f&fcActive=%23000000&iconColorActive=%238ec63f&bgColorHighlight=%23fbf8ee&bgTextureHighlight=flat&borderColorHighlight=%23fcd3a1&fcHighlight=%23444444&iconColorHighlight=%23151c21&bgColorError=%23f3d8d8&bgTextureError=flat&borderColorError=%23a33724&fcError=%23151c21&iconColorError=%23a33724&bgColorOverlay=%23616161&bgTextureOverlay=flat&bgImgOpacityOverlay=50&opacityOverlay=45&bgColorShadow=%23333333&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=10&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px&bgImgOpacityHeader=15&bgImgOpacityContent=75&bgImgOpacityDefault=100&bgImgOpacityHover=100&bgImgOpacityActive=65&bgImgOpacityHighlight=55&bgImgOpacityError=75
* Copyright jQuery Foundation and other contributors; Licensed MIT */

/* Layout helpers
----------------------------------*/
Expand Down Expand Up @@ -144,13 +144,13 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
left: -4px; /*must have*/
width: 200px; /*must have*/
height: 200px; /*must have*/
}.ui-dialog { position: absolute; top: 0; left: 0; padding: 0; width: 300px; overflow: hidden; }
}.ui-dialog { position: absolute; top: 0; left: 0; padding: .2em; width: 300px; overflow: hidden; }
.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative; }
.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; }
.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: #ffffff; overflow: auto; zoom: 1; }
.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
Expand Down Expand Up @@ -231,25 +231,25 @@ body .ui-tooltip { border-width: 2px; }
.ui-widget { font-family: "Roboto",sans-serif; font-size: 1.1em; }
.ui-widget .ui-widget { font-size: 1em; }
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: "Roboto",sans-serif; font-size: 1em; }
.ui-widget-content { border: 1px solid #bfbfbf; background: #ffffff "images/ui-bg_flat_75_ffffff_40x100.png" 50% 50% repeat-x; color: #000000; }
.ui-widget-content { border: 1px solid #bfbfbf; background: #ffffff; color: #000000; }
.ui-widget-content a { color: #000000; }
.ui-widget-header { border: 1px solid #8ec63f; background: #8ec63f; color: #ffffff; font-weight: 500; }
.ui-widget-header { border: 1px solid #8ec63f; background: #8ec63f; color: #ffffff; font-weight: bold; }
.ui-widget-header a { color: #ffffff; }

/* Interaction states
----------------------------------*/
.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d8dcdf; background: #dddddd "images/ui-bg_flat_100_dddddd_40x100.png" 50% 50% repeat-x; font-weight: bold; color: #302825; }
.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d8dcdf; background: #dddddd; font-weight: bold; color: #302825; }
.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #302825; text-decoration: none; }
.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #cdd5da; background: #f6f6f6 "images/ui-bg_flat_100_f6f6f6_40x100.png" 50% 50% repeat-x; font-weight: bold; color: #151c21; }
.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #cdd5da; background: #f6f6f6; font-weight: bold; color: #151c21; }
.ui-state-hover a, .ui-state-hover a:hover, .ui-state-hover a:link, .ui-state-hover a:visited { color: #151c21; text-decoration: none; }
.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #8ec63f; background: #ffffff "images/ui-bg_flat_65_ffffff_40x100.png" 50% 50% repeat-x; font-weight: bold; color: #000000; }
.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #8ec63f; background: #ffffff; font-weight: bold; color: #000000; }
.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #000000; text-decoration: none; }

/* Interaction Cues
----------------------------------*/
.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fcd3a1; background: #fbf8ee "images/ui-bg_flat_55_fbf8ee_40x100.png" 50% 50% repeat-x; color: #444444; }
.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fcd3a1; background: #fbf8ee; color: #444444; }
.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #444444; }
.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #a33724; background: #f3d8d8 "images/ui-bg_flat_75_f3d8d8_40x100.png" 50% 50% repeat-x; color: #151c21; }
.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #a33724; background: #f3d8d8; color: #151c21; }
.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #151c21; }
.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #151c21; }
.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
Expand All @@ -261,14 +261,14 @@ body .ui-tooltip { border-width: 2px; }
----------------------------------*/

/* states and images */
.ui-icon { width: 16px; height: 16px; background-image: "images/ui-icons_8ec63f_256x240.png"; } // got this one
.ui-widget-content .ui-icon {background-image: "images/ui-icons_8ec63f_256x240.png"; } // got this one
.ui-widget-header .ui-icon {background-image: "images/ui-icons_ffffff_256x240.png"; } // got this one
.ui-state-default .ui-icon { background-image: "images/ui-icons_8ec63f_256x240.png"; } // got this one
.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: "images/ui-icons_8ec63f_256x240.png"; } //got this one
.ui-state-active .ui-icon {background-image: "images/ui-icons_8ec63f_256x240.png"; } //got this one
.ui-state-highlight .ui-icon {background-image: "images/ui-icons_151c21_256x240.png"; } //need
.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: "images/ui-icons_a33724_256x240.png"; } //need
.ui-icon { width: 16px; height: 16px; background-image: url("images/ui-icons_8ec63f_256x240.png"); }
.ui-widget-content .ui-icon {background-image: url("images/ui-icons_8ec63f_256x240.png"); }
.ui-widget-header .ui-icon {background-image: url("images/ui-icons_ffffff_256x240.png"); }
.ui-state-default .ui-icon { background-image: url("images/ui-icons_8ec63f_256x240.png"); }
.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url("images/ui-icons_8ec63f_256x240.png"); }
.ui-state-active .ui-icon {background-image: url("images/ui-icons_8ec63f_256x240.png"); }
.ui-state-highlight .ui-icon {background-image: url("images/ui-icons_151c21_256x240.png"); }
.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url("images/ui-icons_a33724_256x240.png"); }

/* positioning */
.ui-icon-carat-1-n { background-position: 0 0; }
Expand Down Expand Up @@ -459,4 +459,4 @@ body .ui-tooltip { border-width: 2px; }

/* Overlays */
.ui-widget-overlay { background: #616161; opacity: .45;filter:Alpha(Opacity=45); }
.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #333333 "images/ui-bg_flat_0_333333_40x100.png") 50% 50% repeat-x; opacity: .1;filter:Alpha(Opacity=10; -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }
.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #333333; opacity: .1;filter:Alpha(Opacity=10); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }

This file was deleted.

0 comments on commit b46aba3

Please sign in to comment.