font box view modified #23

fontman · Feb 3, 2017 · 0a387d7 · 0a387d7
1 parent 48a54b5
commit 0a387d7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/app/index.html b/app/index.html
@@ -50,7 +50,7 @@
                 <md-sidemenu-group>
 
                     <md-sidemenu-button ng-if="authStatus===false || authStatus.includes('undefined')" ng-click="loginDialog($event)">
-                        Sign-up
+                        Sign Up
                     </md-sidemenu-button>
 
                     <md-sidemenu-content md-heading="{{fontmanUser}}" md-arrow="true" ng-if="authStatus===true">

diff --git a/app/package.json b/app/package.json
@@ -10,7 +10,7 @@
     "angular": "1.5.9",
     "angular-animate": "1.5.9",
     "angular-aria": "1.5.9",
-    "angular-material": "1.1.1",
+    "angular-material": "1.1.3",
     "angular-material-icons": "0.7.1",
     "angular-material-sidemenu": "^1.0.2",
     "angular-messages": "1.5.9",

diff --git a/app/views/fonts.html b/app/views/fonts.html
@@ -30,19 +30,19 @@
 
             <li class="font-box" ng-mouseleave="hoverOut()" ng-mouseover="hoverIn()" ng-repeat="font in fontBucket">
 
-                <div layout="row" ng-show="hoverEdit">
+                <div layout="row">
 
                     <md-select aria-label="a" ng-model="font.selectedFontface">
                         <md-option ng-repeat="fontface in font.fontfaces" ng-value="fontface.fontface">
                             {{fontface.fontface}}
                         </md-option>
                     </md-select>
 
-                    <md-icon class="bucket-button" ng-click="addToBucket(font)" ng-if="!font.chosen">
+                    <md-icon class="bucket-button" ng-click="addToBucket(font)" ng-if="!font.chosen" ng-show="hoverEdit">
                         add_circle
                     </md-icon>
 
-                    <md-icon class="bucket-button" ng-click="removeFromBucket(font)" ng-if="font.chosen">
+                    <md-icon class="bucket-button" ng-click="removeFromBucket(font)" ng-if="font.chosen" ng-show="hoverEdit">
                         remove_circle
                     </md-icon>
 
@@ -94,15 +94,15 @@
 
                 <div class="top-indicator">
 
-                    <div layout="row" ng-show="hoverEdit">
+                    <div layout="row">
 
                         <div class="font-name">{{font.name}}</div>
 
-                        <md-icon class="bucket-button" ng-click="addToBucket(font)" ng-if="!font.chosen">
+                        <md-icon class="bucket-button" ng-click="addToBucket(font)" ng-if="!font.chosen" ng-show="hoverEdit">
                             add_circle
                         </md-icon>
 
-                        <md-icon class="bucket-button" ng-click="removeFromBucket(font)" ng-if="font.chosen">
+                        <md-icon class="bucket-button" ng-click="removeFromBucket(font)" ng-if="font.chosen" ng-show="hoverEdit">
                             remove_circle
                         </md-icon>
 
@@ -130,14 +130,18 @@
 
                 </div>
 
-                <div layout="row">
-                    <div flex></div>
+                <div layout="row" ng-show="hoverEdit">
 
-                    <md-select aria-label="a" ng-model="font.selectedFontface" ng-show="hoverEdit">
+                    <md-select aria-label="a" ng-model="font.selectedFontface">
                         <md-option ng-repeat="fontface in font.fontfaces" ng-value="fontface.fontface">
                             {{fontface.fontface}}
                         </md-option>
                     </md-select>
+
+                    <md-slider-container>
+                        <md-slider min="0" max="120" ng-model="textSize" aria-label="fSizer"></md-slider>
+                    </md-slider-container>
+
                 </div>
 
                 <hr class="divider" ng-show="hoverEdit">