summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorMarie <ml.kochsiek@fu-berlin.de>2016-09-13 11:22:17 +0000
committerGitHub <noreply@github.com>2016-09-13 11:22:17 +0000
commit90f956127daeba0bcfb3232e9e1bf86eebd8ced6 (patch)
treed215db9e2bade3b49beb9f3c1e8b1ca064f62f0f /app/assets
parent8fd3aae30e7bfae18d99d936ef5428e8046ab58a (diff)
parentb26c4a45e3f4a82b30972c4b283a98a874bea216 (diff)
Merge pull request #9 from LoadToCode/marie
Update on CSS and view code, one Twitter img deleted
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/images/Twitter_Logo_White_On_Blue.pngbin4861 -> 0 bytes
-rw-r--r--app/assets/stylesheets/twitter.scss8
2 files changed, 1 insertions, 7 deletions
diff --git a/app/assets/images/Twitter_Logo_White_On_Blue.png b/app/assets/images/Twitter_Logo_White_On_Blue.png
deleted file mode 100644
index 25ba09f..0000000
--- a/app/assets/images/Twitter_Logo_White_On_Blue.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/stylesheets/twitter.scss b/app/assets/stylesheets/twitter.scss
index b2481db..b2233d0 100644
--- a/app/assets/stylesheets/twitter.scss
+++ b/app/assets/stylesheets/twitter.scss
@@ -13,7 +13,7 @@
position: absolute;
}
-.twitter_pic {
+.twitter_image_frame {
display: block;
width: 40px;
height: 40px;
@@ -23,12 +23,6 @@
top: 0;
}
-.twitter_image_frame {
- width: 40px;
- height: 40px;
- overflow: hidden
- }
-
.twitter_image_frame > img {
display: block;
position: absolute;