SAK-30481 - Bootstrap fonts (and Actions button) missing on resources…

… page
chundcm · Mar 17, 2016 · ef46b7c · ef46b7c
1 parent 4611de5
commit ef46b7c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/reference/library/src/morpheus-master/sass/_defaults.scss b/reference/library/src/morpheus-master/sass/_defaults.scss
@@ -1,6 +1,7 @@
 /* Global namespace */
 
 $namespace : "Mrphs-";
+$skin-name : "morpheus-default"; // This is used for bootstrap font behaviour.
 
 $break-small-end: 	800px;
 $break-medium-end: 	1030px;

diff --git a/reference/library/src/morpheus-master/sass/base/_bootstrap-defaults.scss b/reference/library/src/morpheus-master/sass/base/_bootstrap-defaults.scss
@@ -81,7 +81,9 @@ $font-family-base:        	 $font-family;
 
 // [converter] If $bootstrap-sass-asset-helper if used, provide path relative to the assets load path.
 // [converter] This is because some asset helpers, such as Sprockets, do not work with file-relative paths.
-// $icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/")
+
+$bootstrap-sass-asset-helper : false;
+$icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../" + $skin-name + "/fonts/bootstrap/");
 
 //** File name for all font files.
 // $icon-font-name:          "glyphicons-halflings-regular"

diff --git a/reference/library/src/morpheus-master/sass/modules/tool/resources/_resources.scss b/reference/library/src/morpheus-master/sass/modules/tool/resources/_resources.scss
@@ -202,6 +202,10 @@
  		display: block;
  		margin-top: 1.4rem;
  	}
+
+ 	button.btn-default.btn{
+ 		@include sakai_button( $button-background-color, $button-border-color, $button-text-color, $button-background-secondary-color );
+ 	}
 
 
 }