tomify 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d85803b12226321bb76440fc8efae058be5d9772
-  data.tar.gz: 3ce0217e98efeced7e3f22ff3abb980f308bfe67
+  metadata.gz: d4f081a00b7ab4f2e5f62d855ddfd8b0bf1bd316
+  data.tar.gz: 27c8deb82e11ae1be2f8c0dca2c1ad49a2744de8
 SHA512:
-  metadata.gz: 3d9363a21eefec8e5262e5361de0eb8f55fd9f53cb3648c7e1d100d7e10a0a5b08bbe525ad0ec5e59ee8a5ab5cf94878c7b4a66b20fc9495278a2c4946d5a3d9
-  data.tar.gz: 5d0bafb20a6461996c1f05fdd989c8e3e1f0d57192bc75439b1d488f9dfea2e6402e136415e178779d7b31b20a4902fd10b649199a18acd0568fc86f03b45b20
+  metadata.gz: bdbc0f49f4ca2787ec6b6075207824210c668d9ac6d7955fc8ce42f0b1728514f12c95696e24a4f509e65abf6409e752014ed8e2d463fc59ee731194afe2ac18
+  data.tar.gz: 3a876a2fa0d1c0d23325b10a0a1aef032561b74d07cc365300d3b8e50741b6c5f2f76fb59677e68fbad6a8df8f77f263817c8b6ddb2a6d56327a2a06e782c70e

data/app/assets/stylesheets/_tomify.scss

@@ -1 +1,12 @@
-@import "tomify/*";
+@import "bootstrap";
+@import "font-awesome";
+@import url(https://fonts.googleapis.com/css?family=Raleway:300,400,700|Dosis:400,700);
+
+@import "tomify/variables";
+@import "tomify/default";
+@import "tomify/header";
+@import "tomify/navbar";
+@import "tomify/content";
+@import "tomify/pagination";
+@import "tomify/plugins";
+@import "tomify/footer";

data/app/assets/stylesheets/tomify/_content.scss

@@ -0,0 +1,33 @@
+.public.content {
+  h1 { color: $brand; text-align: center; }
+  h2, h3, h4, h5, h6 { font-weight: bold; }
+  table, p, li { text-align: left; }
+  table { width: 100%; }
+  div > ul > li {
+    margin-top: 5px;
+    font-size: 18px;
+    &:before { top: 1px; }
+    :not(p) { font-size: 14px; padding-left: 20px; }
+  }
+  ul {
+    list-style-type: none;
+    padding-left: 0;
+  }
+  li {
+    position: relative;
+    padding-left: 25px;
+    &:before {
+      position: absolute;
+      top: 0;
+      left: 0;
+      font-family: "FontAwesome";
+      content: "\f058";
+      color: $brand;
+    }
+    ul li:before { content: "\f055"; }
+  }
+
+  .page {
+    h2, h3 { text-align: center; }
+  }
+}

data/app/assets/stylesheets/tomify/_default.scss

@@ -1,8 +1,3 @@
-@import "bootstrap";
-@import "variables";
-@import "font-awesome";
-@import url(https://fonts.googleapis.com/css?family=Raleway:300,400,700|Dosis:400,700);
-
 html, body {
   margin: 0;
   padding: 0;
@@ -25,6 +20,10 @@ em { font-size: 24px; }
   }
 }
 
+.panel-group .panel-title > a {
+  text-decoration: underline;
+}
+
 .with-sidebar {
   .dynamic-sm {
     @include make-md-column(8);

data/app/controllers/tomify/concerns/default/helper.rb

@@ -8,6 +8,10 @@ module Tomify::Concerns::Default::Helper
   end
 
   def page
-    @page || Tomify.models.page.default
+    return @page if @page
+
+    default_page = Tomify.models.page.default
+    default_page.admin = self.class.name.include? "Admin::"
+    default_page
   end
 end

data/app/models/tomify/concerns/page.rb

@@ -2,6 +2,8 @@ module Tomify::Concerns::Page
   extend ActiveSupport::Concern
 
   included do
+    attr_accessor :admin
+
     mount_uploader :cover_image, Tomify.uploaders.setting
     mount_uploader :share_image, Tomify.uploaders.setting
 

data/app/views/templates/contact.haml

@@ -1,7 +1,7 @@
 .container-fluid
-  .row.text-center
+  .row
     .dynamic-md
-      .page= record.text_to_html
+      = record.text_to_html
       - if contact_email = setting(:contact_email)
         %p
           = link_to "mailto:#{contact_email}", target: :_blank do

data/app/views/templates/default.haml

@@ -1,4 +1,3 @@
-.container-fluid
-  .row.text-center
-    .dynamic-md
-      .page= record.text_to_html
+.row
+  .dynamic-md
+    = record.text_to_html

data/app/views/tomify/defaults/_container.haml

@@ -1,8 +1,8 @@
 - sidebar = page.sidebar if page.sidebar&.active
-.container-fluid{class: "with#{"out" unless sidebar }-sidebar"}
+.container-fluid.content{class: "with#{"out" unless sidebar }-sidebar #{"public" unless page.admin}"}
   .row
     - if sidebar
-      .col-md-8= yield
+      .col-md-8.page= yield
       .col-md-4.sidebar= render template: "templates/#{sidebar.template}", locals: { record: sidebar }
     - else
-      .col-md-12= yield
+      .col-md-12.page= yield

data/lib/tomify/version.rb

@@ -1,3 +1,3 @@
 module Tomify
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomify
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Tom Prats
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-29 00:00:00.000000000 Z
+date: 2017-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -307,11 +307,11 @@ files:
 - app/assets/javascripts/tomify/turbolinks/compatibility.coffee
 - app/assets/javascripts/tomify/turbolinks/react.coffee
 - app/assets/stylesheets/_tomify.scss
+- app/assets/stylesheets/tomify/_content.scss
 - app/assets/stylesheets/tomify/_default.scss
 - app/assets/stylesheets/tomify/_footer.scss
 - app/assets/stylesheets/tomify/_header.scss
 - app/assets/stylesheets/tomify/_navbar.scss
-- app/assets/stylesheets/tomify/_page.scss
 - app/assets/stylesheets/tomify/_pagination.scss
 - app/assets/stylesheets/tomify/_plugins.scss
 - app/assets/stylesheets/tomify/_variables.scss

data/app/assets/stylesheets/tomify/_page.scss

@@ -1,35 +0,0 @@
-.page, .sidebar {
-  h1 { color: $brand; }
-  h2, h3 { font-style: italic; }
-  h2 { font-size: 1.5em; }
-  h3 { font-size: 1.25em; }
-  h2, h3, table, p, li { text-align: left; }
-  table { width: 100%; }
-  > ul > li {
-    margin-top: 10px;
-    font-size: 24px;
-    &:before { top: -1px; }
-    :not(p) { font-size: 14px; }
-  }
-  ul {
-    list-style-type: none;
-    padding-left: 0;
-  }
-  li {
-    position: relative;
-    padding-left: 25px;
-    &:before {
-      position: absolute;
-      top: 0;
-      left: 0;
-      font-family: "FontAwesome";
-      content: "\f058";
-      color: $brand;
-    }
-    ul li:before { content: "\f055"; }
-  }
-}
-
-.sidebar {
-  h1, h2, h3, h4, h5, h6 { margin-top: 0; }
-}