contour 2.1.0.beta2 → 2.1.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fdf1781a856414f26827648185d4d818b51ba39
-  data.tar.gz: 13fd837f2ed45d8c7de0642f62c7a7b600350bfa
+  metadata.gz: a385dbea9ef8095dfc4f2b38b1d0e0ed7c151e40
+  data.tar.gz: 41d9a5cdb061ad01ea8b2bc6010b14da6b62a6f7
 SHA512:
-  metadata.gz: 7b96aa16e491976a2c8f5d58ed4662ec7f5bda19cd0edb035a20d039023bccffd5ef45d99df6969a5f2f818a6015b117f86126ab3e5fffc6aa874aa025080144
-  data.tar.gz: ebc2b2f5833fd95dbf70eab4d49942b68f3ccfaa527efc2881acfaaf9c6d4d041d299b95ac7e87d4ccd7d30e999b21ab72c22b19fa3fb7f9c49b0721c8be3ed7
+  metadata.gz: 2caba4af7dbb7c11430481e7c0666958c9c68e970d1fe8dfab8483839a672d13f2c61f4c56cb5f0ee8b82680f9cd40a34ba7500318889a846de22aa3ed107ce9
+  data.tar.gz: fc322df7ee8ab8f7a2315e40dccf00d204bc69033ba9a9ece472c92bb3a2e44f0bf912a7054c1729a9b86e446a38e77229f1450ed05cf7843c8c60ec97b24c53

data/app/assets/javascripts/contour/global.js.coffee

@@ -7,7 +7,7 @@
     element.html("<div class='spinner'>#{text}</div>")
 
 @flashMessage = (message, alert_type = 'success', overwrite = true) ->
-  div_block = "<div class='navbar-alert alert alert-#{alert_type}'><button type='button' class='close' data-dismiss='alert'>×</button>#{message}</div>"
+  div_block = "<div class='navbar-alert alert alert-#{alert_type}'><button type='button' class='close' data-dismiss='alert'>&times;</button>#{message}</div>"
   flash_container = $('[data-object~="flash-container"]')
   if overwrite
     flash_container.html(div_block)

data/app/assets/stylesheets/{bootstrap-overrides.css.erb → bootstrap-overrides.css}

@@ -19,8 +19,8 @@ h1, h2, h3, h4, h5, h6 {
 }
 
 dt, dd {
-/*  line-height: 18px;
-  min-height: 40px;*/
+  line-height: 18px;
+  min-height: 40px;
 }
 
 .dl-horizontal dt {
@@ -33,18 +33,10 @@ dt, dd {
   text-align: center;
 }
 
-.navbar-alert {
-  margin: 0px 0px 5px 0px;
-  border: 1px solid #515151;
-  -moz-box-shadow: 3px 3px 4px #515151;
-  -webkit-box-shadow: 3px 3px 4px #515151;
-  box-shadow: 3px 3px 4px #515151;
-}
-
 .flash-block {
   position: absolute;
   right: 0px;
-  top: -16px;
+  top: -20px;
   z-index: 1000;
 }
 

data/app/assets/stylesheets/contour.css

@@ -4,7 +4,7 @@
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require_self
  *= require bootstrap/v3.0.0-rc1/bootstrap
- *= require bootstrap/bootstrap-glyphicons
+ *= require glyphicons
  *= require bootstrap-overrides
  *= require twitter-bootstrap/bootstrap-scroll-modal
  *= require typeahead.js-bootstrap

data/app/assets/stylesheets/{bootstrap/bootstrap-glyphicons.css → glyphicons.css.erb}

@@ -1,6 +1,10 @@
 @font-face{
   font-family:'Glyphicons Halflings';
-  src:url('../bootstrap/glyphiconshalflings-regular.eot');
-  src:url('../bootstrap/glyphiconshalflings-regular.eot?#iefix') format('embedded-opentype'),url('../bootstrap/glyphiconshalflings-regular.woff') format('woff'),url('../bootstrap/glyphiconshalflings-regular.ttf') format('truetype'),url('../bootstrap/glyphiconshalflings-regular.svg#glyphicons_halflingsregular') format('svg')
+  src:url('bootstrap/glyphiconshalflings-regular<%= asset_path('bootstrap/glyphiconshalflings-regular.eot').split('glyphiconshalflings-regular').last %>');
+
+  src:url('bootstrap/glyphiconshalflings-regular<%= asset_path('bootstrap/glyphiconshalflings-regular.eot').split('glyphiconshalflings-regular').last %>?#iefix') format('embedded-opentype'),
+      url('bootstrap/glyphiconshalflings-regular<%= asset_path('bootstrap/glyphiconshalflings-regular.woff').split('glyphiconshalflings-regular').last %>') format('woff'),
+      url('bootstrap/glyphiconshalflings-regular<%= asset_path('bootstrap/glyphiconshalflings-regular.ttf').split('glyphiconshalflings-regular').last %>') format('truetype'),
+      url('bootstrap/glyphiconshalflings-regular<%= asset_path('bootstrap/glyphiconshalflings-regular.svg').split('glyphiconshalflings-regular').last %>#glyphicons_halflingsregular') format('svg')
 }.glyphicon:before{font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-plus:before{content:"\002b"}.glyphicon-minus:before{content:"\2212"}.glyphicon-asterisk:before{content:"\002a"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-euro:before{content:"\20ac"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse:before{content:"\e159"}.glyphicon-collapse-top:before{content:"\e160"}
 /* This beautiful CSS-File has been crafted with LESS (lesscss.org) and compiled by simpLESS (wearekiss.com/simpless) */

data/app/views/contour/layouts/_menu.html.erb

@@ -20,7 +20,7 @@
                   (menu_item[:path].blank? ? '#' : eval(menu_item[:path].to_s)),
                   target: menu_item[:target], style: "#{ 'display:inline-block;padding-right:0px' if has_submenu }")
                    %>
-              <%= link_to "<b class='caret'></b>".html_safe, '#', class: 'dropdown-toggle', 'data-toggle' => 'dropdown', style: 'display:inline-block;padding-left:0px' if has_submenu %>
+              <%= link_to "<b class='caret'></b>".html_safe, '#', class: 'dropdown-toggle', 'data-toggle' => 'dropdown', style: 'display:inline-block;padding-left:4px;margin-left:-4px;' if has_submenu %>
               <%# , 'data-target' => "#menu#{position}#{index}" %>
               <% if has_submenu %>
                 <ul class="dropdown-menu">

data/lib/contour/version.rb

@@ -3,7 +3,7 @@ module Contour
     MAJOR = 2
     MINOR = 1
     TINY = 0
-    BUILD = "beta2" # nil, "pre", "rc", "rc2"
+    BUILD = "beta3" # nil, "pre", "rc", "rc2"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contour
 version: !ruby/object:Gem::Version
-  version: 2.1.0.beta2
+  version: 2.1.0.beta3
 platform: ruby
 authors:
 - Remo Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -229,14 +229,14 @@ files:
 - app/assets/javascripts/external/typeahead.js
 - app/assets/javascripts/twitter-bootstrap/bootstrap-scroll-modal.js
 - app/assets/javascripts/twitter-bootstrap/bootstrap.js.coffee
-- app/assets/stylesheets/bootstrap/bootstrap-glyphicons.css
 - app/assets/stylesheets/bootstrap/v3.0.0-rc1/bootstrap.css
-- app/assets/stylesheets/bootstrap-overrides.css.erb
+- app/assets/stylesheets/bootstrap-overrides.css
 - app/assets/stylesheets/contour/about.css
 - app/assets/stylesheets/contour/authentication.css
 - app/assets/stylesheets/contour/errors.css
 - app/assets/stylesheets/contour.css
 - app/assets/stylesheets/datepicker.css
+- app/assets/stylesheets/glyphicons.css.erb
 - app/assets/stylesheets/jquery-ui-1.10.0.custom.css
 - app/assets/stylesheets/spinner.css.erb
 - app/assets/stylesheets/timepicker.css