diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-11-18 12:33:54 -0500 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-11-18 12:33:54 -0500 |
| commit | 6efd39d857ae180a8e40ad7699815350c9bd258b (patch) | |
| tree | 7267ed37a333c4b0870b2ef25d6722e5b4f2dd77 | |
| parent | 3164203c0b196edee882e896adbd33fc65e32588 (diff) | |
| parent | c65777c0a1d7ca8ca03e03b767fa86c798e34e02 (diff) | |
Merge branch 'master' of github.com:okfocus/vvalls
| -rwxr-xr-x | public/assets/stylesheets/app.css | 19 | ||||
| -rw-r--r-- | views/controls/editor/media-drawer.ejs | 4 |
2 files changed, 17 insertions, 6 deletions
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 4c6c909..e3bb325 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -2254,22 +2254,33 @@ input[type="range"]::-webkit-slider-thumb { #randomize { background: transparent; display: inline-block; - color: black; + color: #999; text-decoration: none; - text-align: center; + text-align: left; font-size: 12px; - padding: 3px; + padding: 5px; cursor: pointer; position: absolute; left: 10px; font-weight: 500; top: 0px; - border-bottom: 1px solid; + border: 1px solid #999; + -webkit-transition:0.2s background; + -moz-transition:0.2s background; + transition:0.2s background; } #randomize:hover { color: white; background: black; } +#tumblr-url { + border: 1px solid #999; + padding: 10px 5px; + position: absolute; + top: 18px; + left: 145px; + width: 216px; +} .warn { background:red; display: inline-block; diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs index df7910c..3db71d5 100644 --- a/views/controls/editor/media-drawer.ejs +++ b/views/controls/editor/media-drawer.ejs @@ -14,7 +14,7 @@ --> </h2><br> <h3 class="editBtn warn" id="deleteMedia"></h3> - <h3 class="editBtn" id="randomize">Randomize</h3> + <h3 class="editBtn" id="randomize">Click here<br>to automatically place<br>images on walls!</h3> <div class="myMedia"> <div class="noMedia">You have no media yet. Upload some!</div> @@ -23,7 +23,7 @@ </div> <div class="foundMedia"> - <input type="text" id="tumblr-url" placeholder="Enter a Tumblr url!"> + <input type="text" id="tumblr-url" placeholder="Enter a Tumblr URL to add images from it!"> <span class="container"></span> </div> |