From 06e38245987304ef6bddb1f9c3e6cad16a215209 Mon Sep 17 00:00:00 2001 From: ryderr Date: Tue, 7 Oct 2014 16:12:09 -0400 Subject: new font --- views/controls/builder/settings.ejs | 2 +- views/controls/builder/toolbar.ejs | 14 +++++++------- views/controls/editor/media-drawer.ejs | 2 +- views/controls/editor/media-editor.ejs | 4 ++-- views/controls/editor/settings.ejs | 4 ++-- views/controls/editor/toolbar.ejs | 16 ++++++++-------- views/controls/editor/wallpaper.ejs | 11 ++++++++--- views/controls/reader/media-player.ejs | 8 ++++---- views/home.ejs | 2 +- views/partials/header.ejs | 2 +- views/partials/sign-in.ejs | 4 ++-- views/profile.ejs | 2 +- 12 files changed, 38 insertions(+), 33 deletions(-) (limited to 'views') diff --git a/views/controls/builder/settings.ejs b/views/controls/builder/settings.ejs index dd2496b..aae67d0 100644 --- a/views/controls/builder/settings.ejs +++ b/views/controls/builder/settings.ejs @@ -4,7 +4,7 @@
- + Select Startpoint Move to Desired Point
diff --git a/views/controls/builder/toolbar.ejs b/views/controls/builder/toolbar.ejs index a00249c..8b2e9b8 100644 --- a/views/controls/builder/toolbar.ejs +++ b/views/controls/builder/toolbar.ejs @@ -2,33 +2,33 @@ + class="ion-ios7-photos-outline"> + class="ion-ios7-trash-outline"> + class="ion-ios7-compose-outline"> diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs index 3d95fb9..10a160e 100644 --- a/views/controls/editor/media-drawer.ejs +++ b/views/controls/editor/media-drawer.ejs @@ -1,7 +1,7 @@
-
+
Upload File
diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs index 305a602..f5e3b5b 100644 --- a/views/controls/editor/media-editor.ejs +++ b/views/controls/editor/media-editor.ejs @@ -13,8 +13,8 @@
- - + + + class="ion-ios7-keypad-outline"> + class="ion-ios7-sunny-outline"> [[ if (user.username == "test12343") { ]] + class="ion-ios7-compose-outline"> [[ } ]] + class="ion-key">
diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs index 95cf827..01cf771 100644 --- a/views/controls/editor/wallpaper.ejs +++ b/views/controls/editor/wallpaper.ejs @@ -3,12 +3,12 @@ Add custom wallpaper to walls. Begin by uploading a pattern. Or try this one -> -
+
- +
@@ -17,9 +17,14 @@ -->
- +
+ +
+ + +
diff --git a/views/controls/reader/media-player.ejs b/views/controls/reader/media-player.ejs index ca03ec8..0ca89c5 100644 --- a/views/controls/reader/media-player.ejs +++ b/views/controls/reader/media-player.ejs @@ -1,13 +1,13 @@
- - + + - - + + diff --git a/views/home.ejs b/views/home.ejs index a6f5a88..51d5a92 100755 --- a/views/home.ejs +++ b/views/home.ejs @@ -17,7 +17,7 @@
Create 3D Rooms
-
+
Watch video.
diff --git a/views/partials/header.ejs b/views/partials/header.ejs index 1b7b498..ea579cc 100644 --- a/views/partials/header.ejs +++ b/views/partials/header.ejs @@ -69,7 +69,7 @@ [[ } ]] [[ if (opt.editing) { ]] - + [[ } ]] [[ } else { ]] diff --git a/views/partials/sign-in.ejs b/views/partials/sign-in.ejs index 98f0acc..08c9e99 100644 --- a/views/partials/sign-in.ejs +++ b/views/partials/sign-in.ejs @@ -5,7 +5,7 @@
- +
  • @@ -38,7 +38,7 @@
    - +
  • diff --git a/views/profile.ejs b/views/profile.ejs index 9cfb40d..22c824c 100644 --- a/views/profile.ejs +++ b/views/profile.ejs @@ -14,7 +14,7 @@
    • [[ } else { ]]
    - +
    [[ } ]]
    -- cgit v1.2.3-70-g09d2 From f28ffa4087ce761040029ba61e2a67b1b37a0909 Mon Sep 17 00:00:00 2001 From: ryderr Date: Tue, 7 Oct 2014 16:15:21 -0400 Subject: icon stuff --- views/controls/editor/toolbar.ejs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'views') diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs index f9d91af..2fad418 100644 --- a/views/controls/editor/toolbar.ejs +++ b/views/controls/editor/toolbar.ejs @@ -3,39 +3,39 @@ + class="ion-ios7-photos-outline"> + class="ion-ios7-keypad-outline"> + class="ion-ios7-sunny-outline"> [[ if (user.username == "test12343") { ]] + class="ion-ios7-compose-outline"> [[ } ]] + class="ion-key">
    -- cgit v1.2.3-70-g09d2 From 49ce8683ce072d8ae24176aff7fadbf5195f5922 Mon Sep 17 00:00:00 2001 From: ryderr Date: Tue, 7 Oct 2014 16:48:11 -0400 Subject: wallpaper buttons --- public/assets/stylesheets/app.css | 12 +++++++----- views/controls/editor/wallpaper.ejs | 8 ++++---- 2 files changed, 11 insertions(+), 9 deletions(-) (limited to 'views') 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 @@ -
    +
    @@ -16,13 +16,13 @@ -->
    -
    +
    -
    - +
    +
    -- cgit v1.2.3-70-g09d2