summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorluca-marie <ml.kochsiek@fu-berlin.de>2016-09-09 13:19:51 +0200
committerluca-marie <ml.kochsiek@fu-berlin.de>2016-09-09 15:19:13 +0200
commit42459748e9e8e30a9cc0c64eaf4b8e10814d2dc2 (patch)
treef24728e422f3249d71a2a69b0acec7b990b1168e /app/assets
parentc0aaafcd048c4a2ac74f582ee8d6383c46558427 (diff)
Added changes in css, view and main view file, as well as default avatar is now set as twitter official logo (added 2 official twitter logo images; changed footer text.
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/images/Twitter_Logo_Blue.pngbin0 -> 4298 bytes
-rw-r--r--app/assets/images/Twitter_Logo_White_On_Blue.pngbin0 -> 4861 bytes
-rw-r--r--app/assets/images/rails.pngbin6646 -> 0 bytes
-rw-r--r--app/assets/images/team-loadtocode-Loading_icon.gifbin17490 -> 0 bytes
-rw-r--r--app/assets/stylesheets/twitter.scss32
5 files changed, 18 insertions, 14 deletions
diff --git a/app/assets/images/Twitter_Logo_Blue.png b/app/assets/images/Twitter_Logo_Blue.png
new file mode 100644
index 0000000..b5eebc8
--- /dev/null
+++ b/app/assets/images/Twitter_Logo_Blue.png
Binary files differ
diff --git a/app/assets/images/Twitter_Logo_White_On_Blue.png b/app/assets/images/Twitter_Logo_White_On_Blue.png
new file mode 100644
index 0000000..25ba09f
--- /dev/null
+++ b/app/assets/images/Twitter_Logo_White_On_Blue.png
Binary files differ
diff --git a/app/assets/images/rails.png b/app/assets/images/rails.png
deleted file mode 100644
index d5edc04..0000000
--- a/app/assets/images/rails.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/images/team-loadtocode-Loading_icon.gif b/app/assets/images/team-loadtocode-Loading_icon.gif
deleted file mode 100644
index a718bd8..0000000
--- a/app/assets/images/team-loadtocode-Loading_icon.gif
+++ /dev/null
Binary files differ
diff --git a/app/assets/stylesheets/twitter.scss b/app/assets/stylesheets/twitter.scss
index 89cdecf..b2481db 100644
--- a/app/assets/stylesheets/twitter.scss
+++ b/app/assets/stylesheets/twitter.scss
@@ -3,9 +3,10 @@
}
.twitter_header {
- font-size: 20px;
+ font-size: 16px;
text-align: left;
- margin-bottom: 80px;
+ margin-bottom: 55px;
+ padding: 10px 8px;
}
.twitter_id {
@@ -25,28 +26,29 @@
.twitter_image_frame {
width: 40px;
height: 40px;
- overflow: hidden;
+ overflow: hidden
}
-.twitter_name {
- padding-left: 65px;
- line-height: 40px;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
- font-size: 20px;
-}
-
.twitter_image_frame > img {
display: block;
position: absolute;
top: 0;
bottom: 0;
- left: 0;
+ left: 30;
width: 100%;
margin: auto;
}
+.twitter_name {
+ padding-left: 55px;
+ line-height: 20px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ font-size: 16px;
+}
+
+// Body = displays tweets
.twitter_list {
box-sizing: border-box;
}
@@ -70,5 +72,7 @@ box-sizing: border-box;
.twitter_footer {
border-top-style: solid;
border-color: lightgrey;
- padding-top: 8px;
+ padding: 10px 8px;
+ font-style: italic;
+ font-size: 12px;
}