Skip to content

Commit 09be690

Browse files
rosskevinrosskevin
committed
Simplify project structure, remove cruft, remove tests copied from bootstrap so we can start our own.
1 parent 0706a67 commit 09be690

49 files changed

Lines changed: 159 additions & 14160 deletions

Some content is hidden

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

‎.gitattributes‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎.npmignore‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎.scss-lint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,15 @@ linters:
117117
"flex-shrink",
118118
"flex-grow",
119119
"justify-content",
120+
"align-items",
121+
"align-self",
120122
"float",
121123
"width",
122124
"min-width",
123125
"max-width",
124126
"height",
125127
"min-height",
126128
"max-height",
127-
"align-items",
128-
"align-self",
129129
"padding",
130130
"padding-top",
131131
"padding-right",

‎.travis.yml‎

Lines changed: 20 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,30 @@
1+
sudo: false
2+
git:
3+
depth: 10
4+
5+
# remove the dist branch and dist tags from travis builds
16
branches:
27
except:
3-
- v4-dist
4-
# remove the following later:
5-
- v4-dev
6-
- v4-gulp
8+
- dist
9+
- /^v(\d+\.)?(\d+\.)?(\*|\d+)$/
710

8-
sudo: false # use the container infrastructure
911
language: node_js
10-
git:
11-
depth: 10
1212
node_js:
13-
- "5"
14-
before_install:
15-
# Remove ./node_modules/.bin from PATH so node-which doesn't replace Unix which and cause RVM to barf. See https://github.com/travis-ci/travis-ci/issues/5092
16-
- export PATH=$(python -c 'from sys import argv;from collections import OrderedDict as od;print(":".join(od((p,None) for p in argv[1].split(":") if p.startswith("/")).keys()))' "$PATH")
13+
- "5" # "node" (v6.x) yielded v8::ObjectTemplate::Set() with non-primitive values is deprecated
1714

18-
- rvm install 2.2.2
19-
- rvm use 2.2.2 --fuzzy
20-
- npm install -g npm
21-
- "export TRAVIS_COMMIT_MSG=\"$(git log --format=%B --no-merges -n 1)\""
22-
- echo "$TRAVIS_COMMIT_MSG" | grep '\[skip validator\]'; export BMD_DO_VALIDATOR=$?; true
23-
- echo "$TRAVIS_COMMIT_MSG" | grep '\[skip sauce\]'; export BMD_DO_SAUCE=$?; true
24-
# - if [ "$TRAVIS_REPO_SLUG" = twbs-savage/bootstrap ]; then export BMD_DO_VALIDATOR=0; fi
15+
# enable this once we have reliable builds
16+
cache:
17+
directories:
18+
- node_modules
19+
- vendor/bundle
2520

26-
install:
27-
- bundle install --deployment --jobs=3
28-
- cp grunt/npm-shrinkwrap.json ./
29-
- npm install -g grunt-cli
30-
- npm install -g bower
31-
- bower install
21+
before_install:
22+
- rvm install 2.2
23+
- rvm use 2.2 --fuzzy
24+
- gem install scss-lint
3225

33-
addons:
34-
sauce_connect:
35-
username: "bmaterialdesign"
36-
access_key:
37-
secure: "eFSRVOJsJFi8Yhh0pCQpuJELDk0/B6s5tfvR3hi8oWXmW7FjNvRMgesoBKXbEW2HBhjJFMpt+1Rf49pweqgtZQ9vfz0GD47OjwJCTzip2Wv+EANLTJESdI5E0kw7STxrjL3Y12MBQQFHUYh9mhLdpAobNIppsIB5CG4pjtFSiG0="
3826

39-
env:
40-
matrix:
41-
- BMD_TEST=core
42-
- BMD_TEST=validate-html
43-
- BMD_TEST=sauce-js-unit
27+
before_script:
28+
- npm install -g gulpjs/gulp-cli#4.0
4429

45-
matrix:
46-
fast_finish: true
47-
exclude:
48-
- node_js: "4"
49-
env: BMD_TEST=validate-html
50-
- node_js: "4"
51-
env: BMD_TEST=sauce-js-unit
30+
script: gulp all

‎docs/assets/js/src/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Clipboard from 'clipboard'
33
import anchors from 'anchor-js'
44

55
// import all the bmd code
6-
import '../../../../js/src/index' // eslint-disable-line no-unused-vars
6+
import '../../../../js/index' // eslint-disable-line no-unused-vars
77

88
class Application {
99

‎docs/examples/dashboard/template.html‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
---
2+
layout: example
3+
title: Dashboard Template
4+
group: material-design
5+
js: example.js
6+
---
7+
8+
<!-- Custom styles for this template -->
9+
<link href="example.css" rel="stylesheet">
10+
11+
<div class="bmd-layout-container bmd-drawer-f-l bmd-drawer-overlay-md-down bmd-drawer-in-lg-up">
12+
<header class="bmd-layout-header">
13+
<div class="navbar navbar-light bg-faded">
14+
<button class="navbar-toggler hidden-lg-up" type="button" data-toggle="drawer" data-target="#my-drawer">
15+
<span class="sr-only">Toggle drawer</span>
16+
<i class="material-icons">menu</i>
17+
</button>
18+
<ul class="nav navbar-nav">
19+
<li class="nav-item">
20+
Home
21+
</li>
22+
</ul>
23+
<ul class="nav navbar-nav pull-xs-right">
24+
<li class="nav-item">
25+
<div class="bmd-form-group bmd-collapse-inline pull-xs-right">
26+
<button class="btn bmd-btn-icon" for="search" data-toggle="collapse" data-target="#collapse-search" aria-controls="collapse-search">
27+
<i class="material-icons">search</i>
28+
</button>
29+
<span id="collapse-search" class="collapse">
30+
<input class="form-control" type="text" id="search" placeholder="Enter your query...">
31+
</span>
32+
</div>
33+
</li>
34+
<li class="nav-item">
35+
<div class="dropdown">
36+
<button class="btn bmd-btn-icon btn-secondary dropdown-toggle" type="button" id="more-menu" data-toggle="dropdown" aria-haspopup="true" >
37+
<i class="material-icons">more_vert</i>
38+
</button>
39+
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="more-menu">
40+
<button class="dropdown-item" type="button">About</button>
41+
<button class="dropdown-item" type="button">Contact</button>
42+
<button class="dropdown-item" type="button">Legal information</button>
43+
</div>
44+
</div>
45+
</li>
46+
</ul>
47+
</div>
48+
</header>
49+
50+
<div id="my-drawer" class="bmd-layout-drawer">
51+
<header>
52+
<img src="images/user.jpg" class="avatar">
53+
<div class="account">
54+
<span>hello@example.com</span>
55+
<div class="dropdown">
56+
<button class="btn bmd-btn-icon dropdown-toggle" type="button" id="nav-account-menu" data-toggle="dropdown" aria-haspopup="true">
57+
<i class="material-icons">arrow_drop_down</i>
58+
</button>
59+
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="nav-account-menu">
60+
<a class="dropdown-item">hello@example.com</a>
61+
<a class="dropdown-item">info@example.com</a>
62+
<a class="dropdown-item"><i class="material-icons">add</i>Add account...</a>
63+
</div>
64+
</div>
65+
</div>
66+
</header>
67+
<ul class="list-group">
68+
<a class="list-group-item">
69+
<i class="material-icons" role="presentation">home</i>Home
70+
</a>
71+
<a class="list-group-item">
72+
<i class="material-icons" role="presentation">inbox</i>Inbox
73+
</a>
74+
<a class="list-group-item">
75+
<i class="material-icons" role="presentation">forum</i>Forums
76+
</a>
77+
<a class="list-group-item">
78+
<i class="material-icons" role="presentation">flag</i>Updates
79+
</a>
80+
<a class="list-group-item">
81+
<i class="material-icons" role="presentation">local_offer</i>Promos
82+
</a>
83+
<a class="list-group-item">
84+
<i class="material-icons" role="presentation">people</i>Social
85+
</a>
86+
87+
<li class="bmd-layout-spacer"></li>
88+
<a class="list-group-item">
89+
<i class="material-icons" role="presentation">help_outline</i><span class="sr-only">Help</span>
90+
</a>
91+
</ul>
92+
</div>
93+
94+
95+
<main class="bmd-layout-content">
96+
<div class="container">
97+
<!-- yield content here -->
98+
99+
</div>
100+
</main>
101+
</div>

grunt/jekyll-debug.rb renamed to docs/jekyll-debug.rb

File renamed without changes.

0 commit comments

Comments
 (0)