Merge pull request #104 from aryaapp/pm/styling

styled app
aryaapp · Feb 11, 2016 · 67d4a93 · 67d4a93
2 parents d3384fa + 49419a1
commit 67d4a93
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 4 deletions.
diff --git a/src/javascript/views/HomeView.js b/src/javascript/views/HomeView.js
@@ -55,7 +55,8 @@ class HomeView extends Component {
 
     //confirmation modal state
     this.state = {
-      isOpen: false
+      isOpen: false,
+      hasJournals: false
     }
 
     this.logout = this.logout.bind(this)
@@ -70,7 +71,6 @@ class HomeView extends Component {
 
   componentWillMount() {
     this.props.executeLoadJournals();
-
   }
 
   componentWillReceiveProps(nextProps) {
@@ -112,6 +112,11 @@ class HomeView extends Component {
   }
 
   render() {
+    let toggleDisplay = "no-journals"
+    if (this.props.selectedJournals.length > 0) {
+      toggleDisplay ="journals"
+    }
+
     return (
       <div className="partial-wrapper">
         <div className="partial-container" >
@@ -136,12 +141,13 @@ class HomeView extends Component {
             </div>
           </QuestionHeader>
           <QuestionMain absolute={true}>
+            <p className={ toggleDisplay + " no-journals-text" } >Keine Einträge in dieser Woche</p>
             <JournalList
               journals={this.props.selectedJournals}
               singleJournalPDF={this.singleJournalPDF}
             />
             <div className="col-xs-12">
-              <button className="btn btn-ghost nav-button next-button relative-button" onClick={this.weekPDF}>
+              <button className={ toggleDisplay + " btn btn-ghost nav-button next-button relative-button"} onClick={this.weekPDF}>
                 WOCHE HERUNTERLADEN
               </button>
             </div>

diff --git a/src/javascript/views/LoginView.js b/src/javascript/views/LoginView.js
@@ -68,7 +68,9 @@ class LoginView extends Component {
               asyncErrors={this.props.errors}
               onSubmit={this.onSubmit}
             />
-            <button onClick={this.props.navPassword}>Passwort vergessen</button>
+            <div className="col-xs-12 padding">
+              <a className="forgot-password" onClick={this.props.navPassword}>Passwort vergessen</a>
+            </div>
           </QuestionMain>
         </div>
       </div>

diff --git a/src/less/styles-rtv-app.less b/src/less/styles-rtv-app.less
@@ -5,6 +5,15 @@
 @rtv-red: #b20035;
 @rtv-green: #9acb9b;
 
+a, a:hover, a:focus {
+    color: @rtv-blue;
+    cursor: pointer;
+    text-decoration: underline;
+}
+a.forgot-password{
+    margin-top:8px;
+}
+
 .mock-banner{
     height: 52px;
     background: white;
@@ -48,6 +57,20 @@
 .journal {
     border-bottom: 1px solid #efefef;
 }
+button.no-journals {
+    display:none;
+}
+p.journals {
+    display:none;
+}
+p.no-journals-text {
+    text-align: center;
+    font-style: italic;
+    color: #9A9A9A;
+    margin-top: 16px;
+}
+
+
 .week-navigator {
     padding: 8px 0;
     border-bottom: 1px solid #e9e9e9;