Merge branch 'dev' into 491_Event_list_date_bug

hpi-swt2 · Feb 3, 2017 · 1afcc17 · 1afcc17
2 parents cbaec35 + a785f19
commit 1afcc17
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -31,6 +31,10 @@ body, footer, main, .front-section {
 .m-t-1 { margin-top: 15px; }
 .m-b-1 { margin-bottom: 15px; }
 
+@media (max-width: 485px) {
+    .m-t-1-sm { margin-top: 15px; }
+}
+
 .img-float-corner-tr {
     float: right;
     margin: 0 0 15px 15px;

diff --git a/app/assets/stylesheets/custom_bootstrap/custom_bootstrap.less b/app/assets/stylesheets/custom_bootstrap/custom_bootstrap.less
@@ -128,18 +128,28 @@ a:hover h1, a:hover h2, a:hover h3, a:hover h4 {
 
 	h1 {
 		font-weight: 700;
-		font-size: 60px;
+		font-size: 7rem;
 		letter-spacing: 1px;
 		line-height: 1.3;
+		word-wrap: break-word;
 	}
 
 	h2 {
 		font-weight: 700;
-		font-size: 60px;
+		font-size: 6rem;
 		letter-spacing: 1px;
 		line-height: 0.8;
 		padding-bottom: 30px;
+		word-wrap: break-word;
 	}
+@media (max-width: @screen-sm-max) {
+ h1 { font-size: 5rem; }
+ h2 { font-size: 4rem; }
+}
+@media (max-width: @screen-xs-max) {
+ h1 { font-size: 3.5rem; }
+ h2 { font-size: 2.5rem; }
+}
 
 
 .subheadline--wrapper {
@@ -178,7 +188,6 @@ a:hover h1, a:hover h2, a:hover h3, a:hover h4 {
    border-bottom: 1px solid #eee;
 
    h1 {
-		font-size: 90px;
 		line-height: 0.8;
 	}
    .container {
@@ -203,7 +212,6 @@ a:hover h1, a:hover h2, a:hover h3, a:hover h4 {
 
 		h1 {
 			line-height: 0.9 !important;
-			font-size: 75px;
 		}
 	}
 }

diff --git a/app/views/application/index.html.erb b/app/views/application/index.html.erb
@@ -1,7 +1,7 @@
 <section class="front-section">
 	<div class="container" id="wsp-welcome">
 		<div class="row">
-			<div class="col-sm-6">
+			<div class="col-md-6">
 				<div class="row">
 					<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
 						<h4 class="text-uppercase"><%= t 'start_page.welcome_to' %></h4>
@@ -56,7 +56,7 @@
 		<div class="row">
 			<div class="col-xs-12 col-sm-12 col-md-10 col-lg-10 col-md-offset-1 col-lg-offset-1">
 				<h2><span class="m-r-1"><%= t 'navbar.events' %></span>
-					<a class="btn btn-primary" href="<%= events_path %>">
+					<a class="m-t-1-sm btn btn-primary" href="<%= events_path %>">
 						<%= glyph 'calendar' %> <%= t "start_page.all_events" %>
 					</a>
 				</h2>