Skip to content

Commit c034d0b

Browse files
ZenCocoonZenCocoon
committed
Merge pull request #140 from BookingSync/bootstrap-bookingsync-sass
Use bootstrap-bookingsync-sass for layout
2 parents 856599e + c903d62 commit c034d0b

23 files changed

+394
-267
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ output/
33
tmp/
44
.DS_Store
55
crash.log
6+
.sass-cache

‎Gemfile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ gem "coderay"
1010
gem "kramdown"
1111
gem "pygments.rb"
1212
gem "nokogiri"
13+
gem 'uglifier'
14+
gem 'nanoc-sprockets3'
15+
gem "bootstrap-bookingsync-sass"

‎Gemfile.lock‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,29 @@ GEM
33
specs:
44
adsf (1.2.0)
55
rack (>= 1.0.0)
6+
autoprefixer-rails (6.1.2)
7+
execjs
8+
json
9+
bootstrap-bookingsync-sass (0.0.13)
10+
bootstrap-sass (>= 3.3.5)
11+
bootstrap-sass (3.3.6)
12+
autoprefixer-rails (>= 5.2.1)
13+
sass (>= 3.3.4)
614
celluloid (0.15.2)
715
timers (~> 1.1.0)
816
celluloid-io (0.15.0)
917
celluloid (>= 0.15.0)
1018
nio4r (>= 0.5.0)
1119
coderay (1.1.0)
1220
colored (1.2)
21+
concurrent-ruby (1.0.0)
1322
cri (2.7.0)
1423
colored (~> 1.2)
1524
em-websocket (0.5.0)
1625
eventmachine (>= 0.12.9)
1726
http_parser.rb (~> 0.5.3)
1827
eventmachine (1.0.3)
28+
execjs (2.6.0)
1929
ffi (1.9.3)
2030
formatador (0.2.4)
2131
guard (2.5.1)
@@ -37,6 +47,7 @@ GEM
3747
guard-pow (2.0.0)
3848
guard (~> 2.0)
3949
http_parser.rb (0.5.3)
50+
json (1.8.3)
4051
kramdown (1.3.2)
4152
listen (2.7.0)
4253
celluloid (>= 0.15.2)
@@ -49,6 +60,8 @@ GEM
4960
multi_json (1.9.0)
5061
nanoc (3.8.0)
5162
cri (~> 2.3)
63+
nanoc-sprockets3 (1.0.5)
64+
sprockets (~> 3.2, >= 3.0.0)
5265
nio4r (1.0.0)
5366
nokogiri (1.6.1)
5467
mini_portile (~> 0.5.0)
@@ -64,25 +77,35 @@ GEM
6477
rb-fsevent (0.9.4)
6578
rb-inotify (0.9.3)
6679
ffi (>= 0.5.0)
80+
sass (3.4.19)
6781
slop (3.4.7)
82+
sprockets (3.5.2)
83+
concurrent-ruby (~> 1.0)
84+
rack (> 1, < 3)
6885
thor (0.18.1)
6986
timers (1.1.0)
87+
uglifier (2.7.2)
88+
execjs (>= 0.3.0)
89+
json (>= 1.8.0)
7090
yajl-ruby (1.1.0)
7191

7292
PLATFORMS
7393
ruby
7494

7595
DEPENDENCIES
7696
adsf
97+
bootstrap-bookingsync-sass
7798
coderay
7899
guard-bundler
79100
guard-livereload
80101
guard-nanoc
81102
guard-pow
82103
kramdown
83104
nanoc
105+
nanoc-sprockets3
84106
nokogiri
85107
pygments.rb
108+
uglifier
86109

87110
BUNDLED WITH
88-
1.10.4
111+
1.11.2

‎Rules‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
# item, use the pattern “/about/*/”; “/about/*” will also select the parent,
1414
# because “*” matches zero or more characters.
1515

16+
ignore '/assets/stylesheets/_*'
17+
1618
compile '/static/*' do
1719
end
1820

@@ -30,13 +32,24 @@ compile '/reference/*' do
3032
layout item[:layout] || 'reference'
3133
end
3234

35+
compile %r{/assets/(stylesheets|javascripts)/.+/} do
36+
filter :sprockets, {
37+
:css_compressor => :scss,
38+
:js_compressor => :uglifier
39+
}
40+
end
41+
3342
compile '*' do
3443
filter :erb
3544
filter :kramdown, toc_levels: [2], header_offset: 1, enable_coderay: false
3645
filter :colorize_syntax, default_colorizer: :pygmentsrb
3746
layout item[:layout] || 'default'
3847
end
3948

49+
route '/assets/*/' do
50+
Nanoc::Sprockets::Helper.asset_path(item)
51+
end
52+
4053
route '/CNAME' do
4154
'/CNAME'
4255
end

‎content/assets/javascripts/application.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
//= require bootstrap-sprockets

‎content/assets/stylesheets/_animate.scss‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
.animated {
2+
animation-duration: 1s;
3+
animation-fill-mode: both;
4+
}
5+
6+
.animated.infinite {
7+
animation-iteration-count: infinite;
8+
}
9+
10+
.animated.hinge {
11+
animation-duration: 2s;
12+
}
13+
14+
@keyframes heartbeat {
15+
0%, 30%, 70%, 100% {
16+
transform: scale3d(1, 1, 1);
17+
}
18+
19+
50% {
20+
transform: scale3d(1.05, 1.05, 1.05);
21+
}
22+
}
23+
24+
.heartbeat {
25+
animation-name: heartbeat;
26+
}

‎content/assets/stylesheets/_base.scss‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
.content {
2+
padding-top: 30px;
3+
padding-bottom: 40px;
4+
}
5+
6+
.reference-body h3,
7+
.reference-body h4,
8+
.reference-body h5,
9+
.reference-body h6 {
10+
margin-top: 2em;
11+
}
12+
13+
.reference-body h3+h4 {
14+
margin-top: 1em;
15+
}
16+
17+
.reference-body .nav-pills {
18+
border-bottom: 2px solid $nav-pills-active-link-hover-bg;
19+
}
20+
21+
.reference-body .nav-pills a {
22+
border-radius: 0;
23+
}

‎content/assets/stylesheets/_bootstrap-bookingsync-custom.scss‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
// Core variables and mixins
2+
@import "bootstrap/variables";
3+
@import "bookingsync/variables";
4+
@import "bootstrap/mixins";
5+
6+
@import "variables";
7+
@import "mixins";
8+
9+
// Reset and dependencies
10+
@import "bootstrap/normalize";
11+
@import "bootstrap/print";
12+
// @import "bootstrap/glyphicons";
13+
14+
// Core CSS
15+
@import "bootstrap/scaffolding";
16+
@import "bootstrap/type";
17+
@import "bootstrap/code";
18+
@import "bootstrap/grid";
19+
@import "bootstrap/tables";
20+
@import "bootstrap/forms";
21+
@import "bootstrap/buttons";
22+
23+
// Components
24+
@import "bootstrap/component-animations";
25+
// @import "bootstrap/dropdowns";
26+
// @import "bootstrap/button-groups";
27+
// @import "bootstrap/input-groups";
28+
@import "bootstrap/navs";
29+
@import "bootstrap/navbar";
30+
// @import "bootstrap/breadcrumbs";
31+
// @import "bootstrap/pagination";
32+
// @import "bootstrap/pager";
33+
// @import "bootstrap/labels";
34+
// @import "bootstrap/badges";
35+
@import "bootstrap/jumbotron";
36+
// @import "bootstrap/thumbnails";
37+
// @import "bootstrap/alerts";
38+
// @import "bootstrap/progress-bars";
39+
@import "bootstrap/media";
40+
@import "bootstrap/list-group";
41+
@import "bootstrap/panels";
42+
@import "bootstrap/responsive-embed";
43+
// @import "bootstrap/wells";
44+
// @import "bootstrap/close";
45+
46+
// Components w/ JavaScript
47+
// @import "bootstrap/modals";
48+
// @import "bootstrap/tooltip";
49+
// @import "bootstrap/popovers";
50+
// @import "bootstrap/carousel";
51+
52+
// Utility classes
53+
@import "bootstrap/utilities";
54+
@import "bootstrap/responsive-utilities";
55+
56+
@import "bookingsync/theme";
57+
@import "bookingsync/layout";
58+
// @import "bookingsync/form";
59+
// @import "bookingsync/chosen";
60+
// @import "bookingsync/switch";
61+
// @import "bookingsync/smiles";
62+
// @import "bookingsync/utilities";

‎content/assets/stylesheets/_buttons.scss‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
.btn-xl {
2+
@media (min-width: $screen-sm) {
3+
@include button-size(($padding-large-vertical * 2),
4+
($padding-large-horizontal * 2),
5+
($font-size-large * 1.5),
6+
$line-height-large,
7+
$btn-border-radius-large);
8+
}
9+
}
10+
11+
.btn-outline-white {
12+
@include button-outline-variant(#FFF);
13+
}

‎content/assets/stylesheets/_callout.scss‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
.callout {
2+
padding: 20px;
3+
margin: 20px 0;
4+
border: 1px solid #eee;
5+
border-left-width: 5px;
6+
border-radius: 3px;
7+
}
8+
9+
.callout h4 {
10+
margin-top: 0;
11+
margin-bottom: 5px;
12+
}
13+
14+
.callout-warning {
15+
border-left-color: #ffaf2a;
16+
}
17+
18+
.callout-warning h4 {
19+
color: #ffaf2a;
20+
}
21+
22+
.callout-info {
23+
border-left-color: #2089c8;
24+
}
25+
26+
.callout-info h4 {
27+
color: #2089c8;
28+
}

0 commit comments

Comments
 (0)