Skip to content

Commit

Permalink
Item12192:
Browse files Browse the repository at this point in the history 
   * cover JQSelect2Contrib in foswiki theme
   * make ui-buttons look crisper by using the same font color everywhere



git-svn-id: http://svn.foswiki.org/branches/Release01x01@15823 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
MichaelDaum authored and MichaelDaum committed Nov 1, 2012
1 parent a3e6df9 commit ba35bca
Show file tree
Hide file tree
Showing 4 changed files with 137 additions and 8 deletions.
5 changes: 5 additions & 0 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/MANIFEST
View file
Expand Up @@ -381,6 +381,9 @@ pub/System/JQueryPlugin/plugins/livequery/Makefile 0644
pub/System/JQueryPlugin/plugins/loader/jquery.loader.js 0644
pub/System/JQueryPlugin/plugins/loader/jquery.loader.js.gz 0644
pub/System/JQueryPlugin/plugins/loader/jquery.loader.uncompressed.js 0644
pub/System/JQueryPlugin/plugins/loader/jquery.loader.css 0644
pub/System/JQueryPlugin/plugins/loader/jquery.loader.css.gz 0644
pub/System/JQueryPlugin/plugins/loader/jquery.loader.uncompressed.css 0644
pub/System/JQueryPlugin/plugins/loader/Makefile 0644
pub/System/JQueryPlugin/plugins/localscroll/jquery.localscroll.js 0644
pub/System/JQueryPlugin/plugins/localscroll/jquery.localscroll.js.gz 0644
Expand Down Expand Up @@ -723,6 +726,8 @@ pub/System/JQueryPlugin/themes/foswiki/images/ui-bg_flat_0_aaaaaa_40x100.png 064
pub/System/JQueryPlugin/themes/foswiki/images/ui-icons_666666_256x240.png 0644
pub/System/JQueryPlugin/themes/foswiki/images/ui-icons-famfamfam.png 0644
pub/System/JQueryPlugin/themes/foswiki/images/x.png 0644
pub/System/JQueryPlugin/themes/foswiki/images/select2.png 0644
pub/System/JQueryPlugin/themes/foswiki/images/select2x2.png 0644
pub/System/JQueryPlugin/themes/foswiki/jquery-ui.css 0644
pub/System/JQueryPlugin/themes/foswiki/jquery-ui.css.gz 0644
pub/System/JQueryPlugin/themes/foswiki/jquery-ui.uncompressed.css 0644
Expand Down
Binary file added JQueryPlugin/pub/System/JQueryPlugin/themes/foswiki/images/select2.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added JQueryPlugin/pub/System/JQueryPlugin/themes/foswiki/images/select2x2.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
140 changes: 132 additions & 8 deletions JQueryPlugin/pub/System/JQueryPlugin/themes/foswiki/jquery-ui.uncompressed.css
View file
Expand Up @@ -35,15 +35,15 @@
/* Component containers
----------------------------------*/
.ui-widget {
color: #333;
color: #111;
}
.ui-widget-content {
border: 1px solid #bcbcbc;
background: #ffffff;
color: #333;
color: #111;
}
.ui-widget-header {
color: #333;
color: #111;
text-shadow: 0px 1px #fff;
border-bottom: 1px solid #ddd;
/* http://colorzilla.com/gradient-editor/#ffffff+0,f0f0f0+100;Custom */
Expand All @@ -58,7 +58,7 @@

}
.ui-widget-header a {
color: #333;
color: #111;
}

/* Interaction states and cues
Expand All @@ -68,7 +68,7 @@
.ui-state-default,
.ui-widget-content .ui-state-default,
.ui-widget-header .ui-state-default {
color:#333;
color:#111;
text-shadow: 0px 1px #fff;
border: 1px solid #bcbcbc;
/* http://colorzilla.com/gradient-editor/#ffffff+0,dfdfdf+100;Custom */
Expand All @@ -87,7 +87,7 @@ a.ui-state-default,
.ui-state-default a:link,
.ui-state-default a:visited,
.ui-state-default a {
color:#333;
color:#111;
text-decoration: none;
}

Expand All @@ -107,7 +107,7 @@ a.ui-state-default:hover,
.ui-state-focus,
.ui-widget-content .ui-state-focus,
.ui-widget-header .ui-state-focus {
color:#333;
color:#111;
border-color:#ababab;
/* http://colorzilla.com/gradient-editor/#ffffff+0,ededed+100;Custom */
background: #ffffff;
Expand Down Expand Up @@ -1171,7 +1171,7 @@ table.ui-datepicker-inline {

/*
.ui-datepicker td .ui-state-hover {
color:#333;
color:#111;
background:#ededed;
border-color:#ababab;
}
Expand Down Expand Up @@ -1408,3 +1408,127 @@ table.ui-datepicker-inline {
.ui-jqgrid .ui-pager-control .ui-pg-button .ui-pg-div span.ui-icon {
margin:1px 5px 1px 1px;
}

/* select2 */
.select2-container .select2-choice {
border:1px solid #bcbcbc;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
color: #111;
text-shadow: 0px 1px #fff;
background: #dfdfdf;
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNkZmRmZGYiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); /* IE9 */
background: -moz-linear-gradient(top, #ffffff 0%, #dfdfdf 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#dfdfdf));
background: -webkit-linear-gradient(top, #ffffff 0%,#dfdfdf 100%);
background: -o-linear-gradient(top, #ffffff 0%,#dfdfdf 100%);
background: -ms-linear-gradient(top, #ffffff 0%,#dfdfdf 100%);
background: linear-gradient(top, #ffffff 0%,#dfdfdf 100%);
}
.select2-container.select2-drop-above .select2-choice {
border-bottom-color: #bcbcbc;
-webkit-border-radius:0px 0px 3px 3px;
-moz-border-radius:0px 0px 3px 3px;
border-radius:0px 0px 3px 3px;
}
.select2-drop {
-webkit-border-radius: 0 0 3px 3px;
-moz-border-radius: 0 0 3px 3px;
border-radius: 0 0 3px 3px;
}

.select2-container .select2-choice div {
-webkit-border-radius: 0 3px 3px 0;
-moz-border-radius: 0 3px 3px 0;
border-radius: 0 3px 3px 0;

background: #dfdfdf;
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNkZmRmZGYiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); /* IE9 */
background: -moz-linear-gradient(top, #ffffff 0%, #dfdfdf 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#dfdfdf));
background: -webkit-linear-gradient(top, #ffffff 0%,#dfdfdf 100%);
background: -o-linear-gradient(top, #ffffff 0%,#dfdfdf 100%);
background: -ms-linear-gradient(top, #ffffff 0%,#dfdfdf 100%);
background: linear-gradient(top, #ffffff 0%,#dfdfdf 100%);
border-left: 1px solid #bcbcbc;
}
.select2-container .select2-choice:hover {
border-color:#ababab;
/* http://colorzilla.com/gradient-editor/#ffffff+0,ededed+100;Custom */
background: #ffffff;
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNlZGVkZWQiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); /* IE9 */
background: -moz-linear-gradient(top, #ffffff 0%, #ededed 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#ededed));
background: -webkit-linear-gradient(top, #ffffff 0%,#ededed 100%);
background: -o-linear-gradient(top, #ffffff 0%,#ededed 100%);
background: -ms-linear-gradient(top, #ffffff 0%,#ededed 100%);
background: linear-gradient(top, #ffffff 0%,#ededed 100%);
}
.select2-container .select2-choice:hover div {
background:transparent;
}

.select2-container-active .select2-choice,
.select2-container-active .select2-choices {
-webkit-box-shadow: none;
-moz-box-shadow : none;
-o-box-shadow : none;
box-shadow : none;
outline: none;
border-color:#ababab;
}

.select2-dropdown-open .select2-choice:hover,
.select2-dropdown-open .select2-choice {
/* http://colorzilla.com/gradient-editor/#ededed+0,ffffff+100;Custom */
background: #ededed;
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2VkZWRlZCIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); /* IE9 */
background: -moz-linear-gradient(top, #ededed 0%, #ffffff 50%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ededed), color-stop(50%,#ffffff));
background: -webkit-linear-gradient(top, #ededed 0%,#ffffff 50%);
background: -o-linear-gradient(top, #ededed 0%,#ffffff 50%);
background: -ms-linear-gradient(top, #ededed 0%,#ffffff 50%);
background: linear-gradient(top, #ededed 0%,#ffffff 50%);
-webkit-border-bottom-left-radius : 0;
-webkit-border-bottom-right-radius: 0;
-moz-border-radius-bottomleft : 0;
-moz-border-radius-bottomright: 0;
border-bottom-left-radius : 0;
border-bottom-right-radius: 0;
}
.select2-dropdown-open .select2-choice div {
background: transparent;
border-left: none;
}
.select2-search input,
.select2-search-choice-close,
.select2-container .select2-choice div b,
.select2-container .select2-choice abbr {
background-image: url(images/select2.png) !important;
}

.select2-search input,
.select2-search input:focus {
border: 1px solid #ccc;
background-color:transparent;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
.select2-search input {
margin:0 0 2px 0;
}

.select2-results .select2-highlighted {
background:#0055b5;
}

@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
.select2-search input,
.select2-search-choice-close,
.select2-container .select2-choice abbr,
.select2-container .select2-choice div b {
background-image: url(images/select2x2.png) !important;
}
}

0 comments on commit ba35bca

Please sign in to comment.