publish_my_data 1.3.9 → 1.3.10

data/app/assets/stylesheets/publish_my_data/core/0500-icon-font.scss

@@ -0,0 +1,14 @@
+/* ==========================================================================
+	§0500 - ICONS (via icomoon)
+   ========================================================================== */
+
+@font-face {
+	font-family: 'pmd';
+	src:url('pmd.eot?ba8fya');
+	src:url('pmd.eot?#iefixba8fya') format('embedded-opentype'),
+		url('pmd.woff?ba8fya') format('woff'),
+		url('pmd.ttf?ba8fya') format('truetype'),
+		url('pmd.svg?ba8fya#pmd') format('svg');
+	font-weight: normal;
+	font-style: normal;
+}

data/app/assets/stylesheets/publish_my_data/core/1500-icons.scss

@@ -2,17 +2,6 @@
 	§1500 - ICONS (via icomoon)
    ========================================================================== */
 
-@font-face {
-	font-family: 'pmd';
-	src:url('pmd.eot?ba8fya');
-	src:url('pmd.eot?#iefixba8fya') format('embedded-opentype'),
-		url('pmd.woff?ba8fya') format('woff'),
-		url('pmd.ttf?ba8fya') format('truetype'),
-		url('pmd.svg?ba8fya#pmd') format('svg');
-	font-weight: normal;
-	font-style: normal;
-}
-
 [class^="icon-"], [class*=" icon-"] {
 	@extend .icon;
 }

data/app/assets/stylesheets/publish_my_data/core/2000-elements.scss

@@ -2,7 +2,6 @@
 	§3000 - HTML ELEMENT LEVEL (aka resetting the reset)
    ========================================================================== */
 
-// TODO - consider scoping these only to inside of PMD section to play more nicely when shared
 
 article,
 aside,
@@ -115,4 +114,4 @@ header h2 {
 
 table h3 {
 	margin-top: 0;
-}
+}

data/app/assets/stylesheets/publish_my_data/facades/bootstrap.scss

@@ -13,13 +13,23 @@ $font-family-sans-serif:	$pmdconfig_typeface_bodycopy;
 $font-family-base:			$pmdconfig_typeface_bodycopy;
 $font-family-monospace:		$pmdconfig_typeface_monospace;
 
-@import "vendor/bootstrap/bootstrap";
+// these styles are scoped to the body in bootstrap, so need scoping to pmd
+@if $pmdconfig_scope_global != true {
+	.pmd {
+		font-family: $font-family-base;
+		font-size: $font-size-base;
+	}
+}
+
+#{$scope}{
+	@import "vendor/bootstrap/bootstrap";
+}
 
 // Responsive breakpoints
 // ========================================================================== */
 
 // in pixels, the width above which we switch from single into multi-column view;
-$pmd_breakpoint_mobile: $screen-md; 
+$pmd_breakpoint_mobile: 992px; // bootstrap's default $screen-md;
 
 // Grid
 // ========================================================================== */
@@ -50,4 +60,4 @@ $pmd_breakpoint_mobile: $screen-md;
 }
 .pmd_box_sidebar{
 	@extend .col-md-3;
-}
+}

data/app/assets/stylesheets/publish_my_data.scss

@@ -2,17 +2,17 @@
 
 	     ____  __  ______  __    _________ __  __
 	    / __ \/ / / / __ )/ /   /  _/ ___// / / /
-	   / /_/ / / / / __  / /    / / \__ \/ /_/ / 
-	  / ____/ /_/ / /_/ / /____/ / ___/ / __  /  
-	 /_/    \____/_____/_____/___//____/_/ /_/   
+	   / /_/ / / / / __  / /    / / \__ \/ /_/ /
+	  / ____/ /_/ / /_/ / /____/ / ___/ / __  /
+	 /_/    \____/_____/_____/___//____/_/ /_/
 
 	     __  _____  __
 	    /  |/  /\ \/ /
-	   / /|_/ /  \  / 
-	  / /  / /   / /  
-	 /_/  /_/   /_/   
+	   / /|_/ /  \  /
+	  / /  / /   / /
+	 /_/  /_/   /_/
 
-	     ____  ___  _________ 
+	     ____  ___  _________
 	    / __ \/   |/_  __/   |
 	   / / / / /| | / / / /| |
 	  / /_/ / ___ |/ / / ___ |
@@ -23,7 +23,7 @@
 ****************************************************************************/
 
 // NB - including stylsheet should specify @charset "UTF-8" to support icons
- 
+
 // ==========================================================================
 //   DEFAULTS (override these in your application .scss)
 // ==========================================================================
@@ -82,6 +82,36 @@ $pmdconfig_colour_slickgrid_alternate_row_bg:		#fcfcfc !default;
 $pmdconfig_colour_slickgrid_content_links:			$pmdconfig_colour_link !default;
 $pmdconfig_colour_slickgrid_content_links_hover:	$pmdconfig_colour_link_hover !default;
 
+// ==========================================================================
+//   SCOPE - just style PMD, or style whole page
+// ==========================================================================
+
+// if $pmdconfig_scope_control is true, pmd styles will be scoped inside the
+// class, otherwise, they will be in global scope.
+
+// STOMP on global styles
+// set $pmdconfig_scope_global: true...
+// when you want the framework and/or html reset to spill out
+//
+// ie when you're not providing another stylesheet and want to use pmd
+// as the basis of the whole site's styles without reimcluding the framework
+
+// NOSTOMP on global styles
+// set $pmdconfig_scope_global: false...
+// when you are including a sitewide stylesheet
+//
+// eg when re-using a pre-existing navigation and its styles (read: Wordpress skin)
+// so the framework and reset don't stomp on the site's styling
+
+$pmdconfig_scope_global: false !default;
+$scope: "";
+
+@if $pmdconfig_scope_global{
+	$scope: "html";
+} @else {
+	$scope: ".pmd"
+}
+
 // ==========================================================================
 //   FRAMEWORK (add a facade to sit PMD on your favorite css framework)
 // ==========================================================================
@@ -92,19 +122,23 @@ $pmdconfig_colour_slickgrid_content_links_hover:	$pmdconfig_colour_link_hover !d
 //   REQUIRED PMD STYLING COMPONENTS
 // ==========================================================================
 
-@import "publish_my_data/core/1000-utilities";
-@import "publish_my_data/core/1500-icons";
-@import "publish_my_data/core/2000-elements";
-@import "publish_my_data/core/4000-layout";
-@import "publish_my_data/core/5000-styling";
-@import "publish_my_data/core/6000-datagrid";
-@import "publish_my_data/core/6200-sparqlconsole";
-@import "publish_my_data/core/7000-experimental";
-@import "publish_my_data/core/8000-colour";
+@import "publish_my_data/core/0500-icon-font";
+
+#{$scope}{
+	@import "publish_my_data/core/1000-utilities";
+	@import "publish_my_data/core/1500-icons";
+	@import "publish_my_data/core/2000-elements";
+	@import "publish_my_data/core/4000-layout";
+	@import "publish_my_data/core/5000-styling";
+	@import "publish_my_data/core/6000-datagrid";
+	@import "publish_my_data/core/6200-sparqlconsole";
+	@import "publish_my_data/core/7000-experimental";
+	@import "publish_my_data/core/8000-colour";
+}
 
 // ==========================================================================
 //   TODO list
 // ==========================================================================
 //
 // consolidate error styles
-// consolidate the different types of code, kbd, uri etc
+// consolidate the different types of code, kbd, uri etc

data/lib/publish_my_data/version.rb

@@ -1,3 +1,3 @@
 module PublishMyData
-  VERSION = "1.3.9"
+  VERSION = "1.3.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: publish_my_data
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.3.10
   prerelease: 
 platform: ruby
 authors:
@@ -257,6 +257,7 @@ files:
 - app/assets/javascripts/slick_grid/30_slick-grid.js
 - app/assets/javascripts/vendor/codemirror/codemirror.js
 - app/assets/javascripts/vendor/codemirror/sparql.js
+- app/assets/stylesheets/publish_my_data/core/0500-icon-font.scss
 - app/assets/stylesheets/publish_my_data/core/1000-utilities.scss
 - app/assets/stylesheets/publish_my_data/core/1500-icons.scss
 - app/assets/stylesheets/publish_my_data/core/2000-elements.scss
@@ -541,7 +542,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 292748421446613393
+      hash: 455891400002228453
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: