Skip to content

Commit e33023d

Browse files
authored
Merge pull request #43 from mikejacobson/restruct
Restructure; use gulp; add e2e testing
2 parents b151c2b + 6a056a8 commit e33023d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+2365
-402
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
.project
22
.sass-cache
33
*.rb
4+
node_modules

README.md

+3
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ Usage
3939
3. Include `scrolling-tabs.min.js` (or `scrolling-tabs.js`) on your page (make sure that jQuery and Angular are included before it, and that jQuery is included before Angular)
4040
4. Add `mj.scrollingTabs` as a module dependency to your app: `angular.module('myapp', ['mj.scrollingTabs']);`
4141

42+
Breaking Change for v1.0.0
43+
--
44+
* The directive files, `scrolling-tabs.js` and `scrolling-tabs.css`, have been moved from the project root into `<root>/dist/`.
4245

4346

4447

bower.json

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"name": "angular-bootstrap-scrolling-tabs",
3-
"version": "0.1.1",
3+
"version": "1.0.0",
44
"main": [
5-
"scrolling-tabs.js",
6-
"scrolling-tabs.css"
5+
"./dist/scrolling-tabs.js",
6+
"./dist/scrolling-tabs.css"
77
],
88
"description": "Angular directive for scrollable Bootstrap Tabs",
99
"homepage": "https://github.com/mikejacobson/angular-bootstrap-scrolling-tabs",
@@ -15,14 +15,16 @@
1515
"license": "MIT",
1616
"ignore": [
1717
".gitignore",
18+
"package.json",
1819
"bower.json",
1920
"README.md",
2021
"*.scss",
21-
"config.rb"
22+
"config.rb",
23+
"st-screenshot.png"
2224
],
2325
"dependencies": {
24-
"bootstrap": "~3.1.1",
25-
"angular": "~1.2.25"
26+
"bootstrap": "^3.1.1",
27+
"angular": "^1.6.4"
2628
},
2729
"keywords": [
2830
"angularjs",
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,34 @@
11
/**
22
* angular-bootstrap-scrolling-tabs
3-
* @version v0.1.1
3+
* @version v1.0.0
44
* @link https://github.com/mikejacobson/angular-bootstrap-scrolling-tabs
55
* @author Mike Jacobson <michaeljjacobson1@gmail.com>
66
* @license MIT License, http://www.opensource.org/licenses/MIT
77
*/
8-
/* line 13, scrolling-tabs.scss */
98
.scrtabs-tab-container * {
10-
box-sizing: border-box;
11-
}
9+
box-sizing: border-box; }
1210

13-
/* line 17, scrolling-tabs.scss */
1411
.scrtabs-tab-container {
15-
height: 42px;
16-
}
12+
height: 42px; }
1713

18-
/* line 21, scrolling-tabs.scss */
1914
.scrtabs-tab-container .tab-content {
20-
clear: left;
21-
}
15+
clear: left; }
2216

23-
/* line 25, scrolling-tabs.scss */
2417
.scrtabs-tab-wrapper-container.force-height {
25-
height: 42px;
26-
}
18+
height: 42px; }
2719

28-
/* line 29, scrolling-tabs.scss */
2920
.scrtabs-tabs-fixed-container {
3021
float: left;
3122
height: 42px;
3223
overflow: hidden;
33-
width: 100%;
34-
}
24+
width: 100%; }
3525

36-
/* line 36, scrolling-tabs.scss */
3726
.scrtabs-tabs-movable-container {
38-
position: relative;
39-
}
27+
position: relative; }
4028

41-
/* line 40, scrolling-tabs.scss */
4229
.scrtabs-tabs-movable-container .tab-content {
43-
display: none;
44-
}
30+
display: none; }
4531

46-
/* line 44, scrolling-tabs.scss */
4732
.scrtabs-tab-scroll-arrow {
4833
border: 1px solid #dddddd;
4934
border-top: none;
@@ -56,24 +41,19 @@
5641
margin-bottom: -1px;
5742
padding-left: 2px;
5843
padding-top: 13px;
59-
width: 20px;
60-
}
61-
/* line 57, scrolling-tabs.scss */
62-
.scrtabs-tab-scroll-arrow:hover {
63-
background-color: #eeeeee;
64-
}
44+
width: 20px; }
45+
.scrtabs-tab-scroll-arrow:hover {
46+
background-color: #eeeeee; }
47+
48+
.scrtabs-tab-scroll-arrow--is-on-edge {
49+
pointer-events: none;
50+
opacity: .5; }
6551

66-
/* line 62, scrolling-tabs.scss */
6752
.scrtabs-tabs-fixed-container ul.nav-tabs > li {
68-
white-space: nowrap;
69-
}
53+
white-space: nowrap; }
7054

71-
/* line 66, scrolling-tabs.scss */
7255
.scrtabs-tab-content-outside-movable-container {
73-
clear: left;
74-
}
56+
clear: left; }
7557

76-
/* line 70, scrolling-tabs.scss */
7758
.scrtabs-tab-content-outside-movable-container .nav-tabs {
78-
display: none;
79-
}
59+
display: none; }

0 commit comments

Comments
 (0)