tenon 1.0.18 → 1.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a2158731ad7d04b4520d0bd08b57fb8771dcd81
-  data.tar.gz: 9323256bdf9cf2fbd67c62608d10143372c37187
+  metadata.gz: 26fe2e2693358e70f326dc57a7dbd7dfdd3cb226
+  data.tar.gz: 2327627cafbf3bb52a11d5e6b15ec4f22389e41c
 SHA512:
-  metadata.gz: 7ec76c3de0b1dfeceed8e9f465491b787baf147c1dce86a80fa7aaea8c9425a939986f085f4376a99b2c3efc4bebaad9dab948034a55ddb654400d594145c4ce
-  data.tar.gz: 5349f690b803572e56940b76a80b44344d4e37a7f41ff55180755b40821a8fa15424ce872106dfd4f07f071ac7f3c98e8f749069ae4e0726d9f034497588a6eb
+  metadata.gz: e29b905edcca21eea4fc5c67e44ad2130440817ebaebea716c2e9d34d70173e41f7f8939a8315c60bc16cd7963e5882a24b31b203ccfd203a2f0bb6a505fb22b
+  data.tar.gz: 745254829fe6c1fac1fbc26774889813a421b8506caaf7404dced70001d897cf262ff07849b6af43ff4b6b26765d95ef4558bc3795f71c1afde019f6d100623d

data/app/assets/stylesheets/tenon/colors-custom.css.scss

@@ -2,7 +2,7 @@
 
 // Change these on a per-site basis
 $tn-client-color: #9c0f17;
-$tn-primary: #ff6a00;
+$tn-primary: #df222A;
 $tn-comp: #978fcc;
 $tn-highlight: $tn-med-grey;
 $tn-nav: #12111a;

data/app/assets/stylesheets/tenon/layout/global.css.scss

@@ -27,6 +27,10 @@ body {
 .main-content {
   margin: 0 $tn-margin;
   padding-top: $tn-padding;
+  @include media($mobile-breakpoint) {
+    margin: 0 10px;
+    padding-top: 10px;
+  }
 }
 
 $tn-header-height: 50px;

data/app/assets/stylesheets/tenon/layout/sidebar.css.scss

@@ -97,16 +97,6 @@
     .notification {
       margin-bottom: 20px;
       font-size: 12px;
-      a {
-        display: inline-block;
-        margin-top: 3px;
-        padding: 5px 10px;
-        border-radius: 25px;
-        background: lighten($tn-sidebar, 10%);
-        color: $tn-primary-text;
-        text-align: left;
-        text-transform: uppercase;
-      }
     }
   }
 }

data/app/assets/stylesheets/tenon/layout/util-nav.css.scss

@@ -42,7 +42,7 @@ util-nav {
   left: 0;
   margin: 0;
   a {
-    padding: 10px 13px;
+    padding: 10px 18px;
     display: block;
     width: 60px;
     height: 50px;

data/app/assets/stylesheets/tenon/ui/login.css.scss

@@ -24,7 +24,7 @@
 
   form {
     margin: 0 auto;
-    padding: 24px 0;
+    padding: 0;
     border: 1px solid $tn-dark-grey;
     border-radius: 5px;
     background: #fff;
@@ -52,7 +52,8 @@
     display: inline-block;
 
     img {
-      height: 64px;
+      // height: 135px;
+      width: 100%;
     }
   }
 

data/app/assets/stylesheets/tenon/ui/record-grids.css.scss

@@ -67,7 +67,6 @@ ul.record-grid {
     padding: 0 10px 10px;
     width: 100%;
     color: $tn-dark-grey;
-    text-transform: uppercase;
     font-size: $tn-font-small;
   }
   .record-actions {

data/app/assets/stylesheets/tenon/ui/record-lists.css.scss

@@ -55,7 +55,6 @@ ul.record-list {
       @include clearfix;
       color: $tn-black;
       font-size: $tn-font-small;
-      text-transform: uppercase;
       @include media($tablet-breakpoint) {
         opacity: 0.5;
       }
@@ -121,23 +120,23 @@ ul.record-list {
 
 .record-list.with-thumbnail {
   li {
-    min-height: 100px;
+    min-height: 80px;
     background-color: #fff;
   }
   .thumbnail {
     position: absolute;
     top: 0;
     left: 0;
-    width: 100px;
-    height: 100px;
+    width: 80px;
+    height: 80px;
     img {
       width: 100%;
       height: 100%;
     }
   }
   .record-details {
-    margin-left: 100px;
-    min-height: 100px;
+    margin-left: 80px;
+    min-height: 80px;
     &:hover > .record-actions {
       opacity: 1;
     }

data/app/views/tenon/shared/_main_nav.html.haml

@@ -10,4 +10,4 @@
       = nav_item 'Events', events_path, 'calendar'
       = nav_item 'Galleries', galleries_path, 'th'
       = nav_item 'Contacts', contacts_path, 'envelope'
-      = nav_item 'Settings', settings_path, 'gear'
+      = nav_item 'Settings', settings_path, 'gear'

data/app/views/tenon/shared/_util_nav.html.haml

@@ -12,14 +12,16 @@
 
     .header-menu.hamburger-toggle
       = link_to '#', class: 'user-menu', data: { icon: 'user' } do
-        .header-icon= fa_icon('fw user')
+        .header-icon
+          .mobile= fa_icon('fw user')
+          .tablet= fa_icon('fw caret-down')
         .header-label= current_user.email
 
       %ul
         %li
           = link_to edit_user_path(current_user) do
             .header-icon= fa_icon('fw gear')
-            .header-label Settings
+            .header-label Edit Info
         %li
           = link_to destroy_user_session_path, method: :delete do
             .header-icon= fa_icon('fw sign-out')

data/lib/tenon/version.rb

@@ -1,3 +1,3 @@
 module Tenon
-  VERSION = '1.0.18'
+  VERSION = '1.0.19'
 end

data/lib/tenon/warning_generator.rb

@@ -6,11 +6,11 @@ module Tenon
 
     def warnings
       warnings = []
-      warnings << "Your site needs a title<br /><a href='/tenon/settings'>OK</a><br />".html_safe if Tenon::MySettings.site_title.blank?
-      warnings << "Your site needs an address<br /><a href='/tenon/settings'>OK</a><br />".html_safe if Tenon::MySettings.site_url.blank?
-      warnings << "You haven't entered an email address to receive contact messages.<br /><a href='/tenon/settings'>Correct This</a><br />".html_safe  if Tenon::MySettings.contact_email.blank?
-      warnings << "You haven't entered an email address from which to send contact messages and other site notices.<br /><a href='/tenon/settings'>Correct This</a><br />".html_safe  if Tenon::MySettings.from_email.blank?
-      warnings << "You haven't entered the Google Analytics code.<br /><a href='/tenon/settings'>Correct This</a><br />".html_safe if Tenon::MySettings.google_analytics.blank?
+      warnings << "Your site needs a title.<br /><br /><a class='btn btn-comp btn-block' href='/tenon/settings'>OK</a>".html_safe if Tenon::MySettings.site_title.blank?
+      warnings << "Your site needs an address.<br /><br /><a class='btn btn-comp btn-block' href='/tenon/settings'>OK</a>".html_safe if Tenon::MySettings.site_url.blank?
+      warnings << "You haven't entered an email address to receive contact messages.<br /><br /><a class='btn btn-comp btn-block' href='/tenon/settings'>Correct This</a>".html_safe  if Tenon::MySettings.contact_email.blank?
+      warnings << "You haven't entered an email address from which to send contact messages and other site notices.<br /><br /><a class='btn btn-comp btn-block' href='/tenon/settings'>Correct This</a>".html_safe  if Tenon::MySettings.from_email.blank?
+      warnings << "You haven't entered the Google Analytics code.<br /><br /><a class='btn btn-comp btn-block' href='/tenon/settings'>Correct This</a>".html_safe if Tenon::MySettings.google_analytics.blank?
       warnings << 'You have not included a custom favicon.' unless favicon && favicon.size > 0
       warnings
     end

data/spec/features/tenon/comments_spec.rb

@@ -12,7 +12,7 @@ describe 'An admin viewing the comments index', js: true do
 
     it 'should see the comment in a list' do
       visit comments_path
-      expect(page).to have_content('Test Comment'.upcase)
+      expect(page).to have_content('Test Comment')
     end
 
     it 'should be able to delete the comment' do

data/spec/lib/tenon/warning_generator_spec.rb

@@ -13,7 +13,7 @@ describe Tenon::WarningGenerator do
     end
 
     it 'should include a warning about no site title' do
-      warning = "Your site needs a title<br /><a href='/tenon/settings'>OK</a><br />"
+      warning = "Your site needs a title.<br /><br /><a class='btn btn-comp btn-block' href='/tenon/settings'>OK</a>"
       expect(wg.warnings).to include(warning)
     end
   end
@@ -24,7 +24,7 @@ describe Tenon::WarningGenerator do
     end
 
     it 'should include a warning about no site title' do
-      warning = "Your site needs a title<br /><a href='/tenon/settings'>OK</a><br />"
+      warning = "Your site needs a title.<br /><br /><a class='btn btn-comp btn-block' href='/tenon/settings'>OK</a>"
       expect(wg.warnings).not_to include(warning)
     end
   end
@@ -35,7 +35,7 @@ describe Tenon::WarningGenerator do
     end
 
     it 'should not include a warning about no site domain' do
-      warning = "Your site needs an address<br /><a href='/tenon/settings'>OK</a><br />"
+      warning = "Your site needs an address.<br /><br /><a class='btn btn-comp btn-block' href='/tenon/settings'>OK</a>"
       expect(wg.warnings).to include(warning)
     end
   end
@@ -46,7 +46,7 @@ describe Tenon::WarningGenerator do
     end
 
     it 'should not include a warning about no site title' do
-      warning = "Your site needs an address<br /><a href='/tenon/settings'>OK</a><br />"
+      warning = "Your site needs an address.<br /><br /><a class='btn btn-comp btn-block' href='/tenon/settings'>OK</a>"
       expect(wg.warnings).not_to include(warning)
     end
   end
@@ -57,7 +57,7 @@ describe Tenon::WarningGenerator do
     end
 
     it 'should include a warning about no contact email' do
-      warning = "You haven't entered an email address to receive contact messages.<br /><a href='/tenon/settings'>Correct This</a><br />"
+      warning = "You haven't entered an email address to receive contact messages.<br /><br /><a class='btn btn-comp btn-block' href='/tenon/settings'>Correct This</a>"
       expect(wg.warnings).to include(warning)
     end
   end
@@ -68,7 +68,7 @@ describe Tenon::WarningGenerator do
     end
 
     it 'should include a warning about no contact email' do
-      warning = "You haven't entered an email address to receive contact messages.<br /><a href='/tenon/settings'>Correct This</a><br />"
+      warning = "You haven't entered an email address to receive contact messages.<br /><br /><a class='btn btn-comp btn-block' href='/tenon/settings'>Correct This</a>"
       expect(wg.warnings).not_to include(warning)
     end
   end
@@ -79,7 +79,7 @@ describe Tenon::WarningGenerator do
     end
 
     it 'should include a warning about no from email' do
-      warning = "You haven't entered an email address from which to send contact messages and other site notices.<br /><a href='/tenon/settings'>Correct This</a><br />"
+      warning = "You haven't entered an email address from which to send contact messages and other site notices.<br /><br /><a class='btn btn-comp btn-block' href='/tenon/settings'>Correct This</a>"
       expect(wg.warnings).to include(warning)
     end
   end
@@ -90,7 +90,7 @@ describe Tenon::WarningGenerator do
     end
 
     it 'should include a warning about no from email' do
-      warning = "You haven't entered an email address from which to send contact messages and other site notices.<br /><a href='/tenon/settings'>Correct This</a><br />"
+      warning = "You haven't entered an email address from which to send contact messages and other site notices.<br /><br /><a class='btn btn-comp btn-block' href='/tenon/settings'>Correct This</a>"
       expect(wg.warnings).not_to include(warning)
     end
   end
@@ -101,7 +101,7 @@ describe Tenon::WarningGenerator do
     end
 
     it 'should include a warning about no Google Analytics' do
-      warning = "You haven't entered the Google Analytics code.<br /><a href='/tenon/settings'>Correct This</a><br />"
+      warning = "You haven't entered the Google Analytics code.<br /><br /><a class='btn btn-comp btn-block' href='/tenon/settings'>Correct This</a>"
       expect(wg.warnings).to include(warning)
     end
   end
@@ -112,7 +112,7 @@ describe Tenon::WarningGenerator do
     end
 
     it 'should include a warning about no Google Analytics' do
-      warning = "You haven't entered the Google Analytics code.<br /><a href='/tenon/settings'>Correct This</a><br />"
+      warning = "You haven't entered the Google Analytics code.<br /><br /><a class='btn btn-comp btn-block' href='/tenon/settings'>Correct This</a>"
       expect(wg.warnings).not_to include(warning)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenon
 version: !ruby/object:Gem::Version
-  version: 1.0.18
+  version: 1.0.19
 platform: ruby
 authors:
 - factor[e] design initiative
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_errors
@@ -1452,7 +1452,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: A highly flexible mountable Rails CMS built for rapid application development.