bhf 0.6.6 → 0.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9675e5ce668bddfff3432e753d45d7b82c496ee7
-  data.tar.gz: 7f91d920faf7501beb8e9346ae6ccbf5fdced611
+  metadata.gz: d548b4fa7dceb488f5237116409882daf24ddc2c
+  data.tar.gz: 30151e7d31631907e81e099fe9d47ef53297b9de
 SHA512:
-  metadata.gz: dafe9503474c34bd1d6dd0c4de5aee8634cbb710fa917d621a846f8819f4367a31f7adde2ee7ce524f0bb045ad40219fcfbff87b3da7228ec71b2b90887a147c
-  data.tar.gz: 4fcc6784ec06e84086046a2a513fe3ec72eba617885ea67c2f801ea0d6a17d694e1a88e101f96233b53154e900f46f42d8a99c30ae30ba1fe2ad03116f416701
+  metadata.gz: f9d5bd340a10d4e43fd729fff2a002833fa5289ec85a487c3a2701effe70886c4bf1a9efdaddda04f9b3f053a8e5eebfdec52e360fc08d20800ad5aaeffe4b45
+  data.tar.gz: 5669e6ec13eb935aa5f17143469aff8f34fae25d99b14a5f1b68f33d8afc03bc847f7a5ee5cbb78948c42ad5508173146aedcf51415fb797700e78c9c61ac636

data/app/helpers/bhf/entries_helper.rb

@@ -4,18 +4,22 @@ module Bhf
     def node(f, field, &block)
       render partial: 'bhf/helper/node', locals: {f: f, field: field, input: with_output_buffer(&block)}
     end
-
+    
+    def definition_item(object, column, &block)
+      render partial: 'bhf/helper/definition_item', locals: {object: object, column: column, content: with_output_buffer(&block)}
+    end
+    
     def reflection_node(f, field, &block)
       return if field.form_type == :static && f.object.new_record? && f.object.send(field.reflection.name).blank?
       render partial: 'bhf/helper/reflection_node', locals: {
         f: f, field: field, input: with_output_buffer(&block)
       }
     end
-
+    
     def is_image?(file)
       ! file.match(/\.png|\.jpg|\.jpeg|\.gif|\.svg/i).nil?
     end
-
+    
     def reflection_title(f, field)
       title = f.object.class.human_attribute_name(field.reflection.name)
       if field.link

data/app/views/bhf/_user.haml

@@ -2,4 +2,4 @@
   %p.user
     = t('bhf.helpers.user.login.as', user: current_account.to_bhf_s).html_safe
     - if self.respond_to?(Bhf::Engine.config.logout_path)
-      = link_to t('bhf.helpers.user.logout.link'), self.send(Bhf::Engine.config.logout_path), method: :delete
+      = link_to t('bhf.helpers.user.logout.link'), self.send(Bhf::Engine.config.logout_path), method: :delete, class: :alt_button

data/app/views/bhf/entries/form/column/_static.haml

@@ -1,4 +1,5 @@
 - if value = f.object.send(field.name)
+  - return if @quick_edit and field.display_type == :primary_key
   = node f, field do
     - if field.display_type == :primary_key
       %strong= value

data/app/views/bhf/entries/show.haml

@@ -1,7 +1,11 @@
 %h3= show_t @platform
-.dl
+.dl.content_box
   - @platform.definitions.each do |column|
-    %p
-      %span.dt= @platform.model.human_attribute_name(column.name) + ':'
-      %span.dd{class: "#{column.field.macro} #{column.field.display_type}", :'data-column-name' => column.name}
-        = render(partial: "bhf/pages/macro/#{column.field.macro}/#{column.field.display_type}", locals: {column: column, object: @object})
+    - tmp = column.field.show_type ? column.field.show_type : column.field.display_type
+    = definition_item @object, column do
+      = render(partial: "bhf/pages/macro/#{column.field.macro}/#{tmp}", locals: {column: column, object: @object})
+
+.content_box
+  - @platform.show_extra_fields.each do |name|
+    = render(partial: "bhf/pages/show/#{name}", locals: {name: name, object: @object})
+      

data/app/views/bhf/helper/_definition_item.haml

@@ -0,0 +1,4 @@
+%p
+  %span.dt= object.class.human_attribute_name(column.name) + ':'
+  %span.dd{class: "#{column.field.macro} #{column.field.display_type}", :'data-column-name' => column.name}
+    = content

data/app/views/layouts/bhf/application.haml

@@ -11,7 +11,9 @@
 
   %body
     %header
-      %h1= link_to image_tag(asset_path('logo_bhf.png')), root_url, :'data-no-turbolink' => true
+      %h1
+        - logo = Rails.application.assets.find_asset('logo_bhf.png') ? 'logo_bhf.png' : 'logo_bhf.svg'
+        = link_to image_tag(asset_path(logo)), root_url, :'data-no-turbolink' => true
       - if @config && @config.pages.any?
         %nav
           %ul

data/lib/bhf/data.rb

@@ -1,11 +1,13 @@
 module Bhf
   module Data
     class AbstractField
-      attr_reader :name, :info, :macro, :display_type, :form_type, :overwrite_type, :overwrite_display_type
+      attr_reader :name, :info, :macro, :display_type, :form_type, :show_type, :overwrite_type, :overwrite_display_type, :overwrite_show_type
       
       def initialize(props)
         @name = props[:name]
         @form_type = props[:form_type]
+        @show_type = props[:show_type]
+        @overwrite_show_type = props[:show_type]
         @display_type = props[:display_type]
         @overwrite_display_type = props[:display_type]
         @info = props[:info]
@@ -15,7 +17,7 @@ module Bhf
 
     class Field
 
-      attr_reader :info, :overwrite_display_type
+      attr_reader :info, :overwrite_display_type, :overwrite_show_type
 
       def initialize(props, options = {}, pk = 'id')
         @props = props
@@ -23,6 +25,7 @@ module Bhf
 
         @overwrite_type = options[:overwrite_type].to_sym if options[:overwrite_type]
         @overwrite_display_type = options[:overwrite_display_type].to_sym if options[:overwrite_display_type]
+        @overwrite_show_type = options[:overwrite_show_type].to_sym if options[:overwrite_show_type]
 
         @primary_key = pk
       end
@@ -36,6 +39,10 @@ module Bhf
 
         @props.type
       end
+      
+      def show_type
+        return @overwrite_show_type if @overwrite_show_type
+      end
 
       def form_type
         return @overwrite_type if @overwrite_type
@@ -86,7 +93,7 @@ module Bhf
 
     class Reflection
       
-      attr_reader :reflection, :info, :link, :overwrite_display_type
+      attr_reader :reflection, :info, :link, :overwrite_display_type, :overwrite_show_type
       
       def initialize(reflection, options = {})
         @reflection = reflection
@@ -95,6 +102,7 @@ module Bhf
 
         @overwrite_type = options[:overwrite_type].to_sym if options[:overwrite_type]
         @overwrite_display_type = options[:overwrite_display_type].to_sym if options[:overwrite_display_type]
+        @overwrite_show_type = options[:overwrite_show_type].to_sym if options[:overwrite_show_type]
       end
       
       def macro
@@ -122,6 +130,10 @@ module Bhf
         :default
       end
 
+      def show_type
+        return @overwrite_show_type if @overwrite_show_type
+      end
+
       def name
         @reflection.name.to_s
       end
@@ -140,5 +152,16 @@ module Bhf
 
     end
 
+    class Show
+
+      attr_reader :name, :field, :overwrite_show_type
+
+      def initialize(field)
+        @name = field.name
+        @field = field
+      end
+
+    end
+
   end  
 end

data/lib/bhf/platform.rb

@@ -90,18 +90,22 @@ module Bhf
     end
 
     def columns
-      default_attrs(table_options(:columns), @collection[0..5]).
+      default_attrs(table_options(:display) || table_options(:columns), @collection[0..5]).
       each_with_object([]) do |field, obj|
         obj << Bhf::Data::Column.new(field)
       end
     end
 
     def definitions
-      default_attrs(show_options(:definitions), @collection).
+      default_attrs(show_options(:display) || show_options(:definitions), @collection, false).
       each_with_object([]) do |field, obj|
-        obj << Bhf::Data::Column.new(field)
+        obj << Bhf::Data::Show.new(field)
       end
     end
+    
+    def show_extra_fields
+      show_options(:extra_fields)
+    end
 
     def entries_per_page
       table_options(:per_page)
@@ -179,7 +183,7 @@ module Bhf
       end
 
       def data_source
-        table_options(:source)
+        table_options(:source) || table_options(:scope)
       end
 
       def default_attrs(attrs, d_attrs, warning = true)
@@ -193,6 +197,7 @@ module Bhf
               name: attr_name,
               form_type: form_options(:types, attr_name) || attr_name,
               display_type: table_options(:types, attr_name) || attr_name,
+              show_type: show_options(:types, attr_name) || table_options(:types, attr_name) || attr_name,
               info: I18n.t("bhf.platforms.#{@name}.infos.#{attr_name}", default: '')
             })
           )
@@ -207,6 +212,7 @@ module Bhf
           all[name] = Bhf::Data::Field.new(props, {
             overwrite_type: form_options(:types, name),
             overwrite_display_type: table_options(:types, name),
+            overwrite_show_type: show_options(:types, name) || table_options(:types, name),
             info: I18n.t("bhf.platforms.#{@name}.infos.#{name}", default: '')
           }, model.bhf_primary_key)
         end
@@ -216,6 +222,7 @@ module Bhf
           all[name.to_s] = Bhf::Data::Reflection.new(props, {
             overwrite_type: form_options(:types, name),
             overwrite_display_type: table_options(:types, name),
+            overwrite_show_type: show_options(:types, name) || table_options(:types, name),
             info: I18n.t("bhf.platforms.#{@name}.infos.#{name}", default: ''),
             link: form_options(:links, name)
           })

data/vendor/assets/images/logo_bhf.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="94px" height="59px" viewBox="0 0 94 59" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <title>logo_bhf</title>
+    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <path d="M8.13040865,2.17367788 L8.13040865,29.5414663 C11.1051831,26.456515 14.4765437,24.9140625 18.2445913,24.9140625 C22.5855586,24.9140625 26.1993045,26.5336377 29.0859375,29.7728365 C31.9725705,32.9900001 33.4158654,37.0003766 33.4158654,41.8040865 C33.4158654,46.762044 31.961553,50.8605607 29.0528846,54.0997596 C26.1662516,57.3169231 22.5194531,58.9254808 18.1123798,58.9254808 C14.3884029,58.9254808 11.0611124,57.4932034 8.13040865,54.6286058 L8.13040865,58 L0.693509615,58 L0.693509615,2.17367788 L8.13040865,2.17367788 Z M25.8137019,42.1346154 C25.8137019,39.0496641 24.9763706,36.53767 23.3016827,34.5985577 C21.6049595,32.6153747 19.4785785,31.6237981 16.922476,31.6237981 C14.1900905,31.6237981 11.9645519,32.5823221 10.2457933,34.499399 C8.54907004,36.3944406 7.70072115,38.8623646 7.70072115,41.9032452 C7.70072115,45.0322672 8.53805252,47.5332438 10.2127404,49.40625 C11.8874282,51.3233269 14.0909319,52.281851 16.8233173,52.281851 C19.4014552,52.281851 21.5388537,51.3233269 23.2355769,49.40625 C24.9543355,47.4671377 25.8137019,45.0432838 25.8137019,42.1346154 Z M41.2824519,2.17367788 L48.719351,2.17367788 L48.719351,28.483774 C51.363595,26.1039544 54.2832372,24.9140625 57.4783654,24.9140625 C61.1142009,24.9140625 64.0228256,26.0929369 66.2043269,28.4507212 C68.0552977,30.5000102 68.9807692,33.7722131 68.9807692,38.2674279 L68.9807692,58 L61.5438702,58 L61.5438702,38.9615385 C61.5438702,36.3834006 61.0866432,34.5159313 60.1721755,33.3590745 C59.2577078,32.2022178 57.7868691,31.6237981 55.7596154,31.6237981 C53.1594421,31.6237981 51.3305341,32.4280769 50.2728365,34.0366587 C49.2371743,35.6672758 48.719351,38.4657254 48.719351,42.4320913 L48.719351,58 L41.2824519,58 L41.2824519,2.17367788 Z M86.1021635,32.7475962 L86.1021635,58 L78.6322115,58 L78.6322115,32.7475962 L75.9879808,32.7475962 L75.9879808,25.8064904 L78.6322115,25.8064904 L78.6322115,13.3786058 C78.6322115,9.32409832 79.3373327,6.45954363 80.7475962,4.78485577 C82.6867084,2.44910691 85.507193,1.28125 89.2091346,1.28125 C90.5312566,1.28125 92.1949018,1.66686313 94.2001202,2.43810096 L94.2001202,10.0402644 L93.4399038,9.64362981 C91.8313221,8.82832124 90.5092199,8.42067308 89.4735577,8.42067308 C88.1514357,8.42067308 87.2590167,8.89442635 86.796274,9.84194712 C86.3335313,10.7674325 86.1021635,12.5522704 86.1021635,15.1965144 L86.1021635,25.8064904 L94.2001202,25.8064904 L94.2001202,32.7475962 L86.1021635,32.7475962 Z" id="bhf" fill="#EAEAEA" sketch:type="MSShapeGroup"></path>
+    </g>
+</svg>

data/vendor/assets/javascripts/bhf/application.js

@@ -5,8 +5,8 @@
 //= require_tree ./classes/
 
 var ajaxNote = new Ajaxify();
-var quickEdit = new AjaxEdit();
 var bhfInit = function(){
+	var quickEdit = new AjaxEdit();
 	ajaxNote.setup();
 	var lang = document.html.get('lang');
 	if (lang === 'en') {
@@ -182,6 +182,7 @@ var bhfInit = function(){
 						parent.innerHTML = html;
 						setupSortables(parent);
 						ajaxNote.success();
+						window.fireEvent('platformUpdate', [parent]);
 					}
 				}).send({data: this});
 			},
@@ -339,7 +340,6 @@ if (document.addEventListener) {
 	});
 
 	document.addEventListener('page:load', function(){
-		quickEdit.removeEvents();
 		bhfInit();
 		rails.applyEvents();
 		ajaxNote.success();

data/vendor/assets/stylesheets/bhf/application.css.sass

@@ -15,13 +15,16 @@ html
   min-width: 700px
   height: 100%
   overflow-y: scroll
-  background: image-url('bhf/small_ajax_loader.gif') no-repeat -300px -300px, image-url('bhf/small_ajax_loader_h.gif') no-repeat -300px -300px, #303030 image-url('bhf/bg.png')
-  
+  background: image-url('bhf/small_ajax_loader.gif') no-repeat -300px -300px, image-url('bhf/small_ajax_loader_h.gif') no-repeat -300px -300px, #303030
 
 body
   min-width: 960px
   min-height: 100%
-  +box-inner-shadow(0, 0, 8,#000)
+  //+box-inner-shadow(0, 0, 8,#000)
+  -webkit-font-smoothing: antialiased
+  -moz-font-smoothing: antialiased
+  -o-font-smoothing: antialiased
+  -moz-osx-font-smoothing: grayscale
 
 a
   text-decoration: none
@@ -39,6 +42,12 @@ header
     float: right
     height: 83px
     overflow: hidden
+    a
+      padding: 16px 24px 0 0
+      display: block
+    img
+      display: block
+      height: 50px
   nav
     padding-top: 25px
     li
@@ -49,9 +58,8 @@ header
       &.active
         a
           +text-shadow(#fff)
-          +bg-gradient(#FFFFFF, #D5D5D5)
+          +bg-gradient(#eaeaea, #D5D5D5)
           +box-shadow(0, 1, 4)
-          border-color: #FFFFFF
           color: #414756
           &:hover
             +bg-gradient(#D5D5D5, #FFFFFF)
@@ -62,13 +70,11 @@ header
         text-decoration: none
         display: block
         padding: 5px 23px
-        border: 1px solid transparent
         color: #EAEAEA
         +text-shadow(#000, -1)
         &:hover
           +bg-gradient($b1, $b2)
           color: $w1
-          border-color: $b1
           +box-shadow(0, 1, 4)
           +text-shadow(#0068B3)
         &:active
@@ -83,12 +89,30 @@ header
   max-width: 400px
   max-height: 200px
 
+.content_box
+  margin: 10px 10px 20px 20px
 .dl
   +text-shadow(#fff)
   .dt
     display: inline-block
     min-width: 200px
     color: $g1
+  a
+    text-decoration: underline
+.default_table
+  width: 100%
+  td, th
+    padding: 2px 5px
+  thead
+    th
+      background: #3E3E3E
+      color: #C2C2C2
+      text-align: left
+  tbody
+    td
+      border-bottom: 1px solid #E0E0E0
+.font_size_bigger
+  font-size: 1.2em
     
 
 .quick_edit_holder,
@@ -96,26 +120,25 @@ header
   display: table-cell
   overflow: hidden
   background: #EAEAEA
-  border: 3px solid #FFFFFF
   box-sizing: border-box
-  padding: 10px 20px
   +box-shadow(0, 1, 4, rgba($k1, 0.5))
+  > h3
+    padding: 9px 20px
+    background: #dbdbdb
+
 
-#main_form
-  // TODO: wtf css?
-  margin-left: -20px
-    
 
 
 #content
   display: table
   width: 100%
   box-sizing: border-box
-  margin-top: -20px
-  border-spacing: 20px
+  form
+    border-spacing: 20px
   h2,
   h3
     +text-shadow(#fff)
+    color: #3e3e3e
   h6
     color: $g3
     +text-shadow(#fff)
@@ -142,14 +165,15 @@ header
       width: 300px
       height: 100px
     
+  .quick_edit_holder
+    padding: 0
+    form
+      padding: 10px 20px
     .group
+      margin-top: 0
+      margin-bottom: 10px
+      margin-left: 20px
       padding: 0
-      &:active
-        .save
-          border-right: 1px solid rgba(#fff, 0.4)
-        .save_and_next
-          border-left: 1px solid $b2
-        
       button
         border: none
         background: none
@@ -164,13 +188,9 @@ header
           outline: 0
         &.save
           border-right: 1px solid $b2
-          &.create
-            border-right: none
-          &:focus
-            color: $b2
-            text-shadow: 0 0px 3px #fff
+          &:hover
+            color: darken($b2, 15%)
         &.save_and_next
-          border-left: 1px solid rgba(#fff, 0.3)
           text-indent: -9999px
           background: image-url('bhf/pictos.png') no-repeat -140px -40px
           width: 40px
@@ -183,16 +203,12 @@ header
       &.cancel,
       &.open
         float: right
-        margin-top: 0
-      &.cancel
-        margin-right: -10px
-      &.open
+        margin-top: 10px
         margin-right: 10px
       &.save
         margin-right: 16px
 
 table.data_table
-  margin-top: 20px
   margin-bottom: 40px
   width: 100%
   caption
@@ -200,14 +216,7 @@ table.data_table
     height: 28px
     -moz-box-sizing: content-box
     padding: 10px 10px 10px 20px
-    +border-top-radius(4)
-    +box-shadow(0, 1, 4, #ccc)
-    background: #C9C9C9
-    background: -webkit-gradient(linear, left top, left bottom, from(#CCCCCC), color-stop(50%, #CCCCCC), color-stop(51%, #DCDCDC), to(#DCDCDC))
-    background-size: 100% 2px
-    border: 1px solid #C4C4C4
-    border-bottom: 0
-    border-top: 0
+    background: #DBDBDB
     text-align: left
     h4,
     .info
@@ -223,6 +232,8 @@ table.data_table
       font-size: 12px
       color: $g1
       white-space: nowrap
+      strong
+        color: #3E3E3E
     form
       display: inline-block
     .create
@@ -233,26 +244,15 @@ table.data_table
   th:first-child
     padding-left: 20px
   
-  td
-    &:first-child
-      +border-left-radius(4)
-    &:last-child
-      +border-right-radius(4)
   thead
     th
       padding: 4px 0
       padding-left: 3px
       text-align: left
-      border-top: 1px solid #C6C6C6
-      border-bottom: 1px solid #1B1B1B
       white-space: nowrap
       background: #3E3E3E
       +text-shadow(#000, -1)
       color: #C2C2C2
-      &:first-child
-        +border-bottom-left-radius(4)
-      &:last-child
-        +border-bottom-right-radius(4)
       &.primary_key
         text-transform: uppercase
       &.sorted
@@ -274,8 +274,7 @@ table.data_table
 
   tbody
     td
-      border-top: 1px solid #FFFFFF
-      border-bottom: 1px solid #C6C6C6
+      border-bottom: 1px solid #E0E0E0
       &.has_many,
       &.has_and_belongs_to_many,
       &.text
@@ -333,9 +332,8 @@ table.data_table
       &:hover td,
       &.live_edit td
         +bg-gradient($b1, $b2)
+        border-bottom-color: $b1
         color: $w1
-        box-shadow: inset 0 1px 0 $b2, inset 0 2px 0 rgba(#fff, 0.4)
-        border-color: #EAEAEA
         .duplicate
           background-position: -348px -50px
           &:hover
@@ -359,7 +357,7 @@ table.data_table
             background: image-url('bhf/small_ajax_loader_h.gif') no-repeat center center
       &.live_edit td
         +bg-gradient($b2, $b1)
-        box-shadow: inset 0 -1px 0 $b2, inset 0 -2px 0 rgba(#fff, 0.4)
+        border-bottom-color: $b2
       &.dragged
         td
           opacity: 0.4
@@ -372,7 +370,6 @@ table.data_table
   tfoot
     td
       padding-top: 10px
-      border-top: 1px solid #FFFFFF
 
   thead,
   tbody
@@ -387,13 +384,14 @@ table.data_table
       width: 54px
       &.wider
         width: 88px
-
+  tbody
+    .primary_key
+      color: #999
 
 .default_input
-  border: 1px solid #BBB
+  border: 1px solid transparent
   background: #FFF
   +border-radius(2)
-  +box-shadow(0, 1, 0, #FFFFFF)
   padding: 2px 5px 2px 5px
   width: 300px
   +box-model
@@ -411,6 +409,9 @@ table.data_table
   input[type="text"]
     @extend .default_input
     width: 200px
+    min-height: 20px
+    padding-top: 5px
+    padding-bottom: 3px
 
 form
   .node
@@ -551,6 +552,8 @@ form
     font-size: 12px
     color: $g3
     +text-shadow(#fff)
+    a
+      text-decoration: underline
       
   .error_explanation
     margin-left: 20px
@@ -563,7 +566,7 @@ form
 
 
 footer
-  padding-bottom: 20px
+  padding: 20px 0
   +text-shadow(#000, -1)
   text-align: center
   color: gray
@@ -580,17 +583,14 @@ input[type="submit"],
   cursor: pointer
   display: inline-block
   padding: 6px 20px
-  border: 1px solid $b2
   margin: 20px 0 0
   background: $b1
   color: #fff
-  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4)
   font-weight: bold
   font-size: 18px
   text-decoration: none
+  border: 0
   +border-radius(5)
-  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4), inset 0 1px rgba(255, 255, 255, 0.5), inset 0 12px rgba(255, 255, 255, 0.2), inset 0 10px 20px rgba(255, 255, 255, 0.25), inset 0 -12px 25px rgba(0, 0, 0, 0.3)
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4), inset 0 1px rgba(255, 255, 255, 0.5), inset 0 18px 5px rgba(255, 255, 255, 0.2), inset 0 10px 10px rgba(255, 255, 255, 0.25), inset 0 -12px 25px rgba(0, 0, 0, 0.3)
   +transition-duration(0.3)
   +transition-property(background)
   &:hover
@@ -599,9 +599,8 @@ input[type="submit"],
   &:active
     outline: 0
     background: $b2
-    text-shadow: 0 -1px 1px rgba(0, 0, 0, 0.4)
-    box-shadow: 0 -1px 3px rgba(0, 0, 0, 0.4), inset 0 -1px rgba(255, 255, 255, 0.5), inset 0 -18px rgba(255, 255, 255, 0.1), inset 0 -10px 10px rgba(255, 255, 255, 0.25), inset 0 -12px 25px rgba(0, 0, 0, 0.3)
-    
+  &:active
+    background: darken($b2, 5%)
 
 
 input[type="submit"].alt_button,
@@ -610,26 +609,20 @@ input[type="submit"].alt_button,
   padding: 12px 50px
   +border-radius(4)
   text-decoration: none
-  border: 1px solid gray
   font-size: 13px
   cursor: pointer
   background: #666
   padding: 5px 10px
-  box-shadow: inset 0 1px 0 rgba(#AAABAA, 0.7), inset 0 -10px 20px rgba(#333, 0.6)
   color: $w1
+  border: 0
   +text-shadow(#444, -1)
+  +transition-duration(0.3)
   &:hover
-    border-color: $b2
-    box-shadow: inset 0 1px 0 rgba(#fff, 0.4), inset 0 -10px 20px rgba(#333, 0.4)
     background: $b1    
   &:active
-    box-shadow: inset 0 -1px 0 rgba(#fff, 0.4), inset 0 10px 20px rgba(#333, 0.4)
-    +text-shadow(#444)
+    background: darken($b2, 5%)
   &:focus
     outline: 0
-    +transition-duration(1)
-    +transition-property(box-shadow)
-    box-shadow: 0 1px 12px $b2
 
 #flash_massages
   display: block
@@ -667,7 +660,6 @@ input[type="submit"].alt_button,
     color: #3E3E3E
     border-color: #B7B7B7
     +text-shadow(#fff)
-    box-shadow: inset 0 1px 0 rgba(#fff, 0.4), inset 0 -10px 10px rgba(#333, 0.1)
     &:hover
       color: #fff
       +text-shadow(#999)
@@ -737,7 +729,6 @@ input[type="submit"].alt_button,
   button
     background: white !important
     padding: 2px 4px 4px 4px !important
-    box-shadow: none
     &:hover
       background: $g2 !important
       
@@ -748,16 +739,15 @@ input[type="submit"].alt_button,
   padding: 5px 10px
   background: #E5E5E5
   border: 1px solid #C1C2DC
-  +box-inner-shadow(0, 1, 0, #fff)
   +border-radius(2)
   +text-shadow(#fff)
   color: #535b6f
+  margin-top: -2px
   .header
     position: relative
     margin-bottom: 5px
     padding-bottom: 5px
     border-bottom: 1px solid #C1C2DC
-    +box-shadow(0, 1, 0, #fff)
     .title
       padding-top: 3px
       text-align: center
@@ -924,9 +914,7 @@ input[type="submit"].alt_button,
   left: 50%
   z-index: 4000
   +border-bottom-radius(4)
-  background: image-url('bhf/ajax_loader.gif') no-repeat center 16px, -webkit-gradient(linear, left top, left bottom, from($b1), to($b2))
-  background: image-url('bhf/ajax_loader.gif') no-repeat center 16px, -moz-linear-gradient(top, $b1, $b2)
-  border: 1px solid $b1
+  background: $b1 image-url('bhf/ajax_loader.gif') no-repeat center 16px
   +box-shadow(0, 1, 4)
   +transition-duration(0.6)
   &.loading
@@ -1070,18 +1058,40 @@ input[type="submit"].alt_button,
     font-family: arial, helvetica, sans-serif
   > form
     input[type="text"] 
-      border: 1px solid #999999
+      border: 0
       color: black
   > form
     input[type="button"]
-      border: 1px solid #888888
+      border: 0
       font-size: 0.8em
       font-weight: bold
 
 
-// TODO: bigger ration buttons
+// TODO: bigger radio buttons
 
 
 // TODO: remove me
 .translation_missing
-  color: red !important
+  color: red !important
+  
+
+@media screen and (-webkit-min-device-pixel-ratio: 1.5), screen and (min--moz-device-pixel-ratio: 1.5), screen and (min-device-pixel-ratio: 1.5)
+  table.data_table
+    tbody
+      a
+        &.duplicate,
+        &.edit,
+        &.delete
+          background-image: image-url('bhf/pictos_2x.png')
+          background-size: 377px 152px
+      .handle
+        background-image: image-url('bhf/pictos_2x.png')
+        background-size: 377px 152px
+
+  #content
+    .quick_edit_holder
+      .group
+        button
+          &.save_and_next
+            background-image: image-url('bhf/pictos_2x.png')
+            background-size: 377px 152px

data/vendor/assets/stylesheets/bhf/functions.css.sass

@@ -111,13 +111,13 @@
 
 =bg-gradient($c1, $c2)
   background: $c1
-  background: -moz-linear-gradient(top, $c1, $c2)
-  background: -webkit-gradient(linear, left top, left bottom, from($c1), to($c2))
+  //background: -moz-linear-gradient(top, $c1, $c2)
+  //background: -webkit-gradient(linear, left top, left bottom, from($c1), to($c2))
   
 // Text
 
 =text-shadow($color: #000, $top: 1, $left: 0, $blur: 0)
-  text-shadow: $color $left + px $top + px $blur + px
+  //text-shadow: $color $left + px $top + px $blur + px
 
 // Transitions
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.10
 platform: ruby
 authors:
 - Anton Pawlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-21 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -129,6 +129,7 @@ files:
 - app/views/bhf/entries/form/has_one/_static.haml
 - app/views/bhf/entries/new.haml
 - app/views/bhf/entries/show.haml
+- app/views/bhf/helper/_definition_item.haml
 - app/views/bhf/helper/_field_errors.haml
 - app/views/bhf/helper/_flash.haml
 - app/views/bhf/helper/_frontend_edit.haml
@@ -180,10 +181,11 @@ files:
 - vendor/assets/images/bhf/bg.png
 - vendor/assets/images/bhf/mooeditable-toolbarbuttons-tango.png
 - vendor/assets/images/bhf/pictos.png
+- vendor/assets/images/bhf/pictos_2x.png
 - vendor/assets/images/bhf/small_ajax_loader.gif
 - vendor/assets/images/bhf/small_ajax_loader_h.gif
 - vendor/assets/images/bhf/wmd-buttons.png
-- vendor/assets/images/logo_bhf.png
+- vendor/assets/images/logo_bhf.svg
 - vendor/assets/javascripts/bhf/application.js
 - vendor/assets/javascripts/bhf/classes/AjaxEdit.js
 - vendor/assets/javascripts/bhf/classes/Ajaxify.js