diff options
| author | Marie <ml.kochsiek@fu-berlin.de> | 2016-09-14 16:38:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-14 16:38:51 +0000 |
| commit | d72c87cb94213c9a507596f2103773969d1cbd30 (patch) | |
| tree | 7b13646448e64e560101493eeac1a03c3a25dbd8 /app/assets | |
| parent | 42459748e9e8e30a9cc0c64eaf4b8e10814d2dc2 (diff) | |
| parent | 22478d315af3590d2a344eb1aa8cf2aec0730506 (diff) | |
Merge pull request #14 from LoadToCode/develop
Taking it all from branch develop and push it to branch temp_1_marie
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/images/Twitter_Logo_White_On_Blue.png | bin | 4861 -> 0 bytes | |||
| -rw-r--r-- | app/assets/images/rails.png | bin | 0 -> 6646 bytes | |||
| -rw-r--r-- | app/assets/stylesheets/twitter.scss | 8 |
3 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 Binary files differdeleted file mode 100644 index 25ba09f..0000000 --- a/app/assets/images/Twitter_Logo_White_On_Blue.png +++ /dev/null diff --git a/app/assets/images/rails.png b/app/assets/images/rails.png Binary files differnew file mode 100644 index 0000000..d5edc04 --- /dev/null +++ b/app/assets/images/rails.png 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; |
