From 34fa266bef9fc8e71f5780eeb3b8c340a051d450 Mon Sep 17 00:00:00 2001 From: Jari Bakken Date: Fri, 31 Oct 2014 10:30:23 +0100 Subject: [PATCH] Switching back to FINN styling. --- unleash-server/public/css/unleash.css | 7 --- unleash-server/public/index.html | 4 +- .../public/js/components/ErrorMessages.jsx | 25 +++++++-- .../public/js/components/FeatureList.jsx | 31 ++++++----- unleash-server/public/js/components/Menu.jsx | 51 +++++++++++++++++-- .../public/js/components/SavedFeature.jsx | 19 ++++--- .../public/js/components/Unleash.jsx | 8 ++- .../public/js/components/UnsavedFeature.jsx | 40 +++++++-------- unleash-server/server.js | 5 +- 9 files changed, 127 insertions(+), 63 deletions(-) diff --git a/unleash-server/public/css/unleash.css b/unleash-server/public/css/unleash.css index 0f900c08e7..e69de29bb2 100644 --- a/unleash-server/public/css/unleash.css +++ b/unleash-server/public/css/unleash.css @@ -1,7 +0,0 @@ -.new-feature-form { - padding: 20px 0; -} - -body { - font-family: HelveticaNeueLight, HelveticaNeue-Light, 'Helvetica Neue Light', HelveticaNeue, 'Helvetica Neue', Arial, Helvetica, sans-serif; -} diff --git a/unleash-server/public/index.html b/unleash-server/public/index.html index 231d39cc8f..313610169b 100644 --- a/unleash-server/public/index.html +++ b/unleash-server/public/index.html @@ -4,10 +4,10 @@ - Unleash + unleash admin - + diff --git a/unleash-server/public/js/components/ErrorMessages.jsx b/unleash-server/public/js/components/ErrorMessages.jsx index 153348ef0b..e5c80d69de 100644 --- a/unleash-server/public/js/components/ErrorMessages.jsx +++ b/unleash-server/public/js/components/ErrorMessages.jsx @@ -7,15 +7,32 @@ var ErrorMessages = React.createClass({ } var errorNodes = this.props.errors.map(function(e) { - return (
  • {e}
    • ); + return (
  • {e}
    • ); }); return ( -
    - +
    +
    +
    +
    +
    +
    + + +
    +
    +
      {errorNodes}
    +
    +
    +
    +
    +
    ); } }); -module.exports = ErrorMessages; \ No newline at end of file +module.exports = ErrorMessages; + diff --git a/unleash-server/public/js/components/FeatureList.jsx b/unleash-server/public/js/components/FeatureList.jsx index 542f2d1c5c..a942569b7e 100644 --- a/unleash-server/public/js/components/FeatureList.jsx +++ b/unleash-server/public/js/components/FeatureList.jsx @@ -28,22 +28,25 @@ var FeatureList = React.createClass({ return (
    -
    -
    -

    Features

    -
    - -
    -
    +
    +
    +
    +
    +
    +

    Features

    +
    -
    - {featureNodes} -
    +
    + +
    +
    + +
    + + {featureNodes} +
    +
    ); } diff --git a/unleash-server/public/js/components/Menu.jsx b/unleash-server/public/js/components/Menu.jsx index 9516df1d19..1015009110 100644 --- a/unleash-server/public/js/components/Menu.jsx +++ b/unleash-server/public/js/components/Menu.jsx @@ -2,11 +2,54 @@ var React = require('react'); var Menu = React.createClass({ render: function() { return ( - +
    +
    + ); } }); diff --git a/unleash-server/public/js/components/SavedFeature.jsx b/unleash-server/public/js/components/SavedFeature.jsx index aef57f663a..939582d542 100644 --- a/unleash-server/public/js/components/SavedFeature.jsx +++ b/unleash-server/public/js/components/SavedFeature.jsx @@ -11,17 +11,16 @@ var SavedFeature = React.createClass({ render: function() { return ( -
    -
    - +
    +
    +
    -
    {this.props.feature.name}
    -
    + +
    + {this.props.feature.name} +
    + +
    {this.props.feature.strategy}
    diff --git a/unleash-server/public/js/components/Unleash.jsx b/unleash-server/public/js/components/Unleash.jsx index 7502377326..ec34da4657 100644 --- a/unleash-server/public/js/components/Unleash.jsx +++ b/unleash-server/public/js/components/Unleash.jsx @@ -111,11 +111,17 @@ var Unleash = React.createClass({ this.setState({unsavedFeatures: unsaved}); }, + clearErrors: function() { + this.setState({errors: []}); + }, + render: function() { return (
    - + -
    -
    + +
    + +
    -
    +
    - +
    -
    +