Merge pull request #291 from AdTechMedia/issue_196

#196 Migrate to Material Design Icons
MitocGroup · Jul 20, 2017 · c282d02 · c282d02
2 parents 7d72b81 + fad502d
commit c282d02
Show file tree

Hide file tree

Showing 39 changed files with 236 additions and 1,323 deletions.
diff --git a/src/adtechmedia-website/frontend/css/src/_base.scss b/src/adtechmedia-website/frontend/css/src/_base.scss
@@ -213,15 +213,13 @@ small {
   position: relative;
   &.select-box {
     &:after {
-      content: '\f0d7';
-      font: normal normal normal 14px/1 FontAwesome;
+      font: normal normal normal 24px/1 "Material Design Icons";
+      content: '\F35D';
       position: absolute;
-      top: 50%;
+      top: 60%;
       right: 0;
       z-index: 1;
       color: #bbbbbb;
-      font-size: 14px;
-      line-height: 32px;
       transform: translateY(-50%);
       -webkit-transform: translateY(-50%);
     }
@@ -362,17 +360,19 @@ small {
     cursor: pointer;
     box-shadow: 0 8px 10px 1px rgba(0,0,0,0.14), 0 3px 14px 2px rgba(0,0,0,0.12), 0 5px 5px -3px rgba(0,0,0,0.2);
   }
-  i {
-    color: $link-color;
-    font-size: 1.6rem;
-    line-height: 50px;
-    @include transform(rotate(0deg));
-    @include transition(transform .8s ease-in-out);
-  }
+  &.mdi {
+    &:before {
+      color: $link-color;
+      font-size: 32px;
+      line-height: 50px;
+      @include transform(rotate(0deg));
+      @include transition(transform .8s ease-in-out);
+    }
 
-  &.rotate {
-    i {
-      @include transform(rotate(180deg));
+    &.rotate {
+      &:before {
+        @include transform(rotate(180deg));
+      }
     }
   }
 }
diff --git a/src/adtechmedia-website/frontend/css/src/_mixins.scss b/src/adtechmedia-website/frontend/css/src/_mixins.scss
@@ -103,7 +103,7 @@
 @mixin hover-color($list1, $list2) {
   @each $current in $list1 {
     $i: index($list1, $current);
-    .#{$current}:hover i {
+    .#{$current}:hover :before {
       color: nth($list2, $i);
     }
   }

diff --git a/src/adtechmedia-website/frontend/css/src/_responsive-view.scss b/src/adtechmedia-website/frontend/css/src/_responsive-view.scss
@@ -121,7 +121,7 @@
         a {
           width: 72px;
           height: 72px;
-          i {
+          &:before {
             font-size: 40px;
             line-height: 72px;
           }
@@ -319,7 +319,7 @@
             a {
               width: 70px;
               height: 70px;
-              i {
+              &:before {
                 font-size: 40px;
                 line-height: 70px;
               }
@@ -425,7 +425,7 @@
             a {
               width: 55px;
               height: 55px;
-              i {
+              &:before {
                 font-size: 28px;
                 line-height: 55px;
               }
@@ -469,7 +469,7 @@
             a {
               width: 50px;
               height: 50px;
-              i {
+              &:before {
                 font-size: 26px;
                 line-height: 50px;
               }
@@ -502,7 +502,7 @@
             a {
               width: 45px;
               height: 45px;
-              i {
+              &:before {
                 font-size: 24px;
                 line-height: 45px;
               }
@@ -581,7 +581,7 @@
             a {
               width: 40px;
               height: 40px;
-              i {
+              &:before {
                 font-size: 22px;
                 line-height: 40px;
               }
@@ -625,7 +625,7 @@
             a {
               width: 35px;
               height: 35px;
-              i {
+              &:before {
                 font-size: 20px;
                 line-height: 35px;
               }

diff --git a/src/adtechmedia-website/frontend/css/src/_styles.scss b/src/adtechmedia-website/frontend/css/src/_styles.scss
@@ -264,12 +264,12 @@ header {
         width: 55px;
         height: 55px;
         text-align: center;
-      }
-      i {
-        color: $gray-color;
-        font-size: 28px;
-        line-height: 55px;
-        @include transition(.3s ease-in-out);
+        &:before {
+          color: $gray-color;
+          font-size: 32px;
+          line-height: 55px;
+          @include transition(.3s ease-in-out);
+        }
       }
     }
 

diff --git a/src/adtechmedia-website/frontend/css/src/api/_api.scss b/src/adtechmedia-website/frontend/css/src/api/_api.scss
@@ -40,8 +40,7 @@
     vertical-align: top;
     margin-top: -3px;
     display: inline-block;
-    padding-left: 14px;
-    padding-right: 14px;
+    text-align: center;
     line-height: 36px;
     height: 36px;
     width: 36px;

diff --git a/src/adtechmedia-website/frontend/css/src/api/_responsive-view.scss b/src/adtechmedia-website/frontend/css/src/api/_responsive-view.scss
@@ -284,8 +284,6 @@
     }
 
     .back-link {
-      padding-left: 12px;
-      padding-right: 12px;
       line-height: 30px;
       height: 30px;
       width: 30px;

diff --git a/src/adtechmedia-website/frontend/css/src/calculator/_calculator.scss b/src/adtechmedia-website/frontend/css/src/calculator/_calculator.scss
@@ -101,7 +101,6 @@
         i {
           position: relative;
           z-index: 1;
-          font-size: 18px;
           opacity: 0;
           visibility: hidden;
           @include transition(.4s ease-in-out);

diff --git a/src/adtechmedia-website/frontend/css/src/home/_home.scss b/src/adtechmedia-website/frontend/css/src/home/_home.scss
@@ -67,11 +67,9 @@ section {
           @include transform(translateX(-50%) translateY(-50%) scale(1.2));
           cursor: pointer;
         }
-        i {
+        &:before {
           color: #fff;
-          margin-left: 10%;
           line-height: 46px;
-          font-size: 1.2rem;
         }
       }
     }
@@ -155,77 +153,6 @@ section {
   }
 }
 
-.footer-logo {
-  align-self: center;
-  img {
-    height: 80px;
-    float: right;
-  }
-}
-
-.footer-blocks {
-  padding: 22px 0;
-  a {
-    color: $base-color;
-    &:hover, &.active {
-      color: $link-color;
-    }
-  }
-
-  .social-links {
-    align-self: center;
-    height: 55px;
-    ul {
-      display: inline-block;
-    }
-
-    li {
-      float: left;
-      margin: 0 7px;
-      //a {
-      //  display: block;
-      //  background: #F2F2F2;
-      //  width: 55px;
-      //  height: 55px;
-      //  text-align: center;
-      //}
-      i {
-        color: #BFBFBF;
-        font-size: 28px;
-        line-height: 55px;
-        @include transition(.3s ease-in-out);
-      }
-    }
-
-    @include hover-color($social-icons, $social-colors);
-  }
-
-  .quick-links {
-    text-align: left;
-    h3 {
-      margin-bottom: 5px;
-    }
-
-    li {
-      float: left;
-      width: 50%;
-      position: relative;
-      padding: 0 0 0 15px;
-      &:before {
-        content: '';
-        position: absolute;
-        left: 0;
-        top: 50%;
-        width: 4px;
-        height: 4px;
-        border: 3px solid $link-color;
-        border-radius: 50%;
-        @include transform(translateY(-50%));
-      }
-    }
-  }
-}
-
 .solutions-block {
   width: 100%;
   text-align: left;
@@ -356,7 +283,7 @@ section {
   position: relative;
   &:hover {
     padding-right: 45px;
-    .fa-play {
+    i {
       opacity: 1;
       visibility: visible;
       right: 5px;
@@ -365,11 +292,10 @@ section {
       -webkit-animation: play 2s infinite ease-in-out;
     }
   }
-  .fa-play {
+  i {
     background: #fff;
     border-radius: 50%;
     color: #01ADFD;
-    font-size: 14px;
     width: 28px;
     height: 28px;
     line-height: 28px;
@@ -384,7 +310,6 @@ section {
     @include transition(all 0.4s ease-in-out);
     &:before {
       display: inline-block;
-      margin-left: 3px;
     }
   }
 }

diff --git a/src/adtechmedia-website/frontend/css/src/home/_responsive-view.scss b/src/adtechmedia-website/frontend/css/src/home/_responsive-view.scss
@@ -46,7 +46,7 @@
         .play {
           width: 58px;
           height: 58px;
-          i {
+          &:before {
             font-size: 1.8rem;
             line-height: 58px;
           }
@@ -184,7 +184,7 @@
         .play {
           width: 58px;
           height: 58px;
-          i {
+          &:before {
             font-size: 1.8rem;
             line-height: 58px;
           }
@@ -564,7 +564,7 @@
             .play {
               width: 58px;
               height: 58px;
-              i {
+              &:before {
                 font-size: 1.8rem;
                 line-height: 58px;
               }

diff --git a/src/adtechmedia-website/frontend/css/src/team/_styles.scss b/src/adtechmedia-website/frontend/css/src/team/_styles.scss
@@ -55,19 +55,13 @@
       @include transform(translateX(-50%));
     }
 
-    li {
-      display: inline-block;
-      a {
-        color: #595959;
-        @include transition(.2s linear);
-        &:hover {
-          color: $link-color;
-        }
-      }
-
-      .fa {
-        font-size: 20px;
-        margin: 15px 10px 0;
+    a {
+      color: #595959;
+      @include transition(.2s linear);
+      font-size: 20px;
+      margin: 15px 10px 0;
+      &:hover {
+        color: $link-color;
       }
     }
   }

diff --git a/src/adtechmedia-website/frontend/css/vendor/font-awesome.min.css b/src/adtechmedia-website/frontend/css/vendor/font-awesome.min.css
diff --git a/src/adtechmedia-website/frontend/css/vendor/materialdesignicons.min.css b/src/adtechmedia-website/frontend/css/vendor/materialdesignicons.min.css
diff --git a/src/adtechmedia-website/frontend/fonts/Font-Awesome/FontAwesome.otf b/src/adtechmedia-website/frontend/fonts/Font-Awesome/FontAwesome.otf
diff --git a/src/adtechmedia-website/frontend/fonts/Font-Awesome/fontawesome-webfont.eot b/src/adtechmedia-website/frontend/fonts/Font-Awesome/fontawesome-webfont.eot