From 3408ac694a60df0380a3bf444077165a1f30e87e Mon Sep 17 00:00:00 2001 From: luca-marie Date: Fri, 9 Sep 2016 13:19:51 +0200 Subject: 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. --- app/assets/images/Twitter_Logo_Blue.png | Bin 0 -> 4298 bytes app/assets/images/Twitter_Logo_White_On_Blue.png | Bin 0 -> 4861 bytes app/assets/images/rails.png | Bin 6646 -> 0 bytes app/assets/images/team-loadtocode-Loading_icon.gif | Bin 17490 -> 0 bytes app/assets/stylesheets/twitter.scss | 32 ++++++++++++--------- 5 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 app/assets/images/Twitter_Logo_Blue.png create mode 100644 app/assets/images/Twitter_Logo_White_On_Blue.png delete mode 100644 app/assets/images/rails.png delete mode 100644 app/assets/images/team-loadtocode-Loading_icon.gif (limited to 'app/assets') 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 Binary files /dev/null and b/app/assets/images/Twitter_Logo_Blue.png 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 Binary files /dev/null and b/app/assets/images/Twitter_Logo_White_On_Blue.png differ diff --git a/app/assets/images/rails.png b/app/assets/images/rails.png deleted file mode 100644 index d5edc04..0000000 Binary files a/app/assets/images/rails.png and /dev/null 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 Binary files a/app/assets/images/team-loadtocode-Loading_icon.gif and /dev/null 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; } -- cgit v1.2.3 From 2ef8707a7539622007b6d679a7708a5979594ff3 Mon Sep 17 00:00:00 2001 From: luca-marie Date: Tue, 13 Sep 2016 12:20:12 +0200 Subject: Cleaning CSS &view code, updating twitter helper with develop --- app/assets/stylesheets/twitter.scss | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'app/assets') 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; -- cgit v1.2.3 From 0e46ed05ff0ab7b860e5bb8a4be99ae16474410d Mon Sep 17 00:00:00 2001 From: luca-marie Date: Tue, 13 Sep 2016 12:34:00 +0200 Subject: No need of 2nd Twitter img --- app/assets/images/Twitter_Logo_White_On_Blue.png | Bin 4861 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 app/assets/images/Twitter_Logo_White_On_Blue.png (limited to 'app/assets') 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 Binary files a/app/assets/images/Twitter_Logo_White_On_Blue.png and /dev/null differ -- cgit v1.2.3 From b26c4a45e3f4a82b30972c4b283a98a874bea216 Mon Sep 17 00:00:00 2001 From: luca-marie Date: Tue, 13 Sep 2016 13:20:17 +0200 Subject: Deleting one twitter img, only one is needed --- app/assets/images/Twitter_Logo_White_On_Blue.png | Bin 4861 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 app/assets/images/Twitter_Logo_White_On_Blue.png (limited to 'app/assets') 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 Binary files a/app/assets/images/Twitter_Logo_White_On_Blue.png and /dev/null differ -- cgit v1.2.3 From 4626157572bf20884cfad2b1fc0e24cd60bad918 Mon Sep 17 00:00:00 2001 From: luca-marie Date: Tue, 13 Sep 2016 14:47:29 +0200 Subject: Added what was once deleted by mistake --- app/assets/images/rails.png | Bin 0 -> 6646 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/assets/images/rails.png (limited to 'app/assets') diff --git a/app/assets/images/rails.png b/app/assets/images/rails.png new file mode 100644 index 0000000..d5edc04 Binary files /dev/null and b/app/assets/images/rails.png differ -- cgit v1.2.3