diff --git a/Gemfile.lock b/Gemfile.lock index 8333014ff..4752975ed 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,7 +8,8 @@ PATH compass-rails haml i18n (~> 0.6) - jquery-rails (~> 2.2.1) + jquery-rails (~> 3.1.4) + jquery-ui-rails json maruku (= 0.6.1) opencpu (~> 0.9.0) @@ -74,7 +75,7 @@ GEM launchy childprocess (0.5.9) ffi (~> 1.0, >= 1.0.11) - chunky_png (1.3.6) + chunky_png (1.3.7) codeclimate-test-reporter (0.3.0) simplecov (>= 0.7.1, < 1.0.0) coderay (1.1.1) @@ -151,9 +152,11 @@ GEM multi_xml (>= 0.5.2) i18n (0.7.0) ice_nine (0.11.2) - jquery-rails (2.2.2) + jquery-rails (3.1.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) + jquery-ui-rails (5.0.5) + railties (>= 3.2.16) json (1.8.3) launchy (2.4.2) addressable (~> 2.3) diff --git a/Guardfile b/Guardfile index 5c9eb7197..9812d5a4e 100644 --- a/Guardfile +++ b/Guardfile @@ -31,7 +31,7 @@ guard :teaspoon, teaspoon_options do end guard :rubocop, all_on_start: false, cli: ['-D'] do - excludes = YAML.load_file('.rubocop.yml')['AllCops']['Excludes'] + excludes = YAML.load_file('.rubocop.yml')['AllCops']['Exclude'] watch(%r{(.+\.rb)$}) { |m| m[0] unless excludes.find { |excluded| File.fnmatch(excluded, m[0]) } } watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) } end diff --git a/app/assets/javascripts/quby/answers/hotkeys.js b/app/assets/javascripts/quby/answers/hotkeys.js index a6fdc5031..f616cf011 100644 --- a/app/assets/javascripts/quby/answers/hotkeys.js +++ b/app/assets/javascripts/quby/answers/hotkeys.js @@ -154,7 +154,7 @@ $(this).dialog("close"); } } - }); + }).dialog({position: {my: 'center top', at: 'center', of: $('#content')}}); // center dialog fix }; function handleDownHotKeys(event){ diff --git a/app/assets/stylesheets/quby/application.css.scss b/app/assets/stylesheets/quby/application.css.scss index c8bcf7bfa..c3dd2cb21 100644 --- a/app/assets/stylesheets/quby/application.css.scss +++ b/app/assets/stylesheets/quby/application.css.scss @@ -15,7 +15,7 @@ $masthead_bg: #0f72a4; @import "partials/text.scss"; @import "screen"; @import "table/layout"; -@import "redmond/jquery-ui-1.8.7.custom"; +@import "redmond/jquery-ui-1.11.4.custom"; // display modes @import "paged"; diff --git a/gemfiles/rails40.gemfile.lock b/gemfiles/rails40.gemfile.lock index 18c5f09c1..a6b5dfefb 100644 --- a/gemfiles/rails40.gemfile.lock +++ b/gemfiles/rails40.gemfile.lock @@ -8,7 +8,8 @@ PATH compass-rails haml i18n (~> 0.6) - jquery-rails (~> 2.2.1) + jquery-rails (~> 3.1.4) + jquery-ui-rails json maruku (= 0.6.1) opencpu (~> 0.9.0) @@ -148,10 +149,12 @@ GEM multi_xml (>= 0.5.2) i18n (0.7.0) ice_nine (0.11.2) - jquery-rails (2.2.2) + jquery-rails (3.1.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.3) + jquery-ui-rails (5.0.5) + railties (>= 3.2.16) + json (2.0.2) launchy (2.4.3) addressable (~> 2.3) libv8 (3.16.14.15) diff --git a/gemfiles/rails41.gemfile.lock b/gemfiles/rails41.gemfile.lock index 6deae1c45..ea8822739 100644 --- a/gemfiles/rails41.gemfile.lock +++ b/gemfiles/rails41.gemfile.lock @@ -8,7 +8,8 @@ PATH compass-rails haml i18n (~> 0.6) - jquery-rails (~> 2.2.1) + jquery-rails (~> 3.1.4) + jquery-ui-rails json maruku (= 0.6.1) opencpu (~> 0.9.0) @@ -150,9 +151,11 @@ GEM multi_xml (>= 0.5.2) i18n (0.7.0) ice_nine (0.11.2) - jquery-rails (2.2.2) + jquery-rails (3.1.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) + jquery-ui-rails (5.0.5) + railties (>= 3.2.16) json (1.8.3) launchy (2.4.3) addressable (~> 2.3) diff --git a/gemfiles/rails42.gemfile.lock b/gemfiles/rails42.gemfile.lock index 315a11359..e0538587e 100644 --- a/gemfiles/rails42.gemfile.lock +++ b/gemfiles/rails42.gemfile.lock @@ -8,7 +8,8 @@ PATH compass-rails haml i18n (~> 0.6) - jquery-rails (~> 2.2.1) + jquery-rails (~> 3.1.4) + jquery-ui-rails json maruku (= 0.6.1) opencpu (~> 0.9.0) @@ -161,9 +162,11 @@ GEM multi_xml (>= 0.5.2) i18n (0.7.0) ice_nine (0.11.2) - jquery-rails (2.2.2) + jquery-rails (3.1.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) + jquery-ui-rails (5.0.5) + railties (>= 3.2.16) json (1.8.3) launchy (2.4.3) addressable (~> 2.3) diff --git a/lib/quby/engine.rb b/lib/quby/engine.rb index 59debd457..9e183b981 100644 --- a/lib/quby/engine.rb +++ b/lib/quby/engine.rb @@ -7,6 +7,7 @@ require 'compass' require 'compass-rails' require 'jquery-rails' +require 'jquery-ui-rails' require 'susy' require 'andand' require 'quby/lookup_table' diff --git a/quby.gemspec b/quby.gemspec index 62321cf4f..5b7af787b 100644 --- a/quby.gemspec +++ b/quby.gemspec @@ -39,7 +39,8 @@ Gem::Specification.new do |s| s.add_dependency "virtus", ">= 1.0.3", "< 2.0" s.add_dependency "i18n", "~> 0.6" - s.add_dependency "jquery-rails", "~> 2.2.1" + s.add_dependency "jquery-rails", "~> 3.1.4" + s.add_dependency "jquery-ui-rails" s.add_development_dependency 'combustion', '~> 0.5.1' s.add_development_dependency 'rspec-rails', '~> 2.14.0' diff --git a/spec/features/external_links_spec.rb b/spec/features/external_links_spec.rb new file mode 100644 index 000000000..c3ca4aad0 --- /dev/null +++ b/spec/features/external_links_spec.rb @@ -0,0 +1,28 @@ +require 'spec_helper' + +feature 'External links' do + let(:test_page_url) do + "http://#{Capybara.current_session.server.host}:#{Capybara.current_session.server.port}/test.html" + end + + let(:questionnaire) do + inject_questionnaire("test", <<-END) + allow_hotkeys :all + panel do + question :v1, type: :radio, required: true, deselectable: true do + option :a1, value: 1, description: "~~#{test_page_url}~~Testpage~~" + option :a2, value: 2, description: "Nee" + end; + end; end_panel + END + end + + scenario 'show page in modal window when link is clicked', js: true do + visit_new_answer_for(questionnaire) + click_on('Testpage') + within_frame('modalFrame') do + expect(current_url).to match(test_page_url) + expect(page).to have_content('TESTING') + end + end +end diff --git a/spec/features/hotkeys_spec.rb b/spec/features/hotkeys_spec.rb index 1fd9a0e31..b521e6dcb 100644 --- a/spec/features/hotkeys_spec.rb +++ b/spec/features/hotkeys_spec.rb @@ -60,4 +60,17 @@ page.driver.execute_script(keypress_1) page.should have_checked_field("answer_v1_a1") end + + scenario 'show and close hotkeys dialog when help link is clicked', js: true do + visit_new_answer_for(questionnaire) + + page.should have_content('Sneltoetsen Help') + page.should_not have_content('Gebruik de volgende toetsen') + + page.click_link('Sneltoetsen Help') + page.should have_content('Gebruik de volgende toetsen') + + page.find('button', text: 'Sluiten').trigger('click') + page.should_not have_content('Gebruik de volgende toetsen') + end end diff --git a/spec/internal/public/test.html b/spec/internal/public/test.html new file mode 100644 index 000000000..5938185c0 --- /dev/null +++ b/spec/internal/public/test.html @@ -0,0 +1 @@ +TESTING diff --git a/vendor/assets/images/quby/ui-bg_glass_75_d0e5f5_1x400.png b/vendor/assets/images/quby/ui-bg_glass_75_d0e5f5_1x400.png index 9fb564f8d..25a273c87 100644 Binary files a/vendor/assets/images/quby/ui-bg_glass_75_d0e5f5_1x400.png and b/vendor/assets/images/quby/ui-bg_glass_75_d0e5f5_1x400.png differ diff --git a/vendor/assets/images/quby/ui-bg_glass_85_dfeffc_1x400.png b/vendor/assets/images/quby/ui-bg_glass_85_dfeffc_1x400.png index 014951529..98d4f6ca6 100644 Binary files a/vendor/assets/images/quby/ui-bg_glass_85_dfeffc_1x400.png and b/vendor/assets/images/quby/ui-bg_glass_85_dfeffc_1x400.png differ diff --git a/vendor/assets/images/quby/ui-bg_glass_95_fef1ec_1x400.png b/vendor/assets/images/quby/ui-bg_glass_95_fef1ec_1x400.png index 4443fdc1a..e917e6c2f 100644 Binary files a/vendor/assets/images/quby/ui-bg_glass_95_fef1ec_1x400.png and b/vendor/assets/images/quby/ui-bg_glass_95_fef1ec_1x400.png differ diff --git a/vendor/assets/images/quby/ui-bg_gloss-wave_55_5c9ccc_500x100.png b/vendor/assets/images/quby/ui-bg_gloss-wave_55_5c9ccc_500x100.png index 81ecc362d..179088f7d 100644 Binary files a/vendor/assets/images/quby/ui-bg_gloss-wave_55_5c9ccc_500x100.png and b/vendor/assets/images/quby/ui-bg_gloss-wave_55_5c9ccc_500x100.png differ diff --git a/vendor/assets/images/quby/ui-bg_inset-hard_100_f5f8f9_1x100.png b/vendor/assets/images/quby/ui-bg_inset-hard_100_f5f8f9_1x100.png index 4f3faf8aa..db150a55b 100644 Binary files a/vendor/assets/images/quby/ui-bg_inset-hard_100_f5f8f9_1x100.png and b/vendor/assets/images/quby/ui-bg_inset-hard_100_f5f8f9_1x100.png differ diff --git a/vendor/assets/images/quby/ui-bg_inset-hard_100_fcfdfd_1x100.png b/vendor/assets/images/quby/ui-bg_inset-hard_100_fcfdfd_1x100.png index 38c38335d..83938e7de 100644 Binary files a/vendor/assets/images/quby/ui-bg_inset-hard_100_fcfdfd_1x100.png and b/vendor/assets/images/quby/ui-bg_inset-hard_100_fcfdfd_1x100.png differ diff --git a/vendor/assets/images/quby/ui-icons_217bc0_256x240.png b/vendor/assets/images/quby/ui-icons_217bc0_256x240.png index 6f4bd87c0..3eb1cc2b0 100644 Binary files a/vendor/assets/images/quby/ui-icons_217bc0_256x240.png and b/vendor/assets/images/quby/ui-icons_217bc0_256x240.png differ diff --git a/vendor/assets/images/quby/ui-icons_2e83ff_256x240.png b/vendor/assets/images/quby/ui-icons_2e83ff_256x240.png index 09d1cdc85..1f5f49756 100644 Binary files a/vendor/assets/images/quby/ui-icons_2e83ff_256x240.png and b/vendor/assets/images/quby/ui-icons_2e83ff_256x240.png differ diff --git a/vendor/assets/images/quby/ui-icons_469bdd_256x240.png b/vendor/assets/images/quby/ui-icons_469bdd_256x240.png index bd2cf079a..35ac8d2c5 100644 Binary files a/vendor/assets/images/quby/ui-icons_469bdd_256x240.png and b/vendor/assets/images/quby/ui-icons_469bdd_256x240.png differ diff --git a/vendor/assets/images/quby/ui-icons_6da8d5_256x240.png b/vendor/assets/images/quby/ui-icons_6da8d5_256x240.png index 9f3eafaab..5a6208819 100644 Binary files a/vendor/assets/images/quby/ui-icons_6da8d5_256x240.png and b/vendor/assets/images/quby/ui-icons_6da8d5_256x240.png differ diff --git a/vendor/assets/images/quby/ui-icons_cd0a0a_256x240.png b/vendor/assets/images/quby/ui-icons_cd0a0a_256x240.png index 2ab019b73..7e8ebc180 100644 Binary files a/vendor/assets/images/quby/ui-icons_cd0a0a_256x240.png and b/vendor/assets/images/quby/ui-icons_cd0a0a_256x240.png differ diff --git a/vendor/assets/images/quby/ui-icons_d8e7f3_256x240.png b/vendor/assets/images/quby/ui-icons_d8e7f3_256x240.png index ad2dc6f9d..e5d5e69e6 100644 Binary files a/vendor/assets/images/quby/ui-icons_d8e7f3_256x240.png and b/vendor/assets/images/quby/ui-icons_d8e7f3_256x240.png differ diff --git a/vendor/assets/images/quby/ui-icons_f9bd01_256x240.png b/vendor/assets/images/quby/ui-icons_f9bd01_256x240.png index 78625024d..33d065593 100644 Binary files a/vendor/assets/images/quby/ui-icons_f9bd01_256x240.png and b/vendor/assets/images/quby/ui-icons_f9bd01_256x240.png differ diff --git a/vendor/assets/stylesheets/redmond/jquery-ui-1.11.4.custom.css b/vendor/assets/stylesheets/redmond/jquery-ui-1.11.4.custom.css new file mode 100644 index 000000000..716546aed --- /dev/null +++ b/vendor/assets/stylesheets/redmond/jquery-ui-1.11.4.custom.css @@ -0,0 +1,723 @@ +/*! jQuery UI - v1.11.4 - 2016-09-26 +* http://jqueryui.com +* Includes: core.css, draggable.css, resizable.css, button.css, dialog.css, theme.css +* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Lucida%20Grande%2CLucida%20Sans%2CArial%2Csans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=5px&bgColorHeader=5c9ccc&bgTextureHeader=gloss_wave&bgImgOpacityHeader=55&borderColorHeader=4297d7&fcHeader=ffffff&iconColorHeader=d8e7f3&bgColorContent=fcfdfd&bgTextureContent=inset_hard&bgImgOpacityContent=100&borderColorContent=a6c9e2&fcContent=222222&iconColorContent=469bdd&bgColorDefault=dfeffc&bgTextureDefault=glass&bgImgOpacityDefault=85&borderColorDefault=c5dbec&fcDefault=2e6e9e&iconColorDefault=6da8d5&bgColorHover=d0e5f5&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=79b7e7&fcHover=1d5987&iconColorHover=217bc0&bgColorActive=f5f8f9&bgTextureActive=inset_hard&bgImgOpacityActive=100&borderColorActive=79b7e7&fcActive=e17009&iconColorActive=f9bd01&bgColorHighlight=fbec88&bgTextureHighlight=flat&bgImgOpacityHighlight=55&borderColorHighlight=fad42e&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px +* Copyright jQuery Foundation and other contributors; Licensed MIT */ + +/* Layout helpers +----------------------------------*/ +.ui-helper-hidden { + display: none; +} +.ui-helper-hidden-accessible { + border: 0; + clip: rect(0 0 0 0); + height: 1px; + margin: -1px; + overflow: hidden; + padding: 0; + position: absolute; + width: 1px; +} +.ui-helper-reset { + margin: 0; + padding: 0; + border: 0; + outline: 0; + line-height: 1.3; + text-decoration: none; + font-size: 100%; + list-style: none; +} +.ui-helper-clearfix:before, +.ui-helper-clearfix:after { + content: ""; + display: table; + border-collapse: collapse; +} +.ui-helper-clearfix:after { + clear: both; +} +.ui-helper-clearfix { + min-height: 0; /* support: IE7 */ +} +.ui-helper-zfix { + width: 100%; + height: 100%; + top: 0; + left: 0; + position: absolute; + opacity: 0; + filter:Alpha(Opacity=0); /* support: IE8 */ +} + +.ui-front { + z-index: 100; +} + + +/* Interaction Cues +----------------------------------*/ +.ui-state-disabled { + cursor: default !important; +} + + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { + display: block; + text-indent: -99999px; + overflow: hidden; + background-repeat: no-repeat; +} + + +/* Misc visuals +----------------------------------*/ + +/* Overlays */ +.ui-widget-overlay { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; +} +.ui-draggable-handle { + -ms-touch-action: none; + touch-action: none; +} +.ui-resizable { + position: relative; +} +.ui-resizable-handle { + position: absolute; + font-size: 0.1px; + display: block; + -ms-touch-action: none; + touch-action: none; +} +.ui-resizable-disabled .ui-resizable-handle, +.ui-resizable-autohide .ui-resizable-handle { + display: none; +} +.ui-resizable-n { + cursor: n-resize; + height: 7px; + width: 100%; + top: -5px; + left: 0; +} +.ui-resizable-s { + cursor: s-resize; + height: 7px; + width: 100%; + bottom: -5px; + left: 0; +} +.ui-resizable-e { + cursor: e-resize; + width: 7px; + right: -5px; + top: 0; + height: 100%; +} +.ui-resizable-w { + cursor: w-resize; + width: 7px; + left: -5px; + top: 0; + height: 100%; +} +.ui-resizable-se { + cursor: se-resize; + width: 12px; + height: 12px; + right: 1px; + bottom: 1px; +} +.ui-resizable-sw { + cursor: sw-resize; + width: 9px; + height: 9px; + left: -5px; + bottom: -5px; +} +.ui-resizable-nw { + cursor: nw-resize; + width: 9px; + height: 9px; + left: -5px; + top: -5px; +} +.ui-resizable-ne { + cursor: ne-resize; + width: 9px; + height: 9px; + right: -5px; + top: -5px; +} +.ui-button { + display: inline-block; + position: relative; + padding: 0; + line-height: normal; + margin-right: .1em; + cursor: pointer; + vertical-align: middle; + text-align: center; + overflow: visible; /* removes extra width in IE */ +} +.ui-button, +.ui-button:link, +.ui-button:visited, +.ui-button:hover, +.ui-button:active { + text-decoration: none; +} +/* to make room for the icon, a width needs to be set here */ +.ui-button-icon-only { + width: 2.2em; +} +/* button elements seem to need a little more width */ +button.ui-button-icon-only { + width: 2.4em; +} +.ui-button-icons-only { + width: 3.4em; +} +button.ui-button-icons-only { + width: 3.7em; +} + +/* button text element */ +.ui-button .ui-button-text { + display: block; + line-height: normal; +} +.ui-button-text-only .ui-button-text { + padding: .4em 1em; +} +.ui-button-icon-only .ui-button-text, +.ui-button-icons-only .ui-button-text { + padding: .4em; + text-indent: -9999999px; +} +.ui-button-text-icon-primary .ui-button-text, +.ui-button-text-icons .ui-button-text { + padding: .4em 1em .4em 2.1em; +} +.ui-button-text-icon-secondary .ui-button-text, +.ui-button-text-icons .ui-button-text { + padding: .4em 2.1em .4em 1em; +} +.ui-button-text-icons .ui-button-text { + padding-left: 2.1em; + padding-right: 2.1em; +} +/* no icon support for input elements, provide padding by default */ +input.ui-button { + padding: .4em 1em; +} + +/* button icon element(s) */ +.ui-button-icon-only .ui-icon, +.ui-button-text-icon-primary .ui-icon, +.ui-button-text-icon-secondary .ui-icon, +.ui-button-text-icons .ui-icon, +.ui-button-icons-only .ui-icon { + position: absolute; + top: 50%; + margin-top: -8px; +} +.ui-button-icon-only .ui-icon { + left: 50%; + margin-left: -8px; +} +.ui-button-text-icon-primary .ui-button-icon-primary, +.ui-button-text-icons .ui-button-icon-primary, +.ui-button-icons-only .ui-button-icon-primary { + left: .5em; +} +.ui-button-text-icon-secondary .ui-button-icon-secondary, +.ui-button-text-icons .ui-button-icon-secondary, +.ui-button-icons-only .ui-button-icon-secondary { + right: .5em; +} + +/* button sets */ +.ui-buttonset { + margin-right: 7px; +} +.ui-buttonset .ui-button { + margin-left: 0; + margin-right: -.3em; +} + +/* workarounds */ +/* reset extra padding in Firefox, see h5bp.com/l */ +input.ui-button::-moz-focus-inner, +button.ui-button::-moz-focus-inner { + border: 0; + padding: 0; +} +.ui-dialog { + overflow: hidden; + position: absolute; + top: 0; + left: 0; + padding: .2em; + outline: 0; +} +.ui-dialog .ui-dialog-titlebar { + padding: .4em 1em; + position: relative; +} +.ui-dialog .ui-dialog-title { + float: left; + margin: .1em 0; + white-space: nowrap; + width: 90%; + overflow: hidden; + text-overflow: ellipsis; +} +.ui-dialog .ui-dialog-titlebar-close { + position: absolute; + right: .3em; + top: 50%; + width: 20px; + margin: -10px 0 0 0; + padding: 1px; + height: 20px; +} +.ui-dialog .ui-dialog-content { + position: relative; + border: 0; + padding: .5em 1em; + background: none; + overflow: auto; +} +.ui-dialog .ui-dialog-buttonpane { + text-align: left; + border-width: 1px 0 0 0; + background-image: none; + margin-top: .5em; + 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; +} +.ui-dialog .ui-resizable-se { + width: 12px; + height: 12px; + right: -5px; + bottom: -5px; + background-position: 16px 16px; +} +.ui-draggable .ui-dialog-titlebar { + cursor: move; +} + +/* Component containers +----------------------------------*/ +.ui-widget { + font-family: Lucida Grande,Lucida Sans,Arial,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: Lucida Grande,Lucida Sans,Arial,sans-serif; + font-size: 1em; +} +.ui-widget-content { + border: 1px solid #a6c9e2; + background: #fcfdfd url("ui-bg_inset-hard_100_fcfdfd_1x100.png") 50% bottom repeat-x; + color: #222222; +} +.ui-widget-content a { + color: #222222; +} +.ui-widget-header { + border: 1px solid #4297d7; + background: #5c9ccc url("ui-bg_gloss-wave_55_5c9ccc_500x100.png") 50% 50% repeat-x; + 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 #c5dbec; + background: #dfeffc url("ui-bg_glass_85_dfeffc_1x400.png") 50% 50% repeat-x; + font-weight: bold; + color: #2e6e9e; +} +.ui-state-default a, +.ui-state-default a:link, +.ui-state-default a:visited { + color: #2e6e9e; + 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 #79b7e7; + background: #d0e5f5 url("ui-bg_glass_75_d0e5f5_1x400.png") 50% 50% repeat-x; + font-weight: bold; + color: #1d5987; +} +.ui-state-hover a, +.ui-state-hover a:hover, +.ui-state-hover a:link, +.ui-state-hover a:visited, +.ui-state-focus a, +.ui-state-focus a:hover, +.ui-state-focus a:link, +.ui-state-focus a:visited { + color: #1d5987; + text-decoration: none; +} +.ui-state-active, +.ui-widget-content .ui-state-active, +.ui-widget-header .ui-state-active { + border: 1px solid #79b7e7; + background: #f5f8f9 url("ui-bg_inset-hard_100_f5f8f9_1x100.png") 50% 50% repeat-x; + font-weight: bold; + color: #e17009; +} +.ui-state-active a, +.ui-state-active a:link, +.ui-state-active a:visited { + color: #e17009; + text-decoration: none; +} + +/* Interaction Cues +----------------------------------*/ +.ui-state-highlight, +.ui-widget-content .ui-state-highlight, +.ui-widget-header .ui-state-highlight { + border: 1px solid #fad42e; + background: #fbec88; + color: #363636; +} +.ui-state-highlight a, +.ui-widget-content .ui-state-highlight a, +.ui-widget-header .ui-state-highlight a { + color: #363636; +} +.ui-state-error, +.ui-widget-content .ui-state-error, +.ui-widget-header .ui-state-error { + border: 1px solid #cd0a0a; + background: #fef1ec url("ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x; + color: #cd0a0a; +} +.ui-state-error a, +.ui-widget-content .ui-state-error a, +.ui-widget-header .ui-state-error a { + color: #cd0a0a; +} +.ui-state-error-text, +.ui-widget-content .ui-state-error-text, +.ui-widget-header .ui-state-error-text { + color: #cd0a0a; +} +.ui-priority-primary, +.ui-widget-content .ui-priority-primary, +.ui-widget-header .ui-priority-primary { + font-weight: bold; +} +.ui-priority-secondary, +.ui-widget-content .ui-priority-secondary, +.ui-widget-header .ui-priority-secondary { + opacity: .7; + filter:Alpha(Opacity=70); /* support: IE8 */ + font-weight: normal; +} +.ui-state-disabled, +.ui-widget-content .ui-state-disabled, +.ui-widget-header .ui-state-disabled { + opacity: .35; + filter:Alpha(Opacity=35); /* support: IE8 */ + background-image: none; +} +.ui-state-disabled .ui-icon { + filter:Alpha(Opacity=35); /* support: IE8 - See #6059 */ +} + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { + width: 16px; + height: 16px; +} +.ui-icon, +.ui-widget-content .ui-icon { + background-image: url("ui-icons_469bdd_256x240.png"); +} +.ui-widget-header .ui-icon { + background-image: url("ui-icons_d8e7f3_256x240.png"); +} +.ui-state-default .ui-icon { + background-image: url("ui-icons_6da8d5_256x240.png"); +} +.ui-state-hover .ui-icon, +.ui-state-focus .ui-icon { + background-image: url("ui-icons_217bc0_256x240.png"); +} +.ui-state-active .ui-icon { + background-image: url("ui-icons_f9bd01_256x240.png"); +} +.ui-state-highlight .ui-icon { + background-image: url("ui-icons_2e83ff_256x240.png"); +} +.ui-state-error .ui-icon, +.ui-state-error-text .ui-icon { + background-image: url("ui-icons_cd0a0a_256x240.png"); +} + +/* positioning */ +.ui-icon-blank { background-position: 16px 16px; } +.ui-icon-carat-1-n { background-position: 0 0; } +.ui-icon-carat-1-ne { background-position: -16px 0; } +.ui-icon-carat-1-e { background-position: -32px 0; } +.ui-icon-carat-1-se { background-position: -48px 0; } +.ui-icon-carat-1-s { background-position: -64px 0; } +.ui-icon-carat-1-sw { background-position: -80px 0; } +.ui-icon-carat-1-w { background-position: -96px 0; } +.ui-icon-carat-1-nw { background-position: -112px 0; } +.ui-icon-carat-2-n-s { background-position: -128px 0; } +.ui-icon-carat-2-e-w { background-position: -144px 0; } +.ui-icon-triangle-1-n { background-position: 0 -16px; } +.ui-icon-triangle-1-ne { background-position: -16px -16px; } +.ui-icon-triangle-1-e { background-position: -32px -16px; } +.ui-icon-triangle-1-se { background-position: -48px -16px; } +.ui-icon-triangle-1-s { background-position: -64px -16px; } +.ui-icon-triangle-1-sw { background-position: -80px -16px; } +.ui-icon-triangle-1-w { background-position: -96px -16px; } +.ui-icon-triangle-1-nw { background-position: -112px -16px; } +.ui-icon-triangle-2-n-s { background-position: -128px -16px; } +.ui-icon-triangle-2-e-w { background-position: -144px -16px; } +.ui-icon-arrow-1-n { background-position: 0 -32px; } +.ui-icon-arrow-1-ne { background-position: -16px -32px; } +.ui-icon-arrow-1-e { background-position: -32px -32px; } +.ui-icon-arrow-1-se { background-position: -48px -32px; } +.ui-icon-arrow-1-s { background-position: -64px -32px; } +.ui-icon-arrow-1-sw { background-position: -80px -32px; } +.ui-icon-arrow-1-w { background-position: -96px -32px; } +.ui-icon-arrow-1-nw { background-position: -112px -32px; } +.ui-icon-arrow-2-n-s { background-position: -128px -32px; } +.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; } +.ui-icon-arrow-2-e-w { background-position: -160px -32px; } +.ui-icon-arrow-2-se-nw { background-position: -176px -32px; } +.ui-icon-arrowstop-1-n { background-position: -192px -32px; } +.ui-icon-arrowstop-1-e { background-position: -208px -32px; } +.ui-icon-arrowstop-1-s { background-position: -224px -32px; } +.ui-icon-arrowstop-1-w { background-position: -240px -32px; } +.ui-icon-arrowthick-1-n { background-position: 0 -48px; } +.ui-icon-arrowthick-1-ne { background-position: -16px -48px; } +.ui-icon-arrowthick-1-e { background-position: -32px -48px; } +.ui-icon-arrowthick-1-se { background-position: -48px -48px; } +.ui-icon-arrowthick-1-s { background-position: -64px -48px; } +.ui-icon-arrowthick-1-sw { background-position: -80px -48px; } +.ui-icon-arrowthick-1-w { background-position: -96px -48px; } +.ui-icon-arrowthick-1-nw { background-position: -112px -48px; } +.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; } +.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; } +.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; } +.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; } +.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; } +.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; } +.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; } +.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; } +.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; } +.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; } +.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; } +.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; } +.ui-icon-arrowreturn-1-w { background-position: -64px -64px; } +.ui-icon-arrowreturn-1-n { background-position: -80px -64px; } +.ui-icon-arrowreturn-1-e { background-position: -96px -64px; } +.ui-icon-arrowreturn-1-s { background-position: -112px -64px; } +.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; } +.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; } +.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; } +.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; } +.ui-icon-arrow-4 { background-position: 0 -80px; } +.ui-icon-arrow-4-diag { background-position: -16px -80px; } +.ui-icon-extlink { background-position: -32px -80px; } +.ui-icon-newwin { background-position: -48px -80px; } +.ui-icon-refresh { background-position: -64px -80px; } +.ui-icon-shuffle { background-position: -80px -80px; } +.ui-icon-transfer-e-w { background-position: -96px -80px; } +.ui-icon-transferthick-e-w { background-position: -112px -80px; } +.ui-icon-folder-collapsed { background-position: 0 -96px; } +.ui-icon-folder-open { background-position: -16px -96px; } +.ui-icon-document { background-position: -32px -96px; } +.ui-icon-document-b { background-position: -48px -96px; } +.ui-icon-note { background-position: -64px -96px; } +.ui-icon-mail-closed { background-position: -80px -96px; } +.ui-icon-mail-open { background-position: -96px -96px; } +.ui-icon-suitcase { background-position: -112px -96px; } +.ui-icon-comment { background-position: -128px -96px; } +.ui-icon-person { background-position: -144px -96px; } +.ui-icon-print { background-position: -160px -96px; } +.ui-icon-trash { background-position: -176px -96px; } +.ui-icon-locked { background-position: -192px -96px; } +.ui-icon-unlocked { background-position: -208px -96px; } +.ui-icon-bookmark { background-position: -224px -96px; } +.ui-icon-tag { background-position: -240px -96px; } +.ui-icon-home { background-position: 0 -112px; } +.ui-icon-flag { background-position: -16px -112px; } +.ui-icon-calendar { background-position: -32px -112px; } +.ui-icon-cart { background-position: -48px -112px; } +.ui-icon-pencil { background-position: -64px -112px; } +.ui-icon-clock { background-position: -80px -112px; } +.ui-icon-disk { background-position: -96px -112px; } +.ui-icon-calculator { background-position: -112px -112px; } +.ui-icon-zoomin { background-position: -128px -112px; } +.ui-icon-zoomout { background-position: -144px -112px; } +.ui-icon-search { background-position: -160px -112px; } +.ui-icon-wrench { background-position: -176px -112px; } +.ui-icon-gear { background-position: -192px -112px; } +.ui-icon-heart { background-position: -208px -112px; } +.ui-icon-star { background-position: -224px -112px; } +.ui-icon-link { background-position: -240px -112px; } +.ui-icon-cancel { background-position: 0 -128px; } +.ui-icon-plus { background-position: -16px -128px; } +.ui-icon-plusthick { background-position: -32px -128px; } +.ui-icon-minus { background-position: -48px -128px; } +.ui-icon-minusthick { background-position: -64px -128px; } +.ui-icon-close { background-position: -80px -128px; } +.ui-icon-closethick { background-position: -96px -128px; } +.ui-icon-key { background-position: -112px -128px; } +.ui-icon-lightbulb { background-position: -128px -128px; } +.ui-icon-scissors { background-position: -144px -128px; } +.ui-icon-clipboard { background-position: -160px -128px; } +.ui-icon-copy { background-position: -176px -128px; } +.ui-icon-contact { background-position: -192px -128px; } +.ui-icon-image { background-position: -208px -128px; } +.ui-icon-video { background-position: -224px -128px; } +.ui-icon-script { background-position: -240px -128px; } +.ui-icon-alert { background-position: 0 -144px; } +.ui-icon-info { background-position: -16px -144px; } +.ui-icon-notice { background-position: -32px -144px; } +.ui-icon-help { background-position: -48px -144px; } +.ui-icon-check { background-position: -64px -144px; } +.ui-icon-bullet { background-position: -80px -144px; } +.ui-icon-radio-on { background-position: -96px -144px; } +.ui-icon-radio-off { background-position: -112px -144px; } +.ui-icon-pin-w { background-position: -128px -144px; } +.ui-icon-pin-s { background-position: -144px -144px; } +.ui-icon-play { background-position: 0 -160px; } +.ui-icon-pause { background-position: -16px -160px; } +.ui-icon-seek-next { background-position: -32px -160px; } +.ui-icon-seek-prev { background-position: -48px -160px; } +.ui-icon-seek-end { background-position: -64px -160px; } +.ui-icon-seek-start { background-position: -80px -160px; } +/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */ +.ui-icon-seek-first { background-position: -80px -160px; } +.ui-icon-stop { background-position: -96px -160px; } +.ui-icon-eject { background-position: -112px -160px; } +.ui-icon-volume-off { background-position: -128px -160px; } +.ui-icon-volume-on { background-position: -144px -160px; } +.ui-icon-power { background-position: 0 -176px; } +.ui-icon-signal-diag { background-position: -16px -176px; } +.ui-icon-signal { background-position: -32px -176px; } +.ui-icon-battery-0 { background-position: -48px -176px; } +.ui-icon-battery-1 { background-position: -64px -176px; } +.ui-icon-battery-2 { background-position: -80px -176px; } +.ui-icon-battery-3 { background-position: -96px -176px; } +.ui-icon-circle-plus { background-position: 0 -192px; } +.ui-icon-circle-minus { background-position: -16px -192px; } +.ui-icon-circle-close { background-position: -32px -192px; } +.ui-icon-circle-triangle-e { background-position: -48px -192px; } +.ui-icon-circle-triangle-s { background-position: -64px -192px; } +.ui-icon-circle-triangle-w { background-position: -80px -192px; } +.ui-icon-circle-triangle-n { background-position: -96px -192px; } +.ui-icon-circle-arrow-e { background-position: -112px -192px; } +.ui-icon-circle-arrow-s { background-position: -128px -192px; } +.ui-icon-circle-arrow-w { background-position: -144px -192px; } +.ui-icon-circle-arrow-n { background-position: -160px -192px; } +.ui-icon-circle-zoomin { background-position: -176px -192px; } +.ui-icon-circle-zoomout { background-position: -192px -192px; } +.ui-icon-circle-check { background-position: -208px -192px; } +.ui-icon-circlesmall-plus { background-position: 0 -208px; } +.ui-icon-circlesmall-minus { background-position: -16px -208px; } +.ui-icon-circlesmall-close { background-position: -32px -208px; } +.ui-icon-squaresmall-plus { background-position: -48px -208px; } +.ui-icon-squaresmall-minus { background-position: -64px -208px; } +.ui-icon-squaresmall-close { background-position: -80px -208px; } +.ui-icon-grip-dotted-vertical { background-position: 0 -224px; } +.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; } +.ui-icon-grip-solid-vertical { background-position: -32px -224px; } +.ui-icon-grip-solid-horizontal { background-position: -48px -224px; } +.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; } +.ui-icon-grip-diagonal-se { background-position: -80px -224px; } + + +/* Misc visuals +----------------------------------*/ + +/* Corner radius */ +.ui-corner-all, +.ui-corner-top, +.ui-corner-left, +.ui-corner-tl { + border-top-left-radius: 5px; +} +.ui-corner-all, +.ui-corner-top, +.ui-corner-right, +.ui-corner-tr { + border-top-right-radius: 5px; +} +.ui-corner-all, +.ui-corner-bottom, +.ui-corner-left, +.ui-corner-bl { + border-bottom-left-radius: 5px; +} +.ui-corner-all, +.ui-corner-bottom, +.ui-corner-right, +.ui-corner-br { + border-bottom-right-radius: 5px; +} + +/* Overlays */ +.ui-widget-overlay { + background: #aaaaaa; + opacity: .3; + filter: Alpha(Opacity=30); /* support: IE8 */ +} +.ui-widget-shadow { + margin: -8px 0 0 -8px; + padding: 8px; + background: #aaaaaa; + opacity: .3; + filter: Alpha(Opacity=30); /* support: IE8 */ + border-radius: 8px; +}