saving work

interface/resources/qml/hifi/Card.qml

@@ -153,44 +153,49 @@ Rectangle {
             margins: textPadding;
         }
     }
-    Row {
+
-        FiraSansRegular {
+    Rectangle {
-            id: users;
+        radius: 20
-            visible: isConcurrency;
+        color: "transparent"
-            text: onlineUsers;
+        Row {
-            size: textSize;
+            FiraSansRegular {
-            color: messageColor;
+                id: users;
-            anchors.verticalCenter: message.verticalCenter;
+                visible: isConcurrency;
-        }
+                text: onlineUsers;
-        Image {
+                size: textSize;
-            id: icon;
+                color: messageColor;
-            source: "../../images/snap-icon.svg"
+                anchors.verticalCenter: message.verticalCenter;
-            width: 40;
+            }
-            height: 40;
+            Image {
-            visible: action === 'snapshot';
+                id: icon;
-        }
+                source: "../../images/snap-icon.svg"
-        RalewayRegular {
+                width: 40;
-            id: message;
+                height: 40;
-            text: isConcurrency ? ((onlineUsers === 1) ? "person" : "people") : (drillDownToPlace ? "snapshots" : ("by " + userName));
+                visible: action === 'snapshot';
-            size: textSizeSmall;
+            }
-            color: messageColor;
+            RalewayRegular {
-            elide: Text.ElideRight; // requires a width to be specified`
+                id: message;
-            width: root.width - textPadding
+                text: isConcurrency ? ((onlineUsers === 1) ? "person" : "people") : (drillDownToPlace ? "snapshots" : ("by " + userName));
-                - (users.visible ? users.width + parent.spacing : 0)
+                size: textSizeSmall;
-                - (icon.visible ? icon.width + parent.spacing : 0)
+                color: messageColor;
-                - (actionIcon.width + (2 * smallMargin));
+                elide: Text.ElideRight; // requires a width to be specified`
+                width: root.width - textPadding
+                    - (users.visible ? users.width + parent.spacing : 0)
+                    - (icon.visible ? icon.width + parent.spacing : 0)
+                    - (actionIcon.width + (2 * smallMargin));
+                anchors {
+                    bottom: parent.bottom;
+                    bottomMargin: parent.spacing;
+                }
+            }
+            spacing: textPadding;
+            height: messageHeight;
             anchors {
                 bottom: parent.bottom;
-                bottomMargin: parent.spacing;
+                left: parent.left;
+                leftMargin: textPadding;
             }
         }
-        spacing: textPadding;
-        height: messageHeight;
-        anchors {
-            bottom: parent.bottom;
-            left: parent.left;
-            leftMargin: textPadding;
-        }
     }
     // These two can be supplied to provide hover behavior.
     // For example, AddressBarDialog provides functions that set the current list view item

interface/resources/qml/hifi/TabletTextButton.qml

@@ -0,0 +1,64 @@
+//
+//  TabletTextButton.qml
+//
+//  Created by Dante Ruiz on 2017/3/23
+//  Copyright 2015 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+import Hifi 1.0
+import QtQuick 2.4
+import "../styles-uit"
+
+Rectangle {
+    property alias text: label.text
+    property alias pixelSize: label.font.pixelSize;
+    property bool selected: false
+    property int spacing: 2
+    property var action: function () {}
+    property string highlightColor: hifi.colors.blueHighlight;
+    width: label.width + 64
+    height: 32
+    color: hifi.colors.white
+    HifiConstants { id: hifi }
+    RalewaySemiBold {
+        id: label;
+        color: hifi.colors.blueHighlight;
+        font.pixelSize: 15;
+        anchors {
+            horizontalCenter: parent.horizontalCenter;
+            verticalCenter: parent.verticalCenter;
+        }
+    }
+
+    /*Rectangle {
+        anchors.fill: parent
+        border.width: 3
+        border.color: clickArea.containMouse ? highlightColor : "transparent"
+        color: "transparent"
+    }*/
+        
+    Rectangle {
+        id: indicator
+        width: parent.width
+        height: 3
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+        color: hifi.colors.blueHighlight
+        visible: parent.selected
+    }
+
+    MouseArea {
+        id: clickArea;
+        anchors.fill: parent;
+        acceptedButtons: Qt.LeftButton;
+        onClicked: action(parent);
+        hoverEnabled: true;
+    }
+}
+        

interface/resources/qml/hifi/tablet/TabletAddressDialog.qml

@@ -28,7 +28,7 @@ Item {
     height: parent.height
 
     property var allStories: [];
-    property int cardWidth: 370;
+    property int cardWidth: 460;
     property int cardHeight: 320;
     property string metaverseBase: addressBarDialog.metaverseServerUrl + "/api/v1/";
 
@@ -86,7 +86,7 @@ Item {
             id: navBar
             width: 480
             height: 70
-
+            color: hifi.colors.white
             anchors {
                 top: parent.top
                 right: parent.right
@@ -201,22 +201,17 @@ Item {
                     }
                 }
             }
+
+            Rectangle {
+                anchors.fill: addressLine
+                color: hifiStyleConstants.colors.baseGray
+                opacity: 0.1
+            }
         }
         Rectangle {
             id: topBar
-            height: 90
+            height: 37
-            gradient: Gradient {
+            color: hifi.colors.white
-                GradientStop {
-                    position: 0
-                    color: "#2b2b2b"
-                    
-                }
-
-                GradientStop {
-                    position: 1
-                    color: "#1e1e1e"
-                }
-            }
 
             anchors.right: parent.right
             anchors.rightMargin: 0
@@ -227,14 +222,15 @@ Item {
             
             Row {
                 id: thing
-                spacing: 2 * hifi.layout.spacing
+                spacing: 5 * hifi.layout.spacing
 
                 anchors {
                     top: parent.top;
                     left: parent.left
+                    leftMargin: 25
                 }
 
-                TextButton {
+                TabletTextButton {
                     id: allTab;
                     text: "ALL";
                     property string includeActions: 'snapshot, concurrency';
@@ -242,7 +238,7 @@ Item {
                     action: tabSelect;
                 }
 
-                TextButton {
+                TabletTextButton {
                     id: placeTab;
                     text: "PLACES";
                     property string includeActions: 'concurrency';
@@ -251,7 +247,7 @@ Item {
                     
                 }
 
-                TextButton {
+                TabletTextButton {
                     id: snapTab;
                     text: "SNAP";
                     property string includeActions: 'snapshot';
@@ -264,20 +260,7 @@ Item {
 
         Rectangle {
             id: bgMain
-                gradient: Gradient {
+            color: hifi.colors.white
-                    GradientStop {
-                        position: 0
-                        color: "#2b2b2b"
-
-                    }
-                    
-                    GradientStop {
-                        position: 1
-                        color: "#0f212e"
-                    }
-                }
-
-            
             anchors.bottom: parent.keyboardEnabled ? keyboard.top : parent.bottom
             anchors.bottomMargin: 0
             anchors.right: parent.right
@@ -292,7 +275,7 @@ Item {
             ListView {
                 id: scroll
                 
-                property int stackedCardShadowHeight: 10;
+                property int stackedCardShadowHeight: 0;
                 clip: true
                 spacing: 14
                 anchors {
@@ -300,7 +283,9 @@ Item {
                     top: parent.top
                     left: parent.left
                     right: parent.right
-                    leftMargin: 50
+                    leftMargin: 10
+                    verticalCenter: parent.verticalCenter;
+                    horizontalCenter: parent.horizontalCenter;
                 }
                 model: suggestions
                 orientation: ListView.Vertical

scripts/defaultScripts.js

@@ -21,7 +21,7 @@ var DEFAULT_SCRIPTS_COMBINED = [
     "system/snapshot.js",
     "system/help.js",
     "system/pal.js", // "system/mod.js", // older UX, if you prefer
-    "system/goto.js",
+    "system/tablet-goto.js",
     "system/marketplaces/marketplaces.js",
     "system/edit.js",
     "system/tablet-users.js",