summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authortheaamanda <theaamanda@users.noreply.github.com>2016-09-06 09:27:07 +0200
committerGitHub <noreply@github.com>2016-09-06 09:27:07 +0200
commit3b638103ae7c6094d79812f4cbd44bfce320a217 (patch)
tree4d94d9d077d2925172d6a4444a0cb54868101d87 /app/assets
parent3f83e3078043de06270ec0c406a672f9641ff213 (diff)
parent92e7b90d619111fdaaf50ab0b8538c39605fe005 (diff)
Merge pull request #1 from LoadToCode/marie
Updating the view and CSS, no pic and twitter handle in each tweet;
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/twitter.scss74
1 files changed, 36 insertions, 38 deletions
diff --git a/app/assets/stylesheets/twitter.scss b/app/assets/stylesheets/twitter.scss
index b0ce982..89cdecf 100644
--- a/app/assets/stylesheets/twitter.scss
+++ b/app/assets/stylesheets/twitter.scss
@@ -5,30 +5,14 @@
.twitter_header {
font-size: 20px;
text-align: left;
- margin-bottom: 30px;
+ margin-bottom: 80px;
}
-.twitter_list {
- box-sizing: border-box;
-}
-
-.tweet:hover {
- background-color: #ccf2ff;
- }
-
-.tweet {
- border-bottom-style: solid;
- border-color: #bfbfbf;
- padding: 10px 8px;
-}
-
-.tweet_title {
- position: relative;
- height: 40px;
- margin-bottom: 10px;
+.twitter_id {
+ position: absolute;
}
-.tweet_pic {
+.twitter_pic {
display: block;
width: 40px;
height: 40px;
@@ -38,12 +22,39 @@
top: 0;
}
-.tweet_name {
- padding-left: 50px;
+.twitter_image_frame {
+ width: 40px;
+ height: 40px;
+ 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;
+ width: 100%;
+ margin: auto;
+ }
+
+.twitter_list {
+ box-sizing: border-box;
+}
+
+.tweet {
+ border-top-style: solid;
+ border-color: lightgrey;
+ padding: 10px 8px;
}
.tweet_text {
@@ -55,22 +66,9 @@ box-sizing: border-box;
padding-top: 4px;
font-size: 12px ;
}
+
.twitter_footer {
+ border-top-style: solid;
+ border-color: lightgrey;
padding-top: 8px;
}
-
-.twitter_image_frame {
- width: 40px;
- height: 40px;
- overflow: hidden;
-}
-
-.twitter_image_frame > img {
- display: block;
- position: absolute;
- top: 0;
- bottom: 0;
- left: 0;
- width: 100%;
- margin: auto;
-}