diff options
| -rw-r--r-- | public/assets/img/offbeatrepeat.jpg | bin | 0 -> 33207 bytes | |||
| -rw-r--r-- | public/assets/img/plainpattern.png | bin | 0 -> 39676 bytes | |||
| -rw-r--r-- | public/assets/img/plainpattern2.png | bin | 0 -> 4898 bytes | |||
| -rw-r--r-- | public/assets/img/plainpattern3.png | bin | 0 -> 27441 bytes | |||
| -rwxr-xr-x | public/assets/stylesheets/app.css | 31 | ||||
| -rw-r--r-- | public/assets/stylesheets/staff.css | 2 | ||||
| -rw-r--r-- | views/controls/editor/toolbar.ejs | 15 | ||||
| -rw-r--r-- | views/controls/editor/wallpaper.ejs | 8 |
8 files changed, 39 insertions, 17 deletions
diff --git a/public/assets/img/offbeatrepeat.jpg b/public/assets/img/offbeatrepeat.jpg Binary files differnew file mode 100644 index 0000000..4fa90c7 --- /dev/null +++ b/public/assets/img/offbeatrepeat.jpg diff --git a/public/assets/img/plainpattern.png b/public/assets/img/plainpattern.png Binary files differnew file mode 100644 index 0000000..1c4f12c --- /dev/null +++ b/public/assets/img/plainpattern.png diff --git a/public/assets/img/plainpattern2.png b/public/assets/img/plainpattern2.png Binary files differnew file mode 100644 index 0000000..10d57a5 --- /dev/null +++ b/public/assets/img/plainpattern2.png diff --git a/public/assets/img/plainpattern3.png b/public/assets/img/plainpattern3.png Binary files differnew file mode 100644 index 0000000..3048665 --- /dev/null +++ b/public/assets/img/plainpattern3.png diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index c90dad4..d92282f 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -331,14 +331,14 @@ iframe.embed { } -.projectList a { - padding: 4%; +.projectList .projectItem { + margin: 4%; display: inline-block; } .projectList .room { width: 22vw; height: 17vw; - margin: 1vw 1vw 0 1vw; + margin: 1vw 1vw 10px 1vw; display: table; position: relative; z-index: 1; @@ -424,15 +424,16 @@ iframe.embed { } .page .projectList label { - font-weight: 600; - font-size: 12px; + font-weight: 500; + font-size: 11px; color: black; text-decoration: none; display: inline-block; cursor: pointer; - border: 1px solid black; + border: 1px solid #000; line-height: 18px; - padding:0 5px; + padding: 5px; + letter-spacing: 0.3px; } .page .room .holder a:hover { @@ -1214,7 +1215,7 @@ border-left: 1px solid black; content: ' ' !important; background-image: url("/assets/img/loader.gif"); background-repeat: no-repeat; - width: 40px; + width: 21px; height: 40px; } @@ -2429,6 +2430,12 @@ a[data-role="forgot-password"] { width: 55px; line-height: 55px; } + .facebook b { + font-size: 40px; + } + .facebook span { + line-height: 20px; + } form { max-width: 90%; @@ -2508,4 +2515,12 @@ margin: 9px; #keyhint { display:none; } +.projectList .projectItem { + width:100%; + margin: 20px 0; +} +.projectList .room { +width: 100%; +height: 260px; +} }
\ No newline at end of file diff --git a/public/assets/stylesheets/staff.css b/public/assets/stylesheets/staff.css index 720eb0a..de31571 100644 --- a/public/assets/stylesheets/staff.css +++ b/public/assets/stylesheets/staff.css @@ -28,7 +28,7 @@ nav { text-align: left; } nav a { - margin-left: 20px; + margin-left: 10px; } hr { border: 1px solid #bbb; diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs index c914970..85800f8 100644 --- a/views/controls/editor/toolbar.ejs +++ b/views/controls/editor/toolbar.ejs @@ -4,6 +4,10 @@ data-role='open-media-viewer' data-info="add media" class="ion-ios7-photos-outline"></span> + <span + data-role='toggle-presets' + data-info="preset styles" + class="ion-ios7-briefcase-outline"></span> <!-- <span data-role='resize-media' @@ -22,10 +26,13 @@ data-role='toggle-light-control' data-info="edit room colors" class="ion-ios7-sunny-outline"></span> - <span - data-role='toggle-text-editor' - data-info="add text to wall" - class="ion-ios7-compose-outline"></span> + + <span + data-role='toggle-text-editor' + data-info="add text to wall" + class="ion-ios7-compose-outline"></span> + + <span data-role='toggle-project-settings' data-info="room settings" diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs index d54b9c1..ac025b5 100644 --- a/views/controls/editor/wallpaper.ejs +++ b/views/controls/editor/wallpaper.ejs @@ -4,10 +4,10 @@ <span class="txt" style="margin-bottom:7px">Add custom wallpaper to walls. Begin by uploading a pattern. Or try one of these -> </span> <span class="swatches"> - <span class="swatch"></span> - <span class="swatch"></span> - <span class="swatch"></span> - <span class="swatch"></span> + <span class="swatch" style="background-image:url(/assets/img/offbeatrepeat.jpg)"></span> + <span class="swatch" style="background-image:url(/assets/img/plainpattern3.png)"></span> + <span class="swatch" style="background-image:url(/assets/img/plainpattern.png)"></span> + <span class="swatch" style="background-image:url(/assets/img/plainpattern2.png)"></span> </span> <div class="wallpaperUpload toolButton"> |
