summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorryderr <r@okfoc.us>2014-10-07 16:48:11 -0400
committerryderr <r@okfoc.us>2014-10-07 16:48:11 -0400
commit49ce8683ce072d8ae24176aff7fadbf5195f5922 (patch)
treefaa188c8f45b024bfb28f2efa3a943d5ebd16a4d
parentf28ffa4087ce761040029ba61e2a67b1b37a0909 (diff)
wallpaper buttons
-rwxr-xr-xpublic/assets/stylesheets/app.css12
-rw-r--r--views/controls/editor/wallpaper.ejs8
2 files changed, 11 insertions, 9 deletions
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 6a034ea..943fc8e 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1332,7 +1332,7 @@ iframe.embed {
padding-bottom: 6px;
}
-.wallpaperUpload, .wallpaperRemove {
+.toolButton {
border: 1px solid;
display: inline-block;
width: 100%;
@@ -1341,9 +1341,9 @@ iframe.embed {
font-weight: 300;
}
-.wallpaper label {
+.toolButton label {
position: relative;
- top: -6px;
+ vertical-align: middle;
float: none;
}
.wallpaper form {
@@ -1357,8 +1357,10 @@ iframe.embed {
color:white;
cursor:pointer;
}
-.wallpaper .ion-ios7-upload-outline {
- font-size: 26px;
+.toolButton > span, .toolButton form > span{
+ font-size: 26px;
+ margin: 0 7px;
+ vertical-align: middle;
}
.wallpaper .wallpaperRemove {
cursor: pointer;
diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs
index 01cf771..97a9232 100644
--- a/views/controls/editor/wallpaper.ejs
+++ b/views/controls/editor/wallpaper.ejs
@@ -5,7 +5,7 @@
<span class="swatches"></span>
- <div class="wallpaperUpload">
+ <div class="wallpaperUpload toolButton">
<form>
<span class="ion-ios7-upload-outline upload-icon"></span>
@@ -16,13 +16,13 @@
<input type="text" placeholder="Enter Image URL" class="url">
-->
</div>
- <div class="wallpaperRemove">
+ <div class="wallpaperRemove toolButton">
<span class="ion-scissors"></span>
<label>Remove Wallpaper</label>
</div>
- <div class="wallpaperResize">
- <span class="ion-scissors"></span>
+ <div class="wallpaperResize toolButton">
+ <span class="ion-arrow-resize"></span>
<label>Resize Wallpaper</label>
</div>
</div>