Skip to content

Commit

Permalink
Merge pull request #37 from HubSpot/tether-v1
Browse files Browse the repository at this point in the history
Update Tether to v1.0.0
  • Loading branch information
geekjuice committed Jun 7, 2015
2 parents 614741b + f98eba8 commit 1975bb9
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 17 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## v1.0.0
- Bump `Tether` to v1

## v1.0.0
- Add proper UMD to `Select`
- Convert from `Coffeescript` to `ES6 (Babel)`
Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
## Select

[![npm
version](https://badge.fury.io/js/tether-select.svg)](http://badge.fury.io/js/tether-select)
[![Bower
version](https://badge.fury.io/bo/tether-select.svg)](http://badge.fury.io/bo/tether-select)

Select.js is a Javascript and CSS library for creating styleable select elements. It aims to reproduce the behavior of native controls as much as is possible, while allowing for complete styling with CSS.


Expand Down
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tether-select",
"version": "1.0.0",
"version": "1.1.0",
"homepage": "https://github.com/HubSpot/select",
"authors": [
"Zack Bloom <zbloom@hubspot.com>",
Expand All @@ -26,6 +26,6 @@
"tests"
],
"dependencies": {
"tether": "~0.7.2"
"tether": "~1.0.0"
}
}
2 changes: 1 addition & 1 deletion dist/css/select-theme-chosen.css
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
border-radius: 5px;
box-shadow: 0 0 3px #FFF inset, 0 1px 1px rgba(0, 0, 0, 0.1);
background-image: -webkit-linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
background-image: linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
background-image: linear-gradient(to bottom, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
position: relative;
padding: 3px 30px 2px 11px;
background: #f6f6f6;
Expand Down
2 changes: 1 addition & 1 deletion dist/js/select.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! tether-select 1.0.0 */
/*! tether-select 1.1.0 */

(function(root, factory) {
if (typeof define === 'function' && define.amd) {
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tether-select",
"version": "1.0.0",
"version": "1.1.0",
"description": "Styleable select elements built on Tether",
"authors": [
"Adam Schwartz <adam.flynn.schwartz@gmail.com>",
Expand All @@ -17,20 +17,20 @@
"main": "dist/js/select.js",
"devDependencies": {
"bower": "^1.4.1",
"del": "^1.1.1",
"gulp": "^3.8.11",
"gulp-autoprefixer": "^2.2.0",
"del": "^1.2.0",
"gulp": "^3.9.0",
"gulp-autoprefixer": "^2.3.1",
"gulp-babel": "^5.1.0",
"gulp-bump": "^0.3.0",
"gulp-filter": "^2.0.2",
"gulp-header": "^1.2.2",
"gulp-rename": "^1.2.2",
"gulp-sass": "^2.0.0",
"gulp-sass": "^2.0.1",
"gulp-tag-version": "^1.2.1",
"gulp-uglify": "^1.2.0",
"gulp-wrap-umd": "^0.2.1"
},
"dependencies": {
"tether": "^0.7.2"
"tether": "~1.0.0"
}
}
6 changes: 3 additions & 3 deletions src/css/select-theme-chosen.sass
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
@import user-select
@import checkmark

@import ../bower_components/tether/sass/mixins/inline-block
@import ../bower_components/tether/sass/helpers/tether
@import ../bower_components/tether/src/css/mixins/inline-block
@import ../bower_components/tether/src/css/helpers/tether

@import select

Expand Down Expand Up @@ -94,7 +94,7 @@ $mobileBreakPointSize: ($maxRows + 4) * $optionHeight
+no-mobile-tap-highlight
border-radius: 5px
box-shadow: 0 0 3px #FFF inset, 0 1px 1px rgba(0, 0, 0, 0.1)
background-image: linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%)
background-image: linear-gradient(to bottom, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%)
position: relative
padding: 3px 30px 2px 11px
background: #f6f6f6
Expand Down
4 changes: 2 additions & 2 deletions src/css/select-theme-dark.sass
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
@import user-select
@import checkmark

@import ../bower_components/tether/sass/mixins/inline-block
@import ../bower_components/tether/sass/helpers/tether
@import ../bower_components/tether/src/css/mixins/inline-block
@import ../bower_components/tether/src/css/helpers/tether

@import select

Expand Down
4 changes: 2 additions & 2 deletions src/css/select-theme-default.sass
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
@import user-select
@import checkmark

@import ../bower_components/tether/sass/mixins/inline-block
@import ../bower_components/tether/sass/helpers/tether
@import ../bower_components/tether/src/css/mixins/inline-block
@import ../bower_components/tether/src/css/helpers/tether

@import select

Expand Down

0 comments on commit 1975bb9

Please sign in to comment.