From 34fe391afbe18f89d774137f82620024f697ab6a Mon Sep 17 00:00:00 2001
From: Clemens <cle1000.cb@gmail.com>
Date: Wed, 3 Aug 2016 12:08:10 +0200
Subject: add view all button, add dropdown for contentviews

---
 web/src/js/components/common/Button.jsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'web/src/js/components/common/Button.jsx')

diff --git a/web/src/js/components/common/Button.jsx b/web/src/js/components/common/Button.jsx
index cd01af22..0ac80782 100644
--- a/web/src/js/components/common/Button.jsx
+++ b/web/src/js/components/common/Button.jsx
@@ -1,4 +1,5 @@
 import React, { PropTypes } from 'react'
+import classnames from 'classnames'
 
 Button.propTypes = {
     onClick: PropTypes.func.isRequired,
@@ -6,9 +7,9 @@ Button.propTypes = {
     icon: PropTypes.string
 }
 
-export default function Button({ onClick, text, icon, disabled }) {
+export default function Button({ onClick, text, icon, disabled, isXs }) {
     return (
-        <div className={"btn btn-default"}
+        <div className={classnames('btn btn-default', { 'btn-xs': isXs})}
              onClick={onClick}
              disabled={disabled}>
             {icon && (<i className={"fa fa-fw " + icon}/> )}
-- 
cgit v1.2.3


From fd7b6b958e7da1073b68a13e817ceaacaf6ad28c Mon Sep 17 00:00:00 2001
From: Clemens <cle1000.cb@gmail.com>
Date: Wed, 3 Aug 2016 15:40:23 +0200
Subject: litte style changes

---
 web/src/js/components/common/Button.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'web/src/js/components/common/Button.jsx')

diff --git a/web/src/js/components/common/Button.jsx b/web/src/js/components/common/Button.jsx
index 0ac80782..d623974f 100644
--- a/web/src/js/components/common/Button.jsx
+++ b/web/src/js/components/common/Button.jsx
@@ -7,9 +7,9 @@ Button.propTypes = {
     icon: PropTypes.string
 }
 
-export default function Button({ onClick, text, icon, disabled, isXs }) {
+export default function Button({ onClick, text, icon, disabled, isXs, className }) {
     return (
-        <div className={classnames('btn btn-default', { 'btn-xs': isXs})}
+        <div className={classnames(className, 'btn btn-default', { 'btn-xs': isXs})}
              onClick={onClick}
              disabled={disabled}>
             {icon && (<i className={"fa fa-fw " + icon}/> )}
-- 
cgit v1.2.3


From adfdcc9391ed70202a1b4af65259a89634f36fa0 Mon Sep 17 00:00:00 2001
From: Clemens <cle1000.cb@gmail.com>
Date: Tue, 9 Aug 2016 08:40:24 +0200
Subject: added hints from mhils

---
 web/src/js/components/common/Button.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'web/src/js/components/common/Button.jsx')

diff --git a/web/src/js/components/common/Button.jsx b/web/src/js/components/common/Button.jsx
index d623974f..bfbb455d 100644
--- a/web/src/js/components/common/Button.jsx
+++ b/web/src/js/components/common/Button.jsx
@@ -7,9 +7,9 @@ Button.propTypes = {
     icon: PropTypes.string
 }
 
-export default function Button({ onClick, text, icon, disabled, isXs, className }) {
+export default function Button({ onClick, text, icon, disabled, className }) {
     return (
-        <div className={classnames(className, 'btn btn-default', { 'btn-xs': isXs})}
+        <div className={classnames(className, 'btn btn-default')}
              onClick={onClick}
              disabled={disabled}>
             {icon && (<i className={"fa fa-fw " + icon}/> )}
-- 
cgit v1.2.3

