bootstrap-bookingsync-sass 1.0.0.beta6 → 1.0.0.beta7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (15) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +12 -0
  3. data/assets/javascripts/bookingsync/form.js +37 -27
  4. data/assets/stylesheets/bookingsync/_annotated-sections.scss +11 -4
  5. data/assets/stylesheets/bookingsync/_chosen.scss +9 -0
  6. data/assets/stylesheets/bookingsync/_form.scss +19 -6
  7. data/docs/Gemfile.lock +1 -1
  8. data/docs/content/assets/javascripts/application.js.coffee +0 -1
  9. data/docs/content/components/chosen.md +87 -17
  10. data/docs/content/compositions/_navbar.html +2 -0
  11. data/docs/content/compositions/compositions.md +40 -1
  12. data/docs/content/embed/annotated_section_with_frameless_content.html +46 -0
  13. data/docs/content/forms/forms.md +40 -32
  14. data/lib/bootstrap/bookingsync/version.rb +1 -1
  15. metadata +3 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a1b10e0bf2a0a81c114a2ea4e50191a4a518be54
4
- data.tar.gz: d0b2edf1acaaf3de8d7906fd11a26dc9f3fcca86
3
+ metadata.gz: 31af350522041c5f7ce6035f08b83d32933fd4be
4
+ data.tar.gz: 85d5ba1cdb4e6d84e6b0d82ea690e0b84b4fc752
5
5
  SHA512:
6
- metadata.gz: 600c32d276ae2c51bc15f471112bba8c5f9a17c2479c27169e9757b21ac85a125006a3657cf0f7ae1e4f21f48a209bfe4127a10846b2aac17e75b7d302be22b3
7
- data.tar.gz: 4bed43cbabf3ec6de92585c1d7868b34772cf2a4c13b2be9557a8d8ac3758df282ac1d827c12a7a5d916bf40fa08b003889683afe6a90ddeeac34ca16b1db260
6
+ metadata.gz: 89daf0a2347771e440c6803cd1c84422cc3a64ee52192fc809c73a4e69ba6c16aaf512420dcd1fbcea2da549ddea21c5b93cb44afc976a8acff06b3db03fd471
7
+ data.tar.gz: 778fa689d7e7935e1837e07fe26694bdf7a9dd666d9f6c6c19afad8b2e8ab9d4f558abb41de1cec5fd47e70c3dab5eb09448d5fbd3072d48ab9f650a76b596ef
data/CHANGELOG.md CHANGED
@@ -1,5 +1,17 @@
1
1
  ### master
2
2
 
3
+ ### 1.0.0.beta7 - 2016-08-22
4
+
5
+ * breaking changes
6
+ * require selects to have a `from-group` div
7
+
8
+ * bug fixes
9
+ * fix `select` and `chosen` styles
10
+ * fix `forms` initialization
11
+
12
+ * improvements
13
+ * add support for: frameless annotated section content
14
+
3
15
  ### 1.0.0.beta6 - 2016-08-20
4
16
 
5
17
  * improvements
data/assets/javascripts/bookingsync/form.js CHANGED
@@ -8,33 +8,43 @@
8
8
  +function ($) {
9
9
  'use strict';
10
10
 
11
- $('.form-group .form-control').each(function (index, e) {
12
- if ($(e).val() !== '') {
13
- $(e).parents('.form-group').addClass('filled');
14
- }
15
- });
16
- $('.checkbox input[type="checkbox"][disabled]').each(function (index, e) {
17
- $(e).parents('.checkbox').addClass('disabled');
18
- });
19
- $('.radio input[type="radio"][disabled]').each(function (index, e) {
20
- $(e).parents('.radio').addClass('disabled');
21
- });
22
- $('.form-group .form-control[disabled]').each(function (index, e) {
23
- $(e).parents('.form-group').addClass('disabled');
24
- });
25
- $('.form-group .form-control[readonly]').each(function (index, e) {
26
- $(e).parents('.form-group').addClass('readonly');
27
- });
28
- $(document).on('focus', '.form-group .form-control', function (e) {
29
- $(e.target).parents('.form-group').addClass('focused');
30
- });
31
- $(document).on('blur', '.form-group .form-control', function (e) {
32
- $(e.target).parents('.form-group').removeClass('focused');
11
+ $(document).on('ready', function() {
12
+ $('.form-group .form-control').each(function (index, e) {
13
+ if (!!$(e).val()) {
14
+ $(e).parents('.form-group').addClass('filled');
15
+ }
16
+ });
17
+ $('.checkbox input[type="checkbox"][disabled]').each(function (index, e) {
18
+ $(e).parents('.checkbox').addClass('disabled');
19
+ });
20
+ $('.radio input[type="radio"][disabled]').each(function (index, e) {
21
+ $(e).parents('.radio').addClass('disabled');
22
+ });
23
+ $('.form-group .form-control[disabled]').each(function (index, e) {
24
+ $(e).parents('.form-group').addClass('disabled');
25
+ });
26
+ $('.form-group .form-control[readonly]').each(function (index, e) {
27
+ $(e).parents('.form-group').addClass('readonly');
28
+ });
29
+ $(document).on('focus', '.form-group .form-control', function (e) {
30
+ $(e.target).parents('.form-group').addClass('focused');
31
+ });
32
+ $(document).on('chosen:showing_dropdown', 'select.form-control.chosen', function (e) {
33
+ $(e.target).parents('.form-group').addClass('focused');
34
+ });
35
+ $(document).on('chosen:hiding_dropdown', 'select.form-control.chosen', function (e) {
36
+ if (!$(e.target).val()) {
37
+ $(e.target).parents('.form-group').removeClass('focused');
38
+ }
39
+ });
40
+ $(document).on('blur', '.form-group .form-control', function (e) {
41
+ $(e.target).parents('.form-group').removeClass('focused');
33
42
 
34
- if ($(e.target).val() === '') {
35
- $(e.target).parents('.form-group').removeClass('filled');
36
- } else {
37
- $(e.target).parents('.form-group').addClass('filled');
38
- }
43
+ if (!$(e.target).val()) {
44
+ $(e.target).parents('.form-group').removeClass('filled');
45
+ } else {
46
+ $(e.target).parents('.form-group').addClass('filled');
47
+ }
48
+ });
39
49
  });
40
50
  }(jQuery);
data/assets/stylesheets/bookingsync/_annotated-sections.scss CHANGED
@@ -21,8 +21,15 @@ h2.annotated-section-title {
21
21
 
22
22
  .annotated-section-content {
23
23
  @include make-sm-column(8);
24
- border: 1px solid $sheet-border;
25
- background-color: $sheet-bg;
26
- border-radius: $sheet-border-radius;
27
- padding: $sheet-padding;
24
+
25
+ &:not(.annotated-section-content-frameless) {
26
+ border: 1px solid $sheet-border;
27
+ background-color: $sheet-bg;
28
+ border-radius: $sheet-border-radius;
29
+ padding: $sheet-padding;
30
+ }
31
+
32
+ &.annotated-section-content-frameless {
33
+ padding: 0;
34
+ }
28
35
  }
data/assets/stylesheets/bookingsync/_chosen.scss CHANGED
@@ -21,6 +21,10 @@
21
21
  }
22
22
  }
23
23
 
24
+ input.default {
25
+ visibility: hidden;
26
+ }
27
+
24
28
  .chosen-drop {
25
29
  @include box-shadow(none);
26
30
  border-radius: 0 0 ($border-radius-base * 2) ($border-radius-base * 2);
@@ -63,6 +67,11 @@
63
67
  }
64
68
  }
65
69
 
70
+ .chosen-container-active.chosen-with-drop .chosen-choices {
71
+ padding: 1px ceil($grid-gutter-width / 2);
72
+ margin-top: -3px;
73
+ }
74
+
66
75
  .chosen-container-multi .chosen-choices {
67
76
  li.search-choice {
68
77
  background: none;
data/assets/stylesheets/bookingsync/_form.scss CHANGED
@@ -11,6 +11,11 @@
11
11
  .form-group {
12
12
  margin-top: 0;
13
13
  }
14
+
15
+ button[type="submit"],
16
+ input[type="submit"] {
17
+ margin-top: 0;
18
+ }
14
19
  }
15
20
 
16
21
  // Form groups
@@ -26,10 +31,6 @@
26
31
  margin: 25px 0 0 0;
27
32
  padding: $label-padding-focus 0 $padding-base-vertical;
28
33
 
29
- &:first-of-type {
30
- margin-top: 0;
31
- }
32
-
33
34
  label {
34
35
  position: absolute;
35
36
  bottom: 0;
@@ -96,8 +97,6 @@
96
97
  }
97
98
 
98
99
  .select {
99
- margin-top: 25px;
100
-
101
100
  label {
102
101
  color: $label-color-filled;
103
102
  font-size: $label-font-size-filled;
@@ -135,6 +134,16 @@ fieldset[disabled] .form-control {
135
134
  opacity: .5;
136
135
  }
137
136
 
137
+ .radio, .checkbox {
138
+ margin-top: 15px;
139
+ margin-bottom: 15px;
140
+ }
141
+
142
+ button[type="submit"],
143
+ input[type="submit"] {
144
+ margin-top: 25px;
145
+ }
146
+
138
147
  // Common form controls
139
148
  //
140
149
  // Shared size and type resets for form controls. Apply `.form-control` to any
@@ -241,6 +250,10 @@ fieldset[disabled] .form-control {
241
250
  }
242
251
  }
243
252
 
253
+ .input-group label {
254
+ width: inherit;
255
+ }
256
+
244
257
  .has-success .input-group-addon {
245
258
  border-color: $state-success-border;
246
259
  }
data/docs/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: ../
3
3
  specs:
4
- bootstrap-bookingsync-sass (1.0.0.beta6)
4
+ bootstrap-bookingsync-sass (1.0.0.beta7)
5
5
  bootstrap-sass (>= 3.3.5)
6
6
 
7
7
  GEM
data/docs/content/assets/javascripts/application.js.coffee CHANGED
@@ -3,7 +3,6 @@
3
3
 
4
4
  //= require 'chosen'
5
5
 
6
-
7
6
  $ ->
8
7
  $(".chosen").chosen()
9
8
 
data/docs/content/components/chosen.md CHANGED
@@ -15,6 +15,36 @@
15
15
  </div>
16
16
 
17
17
  <div class="bs-example bs-sheet" data-example-id="chosen-select">
18
+ <div class="select">
19
+ <div class="form-group">
20
+ <label for="destination">Destination</label>
21
+ <select class="form-control chosen">
22
+ <option value=""></option>
23
+ <option value="One">One</option>
24
+ <option value="Two">Two</option>
25
+ <option value="Three">Three</option>
26
+ <option value="Four">Four</option>
27
+ </select>
28
+ </div>
29
+ </div>
30
+
31
+ <div class="select">
32
+ <div class="form-group">
33
+ <label for="destination">Destination</label>
34
+ <select class="form-control chosen">
35
+ <option value="One" selected>One (selected)</option>
36
+ <option value="Two">Two</option>
37
+ <option value="Three">Three</option>
38
+ <option value="Four">Four</option>
39
+ </select>
40
+ </div>
41
+ </div>
42
+ </div>
43
+ </div>
44
+ ~~~ HTML
45
+ <div class="select">
46
+ <div class="form-group">
47
+ <label for="destination">Destination</label>
18
48
  <select class="form-control chosen">
19
49
  <option value=""></option>
20
50
  <option value="One">One</option>
@@ -24,14 +54,18 @@
24
54
  </select>
25
55
  </div>
26
56
  </div>
27
- ~~~ HTML
28
- <select class="form-control chosen">
29
- <option value=""></option>
30
- <option value="One">One</option>
31
- <option value="Two">Two</option>
32
- <option value="Three">Three</option>
33
- <option value="Four">Four</option>
34
- </select>
57
+
58
+ <div class="select">
59
+ <div class="form-group">
60
+ <label for="destination">Destination</label>
61
+ <select class="form-control chosen">
62
+ <option value="One" selected>One (selected)</option>
63
+ <option value="Two">Two</option>
64
+ <option value="Three">Three</option>
65
+ <option value="Four">Four</option>
66
+ </select>
67
+ </div>
68
+ </div>
35
69
  ~~~
36
70
 
37
71
  <div class="example">
@@ -51,7 +85,38 @@
51
85
  </div>
52
86
 
53
87
  <div class="bs-example bs-sheet" data-example-id="chosen-multiple-select">
54
- <select class="form-control chosen" multiple tabindex="3">
88
+ <div class="select">
89
+ <div class="form-group">
90
+ <label for="destination">Destination</label>
91
+ <select class="form-control chosen" multiple>
92
+ <option value=""></option>
93
+ <option value="One">One</option>
94
+ <option value="Two">Two</option>
95
+ <option value="Three">Three</option>
96
+ <option value="Four">Four</option>
97
+ </select>
98
+ </div>
99
+ </div>
100
+
101
+ <div class="select">
102
+ <div class="form-group">
103
+ <label for="destination">Destination</label>
104
+ <select class="form-control chosen" multiple>
105
+ <option value=""></option>
106
+ <option value="One" selected>One (selected)</option>
107
+ <option value="Two" selected>Two (selected)</option>
108
+ <option value="Three">Three</option>
109
+ <option value="Four">Four</option>
110
+ </select>
111
+ </div>
112
+ </div>
113
+ </div>
114
+ </div>
115
+ ~~~ HTML
116
+ <div class="select">
117
+ <div class="form-group">
118
+ <label for="destination">Destination</label>
119
+ <select class="form-control chosen" multiple>
55
120
  <option value=""></option>
56
121
  <option value="One">One</option>
57
122
  <option value="Two">Two</option>
@@ -60,12 +125,17 @@
60
125
  </select>
61
126
  </div>
62
127
  </div>
63
- ~~~ HTML
64
- <select class="form-control chosen" multiple tabindex="3">
65
- <option value=""></option>
66
- <option value="One">One</option>
67
- <option value="Two">Two</option>
68
- <option value="Three">Three</option>
69
- <option value="Four">Four</option>
70
- </select>
128
+
129
+ <div class="select">
130
+ <div class="form-group">
131
+ <label for="destination">Destination</label>
132
+ <select class="form-control chosen" multiple>
133
+ <option value=""></option>
134
+ <option value="One" selected>One (selected)</option>
135
+ <option value="Two" selected>Two (selected)</option>
136
+ <option value="Three">Three</option>
137
+ <option value="Four">Four</option>
138
+ </select>
139
+ </div>
140
+ </div>
71
141
  ~~~
data/docs/content/compositions/_navbar.html CHANGED
@@ -17,6 +17,8 @@
17
17
  class: "list-group-item") %></li>
18
18
  <li><%= link_to("Annotated section with tabulated content",
19
19
  "#annotated-section-with-tabulated-content", class: "list-group-item") %></li>
20
+ <li><%= link_to("Annotated section with frameless content",
21
+ "#annotated-section-with-frameless-content", class: "list-group-item") %></li>
20
22
  <li><%= link_to("Fullscreen modal", "#fullscreen-modal",
21
23
  class: "list-group-item") %></li>
22
24
  </ul>
data/docs/content/compositions/compositions.md CHANGED
@@ -341,7 +341,7 @@
341
341
 
342
342
  <div class="example example-responsive">
343
343
  <div class="sheet-header">
344
- <h3 id="annotated-section">Annotated Section</h3>
344
+ <h3 id="annotated-section">Annotated section</h3>
345
345
  </div>
346
346
 
347
347
  <div class="bs-example bs-sheet bs-example-composition-body bs-example-iframe-container-desktop"
@@ -423,6 +423,45 @@
423
423
  </section>
424
424
  ~~~
425
425
 
426
+ <div class="example example-responsive">
427
+ <div class="sheet-header">
428
+ <h3 id="annotated-section-with-frameless-content">Annotated section with frameless content</h3>
429
+ </div>
430
+
431
+ <div class="bs-example bs-sheet bs-example-composition-body bs-example-iframe-container-desktop"
432
+ data-example-id="annotated-section-with-frameless-content">
433
+ <iframe class="bs-example-iframe" src="/embed/annotated_section_with_frameless_content/index.html"
434
+ frameborder="0"></iframe>
435
+ </div>
436
+ </div>
437
+ ~~~ html
438
+ <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
439
+ ...
440
+ </nav>
441
+ <section class="main-content">
442
+ <section class="annotated-section">
443
+ <header class="annotated-section-annotation">
444
+ <h2 class="annotated-section-title">Section Name</h2>
445
+ <p>Curabitur blandit tempus porttitor. Integer posuere erat a ante venenatis dapibus posuere velit aliquet.</p>
446
+ <p><a href="#">More Information</a></p>
447
+ </header>
448
+ <div class="annotated-section-content annotated-section-content-frameless">
449
+ <div class="panel panel-default">
450
+ <div class="panel-body">
451
+ <p>Panel 1</p>
452
+ </div>
453
+ </div>
454
+
455
+ <div class="panel panel-default">
456
+ <div class="panel-body">
457
+ <p>Panel 2</p>
458
+ </div>
459
+ </div>
460
+ </div>
461
+ </section>
462
+ </section>
463
+ ~~~
464
+
426
465
  <div class="example">
427
466
  <div class="sheet-header">
428
467
  <h3 id="fullscreen-modal">Fullscreen modal</h3>
data/docs/content/embed/annotated_section_with_frameless_content.html ADDED
@@ -0,0 +1,46 @@
1
+ <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
2
+ <div class="container-fluid">
3
+ <div class="navbar-header">
4
+ <button type="button" class="navbar-toggle navbar-toggle-context"
5
+ data-toggle="collapse" data-target=".navbar-top-collapse">
6
+ <span class="sr-only">Toggle Navigation</span>
7
+ <span class="icon-bar"></span>
8
+ <span class="icon-bar"></span>
9
+ <span class="icon-bar"></span>
10
+ </button>
11
+ <div class="navbar-brand-container">
12
+ <span class="navbar-brand">
13
+ <h1 class="text-overflow"><i class="icon-reviews"></i> Section Name</h1>
14
+ </span>
15
+ </div>
16
+ </div>
17
+ <div class="collapse navbar-collapse navbar-top-collapse">
18
+ <div class="navbar-right">
19
+ <button class="btn btn-secondary navbar-btn" type="button">Button</button>
20
+ <button class="btn btn-primary navbar-btn" type="button">Call to action</button>
21
+ </div>
22
+ </div>
23
+ </div>
24
+ </nav>
25
+ <section class="main-content">
26
+ <section class="annotated-section">
27
+ <header class="annotated-section-annotation">
28
+ <h2 class="annotated-section-title">Section Name</h2>
29
+ <p>Curabitur blandit tempus porttitor. Integer posuere erat a ante venenatis dapibus posuere velit aliquet.</p>
30
+ <p><a href="#">More Information</a></p>
31
+ </header>
32
+ <div class="annotated-section-content annotated-section-content-frameless">
33
+ <div class="panel panel-default">
34
+ <div class="panel-body">
35
+ <p>Panel 1</p>
36
+ </div>
37
+ </div>
38
+
39
+ <div class="panel panel-default">
40
+ <div class="panel-body">
41
+ <p>Panel 2</p>
42
+ </div>
43
+ </div>
44
+ </div>
45
+ </section>
46
+ </section>
data/docs/content/forms/forms.md CHANGED
@@ -485,14 +485,16 @@
485
485
  <div class="bs-example bs-sheet" data-example-id="select">
486
486
  <form>
487
487
  <div class="select">
488
- <label for="destination">Destination</label>
489
- <select class="form-control" id="destination">
490
- <option>1</option>
491
- <option>2</option>
492
- <option>3</option>
493
- <option>4</option>
494
- <option>5</option>
495
- </select>
488
+ <div class="form-group">
489
+ <label for="destination">Destination</label>
490
+ <select class="form-control" id="destination">
491
+ <option>1</option>
492
+ <option>2</option>
493
+ <option>3</option>
494
+ <option>4</option>
495
+ <option>5</option>
496
+ </select>
497
+ </div>
496
498
  </div>
497
499
  </form>
498
500
  </div>
@@ -500,14 +502,16 @@
500
502
 
501
503
  ~~~ html
502
504
  <div class="select">
503
- <label for="destination">Destination</label>
504
- <select class="form-control" id="destination">
505
- <option>1</option>
506
- <option>2</option>
507
- <option>3</option>
508
- <option>4</option>
509
- <option>5</option>
510
- </select>
505
+ <div class="form-group">
506
+ <label for="destination">Destination</label>
507
+ <select class="form-control" id="destination">
508
+ <option>1</option>
509
+ <option>2</option>
510
+ <option>3</option>
511
+ <option>4</option>
512
+ <option>5</option>
513
+ </select>
514
+ </div>
511
515
  </div>
512
516
  ~~~
513
517
 
@@ -528,28 +532,32 @@
528
532
  <div class="bs-example bs-sheet" data-example-id="multiple-select">
529
533
  <form>
530
534
  <div class="select">
531
- <label for="destinations">Destinations</label>
532
- <select multiple class="form-control" id="destinations">
533
- <option>1</option>
534
- <option>2</option>
535
- <option>3</option>
536
- <option>4</option>
537
- <option>5</option>
538
- </select>
535
+ <div class="form-group">
536
+ <label for="destinations">Destinations</label>
537
+ <select multiple class="form-control" id="destinations">
538
+ <option>1</option>
539
+ <option>2</option>
540
+ <option>3</option>
541
+ <option>4</option>
542
+ <option>5</option>
543
+ </select>
544
+ </div>
539
545
  </div>
540
546
  </form>
541
547
  </div>
542
548
  </div>
543
549
  ~~~ html
544
550
  <div class="select">
545
- <label for="destinations">Destinations</label>
546
- <select multiple class="form-control" id="destinations">
547
- <option>1</option>
548
- <option>2</option>
549
- <option>3</option>
550
- <option>4</option>
551
- <option>5</option>
552
- </select>
551
+ <div class="form-group">
552
+ <label for="destinations">Destinations</label>
553
+ <select multiple class="form-control" id="destinations">
554
+ <option>1</option>
555
+ <option>2</option>
556
+ <option>3</option>
557
+ <option>4</option>
558
+ <option>5</option>
559
+ </select>
560
+ </div>
553
561
  </div>
554
562
  ~~~
555
563
 
data/lib/bootstrap/bookingsync/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bootstrap
2
2
  module BookingSync
3
- VERSION = '1.0.0.beta6'
3
+ VERSION = '1.0.0.beta7'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bootstrap-bookingsync-sass
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0.beta6
4
+ version: 1.0.0.beta7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sebastien Grosjean
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-08-20 00:00:00.000000000 Z
11
+ date: 2016-08-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bootstrap-sass
@@ -145,6 +145,7 @@ files:
145
145
  - docs/content/compositions/_navbar.html
146
146
  - docs/content/compositions/compositions.md
147
147
  - docs/content/embed/annotated_section.html
148
+ - docs/content/embed/annotated_section_with_frameless_content.html
148
149
  - docs/content/embed/annotated_section_with_tabulated_content.html
149
150
  - docs/content/embed/app_admin.html
150
151
  - docs/content/embed/app_admin__content.html