diff --git a/app/assets/images/arrow.psd b/app/assets/images/arrow.psd deleted file mode 100644 index 877750426..000000000 Binary files a/app/assets/images/arrow.psd and /dev/null differ diff --git a/app/assets/images/hatched-bg-small.jpg b/app/assets/images/hatched-bg-small.jpg deleted file mode 100644 index 81d7c6159..000000000 Binary files a/app/assets/images/hatched-bg-small.jpg and /dev/null differ diff --git a/app/assets/images/hatched-bg-dark.png b/app/assets/images/texture/hatched-dark.png similarity index 100% rename from app/assets/images/hatched-bg-dark.png rename to app/assets/images/texture/hatched-dark.png diff --git a/app/assets/images/hatched-bg.jpg b/app/assets/images/texture/hatched-light.jpg similarity index 100% rename from app/assets/images/hatched-bg.jpg rename to app/assets/images/texture/hatched-light.jpg diff --git a/app/assets/images/pattern.png b/app/assets/images/texture/light-bg.png similarity index 100% rename from app/assets/images/pattern.png rename to app/assets/images/texture/light-bg.png diff --git a/app/assets/images/paper-texture-1.jpg b/app/assets/images/texture/paper.jpg similarity index 100% rename from app/assets/images/paper-texture-1.jpg rename to app/assets/images/texture/paper.jpg diff --git a/app/assets/images/typist_texture.png b/app/assets/images/texture/typist.png similarity index 100% rename from app/assets/images/typist_texture.png rename to app/assets/images/texture/typist.png diff --git a/app/assets/images/texture/vanilla.jpg b/app/assets/images/texture/vanilla.jpg new file mode 100644 index 000000000..0d0c9746c Binary files /dev/null and b/app/assets/images/texture/vanilla.jpg differ diff --git a/app/assets/stylesheets/mobile.css.scss b/app/assets/stylesheets/mobile.css.scss index c6cf0f463..46ef8f116 100644 --- a/app/assets/stylesheets/mobile.css.scss +++ b/app/assets/stylesheets/mobile.css.scss @@ -12,7 +12,7 @@ a { body { background: { - image: image-url('hatched-bg.jpg'); + image: image-url('texture/hatched-light.jpg'); position: fixed; /* scale background image down for iOS retina display */ size: 200px; diff --git a/app/assets/stylesheets/new_styles/_base.scss b/app/assets/stylesheets/new_styles/_base.scss index 502c5d5fb..48462200c 100644 --- a/app/assets/stylesheets/new_styles/_base.scss +++ b/app/assets/stylesheets/new_styles/_base.scss @@ -5,7 +5,7 @@ body { } body { - background-image : image_url("pattern.png"); + background-image : image_url("texture/light-bg.png"); padding : none; &.lock { diff --git a/app/assets/stylesheets/new_styles/_canvas.scss b/app/assets/stylesheets/new_styles/_canvas.scss index 22aea1a08..00d9d0ad7 100644 --- a/app/assets/stylesheets/new_styles/_canvas.scss +++ b/app/assets/stylesheets/new_styles/_canvas.scss @@ -49,7 +49,7 @@ color: white; @include transition(-webkit-transform); @include box-shadow(0, 8px, 50px, rgba(0,0,0,0.9)); - background-image : image_url("paper-texture-1.jpg"); + background-image : image_url("texture/paper.jpg"); &:hover { .info { @@ -332,7 +332,7 @@ color: white; &.typist { .content { background : { - image : image_url("typist_texture.png"); + image : image_url("texture/typist.png"); color : transparent; } } @@ -361,6 +361,13 @@ color: white; } &.vanilla { + .content { + background :{ + color : #fff; + image : image_url("texture/vanilla.jpg"); + } + } + .background-color { display : none; } @@ -383,14 +390,11 @@ color: white; .background { @include box-shadow(-2px, 0, 7px, rgba(0,0,0,0.8)); + @include dark-hatched-bg(); + position : fixed; height : 100%; width : 100%; - - background : { - color : #333; - image : image_url("hatched-bg-dark.png"); - } } diff --git a/app/assets/stylesheets/new_styles/_new_mixins.scss b/app/assets/stylesheets/new_styles/_new_mixins.scss index b401046c3..f2bc78db9 100644 --- a/app/assets/stylesheets/new_styles/_new_mixins.scss +++ b/app/assets/stylesheets/new_styles/_new_mixins.scss @@ -61,7 +61,7 @@ $night-text-color : #999; @mixin dark-hatched-bg() { background-color: #444; - background-image: image-url("hatched-bg-dark.png"); + background-image: image-url("texture/hatched-dark.png"); } @mixin photo-shadow() {