Skip to content
This repository has been archived by the owner on Feb 12, 2022. It is now read-only.

Commit

Permalink
Merge branch 'master' of github.com:ExactTarget/fuelux
Browse files Browse the repository at this point in the history
  • Loading branch information
@interactivellama
interactivellama committed Jul 10, 2015
2 parents 96764ad + 6714e42 commit a94c6e7
Show file tree
Hide file tree
Showing 17 changed files with 245 additions and 207 deletions.
4 changes: 2 additions & 2 deletions Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -817,7 +817,7 @@ module.exports = function (grunt) {

// multiple jQuery versions, then run SauceLabs VMs
grunt.registerTask('releasetest', 'run jshint, build dist, all source tests, validation, and qunit on SauceLabs',
['test', 'dist', 'qunit:dist', 'saucelabs-qunit:defaultBrowsers']);
['test', 'dist', 'browserify:commonjs', 'qunit:dist', 'saucelabs-qunit:defaultBrowsers']);

// can be run locally instead of through TravisCI, but requires the Fuel UX Saucelabs API key file which is not public at this time.
grunt.registerTask('saucelabs', 'run jshint, and qunit on saucelabs',
Expand Down Expand Up @@ -951,7 +951,7 @@ module.exports = function (grunt) {
grunt.task.run(['connect:testServer']);

if (grunt.option('test')) {
grunt.task.run(['qunit:dist', 'watch:full']);
grunt.task.run(['browserify:commonjs','qunit:dist', 'watch:full']);
} else {
grunt.task.run(['watch:dist']);
}
Expand Down
23 changes: 11 additions & 12 deletions less/checkbox.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}

&.checked label.checkbox-custom, label.checked.checkbox-custom {
background: #e9e9e9;
background: @gray90;
border-radius: @baseBorderRadius;
}
}
Expand All @@ -26,7 +26,7 @@
input[type="checkbox"]:hover + .checkbox-label,
.checkbox-label:hover
{
color: @grayLight;
color: @gray60;
}

input[type="checkbox"]:disabled:focus + .checkbox-label,
Expand All @@ -52,9 +52,9 @@

&:before {
#fuelux > .icon-base-styles("Glyphicons Halflings");
border: 1px solid #adadad;
border: 1px solid @gray67;
border-radius: @baseBorderRadius;
color: #fff;
color: @true-white;
content: " ";
font-size: 9px;
height: 14px;
Expand All @@ -67,10 +67,9 @@

/* for keyboard tabbing */
&:active:before, &:focus:before {
color: @text-color;
color: rgb(91, 157, 217);
color: @focusColor;
cursor: pointer;
box-shadow: inset 0px 0px 2px 1px rgb(91, 157, 217), 0px 0px 5px 0px rgb(91, 157, 217);
box-shadow: inset 0px 0px 2px 1px @focusColor, 0px 0px 5px 0px @focusColor;
}

&.highlight {
Expand All @@ -82,8 +81,8 @@

&.checked {
&:before {
background: #39b3d7;
border-color: #39b3d7;
background: @checkboxPrimaryColor;
border-color: @checkboxPrimaryColor;
content: "\e013";
}
}
Expand Down Expand Up @@ -115,7 +114,7 @@
}

&.checked {
background: #e9e9e9;
background: @gray90;
border-radius: @baseBorderRadius;
}
}
Expand All @@ -124,7 +123,7 @@

/* for keyboard tabbing */
input[type="checkbox"]:focus + .checkbox-label {
color: @grayLight;
color: @gray60;
}

}
Expand All @@ -133,4 +132,4 @@
padding-left: 20px;
}

}
}
72 changes: 36 additions & 36 deletions less/datepicker.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
width: 100%;

thead {
border-bottom: 1px solid #cccaca;
border-bottom: 1px solid @gray80;
}

/* for spacing */
Expand All @@ -40,7 +40,7 @@

td {
b, button {
color: #333;
color: @gray20;
display: inline-block;
font-weight: normal;
height: 30px;
Expand All @@ -65,7 +65,7 @@

&.current-day {
span {
border: 1px solid #333;
border: 1px solid @gray20;
}
}

Expand All @@ -85,7 +85,7 @@

&.past {
b, button {
color: lighten(#333, 40%);
color: lighten(@gray20, 40%);
}
}

Expand All @@ -95,7 +95,7 @@
position: relative;

&:before {
border-top: 1px solid #a94442;
border-top: 1px solid darken(@btnDangerBackground, 10%);
bottom: 0;
content: " ";
display: block;
Expand All @@ -121,19 +121,19 @@
}

b, button {
color: #8d8787;
color: @gray53;
}

&.current-day {
box-shadow: 0 0 0 1px #fff offset;
box-shadow: 0 0 0 1px @true-white offset;
b, button {
color: #222;
color: @gray13;
}

span {
&:hover {
b, button {
border-color: #0f5f9f;
border-color: @datepickerHover;
}
}
}
Expand Down Expand Up @@ -162,14 +162,14 @@
text-align: center;
display: block;
width: 174px;
color: #222;
color: @gray13;
font-size: 20px;
line-height: 30px;
text-decoration: underline;
vertical-align: middle;

&:hover {
color: #1d75bb;
color: @datepickerHover;
text-decoration: underline;
}

Expand All @@ -195,7 +195,7 @@
}

.next, .prev {
background: #666669;
background: @gray40;
background-clip: padding-box;
border-radius: 30px;
cursor: pointer;
Expand All @@ -205,13 +205,13 @@
width: 30px;

span.glyphicon {
color: #fff;
color: @true-white;
font-size: 16px;
line-height: 30px;
}

&:hover {
background: #1d75bb;
background: @datepickerHover;
}
}

Expand All @@ -225,39 +225,39 @@
}

&-footer {
background: #e3e2e1;
background: @gray90;
background-clip: padding-box;
border-radius: 0 0 4px 4px;
border-top: 1px solid #cccaca;
border-top: 1px solid @gray80;
height: 30px;
margin: 0 -16px;
padding: 4px 14px;

.datepicker-today {
color: #333;
color: @gray20;
font-size: 14px;
text-decoration: underline;

&:hover {
color: #1b75bb;
color: @datepickerHoverAlt;
text-decoration: underline;
}

&.disabled {
color: #8b8c8e;
color: @gray53;
cursor: default;
pointer-events: none;

&:hover {
color: #8b8c8e
color: @gray53;
}
}
}
}
}

&-calendar-wrapper {
border: 1px solid #6e6f71;
border: 1px solid @gray46;
min-height: 20px;
padding: 0;
width: 300px;
Expand All @@ -273,31 +273,31 @@
}

&-footer {
background: #e3e2e1;
background: @gray90;
border-radius: 0 0 4px 4px;
border-top: 1px solid #cccaca;
border-top: 1px solid @gray80;
clear: both;

.datepicker-wheels-back {
display: block;
color: #222;
color: @gray13;
float: left;
line-height: 22px;
border: 0;
background-color: transparent;

&:hover {
color: #1d75bb;
color: @datepickerHoverAlt;
}
}

.datepicker-wheels-select {
float: right;
background-color: transparent;
color: @blue;
color: @focusColor;

&:hover {
color: #1d75bb;
color: @datepickerHoverAlt;
}
}
}
Expand All @@ -321,37 +321,37 @@
display: block;
width: 100%;
text-align: center;
color: #414041;
color: @gray27;
display: block;
font-size: 16px;
line-height: 24px;
text-decoration: none;

&:hover {
background: #aee0f8;
background: @infoBackground;
text-decoration: none;
}
}

&.selected {
button {
background: #1d75bb;
color: #fff;
background: @datepickerHoverAlt;
color: @true-white;

&:hover {
background: #0f5f9f;
background: @datepickerHover;
}
}
}
}
}

.header {
background: #e3e2e1;
background: @gray90;
background-clip: padding-box;
border-bottom: 1px solid #cccaca;
border-bottom: 1px solid @gray80;
border-radius: 4px 0 0 0;
color: #222;
color: @gray13;
font-size: 20px;
font-weight: bold;
line-height: 30px;
Expand All @@ -371,7 +371,7 @@
}

&-year {
border-left: 1px solid #cccaca;
border-left: 1px solid @gray80;
float: right;

.header {
Expand Down
12 changes: 6 additions & 6 deletions less/forms.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
border-radius: @baseBorderRadius;
}
&:checked ~ label {
background-color: #e9e9e9;
background-color: @gray90;
opacity: 1;
z-index: 0;
}
Expand Down Expand Up @@ -76,8 +76,8 @@
text-transform: none;
line-height: 1;
speak: none;
border: 1px solid #adadad;
color: #fff;
border: 1px solid @gray67;
color: @true-white;
font-size: 9px;
width: 14px;
height: 14px;
Expand All @@ -98,7 +98,7 @@
/* for keyboard tabbing */
&:active ~ label, &:focus ~ label {
color: @text-color;
color: rgb(91, 157, 217);
color: @checkboxPrimaryColor;
cursor: pointer;

&:before {
Expand Down Expand Up @@ -133,8 +133,8 @@

&:checked ~ label {
&:before {
background: #39b3d7;
border-color: #39b3d7;
background: @checkboxPrimaryColor;
border-color: @checkboxPrimaryColor;
}
}

Expand Down
2 changes: 1 addition & 1 deletion less/loader.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
}

&.iefix:before{
color: #bcbcbc;
color: @gray74;
opacity: 1;
}

Expand Down
Loading

0 comments on commit a94c6e7

Please sign in to comment.