HEUHUE master

lailatulcoding · May 25, 2018 · 6eb780a · 6eb780a
1 parent e9bb950
commit 6eb780a
Show file tree

Hide file tree

Showing 39 changed files with 8 additions and 7 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/app/.DS_Store b/app/.DS_Store
diff --git a/app/assets/.DS_Store b/app/assets/.DS_Store
diff --git a/app/assets/fonts/.DS_Store b/app/assets/fonts/.DS_Store
diff --git a/app/assets/fonts/Kalam-Bold.ttf b/app/assets/fonts/Kalam-Bold.ttf
diff --git a/app/assets/fonts/Raleway-Bold.ttf b/app/assets/fonts/Raleway-Bold.ttf
diff --git a/app/assets/fonts/Raleway-ExtraBold.ttf b/app/assets/fonts/Raleway-ExtraBold.ttf
diff --git a/app/assets/fonts/Raleway-ExtraLight.ttf b/app/assets/fonts/Raleway-ExtraLight.ttf
diff --git a/app/assets/fonts/Raleway-Heavy.ttf b/app/assets/fonts/Raleway-Heavy.ttf
diff --git a/app/assets/fonts/Raleway-Light.ttf b/app/assets/fonts/Raleway-Light.ttf
diff --git a/app/assets/fonts/Raleway-Medium.ttf b/app/assets/fonts/Raleway-Medium.ttf
diff --git a/app/assets/fonts/Raleway-Regular.ttf b/app/assets/fonts/Raleway-Regular.ttf
diff --git a/app/assets/fonts/Raleway-SemiBold.ttf b/app/assets/fonts/Raleway-SemiBold.ttf
diff --git a/app/assets/fonts/Raleway-Thin.ttf b/app/assets/fonts/Raleway-Thin.ttf
diff --git a/app/assets/fonts/Simple-Line-Icons.ttf b/app/assets/fonts/Simple-Line-Icons.ttf
diff --git a/app/assets/fonts/roboto/Roboto-Bold.eot b/app/assets/fonts/roboto/Roboto-Bold.eot
diff --git a/app/assets/fonts/roboto/Roboto-Bold.ttf b/app/assets/fonts/roboto/Roboto-Bold.ttf
diff --git a/app/assets/fonts/roboto/Roboto-Bold.woff b/app/assets/fonts/roboto/Roboto-Bold.woff
diff --git a/app/assets/fonts/roboto/Roboto-Bold.woff2 b/app/assets/fonts/roboto/Roboto-Bold.woff2
diff --git a/app/assets/fonts/roboto/Roboto-Light.eot b/app/assets/fonts/roboto/Roboto-Light.eot
diff --git a/app/assets/fonts/roboto/Roboto-Light.ttf b/app/assets/fonts/roboto/Roboto-Light.ttf
diff --git a/app/assets/fonts/roboto/Roboto-Light.woff b/app/assets/fonts/roboto/Roboto-Light.woff
diff --git a/app/assets/fonts/roboto/Roboto-Light.woff2 b/app/assets/fonts/roboto/Roboto-Light.woff2
diff --git a/app/assets/fonts/roboto/Roboto-Medium.eot b/app/assets/fonts/roboto/Roboto-Medium.eot
diff --git a/app/assets/fonts/roboto/Roboto-Medium.ttf b/app/assets/fonts/roboto/Roboto-Medium.ttf
diff --git a/app/assets/fonts/roboto/Roboto-Medium.woff b/app/assets/fonts/roboto/Roboto-Medium.woff
diff --git a/app/assets/fonts/roboto/Roboto-Medium.woff2 b/app/assets/fonts/roboto/Roboto-Medium.woff2
diff --git a/app/assets/fonts/roboto/Roboto-Regular.eot b/app/assets/fonts/roboto/Roboto-Regular.eot
diff --git a/app/assets/fonts/roboto/Roboto-Regular.ttf b/app/assets/fonts/roboto/Roboto-Regular.ttf
diff --git a/app/assets/fonts/roboto/Roboto-Regular.woff b/app/assets/fonts/roboto/Roboto-Regular.woff
diff --git a/app/assets/fonts/roboto/Roboto-Regular.woff2 b/app/assets/fonts/roboto/Roboto-Regular.woff2
diff --git a/app/assets/fonts/roboto/Roboto-Thin.eot b/app/assets/fonts/roboto/Roboto-Thin.eot
diff --git a/app/assets/fonts/roboto/Roboto-Thin.ttf b/app/assets/fonts/roboto/Roboto-Thin.ttf
diff --git a/app/assets/fonts/roboto/Roboto-Thin.woff b/app/assets/fonts/roboto/Roboto-Thin.woff
diff --git a/app/assets/fonts/roboto/Roboto-Thin.woff2 b/app/assets/fonts/roboto/Roboto-Thin.woff2
diff --git a/app/assets/stylesheets/mdb.min.css b/app/assets/stylesheets/mdb.min.css
diff --git a/app/assets/stylesheets/style.css → app/assets/stylesheets/style.scss b/app/assets/stylesheets/style.css → app/assets/stylesheets/style.scss
@@ -6,11 +6,11 @@ body,
 }
 @font-face {
     font-family: kalam;
-    src: url(../assets/fonts/Kalam-Bold.ttf);
+    src: font-url('Kalam-Bold.ttf');
 }
 @font-face {
     font-family: simple-line-icons;
-    src: url(../assets/fonts/Simple-Line-Icons.ttf);
+    src: font-url('Simple-Line-Icons.ttf');
 }
 /* Navigation*/
 

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -5,7 +5,7 @@
     <%= csrf_meta_tags %>
 
     <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
-
+    <%= stylesheet_link_tag 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.css' %>
     <%= javascript_include_tag 'https://maps.googleapis.com/maps/api/js?key=AIzaSyBAgu9IMeQUB5dWfwKN6mDKAoyoqAuIXSg' %>
     <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
   </head>

diff --git a/app/views/pages/landing.html.erb b/app/views/pages/landing.html.erb
@@ -426,7 +426,7 @@
         </div>
         </section>
         <section id="full-team">
-          <div class="container-fluid background-full-team  header-intro view hm-black-light jarallax" data-jarallax='{"speed": 0.2}' style="background-image: url(assets/images/team-hand.jpg);">
+          <div class="container-fluid background-full-team  header-intro view hm-black-light jarallax" data-jarallax='{"speed": 0.2}' style="background-image: url(<%= image_path('team-hand.jpg') %>);">
             <div class="row">
               <div class="col-md-12">
                 <p class="wow fadeInUp">Lihat Semua Anggota Kita <span>Klik Disini!</span></p>
@@ -678,7 +678,7 @@ function init() {
     map = new google.maps.Map(mapElement, mapOptions);
 
     // Custom Map Marker Icon - Customize the map-marker.png file to customize your icon
-    var image = 'assets/images/map-marker.png';
+    var image = "<%= image_path('map-marker.png') %>";
     var myLatLng = new google.maps.LatLng(40.6700, -73.9400);
     var beachMarker = new google.maps.Marker({
         position: myLatLng,