Merge branch 'master' of github.com:okfocus/vvalls

1 files changed, 17 insertions, 12 deletions

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 15f29c3..2d966ee 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -79,11 +79,11 @@ a{
 .editing #help-button {
   display: inline;
 }
-.topLinks a.icon-help-circled {
+.topLinks a.ion-help-circled {
 	font-size: 24px;
 	padding: 21px 27px 0 8px;
 }
-.topLinks a.icon-help-circled:hover  {
+.topLinks a.ion-help-circled:hover  {
 	background:transparent;
 	color:red;
 }
@@ -894,7 +894,7 @@ iframe.embed {
 }
 
 .menu span.inuse:before {
-	content: "\e736" !important;
+	content: "\f12a" !important;
 }
 
 .menu span:hover:after{
@@ -912,7 +912,7 @@ iframe.embed {
 	font-family:'Lato', sans-serif;
 }
 
-.menu span.icon-ios7-sunny-outline:hover:after {
+.menu span.ion-ios7-sunny-outline:hover:after {
 	width: 130px;
 }
 
@@ -921,7 +921,7 @@ iframe.embed {
   content:"";
   opacity:0;
 }
-.menu span.icon-map.hidden:hover:after{
+.menu span.ion-map.hidden:hover:after{
   content:"show map";
 }
 .fixed {
@@ -1070,7 +1070,7 @@ iframe.embed {
   transform:translateY(0%);
 }
 
-.fileUpload .icon-ios7-upload-outline {
+.fileUpload .ion-ios7-upload-outline {
   font-size:40px;
 }
 .fileUpload .upload-icon.uploading {
@@ -1332,7 +1332,7 @@ iframe.embed {
 	padding-bottom: 6px;
 }
 
-.wallpaperUpload, .wallpaperRemove {
+.toolButton {
 	border: 1px solid;
 	display: inline-block;
 	width: 100%;
@@ -1341,24 +1341,29 @@ iframe.embed {
 	font-weight: 300;
 }
 
-.wallpaper label {
+.toolButton label {
   position: relative;
-  top: -6px;
+  vertical-align: middle;
   float: none;
 }
+.wallpaperUpload:hover {
+	cursor:pointer;
+}
 .wallpaper form {
   position: relative;
   padding: 2px 0 0 0;
   font-size: 14px;
   font-weight: 300;
 }
-.wallpaper form:hover, .wallpaperRemove:hover {
+.toolButton:hover {
 	background:black;
 	color:white;
 	cursor:pointer;
 }
-.wallpaper .icon-ios7-upload-outline {
-  font-size: 26px;
+.toolButton > span, .toolButton form > span{
+	font-size: 26px;
+	margin: 0 7px;
+	vertical-align: middle;
 }
 .wallpaper .wallpaperRemove {
   cursor: pointer;