Client-side cleanup

- Remove grunt - Formatting and spacing. There shall be 4 spaces in a tab. Not 3. Not 5. And 2 is right out.
nderkach · Sep 15, 2014 · 563078d · 563078d
1 parent 2cefd05
commit 563078d
Show file tree

Hide file tree

Showing 10 changed files with 110 additions and 280 deletions.
diff --git a/libmproxy/web/static/js/app.js b/libmproxy/web/static/js/app.js
diff --git a/web/Gruntfile.js b/web/Gruntfile.js
diff --git a/web/package.json b/web/package.json
@@ -5,17 +5,6 @@
     "bower": "",
     "bower-installer": "^0.8.4",
     "clean-css": "",
-    "grunt": "",
-    "grunt-contrib-connect": "",
-    "grunt-contrib-copy": "",
-    "grunt-contrib-jshint": "",
-    "grunt-contrib-less": "",
-    "grunt-contrib-qunit": "",
-    "grunt-contrib-uglify": "",
-    "grunt-contrib-watch": "",
-    "grunt-notify": "",
-    "grunt-react": "",
-    "grunt-shell": "",
     "gulp": "^3.8.8",
     "gulp-concat": "^2.4.0",
     "gulp-jshint": "^1.8.4",

diff --git a/web/src/css/app.less b/web/src/css/app.less
@@ -1,10 +1,10 @@
 // www.paulirish.com/2012/box-sizing-border-box-ftw/
 html {
-  box-sizing: border-box;
+	box-sizing: border-box;
 }
 
 *, *:before, *:after {
-  box-sizing: inherit;
+	box-sizing: inherit;
 }
 
 @import (less) "layout.less";

diff --git a/web/src/css/footer.less b/web/src/css/footer.less
@@ -1,4 +1,4 @@
 footer {
-  padding: 0 10px;
-  //text-align: center;
+	padding: 0 10px;
+	//text-align: center;
 }
diff --git a/web/src/css/header.less b/web/src/css/header.less
@@ -1,62 +1,60 @@
 header {
+    background-color: white;
 
-  background-color: white;
-
-  .title-bar {
-    line-height: 25px;
-    text-align: center;
-  }
-
-  @separator-color: lighten(grey, 15%);
-
-  nav {
-
-    border-bottom: solid @separator-color 1px;
-
-    a {
-      display: inline-block;
-      padding: 3px 14px;
-      margin: 0 2px -1px;
-      border: solid transparent 1px;
-      //text-transform: uppercase;
-      //font-family: Lato;
-
-      &.active {
-        border-color: @separator-color;
-        border-bottom-color: white;
-      }
-      &:hover {
-        /*
-        @preview: lightgrey;
-        border-top-color: @preview;
-        border-left-color: @preview;
-        border-right-color: @preview;
-        */
-        text-decoration: none;
-      }
-      &.special {
-        @special-color: #396cad;
-        color: white;
-        background-color: @special-color;
-        border-bottom-color: @special-color;
-        &:hover {
-          background-color: lighten(@special-color, 10%);
-        }
-      }
+    .title-bar {
+        line-height: 25px;
+        text-align: center;
     }
 
-    &:before {
-      content: " ";
-    }
+    @separator-color: lighten(grey, 15%);
+
+    nav {
+        border-bottom: solid @separator-color 1px;
+
+        a {
+            display: inline-block;
+            padding: 3px 14px;
+            margin: 0 2px -1px;
+            border: solid transparent 1px;
+            //text-transform: uppercase;
+            //font-family: Lato;
+
+            &.active {
+            border-color: @separator-color;
+            border-bottom-color: white;
+            }
+            &:hover {
+                /*
+                @preview: lightgrey;
+                border-top-color: @preview;
+                border-left-color: @preview;
+                border-right-color: @preview;
+                */
+                text-decoration: none;
+            }
+            &.special {
+                @special-color: #396cad;
+                color: white;
+                background-color: @special-color;
+                border-bottom-color: @special-color;
+                &:hover {
+                    background-color: lighten(@special-color, 10%);
+                }
+            }
+        }
 
-    &:after {
-      clear: both;
-    }
+        &:before {
+            content: " ";
+        }
 
-  }
+        &:after {
+            clear: both;
+        }
+
+    }
 
-  .menu {
-    height: 100px;
-    border-bottom: solid @separator-color 1px;
-  }
+    .menu {
+        height: 100px;
+        border-bottom: solid @separator-color 1px;
+    }
 }