twbs_sass_rails 0.2.0 → 0.3.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (131) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +17 -8
  3. data/CONTRIBUTING.md +4 -4
  4. data/Gemfile.lock +52 -65
  5. data/LICENSE +2 -2
  6. data/README.md +48 -18
  7. data/Rakefile +67 -32
  8. data/app/assets/fonts/fontawesome-webfont.eot +0 -0
  9. data/app/assets/fonts/fontawesome-webfont.svg +23 -8
  10. data/app/assets/fonts/fontawesome-webfont.ttf +0 -0
  11. data/app/assets/fonts/fontawesome-webfont.woff +0 -0
  12. data/app/assets/fonts/glyphicons-halflings-regular.eot +0 -0
  13. data/app/assets/fonts/glyphicons-halflings-regular.svg +200 -199
  14. data/app/assets/fonts/glyphicons-halflings-regular.ttf +0 -0
  15. data/app/assets/fonts/glyphicons-halflings-regular.woff +0 -0
  16. data/gemfiles/Gemfile.rails-3.2.x +2 -3
  17. data/gemfiles/Gemfile.rails-4.0.x +2 -3
  18. data/lib/generators/twbs_sass_rails/install/install_generator.rb +2 -2
  19. data/lib/generators/twbs_sass_rails/install/templates/{twbs-variables.css.less → twbs-variables.css.scss} +4 -3
  20. data/lib/generators/twbs_sass_rails/install/templates/{twbs.css.less → twbs.css.scss} +12 -7
  21. data/lib/twbs_sass_rails/version.rb +1 -1
  22. data/test/dummy/app/assets/stylesheets/{default-twbs.css.less → default-twbs.css.scss} +0 -0
  23. data/test/dummy/app/assets/stylesheets/test.css.scss +9 -0
  24. data/test/dummy/app/assets/stylesheets/twbs-variables.css.scss +7 -0
  25. data/test/dummy/app/assets/stylesheets/{twbs.css.less → twbs.css.scss} +12 -7
  26. data/test/dummy/config/application.rb +4 -1
  27. data/test/dummy/config/environments/development.rb +1 -1
  28. data/test/generators/install_generator_test.rb +4 -4
  29. data/test/integration/assets_precompile_integration_test.rb +11 -5
  30. data/test/integration/twbs_sass_rails_integration_test.rb +8 -7
  31. data/test/test_helper.rb +2 -4
  32. data/twbs_sass_rails.gemspec +6 -9
  33. data/vendor/assets/javascripts/respond.js +223 -212
  34. data/vendor/assets/javascripts/twbs/bootstrap/affix.js +36 -25
  35. data/vendor/assets/javascripts/twbs/bootstrap/alert.js +7 -17
  36. data/vendor/assets/javascripts/twbs/bootstrap/button.js +26 -28
  37. data/vendor/assets/javascripts/twbs/bootstrap/carousel.js +22 -34
  38. data/vendor/assets/javascripts/twbs/bootstrap/collapse.js +9 -18
  39. data/vendor/assets/javascripts/twbs/bootstrap/dropdown.js +25 -32
  40. data/vendor/assets/javascripts/twbs/bootstrap/modal.js +27 -30
  41. data/vendor/assets/javascripts/twbs/bootstrap/popover.js +16 -23
  42. data/vendor/assets/javascripts/twbs/bootstrap/scrollspy.js +19 -24
  43. data/vendor/assets/javascripts/twbs/bootstrap/tab.js +10 -20
  44. data/vendor/assets/javascripts/twbs/bootstrap/tooltip.js +54 -41
  45. data/vendor/assets/javascripts/twbs/bootstrap/transition.js +13 -21
  46. data/vendor/assets/stylesheets/fontawesome/_bordered-pulled.scss +16 -0
  47. data/vendor/assets/stylesheets/fontawesome/_core.scss +12 -0
  48. data/vendor/assets/stylesheets/fontawesome/_extras.scss +44 -0
  49. data/vendor/assets/stylesheets/fontawesome/_fixed-width.scss +6 -0
  50. data/vendor/assets/stylesheets/fontawesome/_icons.scss +412 -0
  51. data/vendor/assets/stylesheets/fontawesome/_larger.scss +13 -0
  52. data/vendor/assets/stylesheets/fontawesome/_list.scss +19 -0
  53. data/vendor/assets/stylesheets/fontawesome/_mixins.scss +20 -0
  54. data/vendor/assets/stylesheets/fontawesome/_path.scss +14 -0
  55. data/vendor/assets/stylesheets/fontawesome/_rotated-flipped.scss +9 -0
  56. data/vendor/assets/stylesheets/fontawesome/_spinning.scss +30 -0
  57. data/vendor/assets/stylesheets/fontawesome/_stacked.scss +20 -0
  58. data/vendor/assets/stylesheets/fontawesome/_variables.scss +381 -0
  59. data/vendor/assets/stylesheets/fontawesome/font-awesome.scss +17 -0
  60. data/vendor/assets/stylesheets/twbs/bootstrap/{alerts.less → _alerts.scss} +10 -10
  61. data/vendor/assets/stylesheets/twbs/bootstrap/{badges.less → _badges.scss} +19 -15
  62. data/vendor/assets/stylesheets/twbs/bootstrap/_breadcrumbs.scss +26 -0
  63. data/vendor/assets/stylesheets/twbs/bootstrap/{button-groups.less → _button-groups.scss} +38 -60
  64. data/vendor/assets/stylesheets/twbs/bootstrap/{buttons.less → _buttons.scss} +28 -34
  65. data/vendor/assets/stylesheets/twbs/bootstrap/{carousel.less → _carousel.scss} +38 -19
  66. data/vendor/assets/stylesheets/twbs/bootstrap/_close.scss +35 -0
  67. data/vendor/assets/stylesheets/twbs/bootstrap/_code.scss +63 -0
  68. data/vendor/assets/stylesheets/twbs/bootstrap/{component-animations.less → _component-animations.scss} +2 -2
  69. data/vendor/assets/stylesheets/twbs/bootstrap/{dropdowns.less → _dropdowns.scss} +53 -33
  70. data/vendor/assets/stylesheets/twbs/bootstrap/{forms.less → _forms.scss} +133 -79
  71. data/vendor/assets/stylesheets/twbs/bootstrap/{glyphicons.less → _glyphicons.scss} +16 -19
  72. data/vendor/assets/stylesheets/twbs/bootstrap/_grid.scss +100 -0
  73. data/vendor/assets/stylesheets/twbs/bootstrap/{input-groups.less → _input-groups.scss} +58 -29
  74. data/vendor/assets/stylesheets/twbs/bootstrap/_jumbotron.scss +44 -0
  75. data/vendor/assets/stylesheets/twbs/bootstrap/{labels.less → _labels.scss} +14 -8
  76. data/vendor/assets/stylesheets/twbs/bootstrap/_list-group.scss +110 -0
  77. data/vendor/assets/stylesheets/twbs/bootstrap/{media.less → _media.scss} +0 -0
  78. data/vendor/assets/stylesheets/twbs/bootstrap/_mixins.scss +931 -0
  79. data/vendor/assets/stylesheets/twbs/bootstrap/{modals.less → _modals.scss} +37 -40
  80. data/vendor/assets/stylesheets/twbs/bootstrap/_navbar.scss +620 -0
  81. data/vendor/assets/stylesheets/twbs/bootstrap/{navs.less → _navs.scss} +41 -52
  82. data/vendor/assets/stylesheets/twbs/bootstrap/{normalize.less → _normalize.scss} +148 -121
  83. data/vendor/assets/stylesheets/twbs/bootstrap/{pager.less → _pager.scss} +8 -8
  84. data/vendor/assets/stylesheets/twbs/bootstrap/_pagination.scss +88 -0
  85. data/vendor/assets/stylesheets/twbs/bootstrap/_panels.scss +230 -0
  86. data/vendor/assets/stylesheets/twbs/bootstrap/{popovers.less → _popovers.scss} +36 -36
  87. data/vendor/assets/stylesheets/twbs/bootstrap/{print.less → _print.scss} +6 -5
  88. data/vendor/assets/stylesheets/twbs/bootstrap/_progress-bars.scss +80 -0
  89. data/vendor/assets/stylesheets/twbs/bootstrap/_responsive-utilities.scss +80 -0
  90. data/vendor/assets/stylesheets/twbs/bootstrap/{scaffolding.less → _scaffolding.scss} +39 -24
  91. data/vendor/assets/stylesheets/twbs/bootstrap/{tables.less → _tables.scss} +42 -48
  92. data/vendor/assets/stylesheets/twbs/bootstrap/_theme.scss +247 -0
  93. data/vendor/assets/stylesheets/twbs/bootstrap/_thumbnails.scss +38 -0
  94. data/vendor/assets/stylesheets/twbs/bootstrap/_tooltip.scss +95 -0
  95. data/vendor/assets/stylesheets/twbs/bootstrap/_type.scss +296 -0
  96. data/vendor/assets/stylesheets/twbs/bootstrap/{utilities.less → _utilities.scss} +14 -3
  97. data/vendor/assets/stylesheets/twbs/bootstrap/_variables.scss +831 -0
  98. data/vendor/assets/stylesheets/twbs/bootstrap/{wells.less → _wells.scss} +6 -6
  99. data/vendor/assets/stylesheets/twbs/bootstrap/bootstrap.scss +48 -0
  100. data/vendor/assets/stylesheets/twbs/{bootstrap.less → bootstrap.scss} +0 -0
  101. metadata +94 -134
  102. data/test/dummy/app/assets/stylesheets/test.css.less +0 -5
  103. data/test/dummy/app/assets/stylesheets/twbs-variables.css.less +0 -6
  104. data/test/dummy/config/database.yml +0 -25
  105. data/test/dummy/db/.keep +0 -0
  106. data/vendor/assets/stylesheets/fontawesome/bootstrap.less +0 -84
  107. data/vendor/assets/stylesheets/fontawesome/core.less +0 -129
  108. data/vendor/assets/stylesheets/fontawesome/extras.less +0 -93
  109. data/vendor/assets/stylesheets/fontawesome/font-awesome.less +0 -33
  110. data/vendor/assets/stylesheets/fontawesome/icons.less +0 -381
  111. data/vendor/assets/stylesheets/fontawesome/mixins.less +0 -48
  112. data/vendor/assets/stylesheets/fontawesome/path.less +0 -14
  113. data/vendor/assets/stylesheets/fontawesome/variables.less +0 -735
  114. data/vendor/assets/stylesheets/twbs/bootstrap/bootstrap.less +0 -58
  115. data/vendor/assets/stylesheets/twbs/bootstrap/breadcrumbs.less +0 -23
  116. data/vendor/assets/stylesheets/twbs/bootstrap/close.less +0 -33
  117. data/vendor/assets/stylesheets/twbs/bootstrap/code.less +0 -56
  118. data/vendor/assets/stylesheets/twbs/bootstrap/grid.less +0 -346
  119. data/vendor/assets/stylesheets/twbs/bootstrap/jumbotron.less +0 -40
  120. data/vendor/assets/stylesheets/twbs/bootstrap/list-group.less +0 -88
  121. data/vendor/assets/stylesheets/twbs/bootstrap/mixins.less +0 -744
  122. data/vendor/assets/stylesheets/twbs/bootstrap/navbar.less +0 -621
  123. data/vendor/assets/stylesheets/twbs/bootstrap/pagination.less +0 -85
  124. data/vendor/assets/stylesheets/twbs/bootstrap/panels.less +0 -143
  125. data/vendor/assets/stylesheets/twbs/bootstrap/progress-bars.less +0 -96
  126. data/vendor/assets/stylesheets/twbs/bootstrap/responsive-utilities.less +0 -220
  127. data/vendor/assets/stylesheets/twbs/bootstrap/theme.less +0 -244
  128. data/vendor/assets/stylesheets/twbs/bootstrap/thumbnails.less +0 -32
  129. data/vendor/assets/stylesheets/twbs/bootstrap/tooltip.less +0 -95
  130. data/vendor/assets/stylesheets/twbs/bootstrap/type.less +0 -271
  131. data/vendor/assets/stylesheets/twbs/bootstrap/variables.less +0 -635
@@ -10,14 +10,6 @@
10
10
  // Kill the scroll on the body
11
11
  .modal-open {
12
12
  overflow: hidden;
13
-
14
-
15
- // Account for hiding of scrollbar
16
- body&,
17
- .navbar-fixed-top,
18
- .navbar-fixed-bottom {
19
- margin-right: 15px
20
- }
21
13
  }
22
14
 
23
15
  // Container that the modal scrolls within
@@ -30,33 +22,36 @@
30
22
  right: 0;
31
23
  bottom: 0;
32
24
  left: 0;
33
- z-index: @zindex-modal-background;
25
+ z-index: $zindex-modal;
26
+ -webkit-overflow-scrolling: touch;
27
+
28
+ // Prevent Chrome on Windows from adding a focus outline. For details, see
29
+ // https://github.com/twbs/bootstrap/pull/10951.
30
+ outline: 0;
34
31
 
35
32
  // When fading in the modal, animate it to slide down
36
33
  &.fade .modal-dialog {
37
- .translate(0, -25%);
38
- .transition-transform(~"0.3s ease-out");
34
+ @include translate(0, -25%);
35
+ @include transition-transform(0.3s ease-out);
39
36
  }
40
- &.in .modal-dialog { .translate(0, 0)}
37
+ &.in .modal-dialog { @include translate(0, 0)}
41
38
  }
42
39
 
43
40
  // Shell div to position the modal with bottom padding
44
41
  .modal-dialog {
45
- margin-left: auto;
46
- margin-right: auto;
42
+ position: relative;
47
43
  width: auto;
48
- padding: 10px;
49
- z-index: (@zindex-modal-background + 10);
44
+ margin: 10px;
50
45
  }
51
46
 
52
47
  // Actual modal
53
48
  .modal-content {
54
49
  position: relative;
55
- background-color: @modal-content-bg;
56
- border: 1px solid @modal-content-fallback-border-color; //old browsers fallback (ie8 etc)
57
- border: 1px solid @modal-content-border-color;
58
- border-radius: @border-radius-large;
59
- .box-shadow(0 3px 9px rgba(0,0,0,.5));
50
+ background-color: $modal-content-bg;
51
+ border: 1px solid $modal-content-fallback-border-color; //old browsers fallback (ie8 etc)
52
+ border: 1px solid $modal-content-border-color;
53
+ border-radius: $border-radius-large;
54
+ @include box-shadow(0 3px 9px rgba(0,0,0,.5));
60
55
  background-clip: padding-box;
61
56
  // Remove focus outline from opened modal
62
57
  outline: none;
@@ -69,19 +64,19 @@
69
64
  right: 0;
70
65
  bottom: 0;
71
66
  left: 0;
72
- z-index: (@zindex-modal-background - 10);
73
- background-color: @modal-backdrop-bg;
67
+ z-index: $zindex-modal-background;
68
+ background-color: $modal-backdrop-bg;
74
69
  // Fade for backdrop
75
- &.fade { .opacity(0); }
76
- &.in { .opacity(.5); }
70
+ &.fade { @include opacity(0); }
71
+ &.in { @include opacity($modal-backdrop-opacity); }
77
72
  }
78
73
 
79
74
  // Modal header
80
75
  // Top section of the modal w/ title and dismiss
81
76
  .modal-header {
82
- padding: @modal-title-padding;
83
- border-bottom: 1px solid @modal-header-border-color;
84
- min-height: (@modal-title-padding + @modal-title-line-height);
77
+ padding: $modal-title-padding;
78
+ border-bottom: 1px solid $modal-header-border-color;
79
+ min-height: ($modal-title-padding + $modal-title-line-height);
85
80
  }
86
81
  // Close icon
87
82
  .modal-header .close {
@@ -91,23 +86,23 @@
91
86
  // Title text within header
92
87
  .modal-title {
93
88
  margin: 0;
94
- line-height: @modal-title-line-height;
89
+ line-height: $modal-title-line-height;
95
90
  }
96
91
 
97
92
  // Modal body
98
93
  // Where all modal content resides (sibling of .modal-header and .modal-footer)
99
94
  .modal-body {
100
95
  position: relative;
101
- padding: @modal-inner-padding;
96
+ padding: $modal-inner-padding;
102
97
  }
103
98
 
104
99
  // Footer (for actions)
105
100
  .modal-footer {
106
101
  margin-top: 15px;
107
- padding: (@modal-inner-padding - 1) @modal-inner-padding @modal-inner-padding;
102
+ padding: ($modal-inner-padding - 1) $modal-inner-padding $modal-inner-padding;
108
103
  text-align: right; // right align buttons
109
- border-top: 1px solid @modal-footer-border-color;
110
- .clearfix(); // clear it in case folks use .pull-* classes on buttons
104
+ border-top: 1px solid $modal-footer-border-color;
105
+ @include clearfix(); // clear it in case folks use .pull-* classes on buttons
111
106
 
112
107
  // Properly space out buttons
113
108
  .btn + .btn {
@@ -125,17 +120,19 @@
125
120
  }
126
121
 
127
122
  // Scale up the modal
128
- @media screen and (min-width: @screen-sm) {
123
+ @media (min-width: $screen-sm-min) {
129
124
 
125
+ // Automatically set modal's width for larger viewports
130
126
  .modal-dialog {
131
- left: 50%;
132
- right: auto;
133
- width: 600px;
134
- padding-top: 30px;
135
- padding-bottom: 30px;
127
+ width: $modal-md;
128
+ margin: 30px auto;
136
129
  }
137
130
  .modal-content {
138
- .box-shadow(0 5px 15px rgba(0,0,0,.5));
131
+ @include box-shadow(0 5px 15px rgba(0,0,0,.5));
139
132
  }
140
133
 
134
+ // Modal sizes
135
+ .modal-sm { width: $modal-sm; }
136
+ .modal-lg { width: $modal-lg; }
137
+
141
138
  }