contour 2.1.0.beta9 → 2.1.0.beta10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/bootstrap-overrides.css +57 -27
  3. data/app/views/contour/layouts/_per_page.html.erb +2 -0
  4. data/lib/contour/version.rb +1 -1
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f95173b0be23bb0b7a5cba163298143ebe575271
4
- data.tar.gz: db57c272ed7efb39ca088a195627e606f1c97e52
3
+ metadata.gz: 6776e6885155bb634ed79e9972eca4bb04484be1
4
+ data.tar.gz: 563b6159d39f13d55ccaf7e2b3dfb670843d8e85
5
5
  SHA512:
6
- metadata.gz: c359b629c089a6a957e7b38db4c3b1d9ac5ac71aa74218136fd7ac43e54807e07d96f21fd29ea5bb22dd0f64cb125b744f5c025c23537c62c220ac0a43a6ee36
7
- data.tar.gz: d307eca5900c72e7cee36247542b442ab1300c512e671635d042afb64ab82955ef535defa66bb68858cd1fe52167b89c492988692e36afd4468d4b5427b6175b
6
+ metadata.gz: 5cd3a183b064d1f26a2a38e31f2c0096c09cb5b33c9d7223744f107b951145839d0836a46619456ad4a72eb1d978d800af20c31b2e361b733d2cb46e29ad2ab8
7
+ data.tar.gz: 0f46a81f6f5ae183b10686d624f073096c264effe52248fcb0b987520a791e25be737c5fd06a22315aad1788ddba600d5275cc79b7f1d00f27b15ef5bf3ef9e6
data/app/assets/stylesheets/bootstrap-overrides.css CHANGED
@@ -1,23 +1,26 @@
1
1
  /* bootstrap-base-overrides.css */
2
2
  /* These overrides come after bootstrap.css */
3
3
 
4
- .navbar-inverse .navbar-brand {
5
- color: #ffffff;
6
- }
4
+ body { padding-top: 50px; padding-bottom: 90px; }
7
5
 
8
- /* Line 4853 */
9
- .navbar-inverse .nav li.dropdown.open > .dropdown-toggle,
10
- .navbar-inverse .nav li.dropdown.active > .dropdown-toggle,
11
- .navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle {
12
- /*background-color: transparent;*/
13
- }
14
-
15
- body { padding-top: 50px; padding-bottom: 70px; }
6
+ /* Skinnier titles */
16
7
 
17
8
  h1, h2, h3, h4, h5, h6 {
18
9
  font-weight: 300;
19
10
  }
20
11
 
12
+ /* Make sure navbar brand does not wrap onto two lines */
13
+
14
+ .navbar-brand {
15
+ white-space: nowrap;
16
+ }
17
+
18
+ .navbar-inverse .navbar-brand {
19
+ color: #ffffff;
20
+ }
21
+
22
+ /* Add spacing for definition lists */
23
+
21
24
  dt, dd {
22
25
  line-height: 18px;
23
26
  min-height: 40px;
@@ -28,6 +31,44 @@ dt, dd {
28
31
  overflow: visible;
29
32
  }
30
33
 
34
+ /* Modify the page-header class to look differently on mobile and larger screen */
35
+ .page-header {
36
+ text-align: center;
37
+ }
38
+
39
+ .page-header h1, .page-header .h1 {
40
+ font-size: 30px
41
+ }
42
+
43
+ @media screen and (min-width: 768px) {
44
+ .page-header {
45
+ text-align: left;
46
+ }
47
+
48
+ .page-header h1, .page-header .h1 {
49
+ font-size: 38px
50
+ }
51
+ }
52
+
53
+ /* Make sure datepicker shows up ontop of bootstrap modals */
54
+ .datepicker {
55
+ z-index: 10000 !important;;
56
+ }
57
+
58
+ /* Make sure some text is always veiwable in the form control */
59
+ .form-control {
60
+ min-width: 100px;
61
+ }
62
+
63
+ /* Custom Classes */
64
+
65
+
66
+ /* Allows modals to be wider on larger screens */
67
+ @media screen and (min-width: 900px) {
68
+ .modal-dialog.modal-wide-width {
69
+ width: 900px;
70
+ }
71
+ }
31
72
 
32
73
  .center {
33
74
  text-align: center;
@@ -38,6 +79,7 @@ dt, dd {
38
79
  right: 0px;
39
80
  top: 0px;
40
81
  z-index: 1000;
82
+ white-space: nowrap;
41
83
  }
42
84
 
43
85
  .btn-danger-inverse {
@@ -101,20 +143,8 @@ dt, dd {
101
143
  min-height: 35px;
102
144
  }
103
145
 
104
- .page-header {
105
- text-align: center;
106
- }
107
-
108
- .page-header h1, .page-header .h1 {
109
- font-size: 30px
110
- }
111
-
112
- @media screen and (min-width: 768px) {
113
- .page-header {
114
- text-align: left;
115
- }
116
-
117
- .page-header h1, .page-header .h1 {
118
- font-size: 38px
119
- }
146
+ /* Make default active gray instead of black next to black to give more contrast between selected options */
147
+ .btn.btn-default:active, .btn.active.btn-default {
148
+ background-color: #ededed;
149
+ color: #333333;
120
150
  }
data/app/views/contour/layouts/_per_page.html.erb CHANGED
@@ -3,3 +3,5 @@
3
3
  <li class="active per_page"><%= link_to (defined?(per_page) and per_page ? per_page : 20), "#" %></li>
4
4
  <% if defined?(object_count) and object_count %><li class="disabled"><span>out of <%= object_count %></span></li><% end %>
5
5
  </ul>
6
+
7
+ <div class="clear">&nbsp;</div>
data/lib/contour/version.rb CHANGED
@@ -3,7 +3,7 @@ module Contour
3
3
  MAJOR = 2
4
4
  MINOR = 1
5
5
  TINY = 0
6
- BUILD = "beta9" # nil, "pre", "rc", "rc2"
6
+ BUILD = "beta10" # nil, "pre", "rc", "rc2"
7
7
 
8
8
  STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
9
9
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: contour
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.0.beta9
4
+ version: 2.1.0.beta10
5
5
  platform: ruby
6
6
  authors:
7
7
  - Remo Mueller
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-08-07 00:00:00.000000000 Z
11
+ date: 2013-08-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails