diff options
author | Benjamin Neff <benjamin@coding4coffee.ch> | 2022-07-04 00:14:51 +0300 |
---|---|---|
committer | Benjamin Neff <benjamin@coding4coffee.ch> | 2022-07-04 00:14:51 +0300 |
commit | c6dda6cf2d776eb1be2ba02a554c2ea1fc4131a4 (patch) | |
tree | f97eab76a19f92c23ccccf18b0bbbeb798678e7b /app/assets/stylesheets | |
parent | 1e3386c77a7bb381cf4d6eae75c195016631966f (diff) | |
parent | a7a02e87cf7ee05287917a48cfebe2d6dfcc9482 (diff) |
Merge branch 'next-minor' into develop
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/_application.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/login.scss | 4 | ||||
-rw-r--r-- | app/assets/stylesheets/navbar_left.scss | 13 | ||||
-rw-r--r-- | app/assets/stylesheets/publisher.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/sprites.scss | 5 |
5 files changed, 16 insertions, 8 deletions
diff --git a/app/assets/stylesheets/_application.scss b/app/assets/stylesheets/_application.scss index ae8ca9c06..b032ae28c 100644 --- a/app/assets/stylesheets/_application.scss +++ b/app/assets/stylesheets/_application.scss @@ -11,7 +11,6 @@ @import 'icons'; @import 'animations'; @import 'flash_messages'; -@import 'sprites'; @import 'hovercard'; @import 'base'; @import 'interactions'; diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss index bdb62a343..13a8c0757 100644 --- a/app/assets/stylesheets/login.scss +++ b/app/assets/stylesheets/login.scss @@ -5,9 +5,9 @@ padding-top: 25px; .logos-asterisk { + background: image-url('branding/logos/asterisk.png') no-repeat; height: 154px; - margin: auto; - margin-bottom: 12px; + margin: auto auto 12px; width: 154px; } diff --git a/app/assets/stylesheets/navbar_left.scss b/app/assets/stylesheets/navbar_left.scss index 3fde9e3a8..6d062bf3a 100644 --- a/app/assets/stylesheets/navbar_left.scss +++ b/app/assets/stylesheets/navbar_left.scss @@ -202,10 +202,23 @@ .social-media-logos-twitter-24x24, .social-media-logos-tumblr-24x24, .social-media-logos-wordpress-24x24 { + background-repeat: no-repeat; height: 24px; width: 24px; } + .social-media-logos-twitter-24x24 { + background-image: image-url('social-media-logos/twitter-24x24.png'); + } + + .social-media-logos-tumblr-24x24 { + background-image: image-url('social-media-logos/tumblr-24x24.png'); + } + + .social-media-logos-wordpress-24x24 { + background-image: image-url('social-media-logos/wordpress-24x24.png'); + } + a { display: inline-block; } diff --git a/app/assets/stylesheets/publisher.scss b/app/assets/stylesheets/publisher.scss index 6db248519..e07293d25 100644 --- a/app/assets/stylesheets/publisher.scss +++ b/app/assets/stylesheets/publisher.scss @@ -43,6 +43,7 @@ .btn.btn-link.question_mark:hover .entypo-cog { color: $black; } .dim { opacity: 0.3; } .social-media-logos-wordpress-16x16 { + background: image-url('social-media-logos/wordpress-16x16.png') no-repeat; display: inline-block; height: 16px; width: 16px; diff --git a/app/assets/stylesheets/sprites.scss b/app/assets/stylesheets/sprites.scss deleted file mode 100644 index 981e20cc3..000000000 --- a/app/assets/stylesheets/sprites.scss +++ /dev/null @@ -1,5 +0,0 @@ -/* ===== sprites ===== */ -@import 'branding/logos/*.png'; -@import 'social-media-logos/*.png'; -@include all-logos-sprites; -@include all-social-media-logos-sprites; |