From 20c63b20ba2a7548c8964e209fdaaa0f89e76662 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 4 Jun 2015 16:32:47 +0200 Subject: [PATCH] Remove inline css, use font-size-small --- app/assets/stylesheets/bootstrap-variables.scss | 2 +- app/assets/stylesheets/comments.scss | 4 ++-- app/assets/stylesheets/conversations.scss | 2 +- app/assets/stylesheets/facebox.scss | 2 +- app/assets/stylesheets/header.scss | 2 +- app/assets/stylesheets/leftnavbar.scss | 2 +- app/assets/stylesheets/people.scss | 3 ++- app/assets/stylesheets/sidebar.scss | 9 +++++++-- app/assets/stylesheets/stream_element.scss | 6 +++--- app/views/shared/_invitations.haml | 4 ++-- app/views/streams/main_stream.mobile.haml | 6 ------ app/views/users/_edit.haml | 2 +- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/assets/stylesheets/bootstrap-variables.scss b/app/assets/stylesheets/bootstrap-variables.scss index 220de7495..599a7303a 100644 --- a/app/assets/stylesheets/bootstrap-variables.scss +++ b/app/assets/stylesheets/bootstrap-variables.scss @@ -52,7 +52,7 @@ $link-color: rgb(42,156,235); $font-size-base: 13px; // $font-size-large: ceil(($font-size-base * 1.25)) // ~18px -// $font-size-small: ceil(($font-size-base * 0.85)) // ~12px +$font-size-small: 11px; // $font-size-h1: floor(($font-size-base * 2.6)) // ~36px // $font-size-h2: floor(($font-size-base * 2.15)) // ~30px diff --git a/app/assets/stylesheets/comments.scss b/app/assets/stylesheets/comments.scss index 6a8551eb9..a56a02de9 100644 --- a/app/assets/stylesheets/comments.scss +++ b/app/assets/stylesheets/comments.scss @@ -19,8 +19,8 @@ .info { margin-top: 5px; - font-size: 11px; - line-height: 11px; + font-size: $font-size-small; + line-height: $font-size-small; } >.highlighted { diff --git a/app/assets/stylesheets/conversations.scss b/app/assets/stylesheets/conversations.scss index 747852691..4e35d2b0a 100644 --- a/app/assets/stylesheets/conversations.scss +++ b/app/assets/stylesheets/conversations.scss @@ -27,7 +27,7 @@ min-width: 100%; } } - .timestamp { font-size: 11px; } + .timestamp { font-size: $font-size-small; } } .stream_element.conversation { diff --git a/app/assets/stylesheets/facebox.scss b/app/assets/stylesheets/facebox.scss index 18b07f2a3..43440b475 100644 --- a/app/assets/stylesheets/facebox.scss +++ b/app/assets/stylesheets/facebox.scss @@ -26,7 +26,7 @@ } .tiny_text { - font-size: 11px; + font-size: $font-size-small; font-weight: normal; } } diff --git a/app/assets/stylesheets/header.scss b/app/assets/stylesheets/header.scss index f2f0ed651..e51398ba9 100644 --- a/app/assets/stylesheets/header.scss +++ b/app/assets/stylesheets/header.scss @@ -149,7 +149,7 @@ body > header { } a { - font-size: 11px; + font-size: $font-size-small; font-weight: bold; } } diff --git a/app/assets/stylesheets/leftnavbar.scss b/app/assets/stylesheets/leftnavbar.scss index 0ba2c18c5..a055f34bb 100644 --- a/app/assets/stylesheets/leftnavbar.scss +++ b/app/assets/stylesheets/leftnavbar.scss @@ -32,7 +32,7 @@ border-bottom: 1px dashed $border-grey; margin-bottom: 10px; min-height: 50px; - padding-bottom: 10px; + padding-bottom: 20px; padding-left: 4px; .avatar { diff --git a/app/assets/stylesheets/people.scss b/app/assets/stylesheets/people.scss index c217dcca4..750e3a01c 100644 --- a/app/assets/stylesheets/people.scss +++ b/app/assets/stylesheets/people.scss @@ -3,6 +3,7 @@ .term { font-weight: 700; } small { margin-left: 15px; } } + #invitations-button { padding-left: 0; } } #people_stream { .media, .media-body { @@ -24,6 +25,6 @@ line-height: 50px; margin-right: 10px; } - .info { font-size: 11px; } + .info { font-size: $font-size-small; } } } diff --git a/app/assets/stylesheets/sidebar.scss b/app/assets/stylesheets/sidebar.scss index 9b6efb653..ea9d1378d 100644 --- a/app/assets/stylesheets/sidebar.scss +++ b/app/assets/stylesheets/sidebar.scss @@ -21,7 +21,7 @@ .content { color: $text-grey; - font-size: 11px; + font-size: $font-size-small; line-height: 18px; padding: 5px; @@ -33,9 +33,14 @@ li { list-style: none; } } + .btn-link { + font-size: $font-size-small; + padding-left: 0; + } + & > #invite_code { box-sizing: border-box; - font-size: 11px; + font-size: $font-size-small; height: 30px; width: 100%; } diff --git a/app/assets/stylesheets/stream_element.scss b/app/assets/stylesheets/stream_element.scss index f084e0e51..fc7aa109d 100644 --- a/app/assets/stylesheets/stream_element.scss +++ b/app/assets/stylesheets/stream_element.scss @@ -59,8 +59,8 @@ a.author-name { color: $blue; } .feedback { margin-top: 5px; - font-size: 11px; - line-height: 11px; + font-size: $font-size-small; + line-height: $font-size-small; } .likes { margin-top: 10px; @@ -80,7 +80,7 @@ margin-top: 6px; } .status-message-location .near-from { - font-size: 11px; + font-size: $font-size-small; color: $text-grey; } .grey { color: $text-grey; } diff --git a/app/views/shared/_invitations.haml b/app/views/shared/_invitations.haml index ee4610048..83f9b7807 100644 --- a/app/views/shared/_invitations.haml +++ b/app/views/shared/_invitations.haml @@ -1,7 +1,7 @@ = t('.share_this') = invite_link(current_user.invitation_code) -#invitations-button.btn.btn-link{ 'data-toggle' => 'modal', style: "padding-left: 0;"} - = t('.by_email') +#invitations-button.btn.btn-link{ "data-toggle" => "modal"} + = t(".by_email") = render 'shared/modal', path: new_user_invitation_path, diff --git a/app/views/streams/main_stream.mobile.haml b/app/views/streams/main_stream.mobile.haml index 3a8424ada..18745ff77 100644 --- a/app/views/streams/main_stream.mobile.haml +++ b/app/views/streams/main_stream.mobile.haml @@ -2,12 +2,6 @@ -# licensed under the Affero General Public License version 3 or later. See -# the COPYRIGHT file. -%h2{style: "padding:0 10px;display:none;"} - - if @stream.for_all_aspects? - = t('all_aspects') - - else - = @stream.aspect - #main_stream.stream.col-md-12 = render 'shared/stream', posts: @stream.stream_posts = render 'shared/stream_more_button' diff --git a/app/views/users/_edit.haml b/app/views/users/_edit.haml index 9bf6ae3b0..381e46dc7 100644 --- a/app/views/users/_edit.haml +++ b/app/views/users/_edit.haml @@ -179,7 +179,7 @@ = link_to t('.request_export_photos'), export_photos_user_path, method: :post, class: "btn btn-default btn-block" .col-lg-5 - %h3{ style: "text-align: right;" } + %h3.text-right = t('.close_account_text') - if mobile