Skip to content

Commit

Permalink
Merge branch 'release/2.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
chambaz committed Jun 11, 2013
2 parents 4c8f0d4 + ee2bf13 commit 5944ce6
Show file tree
Hide file tree
Showing 14 changed files with 1,329 additions and 1,203 deletions.
2 changes: 1 addition & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "gumby",
"version": "2.2.12",
"version": "2.3.0",
"main": ["./js/libs/gumby.min.js", "./css/gumby.css"]
}
24 changes: 15 additions & 9 deletions css/gumby.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,8 @@ abbr { text-transform: none; }
.column.omega, .columns.omega { float: right; }

/* Column Classes */
.row .one.column, .row .one.columns, .sixteen.colgrid .row .one.columns { width: 6.38298%; }
.row .one.column { width: 6.38298%; }
.row .one.columns { width: 6.38298%; }
.row .two.columns { width: 14.89362%; }
.row .three.columns { width: 23.40426%; }
.row .four.columns { width: 31.91489%; }
Expand Down Expand Up @@ -223,7 +224,8 @@ abbr { text-transform: none; }
.row .eleven.centered { margin-left: 4.25532%; }

/* Hybrid Grid Columns */
.sixteen.colgrid .row .one.column, .sixteen.colgrid .row .one.columns { width: 4.25532%; }
.sixteen.colgrid .row .one.column { width: 4.25532%; }
.sixteen.colgrid .row .one.columns { width: 4.25532%; }
.sixteen.colgrid .row .two.columns { width: 10.6383%; }
.sixteen.colgrid .row .three.columns { width: 17.02128%; }
.sixteen.colgrid .row .four.columns { width: 23.40426%; }
Expand Down Expand Up @@ -404,7 +406,8 @@ img { -ms-interpolation-mode: bicubic; }

.no-touch .navbar ul li:hover .dropdown, .touch .navbar ul li.active .dropdown { min-height: 50px; max-height: 561px; overflow: visible; height: auto; width: 100%; padding: 0; border-top: 1px solid #3e4043; -webkit-box-shadow: 0px 3px 4px rgba(0, 0, 0, 0.3); -moz-box-shadow: 0px 3px 4px rgba(0, 0, 0, 0.3); box-shadow: 0px 3px 4px rgba(0, 0, 0, 0.3); }

.no-touch .navbar ul li:hover .dropdown ul { position: relative; top: 0; min-height: 50px; max-height: 250px; height: auto; -webkit-box-shadow: none !important; -moz-box-shadow: none !important; box-shadow: none !important; -webkit-transition-duration: 0.5s; -moz-transition-duration: 0.5s; -o-transition-duration: 0.5s; transition-duration: 0.5s; }
.no-touch .navbar ul li:hover .dropdown ul { position: relative; top: 0; min-height: 50px; max-height: 250px; height: auto; -webkit-box-shadow: none !important; -moz-box-shadow: none !important; box-shadow: none !important; -webkit-transition-duration: 0.5s; -moz-transition-duration: 0.5s; -o-transition-duration: 0.5s; transition-duration: 0.5s; min-height: 50px; max-height: 250px; height: auto; -webkit-box-shadow: none !important; -moz-box-shadow: none !important; box-shadow: none !important; -webkit-transition-duration: 0.5s; -moz-transition-duration: 0.5s; -o-transition-duration: 0.5s; transition-duration: 0.5s; }
.no-touch .navbar ul li:hover .dropdown ul li { min-height: 50px; }
@media only screen and (max-width: 767px) { .no-touch .navbar ul li:hover .dropdown ul { overflow: auto; background: #36393b; }
.no-touch .navbar ul li:hover .dropdown ul li { border-bottom: #3e4043; }
.no-touch .navbar ul li:hover .dropdown ul li a { color: white; border-bottom: 1px solid #313436; }
Expand Down Expand Up @@ -1667,7 +1670,7 @@ form ul, form ul li { margin-left: 0; list-style-type: none; }
form fieldset { border-style: solid; border-width: 0.0625em; padding: 1.5625em; border-color: #d8d8d8; margin: 18px 0; }
form fieldset legend { padding: 5px 10px; }

.field { position: relative; max-width: 100%; margin-bottom: 10px; vertical-align: middle; /* remove inline-block white-space — A 0px font-size = 0px of white space */ }
.field { position: relative; max-width: 100%; margin-bottom: 10px; vertical-align: middle; font-size: 16px; /* remove inline-block white-space — A 0px font-size = 0px of white space */ }
.field.metro, .field .metro { -webkit-border-radius: 0; -moz-border-radius: 0; -ms-border-radius: 0; -o-border-radius: 0; border-radius: 0; }
.field input, .field input[type="*"], .field textarea { max-width: 100%; width: 100%; padding: 0; margin: 0; border: none; outline: none; resize: none; -webkit-appearance: none; font-family: "Open Sans"; font-weight: 300; font-size: 16px; font-size: 1rem; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; }
.field .radio, .field .checkbox { position: relative; }
Expand Down Expand Up @@ -1706,19 +1709,19 @@ form fieldset legend { padding: 5px 10px; }
.field.append input:first-child { margin-right: 0; }
.field.double input, .field.double .input { width: 50% !important; }
.field.double input:last-child, .field.double .input:last-child { margin-left: -1px; }
.field.danger:after { font-family: "entypo"; content: "\2716"; font-size: 16px; position: absolute; top: 5px; right: 15px; z-index: 999; color: #ca3838; }
.field.danger:after { font-family: "entypo"; content: "\2716"; font-size: 16px; position: absolute; top: 14%; right: 15px; z-index: 999; color: #ca3838; }
.field.danger.append:after, .field.danger.prepend:after { content: ""; }
.field.danger input, .field.danger .input, .field.danger textarea, .field.danger .textarea, .field.danger .radio span, .field.danger .checkbox span, .field.danger .picker { border-color: #ca3838; color: #ca3838; background: #f0c5c5; -webkit-transition-duration: 0.2s; -moz-transition-duration: 0.2s; -o-transition-duration: 0.2s; transition-duration: 0.2s; }
.field.danger textarea { color: #ca3838; }
.field.danger input::-webkit-input-placeholder, .field.danger textarea::-webkit-input-placeholder { color: #ca3838; }
.field.danger input:-moz-placeholder, .field.danger textarea:-moz-placeholder { color: #ca3838; }
.field.warning:after { font-family: "entypo"; content: "\26a0"; font-size: 16px; position: absolute; top: 5px; right: 15px; z-index: 999; color: #f6b83f; }
.field.warning:after { font-family: "entypo"; content: "\26a0"; font-size: 16px; position: absolute; top: 14%; right: 15px; z-index: 999; color: #f6b83f; }
.field.warning.append:after, .field.warning.prepend:after { content: ""; }
.field.warning input, .field.warning .input, .field.warning textarea, .field.warning .textarea, .field.warning .radio span, .field.warning .checkbox span, .field.warning .picker { border-color: #f6b83f; color: #f6b83f; background: #fef7ea; -webkit-transition-duration: 0.2s; -moz-transition-duration: 0.2s; -o-transition-duration: 0.2s; transition-duration: 0.2s; }
.field.warning textarea { color: #f6b83f; }
.field.warning input::-webkit-input-placeholder, .field.warning textarea::-webkit-input-placeholder { color: #f6b83f; }
.field.warning input:-moz-placeholder, .field.warning textarea:-moz-placeholder { color: #f6b83f; }
.field.success:after { font-family: "entypo"; content: "\2713"; font-size: 16px; position: absolute; top: 5px; right: 15px; z-index: 999; color: #58c026; }
.field.success:after { font-family: "entypo"; content: "\2713"; font-size: 16px; position: absolute; top: 14%; right: 15px; z-index: 999; color: #58c026; }
.field.success.append:after, .field.success.prepend:after { content: ""; }
.field.success input, .field.success .input, .field.success textarea, .field.success .textarea, .field.success .radio span, .field.success .checkbox span, .field.success .picker { border-color: #58c026; color: #58c026; background: #c0eeaa; -webkit-transition-duration: 0.2s; -moz-transition-duration: 0.2s; -o-transition-duration: 0.2s; transition-duration: 0.2s; }
.field.success textarea { color: #58c026; }
Expand All @@ -1745,11 +1748,14 @@ form fieldset legend { padding: 5px 10px; }
.field .text input[type="search"] { -webkit-appearance: textfield; }

/* Form Picker Element (<select>) */
.picker { position: relative; width: auto; display: inline-block; margin: 0 0 2px 1.2%; overflow: hidden; border: 1px solid #e5e5e5; -webkit-border-radius: 4px; -moz-border-radius: 4px; -ms-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; font-family: "Open Sans"; font-weight: 600; height: 36px; line-height: 34px; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #f2f2f2)); background-image: -webkit-linear-gradient(#ffffff, #f2f2f2); background-image: -moz-linear-gradient(#ffffff, #f2f2f2); background-image: -o-linear-gradient(#ffffff, #f2f2f2); background-image: linear-gradient(#ffffff, #f2f2f2); }
.picker:after { content: "\25BE"; z-index: 0; position: absolute; right: 8%; top: 0%; color: #555555; }
.picker { position: relative; width: auto; display: inline-block; margin: 0 0 2px 1.2%; overflow: hidden; border: 1px solid #e5e5e5; -webkit-border-radius: 4px; -moz-border-radius: 4px; -ms-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; font-family: "Open Sans"; font-weight: 600; height: auto; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #f2f2f2)); background-image: -webkit-linear-gradient(#ffffff, #f2f2f2); background-image: -moz-linear-gradient(#ffffff, #f2f2f2); background-image: -o-linear-gradient(#ffffff, #f2f2f2); background-image: linear-gradient(#ffffff, #f2f2f2); }
.picker:after { content: "\25BE"; z-index: 0; position: absolute; right: 8%; top: 50%; margin-top: -12px; color: #555555; }
.picker:first-child { margin-left: 0; }
.picker select { position: relative; display: block; min-width: 100%; width: 135%; height: 34px; padding: 6px 45px 6px 15px; color: #555555; border: none; background: transparent; outline: none; -webkit-appearance: none; z-index: 99; cursor: pointer; font-size: 16px; font-size: 1rem; }

.ie9 .radio.checked i, .oldie .radio.checked i { top: 2px; }
.ie9 .checkbox.checked i, .oldie .checkbox.checked i { top: 1px; }

/* Labels */
.badge, .label { height: 20px; display: inline-block; font-family: Helvetica, arial, verdana, sans-serif; font-weight: bold; line-height: 20px; text-align: center; color: #fff; }
.badge a, .label a { color: #fff; }
Expand Down
1 change: 1 addition & 0 deletions demo.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1092,6 +1092,7 @@ <h2>A <span>responsive <span>960</span> grid</span>
<script src="js/libs/ui/gumby.radiobtn.js"></script>
<script src="js/libs/ui/gumby.tabs.js"></script>
<script src="js/libs/ui/gumby.navbar.js"></script>
<script src="js/libs/ui/gumby.fittext.js"></script>
<script src="js/libs/ui/jquery.validation.js"></script>
<script src="js/libs/gumby.init.js"></script>-->

Expand Down
2 changes: 1 addition & 1 deletion js/libs/gumby.init.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Modernizr.load({
test: Modernizr.touch,

// if present load custom jQuery mobile build and update Gumby.click
yep: 'js/libs/jquery.mobile.custom.min.js',
yep: Gumby.path+'/jquery.mobile.custom.min.js',
callback: function(url, result, key) {
// check jQuery mobile has successfully loaded before using tap events
if($.mobile) {
Expand Down
7 changes: 6 additions & 1 deletion js/libs/gumby.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@
this.onReady = this.onOldie = this.onTouch = false;
this.uiModules = {};
this.inits = {};

// check and set path with js/libs default
this.path = $('script[gumby-path]').attr('gumby-path') ||
$('script[data-path]').attr('data-path') ||
$('script[path]').attr('path') ||
'js/libs';
}

// initialize Gumby
Expand Down Expand Up @@ -84,7 +90,6 @@
};
};


// grab attribute value, testing data- gumby- and no prefix
Gumby.prototype.selectAttr = function() {
var i = 0;
Expand Down
Loading

0 comments on commit 5944ce6

Please sign in to comment.