From d892639ce4cb1865d98dfb433d337ecc61d22114 Mon Sep 17 00:00:00 2001 From: aragonc Date: Wed, 29 Oct 2014 10:57:44 -0500 Subject: [PATCH] update options background color refs CT#7374 --- main/css/base.css | 40 ++++++++++++++------ main/inc/lib/javascript/d3/colorbrewer.js | 2 +- main/inc/lib/javascript/tag/style.css | 10 ++--- main/template/default/skill/profile_item.tpl | 12 +++--- main/template/default/skill/skill_wheel.tpl | 40 +++++++++++++++++++- 5 files changed, 81 insertions(+), 23 deletions(-) diff --git a/main/css/base.css b/main/css/base.css index f3a61a1830..ee69948acb 100755 --- a/main/css/base.css +++ b/main/css/base.css @@ -3347,7 +3347,7 @@ form .formw .freeze { margin-top: 1em; background-color: #FFFFFF; } -.skill-options .legend .title-skill{ +.skill-options .legend .title-skill, .skill-options .saved_profiles .title-skill{ color: #666655; padding-bottom: 1em; font-size: 16px; @@ -3382,6 +3382,34 @@ form .formw .freeze { /*border: 1px solid #dadada;*/ background-color: #FFFFFF; } +.skill-options .items_save{ + margin-top: .5em; + margin-bottom: .5em; + display: inline-block; + height: auto !important; + clear: both; + width: 100%; +} +.skill-options .accordion-group { + margin-bottom: 2px; + border: 1px solid #3FA5C3; + border-radius: 4px; +} +.skill-options .accordion-inner { + padding: 9px 15px; + border-top: 1px solid #3FA5C3; +} +.skill_partition { + cursor: pointer; + stroke: #000000; + stroke-width: 0.5px; +} + +#skill_holder li { + float:left; + padding-right: 10px; +} + /* **************************************************** END SKILL **************************************************** */ @@ -4890,16 +4918,6 @@ i.size-32.icon-new-work{ } /* Default skill partition colors */ -.skill_partition { - cursor: pointer; - stroke: #000000; - stroke-width: 1.5; -} - -#skill_holder li { - float:left; - padding-right: 10px; -} #filepaths input{ margin-bottom:5px; diff --git a/main/inc/lib/javascript/d3/colorbrewer.js b/main/inc/lib/javascript/d3/colorbrewer.js index 7261590924..9595aa834c 100755 --- a/main/inc/lib/javascript/d3/colorbrewer.js +++ b/main/inc/lib/javascript/d3/colorbrewer.js @@ -6,7 +6,7 @@ var colorbrewer = { YlGn:{3:["rgb(247,252,185)","rgb(173,221,142)","rgb(49,163,84)"],4:["rgb(255,255,204)","rgb(194,230,153)","rgb(120,198,121)","rgb(35,132,67)"],5:["rgb(255,255,204)","rgb(194,230,153)","rgb(120,198,121)","rgb(49,163,84)","rgb(0,104,55)"],6:["rgb(255,255,204)","rgb(217,240,163)","rgb(173,221,142)","rgb(120,198,121)","rgb(49,163,84)","rgb(0,104,55)"],7:["rgb(255,255,204)","rgb(217,240,163)","rgb(173,221,142)","rgb(120,198,121)","rgb(65,171,93)","rgb(35,132,67)","rgb(0,90,50)"],8:["rgb(255,255,229)","rgb(247,252,185)","rgb(217,240,163)","rgb(173,221,142)","rgb(120,198,121)","rgb(65,171,93)","rgb(35,132,67)","rgb(0,90,50)"],9:["rgb(255,255,229)","rgb(247,252,185)","rgb(217,240,163)","rgb(173,221,142)","rgb(120,198,121)","rgb(65,171,93)","rgb(35,132,67)","rgb(0,104,55)","rgb(0,69,41)"]}, YlGnBu:{3:["rgb(237,248,177)","rgb(127,205,187)","rgb(44,127,184)"],4:["rgb(255,255,204)","rgb(161,218,180)","rgb(65,182,196)","rgb(34,94,168)"],5:["rgb(255,255,204)","rgb(161,218,180)","rgb(65,182,196)","rgb(44,127,184)","rgb(37,52,148)"],6:["rgb(255,255,204)","rgb(199,233,180)","rgb(127,205,187)","rgb(65,182,196)","rgb(44,127,184)","rgb(37,52,148)"],7:["rgb(255,255,204)","rgb(199,233,180)","rgb(127,205,187)","rgb(65,182,196)","rgb(29,145,192)","rgb(34,94,168)","rgb(12,44,132)"],8:["rgb(255,255,217)","rgb(237,248,177)","rgb(199,233,180)","rgb(127,205,187)","rgb(65,182,196)","rgb(29,145,192)","rgb(34,94,168)","rgb(12,44,132)"],9:["rgb(255,255,217)","rgb(237,248,177)","rgb(199,233,180)","rgb(127,205,187)","rgb(65,182,196)","rgb(29,145,192)","rgb(34,94,168)","rgb(37,52,148)","rgb(8,29,88)"]}, GnBu:{3:["rgb(224,243,219)","rgb(168,221,181)","rgb(67,162,202)"],4:["rgb(240,249,232)","rgb(186,228,188)","rgb(123,204,196)","rgb(43,140,190)"],5:["rgb(240,249,232)","rgb(186,228,188)","rgb(123,204,196)","rgb(67,162,202)","rgb(8,104,172)"],6:["rgb(240,249,232)","rgb(204,235,197)","rgb(168,221,181)","rgb(123,204,196)","rgb(67,162,202)","rgb(8,104,172)"],7:["rgb(240,249,232)","rgb(204,235,197)","rgb(168,221,181)","rgb(123,204,196)","rgb(78,179,211)","rgb(43,140,190)","rgb(8,88,158)"],8:["rgb(247,252,240)","rgb(224,243,219)","rgb(204,235,197)","rgb(168,221,181)","rgb(123,204,196)","rgb(78,179,211)","rgb(43,140,190)","rgb(8,88,158)"],9:["rgb(247,252,240)","rgb(224,243,219)","rgb(204,235,197)","rgb(168,221,181)","rgb(123,204,196)","rgb(78,179,211)","rgb(43,140,190)","rgb(8,104,172)","rgb(8,64,129)"]}, -BuGn:{3:["rgb(229,245,249)","rgb(153,216,201)","rgb(44,162,95)"],4:["rgb(237,248,251)","rgb(178,226,226)","rgb(102,194,164)","rgb(35,139,69)"],5:["rgb(237,248,251)","rgb(178,226,226)","rgb(102,194,164)","rgb(44,162,95)","rgb(0,109,44)"],6:["rgb(237,248,251)","rgb(204,236,230)","rgb(153,216,201)","rgb(102,194,164)","rgb(44,162,95)","rgb(0,109,44)"],7:["rgb(237,248,251)","rgb(204,236,230)","rgb(153,216,201)","rgb(102,194,164)","rgb(65,174,118)","rgb(35,139,69)","rgb(0,88,36)"],8:["rgb(247,252,253)","rgb(229,245,249)","rgb(204,236,230)","rgb(153,216,201)","rgb(102,194,164)","rgb(65,174,118)","rgb(35,139,69)","rgb(0,88,36)"],9:["rgb(247,252,253)","rgb(229,245,249)","rgb(204,236,230)","rgb(153,216,201)","rgb(102,194,164)","rgb(65,174,118)","rgb(35,139,69)","rgb(0,109,44)","rgb(0,68,27)"]}, +BuGn:{3:["rgb(229,245,249)","rgb(153git c,216,201)","rgb(44,162,95)"],4:["rgb(237,248,251)","rgb(178,226,226)","rgb(102,194,164)","rgb(35,139,69)"],5:["rgb(237,248,251)","rgb(178,226,226)","rgb(102,194,164)","rgb(44,162,95)","rgb(0,109,44)"],6:["rgb(237,248,251)","rgb(204,236,230)","rgb(153,216,201)","rgb(102,194,164)","rgb(44,162,95)","rgb(0,109,44)"],7:["rgb(237,248,251)","rgb(204,236,230)","rgb(153,216,201)","rgb(102,194,164)","rgb(65,174,118)","rgb(35,139,69)","rgb(0,88,36)"],8:["rgb(247,252,253)","rgb(229,245,249)","rgb(204,236,230)","rgb(153,216,201)","rgb(102,194,164)","rgb(65,174,118)","rgb(35,139,69)","rgb(0,88,36)"],9:["rgb(247,252,253)","rgb(229,245,249)","rgb(204,236,230)","rgb(153,216,201)","rgb(102,194,164)","rgb(65,174,118)","rgb(35,139,69)","rgb(0,109,44)","rgb(0,68,27)"]}, PuBuGn:{3:["rgb(236,226,240)","rgb(166,189,219)","rgb(28,144,153)"],4:["rgb(246,239,247)","rgb(189,201,225)","rgb(103,169,207)","rgb(2,129,138)"],5:["rgb(246,239,247)","rgb(189,201,225)","rgb(103,169,207)","rgb(28,144,153)","rgb(1,108,89)"],6:["rgb(246,239,247)","rgb(208,209,230)","rgb(166,189,219)","rgb(103,169,207)","rgb(28,144,153)","rgb(1,108,89)"],7:["rgb(246,239,247)","rgb(208,209,230)","rgb(166,189,219)","rgb(103,169,207)","rgb(54,144,192)","rgb(2,129,138)","rgb(1,100,80)"],8:["rgb(255,247,251)","rgb(236,226,240)","rgb(208,209,230)","rgb(166,189,219)","rgb(103,169,207)","rgb(54,144,192)","rgb(2,129,138)","rgb(1,100,80)"],9:["rgb(255,247,251)","rgb(236,226,240)","rgb(208,209,230)","rgb(166,189,219)","rgb(103,169,207)","rgb(54,144,192)","rgb(2,129,138)","rgb(1,108,89)","rgb(1,70,54)"]}, PuBu:{3:["rgb(236,231,242)","rgb(166,189,219)","rgb(43,140,190)"],4:["rgb(241,238,246)","rgb(189,201,225)","rgb(116,169,207)","rgb(5,112,176)"],5:["rgb(241,238,246)","rgb(189,201,225)","rgb(116,169,207)","rgb(43,140,190)","rgb(4,90,141)"],6:["rgb(241,238,246)","rgb(208,209,230)","rgb(166,189,219)","rgb(116,169,207)","rgb(43,140,190)","rgb(4,90,141)"],7:["rgb(241,238,246)","rgb(208,209,230)","rgb(166,189,219)","rgb(116,169,207)","rgb(54,144,192)","rgb(5,112,176)","rgb(3,78,123)"],8:["rgb(255,247,251)","rgb(236,231,242)","rgb(208,209,230)","rgb(166,189,219)","rgb(116,169,207)","rgb(54,144,192)","rgb(5,112,176)","rgb(3,78,123)"],9:["rgb(255,247,251)","rgb(236,231,242)","rgb(208,209,230)","rgb(166,189,219)","rgb(116,169,207)","rgb(54,144,192)","rgb(5,112,176)","rgb(4,90,141)","rgb(2,56,88)"]}, BuPu:{3:["rgb(224,236,244)","rgb(158,188,218)","rgb(136,86,167)"],4:["rgb(237,248,251)","rgb(179,205,227)","rgb(140,150,198)","rgb(136,65,157)"],5:["rgb(237,248,251)","rgb(179,205,227)","rgb(140,150,198)","rgb(136,86,167)","rgb(129,15,124)"],6:["rgb(237,248,251)","rgb(191,211,230)","rgb(158,188,218)","rgb(140,150,198)","rgb(136,86,167)","rgb(129,15,124)"],7:["rgb(237,248,251)","rgb(191,211,230)","rgb(158,188,218)","rgb(140,150,198)","rgb(140,107,177)","rgb(136,65,157)","rgb(110,1,107)"],8:["rgb(247,252,253)","rgb(224,236,244)","rgb(191,211,230)","rgb(158,188,218)","rgb(140,150,198)","rgb(140,107,177)","rgb(136,65,157)","rgb(110,1,107)"],9:["rgb(247,252,253)","rgb(224,236,244)","rgb(191,211,230)","rgb(158,188,218)","rgb(140,150,198)","rgb(140,107,177)","rgb(136,65,157)","rgb(129,15,124)","rgb(77,0,75)"]}, diff --git a/main/inc/lib/javascript/tag/style.css b/main/inc/lib/javascript/tag/style.css index aa9bdd71fb..a6f55bba2c 100755 --- a/main/inc/lib/javascript/tag/style.css +++ b/main/inc/lib/javascript/tag/style.css @@ -20,15 +20,15 @@ ul.holder_simple li.bit-box { -moz-border-radius:6px; -webkit-border-radius:6px; border-radius:6px; - border:1px solid #FCF8E3; + border:1px solid #C09853; background:#FCF8E3; - padding:1px 5px 2px + padding:1px 5px 2px; + color:#333; } ul.holder_simple li.bit-box-focus { border-color:#FCF8E3; background:#FCF8E3; - color:#333; } ul.holder li.bit-input input { @@ -178,8 +178,8 @@ ul.holder li.bit-box-focus a.closebutton,ul.holder li.bit-box-focus a.closebutto } .facebook-auto ul li.auto-focus { - background:#4173CC; - color:#fff + background:#F0F0F0; + color:#333; } .facebook-auto ul li.auto-focus em { diff --git a/main/template/default/skill/profile_item.tpl b/main/template/default/skill/profile_item.tpl index 7e71eb754f..1a485bc17d 100755 --- a/main/template/default/skill/profile_item.tpl +++ b/main/template/default/skill/profile_item.tpl @@ -1,10 +1,12 @@ {% if profiles is not null %} -

{{ "SkillProfiles"|get_lang }}

- + {% endif %} \ No newline at end of file diff --git a/main/template/default/skill/skill_wheel.tpl b/main/template/default/skill/skill_wheel.tpl index 7ec259516e..669a4e5e03 100644 --- a/main/template/default/skill/skill_wheel.tpl +++ b/main/template/default/skill/skill_wheel.tpl @@ -429,7 +429,24 @@ $(document).ready(function() { } }); } - +/* change background color */ + $(document).ready(function () { + $("#celestial").click(function () { + $("#page-back").css("background","#A9E2F3"); + }); + $("#white").click(function () { + $("#page-back").css("background","#FFFFFF"); + }); + $("#black").click(function () { + $("#page-back").css("background","#000000"); + }); + $("#lead").click(function () { + $("#page-back").css("background","#848484"); + }); + $("#light-yellow").click(function () { + $("#page-back").css("background","#F7F8E0"); + }); + }); /* Generated random colour */ /* function colour(d) { @@ -446,6 +463,7 @@ $(document).ready(function() { }*/ }); +
@@ -514,6 +532,25 @@ $(document).ready(function() {
+
+
+ +

Opciones de presentación

+ +
+
+
+

Escoge un color de fondo:

+ +
+
+
@@ -597,3 +634,4 @@ $(document).ready(function() { +