Merge pull request sakaiproject#1019 from udayg/SAK-29801

SAK-29801: Integrate Bootstrap into Morpheus
susowrc · Aug 27, 2015 · f4a76d5 · f4a76d5
2 parents 06f19d5 + eadc271
commit f4a76d5
Show file tree

Hide file tree

Showing 14 changed files with 1,196 additions and 12 deletions.
diff --git a/reference/library/pom.xml b/reference/library/pom.xml
@@ -228,6 +228,12 @@
 								<version>4.3.2.1</version>
 								<type>gem</type>
 							</dependency>
+							<dependency>
+								<groupId>rubygems</groupId>
+								<artifactId>bootstrap-sass</artifactId>
+								<version>3.3.5.1</version>
+								<type>gem</type>
+							</dependency>
 						</dependencies>
 					</plugin>
 					<plugin>

diff --git a/reference/library/src/morpheus-master/config.rb b/reference/library/src/morpheus-master/config.rb
@@ -1,6 +1,7 @@
 # Require any additional compass plugins here.
 # require 'breakpoint'
 require 'font-awesome-sass'
+require 'bootstrap-sass'
 # Set this to the root of your project when deployed:
 sass_dir = "sass"
 images_dir = "images"

diff --git a/reference/library/src/morpheus-master/fonts/bootstrap/glyphicons-halflings-regular.eot b/reference/library/src/morpheus-master/fonts/bootstrap/glyphicons-halflings-regular.eot
diff --git a/...ce/library/src/morpheus-master/fonts/bootstrap/glyphicons-halflings-regular.svg b/...ce/library/src/morpheus-master/fonts/bootstrap/glyphicons-halflings-regular.svg
diff --git a/reference/library/src/morpheus-master/fonts/bootstrap/glyphicons-halflings-regular.ttf b/reference/library/src/morpheus-master/fonts/bootstrap/glyphicons-halflings-regular.ttf
diff --git a/reference/library/src/morpheus-master/fonts/bootstrap/glyphicons-halflings-regular.woff b/reference/library/src/morpheus-master/fonts/bootstrap/glyphicons-halflings-regular.woff
diff --git a/reference/library/src/morpheus-master/fonts/bootstrap/glyphicons-halflings-regular.woff2 b/reference/library/src/morpheus-master/fonts/bootstrap/glyphicons-halflings-regular.woff2