bootstrap-sass 2.0.3.1 → 2.0.4.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of bootstrap-sass might be problematic. Click here for more details.

Files changed (28) hide show
  1. data/README.md +11 -2
  2. data/vendor/assets/javascripts/bootstrap-alert.js +1 -1
  3. data/vendor/assets/javascripts/bootstrap-button.js +1 -1
  4. data/vendor/assets/javascripts/bootstrap-carousel.js +1 -1
  5. data/vendor/assets/javascripts/bootstrap-collapse.js +1 -1
  6. data/vendor/assets/javascripts/bootstrap-dropdown.js +1 -1
  7. data/vendor/assets/javascripts/bootstrap-modal.js +1 -1
  8. data/vendor/assets/javascripts/bootstrap-popover.js +1 -1
  9. data/vendor/assets/javascripts/bootstrap-scrollspy.js +2 -2
  10. data/vendor/assets/javascripts/bootstrap-tab.js +1 -1
  11. data/vendor/assets/javascripts/bootstrap-tooltip.js +3 -3
  12. data/vendor/assets/javascripts/bootstrap-transition.js +1 -1
  13. data/vendor/assets/javascripts/bootstrap-typeahead.js +1 -1
  14. data/vendor/assets/stylesheets/_bootstrap-responsive.scss +12 -357
  15. data/vendor/assets/stylesheets/bootstrap/_component-animations.scss +2 -2
  16. data/vendor/assets/stylesheets/bootstrap/_dropdowns.scss +3 -3
  17. data/vendor/assets/stylesheets/bootstrap/_forms.scss +54 -79
  18. data/vendor/assets/stylesheets/bootstrap/_mixins.scss +31 -4
  19. data/vendor/assets/stylesheets/bootstrap/_navbar.scss +7 -6
  20. data/vendor/assets/stylesheets/bootstrap/_reset.scss +5 -0
  21. data/vendor/assets/stylesheets/bootstrap/_responsive-1200px-min.scss +26 -0
  22. data/vendor/assets/stylesheets/bootstrap/_responsive-767px-max.scss +136 -0
  23. data/vendor/assets/stylesheets/bootstrap/_responsive-768px-979px.scss +16 -0
  24. data/vendor/assets/stylesheets/bootstrap/_responsive-navbar.scss +147 -0
  25. data/vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss +41 -0
  26. data/vendor/assets/stylesheets/bootstrap/_type.scss +1 -4
  27. data/vendor/assets/stylesheets/bootstrap/_variables.scss +3 -0
  28. metadata +11 -6
@@ -0,0 +1,16 @@
1
+ // PORTRAIT TABLET TO DEFAULT DESKTOP
2
+ // ----------------------------------
3
+
4
+ @media (min-width: 768px) and (max-width: 979px) {
5
+
6
+ // Fixed grid
7
+ @include gridCore($gridColumnWidthTablet, $gridGutterWidthTablet);
8
+
9
+ // Fluid grid
10
+ @include gridFluid($fluidGridColumnWidthTablet, $fluidGridGutterWidthTablet);
11
+
12
+ // Input grid
13
+ @include gridInput($gridColumnWidthTablet, $gridGutterWidthTablet);
14
+
15
+ // No need to reset .thumbnails here since it's the same $gridGutterWidth
16
+ }
@@ -0,0 +1,147 @@
1
+ // TABLETS AND BELOW
2
+ // -----------------
3
+ @media (max-width: 979px) {
4
+
5
+ // UNFIX THE TOPBAR
6
+ // ----------------
7
+ // Remove any padding from the body
8
+ body {
9
+ padding-top: 0;
10
+ }
11
+ // Unfix the navbar
12
+ .navbar-fixed-top, .navbar-fixed-bottom {
13
+ position: static;
14
+ }
15
+ .navbar-fixed-top {
16
+ margin-bottom: $baseLineHeight;
17
+ }
18
+ .navbar-fixed-bottom {
19
+ margin-top: $baseLineHeight;
20
+ }
21
+ .navbar-fixed-top .navbar-inner, .navbar-fixed-bottom .navbar-inner {
22
+ padding: 5px;
23
+ }
24
+ .navbar .container {
25
+ width: auto;
26
+ padding: 0;
27
+ }
28
+ // Account for brand name
29
+ .navbar .brand {
30
+ padding-left: 10px;
31
+ padding-right: 10px;
32
+ margin: 0 0 0 -5px;
33
+ }
34
+
35
+ // COLLAPSIBLE NAVBAR
36
+ // ------------------
37
+ // Nav collapse clears brand
38
+ .nav-collapse {
39
+ clear: both;
40
+ }
41
+ // Block-level the nav
42
+ .nav-collapse .nav {
43
+ float: none;
44
+ margin: 0 0 ($baseLineHeight / 2);
45
+ }
46
+ .nav-collapse .nav > li {
47
+ float: none;
48
+ }
49
+ .nav-collapse .nav > li > a {
50
+ margin-bottom: 2px;
51
+ }
52
+ .nav-collapse .nav > .divider-vertical {
53
+ display: none;
54
+ }
55
+ .nav-collapse .nav .nav-header {
56
+ color: $navbarText;
57
+ text-shadow: none;
58
+ }
59
+ // Nav and dropdown links in navbar
60
+ .nav-collapse .nav > li > a, .nav-collapse .dropdown-menu a {
61
+ padding: 6px 15px;
62
+ font-weight: bold;
63
+ color: $navbarLinkColor;
64
+ @include border-radius(3px);
65
+ }
66
+ // Buttons
67
+ .nav-collapse .btn {
68
+ padding: 4px 10px 4px;
69
+ font-weight: normal;
70
+ @include border-radius(4px);
71
+ }
72
+ .nav-collapse .dropdown-menu li + li a {
73
+ margin-bottom: 2px;
74
+ }
75
+ .nav-collapse .nav > li > a:hover, .nav-collapse .dropdown-menu a:hover {
76
+ background-color: $navbarBackground;
77
+ }
78
+ // Buttons in the navbar
79
+ .nav-collapse.in .btn-group {
80
+ margin-top: 5px;
81
+ padding: 0;
82
+ }
83
+ // Dropdowns in the navbar
84
+ .nav-collapse .dropdown-menu {
85
+ position: static;
86
+ top: auto;
87
+ left: auto;
88
+ float: none;
89
+ display: block;
90
+ max-width: none;
91
+ margin: 0 15px;
92
+ padding: 0;
93
+ background-color: transparent;
94
+ border: none;
95
+ @include border-radius(0);
96
+ @include box-shadow(none);
97
+ }
98
+ .nav-collapse .dropdown-menu:before, .nav-collapse .dropdown-menu:after {
99
+ display: none;
100
+ }
101
+ .nav-collapse .dropdown-menu .divider {
102
+ display: none;
103
+ }
104
+ // Forms in navbar
105
+ .nav-collapse .navbar-form, .nav-collapse .navbar-search {
106
+ float: none;
107
+ padding: ($baseLineHeight / 2) 15px;
108
+ margin: ($baseLineHeight / 2) 0;
109
+ border-top: 1px solid $navbarBackground;
110
+ border-bottom: 1px solid $navbarBackground;
111
+ @include box-shadow(#{inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)});
112
+ }
113
+ // Pull right (secondary) nav content
114
+ .navbar .nav-collapse .nav.pull-right {
115
+ float: none;
116
+ margin-left: 0;
117
+ }
118
+ // Hide everything in the navbar save .brand and toggle button */
119
+ .nav-collapse,
120
+ .nav-collapse.collapse {
121
+ overflow: hidden;
122
+ height: 0;
123
+ }
124
+ // Navbar button
125
+ .navbar .btn-navbar {
126
+ display: block;
127
+ }
128
+
129
+ // STATIC NAVBAR
130
+ // -------------
131
+ .navbar-static .navbar-inner {
132
+ padding-left: 10px;
133
+ padding-right: 10px;
134
+ }
135
+ }
136
+
137
+
138
+ // DEFAULT DESKTOP
139
+ // ---------------
140
+
141
+ // Required to make the collapsing navbar work on regular desktops
142
+ @media (min-width: 980px) {
143
+ .nav-collapse.collapse {
144
+ height: auto !important;
145
+ overflow: visible !important;
146
+ }
147
+ }
@@ -0,0 +1,41 @@
1
+ // RESPONSIVE CLASSES
2
+ // ------------------
3
+
4
+ // Hide from screenreaders and browsers
5
+ // Credit: HTML5 Boilerplate
6
+ .hidden {
7
+ display: none;
8
+ visibility: hidden;
9
+ }
10
+
11
+ // Visibility utilities
12
+
13
+ // For desktops
14
+ .visible-phone { display: none !important; }
15
+ .visible-tablet { display: none !important; }
16
+ .visible-desktop { } // Don't set initially
17
+ .hidden-phone { }
18
+ .hidden-tablet { }
19
+ .hidden-desktop { display: none !important; }
20
+
21
+ // Phones only
22
+ @media (max-width: 767px) {
23
+ // Show
24
+ .visible-phone { display: inherit !important; } // Use inherit to restore previous behavior
25
+ // Hide
26
+ .hidden-phone { display: none !important; }
27
+ // Hide everything else
28
+ .hidden-desktop { display: inherit !important; }
29
+ .visible-desktop { display: none !important; }
30
+ }
31
+
32
+ // Tablets & small desktops only
33
+ @media (min-width: 768px) and (max-width: 979px) {
34
+ // Show
35
+ .visible-tablet { display: inherit !important; }
36
+ // Hide
37
+ .hidden-tablet { display: none !important; }
38
+ // Hide everything else
39
+ .hidden-desktop { display: inherit !important; }
40
+ .visible-desktop { display: none !important ; }
41
+ }
@@ -8,9 +8,6 @@
8
8
 
9
9
  p {
10
10
  margin: 0 0 $baseLineHeight / 2;
11
- font-family: $baseFontFamily;
12
- font-size: $baseFontSize;
13
- line-height: $baseLineHeight;
14
11
  small {
15
12
  font-size: $baseFontSize - 2;
16
13
  color: $grayLight;
@@ -166,7 +163,7 @@ em {
166
163
  // Abbreviations and acronyms
167
164
  abbr[title] {
168
165
  cursor: help;
169
- border-bottom: 1px dotted #ddd;
166
+ border-bottom: 1px dotted $grayLight;
170
167
  }
171
168
 
172
169
  abbr.initialism {
@@ -103,6 +103,9 @@ $dropdownLinkColor: $grayDark !default;
103
103
  $dropdownLinkColorHover: $white !default;
104
104
  $dropdownLinkBackgroundHover: $linkColor !default;
105
105
 
106
+ $dropdownDividerTop: #e5e5e5 !default;
107
+ $dropdownDividerBottom: $white !default;
108
+
106
109
 
107
110
  // COMPONENT VARIABLES
108
111
  // --------------------------------------------------
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bootstrap-sass
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.3.1
4
+ version: 2.0.4.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-05-22 00:00:00.000000000 Z
12
+ date: 2012-06-26 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: compass
16
- requirement: &70113493301080 !ruby/object:Gem::Requirement
16
+ requirement: &70232742167840 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :development
23
23
  prerelease: false
24
- version_requirements: *70113493301080
24
+ version_requirements: *70232742167840
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: sass-rails
27
- requirement: &70113493300560 !ruby/object:Gem::Requirement
27
+ requirement: &70232742167180 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,7 +32,7 @@ dependencies:
32
32
  version: '3.1'
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *70113493300560
35
+ version_requirements: *70232742167180
36
36
  description:
37
37
  email: tom@conceptcoding.co.uk
38
38
  executables: []
@@ -65,6 +65,11 @@ files:
65
65
  - vendor/assets/stylesheets/bootstrap/_popovers.scss
66
66
  - vendor/assets/stylesheets/bootstrap/_progress-bars.scss
67
67
  - vendor/assets/stylesheets/bootstrap/_reset.scss
68
+ - vendor/assets/stylesheets/bootstrap/_responsive-1200px-min.scss
69
+ - vendor/assets/stylesheets/bootstrap/_responsive-767px-max.scss
70
+ - vendor/assets/stylesheets/bootstrap/_responsive-768px-979px.scss
71
+ - vendor/assets/stylesheets/bootstrap/_responsive-navbar.scss
72
+ - vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss
68
73
  - vendor/assets/stylesheets/bootstrap/_scaffolding.scss
69
74
  - vendor/assets/stylesheets/bootstrap/_sprites.scss
70
75
  - vendor/assets/stylesheets/bootstrap/_tables.scss