From 563078df2473a2a65c1a408e4cb27e79c95b7c87 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Mon, 15 Sep 2014 12:37:52 +1200 Subject: 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. --- web/src/css/app.less | 4 +- web/src/css/footer.less | 4 +- web/src/css/header.less | 106 +++++++++++++++++++++--------------------- web/src/css/layout.less | 32 ++++++------- web/src/js/footer.react.js | 8 ++-- web/src/js/header.react.js | 29 ++++++------ web/src/js/mitmproxy.react.js | 20 ++++---- 7 files changed, 100 insertions(+), 103 deletions(-) (limited to 'web/src') diff --git a/web/src/css/app.less b/web/src/css/app.less index 4efb8ceb..ff3c614c 100644 --- 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 index 4c0035c8..69ab62ce 100644 --- 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; } \ No newline at end of file diff --git a/web/src/css/header.less b/web/src/css/header.less index 998c0612..4f4af121 100644 --- 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; + } } \ No newline at end of file diff --git a/web/src/css/layout.less b/web/src/css/layout.less index e1f22249..7c5f79b9 100644 --- a/web/src/css/layout.less +++ b/web/src/css/layout.less @@ -1,36 +1,36 @@ html, body, #container { - height: 100%; - margin: 0; - overflow: hidden; + height: 100%; + margin: 0; + overflow: hidden; } header, footer { - display: block; + display: block; } @headerheight: 153px; @footerheight: 25px; #container { - //Set padding on container so that #main can take 100% height - //If we don't do it, the scrollbars will be too large. - padding: @headerheight 0 @footerheight; + //Set padding on container so that #main can take 100% height + //If we don't do it, the scrollbars will be too large. + padding: @headerheight 0 @footerheight; } header { - height: @headerheight; - //Substract #container padding - margin-top: -@headerheight; + height: @headerheight; + //Substract #container padding + margin-top: -@headerheight; } #main { - height: 100%; - display: block; - overflow-y: auto; + height: 100%; + display: block; + overflow-y: auto; } footer { - //This starts at the beginning of the #container padding, all fine. - height: @footerheight; - line-height: @footerheight; + //This starts at the beginning of the #container padding, all fine. + height: @footerheight; + line-height: @footerheight; } diff --git a/web/src/js/footer.react.js b/web/src/js/footer.react.js index 9b36d841..1b65e19d 100644 --- a/web/src/js/footer.react.js +++ b/web/src/js/footer.react.js @@ -2,8 +2,10 @@ var Footer = React.createClass({ render : function(){ - return (); + return ( + + ); } }); \ No newline at end of file diff --git a/web/src/js/header.react.js b/web/src/js/header.react.js index b204eeb8..85dc3106 100644 --- a/web/src/js/header.react.js +++ b/web/src/js/header.react.js @@ -1,17 +1,17 @@ /** @jsx React.DOM */ var MainMenu = React.createClass({ - render : function(){ + render: function(){ return (
Main Menu
); } }); var ToolsMenu = React.createClass({ - render : function(){ + render: function(){ return (
Tools Menu
); } }); var ReportsMenu = React.createClass({ - render : function(){ + render: function(){ return (
Reports Menu
); } }); @@ -36,7 +36,7 @@ var _Header_Entries = { var Header = React.createClass({ getInitialState: function(){ - return {active: "main"}; + return {active: "main"}; }, handleClick: function(active){ this.setState({active: active}); @@ -47,7 +47,6 @@ var Header = React.createClass({ console.log("File click"); }, render: function(){ - var header = []; for(var item in _Header_Entries){ var classes = this.state.active == item ? "active" : ""; @@ -58,16 +57,16 @@ var Header = React.createClass({ var menu = _Header_Entries[this.state.active].menu(); return (
-
- mitmproxy { this.props.settings.version } -
- -
- { menu } -
+
+ mitmproxy { this.props.settings.version } +
+ +
+ { menu } +
); } }); \ No newline at end of file diff --git a/web/src/js/mitmproxy.react.js b/web/src/js/mitmproxy.react.js index cdb6221d..609d2014 100644 --- a/web/src/js/mitmproxy.react.js +++ b/web/src/js/mitmproxy.react.js @@ -19,15 +19,15 @@ var App = React.createClass({ this.setState({settings: settings.getAll()}); }, render: function () { - return ( -
-
-
- + return ( +
+
+
+ +
+
-
- ); + ); } }); @@ -44,20 +44,18 @@ var TrafficTable = React.createClass({ flowStore.addChangeListener(this.onFlowsChange); $.getJSON("/flows.json").success(function (flows) { - flows.forEach(function (flow, i) { window.setTimeout(function () { flowStore.addFlow(flow); }, _.random(i*400,i*400+1000)); }); - }.bind(this)); }, componentWillUnmount: function(){ this.state.flowStore.close(); }, onFlowsChange: function(event, flows){ - this.setState({flows: flows.getAll()}); + this.setState({flows: flows.getAll()}); }, render: function () { var flows = this.state.flows.map(function(flow){ -- cgit v1.2.3