Fixing less building in plugin, and tweaking styles for better responsive layout

5 files changed, 13 insertions, 6 deletions

diff --git a/plugins/RequireJS-0.2.1.zip b/plugins/RequireJS-0.2.1.zip
index 1e886ef..a169c3e 100644
--- a/plugins/RequireJS-0.2.1.zip
+++ b/plugins/RequireJS-0.2.1.zip
diff --git a/plugins/RequireJS/RequireJS.cfc b/plugins/RequireJS/RequireJS.cfc
index a6951da..30bfb96 100644
--- a/plugins/RequireJS/RequireJS.cfc
+++ b/plugins/RequireJS/RequireJS.cfc
@@ -5,7 +5,7 @@
         <cfreturn this>
     </cffunction>
 
-	<cffunction name="requireStyleTags" output="false">
+	<cffunction name="requireStyleTags" output="true">
 		<cfargument name="href" type="Array" required="true">
 		<cfargument name="outputTarget" type="string" required="false" default="#ListFirst(Replace(CGI.script_name, '/', '_', "ALL"), '.')#.css">
 		
@@ -66,7 +66,10 @@
 
 					<cfloop condition="#ArrayLen(loc.import.pos)# IS 2">
 						<cfset loc.importFile = ReReplace(mid(loc.ssContent, loc.import.pos[2], loc.import.len[2]), "(^""|')|(""|'$)", "", "ALL")>
-						<cfset loc.importFile = GetDirectoryFromPath(loc.stylesheetSrc) & loc.importFile>
+						
+						<cfif Find("/", loc.stylesheetSrc)>
+							<cfset loc.importFile = GetDirectoryFromPath(loc.stylesheetSrc) & loc.importFile>
+						</cfif>
 						
 						<cfset ArrayAppend(loc.ssFiles, loc.importFile)>
 
@@ -74,7 +77,9 @@
 					</cfloop>
 
 					<cfloop query="loc.ssMetaData">
+
 						<cfloop array="#loc.ssFiles#" index="loc.thisSS">
+							
 							<cfif Replace(directory & "/" & REReplaceNoCase(name, ".(le|c)ss$", ""), "#GetDirectoryFromPath(GetBaseTemplatePath())#stylesheets/","") IS REReplaceNoCase(loc.thisSS, ".less$", "")>
 							
 								<!--- If any of the less files we are dealing with have a date greater than the oldest css, then we need to regenerate.
diff --git a/stylesheets/fiddle.css b/stylesheets/fiddle.css
index 1a4bb62..6dc1d19 100644
--- a/stylesheets/fiddle.css
+++ b/stylesheets/fiddle.css
@@ -30,7 +30,7 @@
   }
   .helpTip {
     width: 180px !important;
-    height: 50% !important;
+    height: 30% !important;
   }
 }
 @media (min-width: 768px) and (max-width: 979px) {
@@ -79,7 +79,7 @@ textarea.fullscreen {
   display: none;
   width: 180px;
   height: 60%;
-  min-height: 100px;
+  min-height: 50px;
   overflow-y: auto;
   right: 0px;
   z-index: 1001;
@@ -102,6 +102,7 @@ textarea.fullscreen {
   white-space: nowrap;
   overflow: auto;
   font-size: 10pt;
+  min-height: 100px;
 }
 .tables,
 .columns {
diff --git a/stylesheets/fiddle.less b/stylesheets/fiddle.less
index 12f595f..4dc326b 100644
--- a/stylesheets/fiddle.less
+++ b/stylesheets/fiddle.less
@@ -35,7 +35,7 @@ textarea.fullscreen {
 	display: none;
 	width: 180px;
 	height: 60%;
-	min-height: 100px;
+	min-height: 50px;
 	overflow-y: auto;
 	right: 0px;
 	z-index: 1001;
@@ -57,6 +57,7 @@ textarea.fullscreen {
 	white-space: nowrap;
 	overflow: auto;
 	font-size: 10pt;
+	min-height: 100px;
 }
 
 .tables, .columns {
diff --git a/stylesheets/fiddle_responsive.less b/stylesheets/fiddle_responsive.less
index ae3fd11..518829e 100644
--- a/stylesheets/fiddle_responsive.less
+++ b/stylesheets/fiddle_responsive.less
@@ -29,7 +29,7 @@
 
 	.helpTip {
 		width: 180px !important;
-		height: 50% !important; 	
+		height: 30% !important; 	
 	}
 
 }