Skip to content

Commit 4a2198b

Browse files
committed
Several fixes and modifications
1 parent 8e4c9bf commit 4a2198b

61 files changed

Lines changed: 87 additions & 91 deletions

Some content is hidden

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

Gruntfile.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module.exports = function (grunt) {
2424
},
2525
watch: {
2626
dev: {
27-
files: ['*', 'lib/**/*', 'css/**/*', 'bin/**/*'],
27+
files: ['*', 'lib/**/*', 'bin/**/*', 'landing/*'],
2828
tasks: ["build"]
2929
}
3030
},
@@ -33,16 +33,16 @@ module.exports = function (grunt) {
3333
],
3434
shell: {
3535
fix_utf8: {
36-
command: './bin/fix-utf8-problem css/budicon/budicon.css css/budicon/budicon.fixed.css'
36+
command: './bin/fix-utf8-problem lib/budicon/budicon.css lib/budicon/budicon.fixed.css'
3737
},
3838
generate_index: {
39-
command: './node_modules/.bin/jade index.jade -O package.json --out build/'
39+
command: './node_modules/.bin/jade landing/index.jade -O package.json --out build/'
4040
},
4141
generate_css: {
42-
command: './node_modules/.bin/stylus css/index.styl --include css --include-css --out build/'
42+
command: './node_modules/.bin/stylus --include-css --include . --resolve-url --out build/ index.styl'
4343
},
4444
generate_demo_css: {
45-
command: './node_modules/.bin/stylus css/styleguide.styl --include-css --out build/'
45+
command: './node_modules/.bin/stylus --include-css --include . --resolve-url --out build/ landing/landing.styl'
4646
},
4747
purge_cdn_latest: {
4848
command: 'curl -X DELETE https://cdn.auth0.com/styleguide/latest'
@@ -57,8 +57,7 @@ module.exports = function (grunt) {
5757
copy: {
5858
main: {
5959
files: [
60-
{ expand: true, cwd: 'css/', src: ['budicon/fonts/*'], dest: 'build'},
61-
{ expand: true, src: ['css/**/*'], dest: 'build'},
60+
{ expand: true, src: ['lib/**/*', '!**/*.styl', '!**/*.jade'], dest: 'build', filter: 'isFile'}
6261
]
6362
}
6463
},

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"name": "auth0-styleguide",
3-
"version": "0.6.7"
3+
"version": "1.0.0"
44
}

css/index.styl

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

index.styl

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
@charset "UTF-8";
2+
3+
@import 'lib/vars/index.styl';
4+
5+
// Vendor
6+
@import 'node_modules/bootstrap/dist/css/bootstrap.css';
7+
@import 'node_modules/animate.css/animate.min.css';
8+
9+
// CSS
10+
@import 'lib/budicon/budicon.fixed.css';
11+
@import 'lib/grid/index.styl';
12+
@import 'lib/buttons/index.styl';
13+
@import 'lib/logos/index.styl';
14+
@import 'lib/typography/index.styl';
15+
16+
// Components
17+
@import 'lib/sidebar-box/index.styl';
18+
@import 'lib/banner/index.styl';
19+
@import 'lib/big-tabs/index.styl';
20+
@import 'lib/breadcrumb/index.styl';
21+
@import 'lib/browser/index.styl';
22+
@import 'lib/center-title-block/index.styl';
23+
@import 'lib/footer/index.styl';
24+
@import 'lib/navs/index.styl';
25+
@import 'lib/sidebar-box/index.styl';
26+
@import 'lib/sub-header/index.styl';
27+
28+
// JS
29+
@import 'lib/modal/index.styl';
30+
@import 'lib/popover/index.styl';
31+
@import 'lib/prettify/index.styl';
32+
@import 'lib/quotes/index.styl';
33+
@import 'lib/tooltip/index.styl';
34+
@import 'lib/try-banner/index.styl';
35+
36+
37+
.bg-grey
38+
border-top: 1px solid #f1f1f1;
39+
border-bottom: 1px solid #f1f1f1;
40+
background: none;
41+
42+
43+
.help-circle
44+
max-height: 14px;
45+
max-width: 14px;
46+
opacity: .2;
47+
margin-left: 4px;
48+
position: relative;
49+
top: -2px;
50+
51+
&:hover
52+
opacity: 1;
53+
54+
section.section
55+
margin-bottom: 80px;
56+
57+
@media screen and (max-width: 992px)
58+
.zopim
59+
display: none
60+

index.jade renamed to landing/index.jade

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ html
77
title Styleguide
88

99
link(href='index.css', rel='stylesheet')
10-
link(href='styleguide.css', rel='stylesheet')
10+
link(href='landing.css', rel='stylesheet')
1111
link(rel="shortcut icon", href="img/favicon.png")
1212
link(href="https://cdn.auth0.com/web-header/latest/standalone.css", rel='stylesheet')
1313
script(type='text/javascript', src='//cdn.auth0.com/web-header/latest/standalone.min.js')
@@ -142,11 +142,11 @@ html
142142

143143
h4
144144
a(name="logos") Logos
145-
include css/logos/index
145+
include ../lib/logos/demo
146146

147147
h5.styled
148148
a(name="colors") Colors
149-
include css/colors/index
149+
include ../lib/colors/demo
150150

151151
hr
152152

@@ -155,17 +155,17 @@ html
155155

156156
h5.styled
157157
a(name="typography") Typography
158-
include css/typography/index
158+
include ../lib/typography/demo
159159

160160

161161
h5.styled
162162
a(name="buttons") Buttons
163-
include css/buttons/index
163+
include ../lib/buttons/demo
164164

165165

166166
h5.styled
167167
a(name="icons") Icons
168-
include css/budicon/icons
168+
include ../lib/budicon/demo
169169

170170
hr
171171

@@ -174,36 +174,36 @@ html
174174

175175
h5.styled
176176
a(name="sub-header") Sub Header
177-
include components/sub-header/index
177+
include ../lib/sub-header/demo
178178

179179

180180
h5.styled
181181
a(name="footer") Footer
182-
include components/footer/index
182+
include ../lib/footer/demo
183183

184184

185185
h5.styled
186186
a(name="banner") Banner
187-
include components/banner/index
187+
include ../lib/banner/demo
188188

189189
h5.styled
190190
a(name="modal") Modal
191-
include js/modal/index
191+
include ../lib/modal/demo
192192

193193

194194
h5.styled
195195
a(name="center-title-content") Center Title Content
196-
include components/center-title-block/index
196+
include ../lib/center-title-block/demo
197197

198198

199199
h5.styled
200200
a(name="try-banner") Try Auth0
201-
include js/try-banner/index
201+
include ../lib/try-banner/demo
202202

203203

204204
h5.styled
205205
a(name="quotes") Quotes
206-
include js/quotes/index
206+
include ../lib/quotes/demo
207207

208208

209209

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'vars.styl';
1+
@import 'lib/vars/index.styl';
22
body
33
padding-bottom: 200px;
44
font-family: "proxima-nova";

0 commit comments

Comments
 (0)