Merge branch 'master' of github.com:ByteInternet/hypernode-vagrant into move-config-mgmtlogic-into-vagrant-hypconfigmgmt-plugin

Conflicts:
	Vagrantfile

Author: vdloo

Vagrantfile

@@ -100,8 +100,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         hypernode_vagrant_name = ENV['HYPERNODE_VAGRANT_NAME'] ? ENV['HYPERNODE_VAGRANT_NAME'] : directory_name
 
         # remove special characters so we have a valid hostname
-        hypernode_host = hypernode_vagrant_name.gsub(/[^a-zA-Z0-9\-]/, "") 
+        hypernode_host = hypernode_vagrant_name.gsub(/[^a-zA-Z0-9]/, "")
         hypernode_host = hypernode_host.empty? ? 'hypernode' : hypernode_host
+        hypernode_host = hypernode_host.split('-')[0]
 
         directory_alias = hypernode_host + ".hypernode.local"
 

vagrant/resources/bootstrap.min.css

@@ -0,0 +1,18 @@
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 300;
+  src: local('Open Sans Light'), local('OpenSans-Light'), url(https://fonts.gstatic.com/s/opensans/v13/DXI1ORHCpsQm3Vp6mXoaTYnF5uFdDttMLvmWuJdhhgs.ttf) format('truetype');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Open Sans'), local('OpenSans'), url(https://fonts.gstatic.com/s/opensans/v13/cJZKeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf) format('truetype');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Open Sans Bold'), local('OpenSans-Bold'), url(https://fonts.gstatic.com/s/opensans/v13/k3k702ZOKiLJc3WVjuplzInF5uFdDttMLvmWuJdhhgs.ttf) format('truetype');
+}