From 56bef6a4aa2d0477104944fd68519a3282529adb Mon Sep 17 00:00:00 2001 From: Andreas Nedbal Date: Wed, 29 Apr 2020 14:49:24 +0200 Subject: [PATCH] Remove unnecessary styles for "data" page --- app/assets/stylesheets/base.css.scss | 2 -- app/assets/stylesheets/scss/data.scss | 10 ------ app/views/settings/_data.haml | 52 +++++++++++++-------------- 3 files changed, 26 insertions(+), 38 deletions(-) delete mode 100644 app/assets/stylesheets/scss/data.scss diff --git a/app/assets/stylesheets/base.css.scss b/app/assets/stylesheets/base.css.scss index 3d8219b8..9f1470e1 100644 --- a/app/assets/stylesheets/base.css.scss +++ b/app/assets/stylesheets/base.css.scss @@ -17,8 +17,6 @@ body { @import "scss/user"; @import "scss/notifications"; @import "scss/groups"; -@import "scss/data"; -@import "scss/mobile"; .j2-page { padding-top: 30px; diff --git a/app/assets/stylesheets/scss/data.scss b/app/assets/stylesheets/scss/data.scss deleted file mode 100644 index c4aa26c0..00000000 --- a/app/assets/stylesheets/scss/data.scss +++ /dev/null @@ -1,10 +0,0 @@ -.data-heading { - margin-bottom: 0; - font-weight: bold; - font-size: 1.1em; -} - -.data-header-preview { - height: auto; - width: 100%; -} diff --git a/app/views/settings/_data.haml b/app/views/settings/_data.haml index f0d277d9..b30acf87 100644 --- a/app/views/settings/_data.haml +++ b/app/views/settings/_data.haml @@ -8,31 +8,31 @@ .col-md-6.col-sm-6.col-xs-12 %h4 Profile - %p.data-heading User name + %p.font-weight-bold.mb-0 User name %p.text-muted= current_user.screen_name - %p.data-heading Display name + %p.font-weight-bold.mb-0 Display name %p.text-muted - if current_user.display_name.blank? None set! - else = current_user.display_name - %p.data-heading Bio + %p.font-weight-bold.mb-0 Bio %p.text-muted - if current_user.bio.blank? None set! - else = current_user.bio - %p.data-heading Location + %p.font-weight-bold.mb-0 Location %p.text-muted - if current_user.location.blank? None set! - else = current_user.location - %p.data-heading Website + %p.font-weight-bold.mb-0 Website %p.text-muted - if current_user.website.blank? None set! @@ -40,7 +40,7 @@ = current_user.website .col-md-6.col-sm-6.col-xs-12 %h4 Pictures - %p.data-heading Profile picture + %p.font-weight-bold.mb-0 Profile picture .media .pull-left %img.profile--img{src: current_user.profile_picture.url(:medium)} @@ -55,8 +55,8 @@ %li %a{href: current_user.profile_picture.url(:original)} Original image - %p.data-heading Header picture - %img.data-header-preview{src: current_user.profile_header.url(:mobile)} + %p.font-weight-bold.mb-0 Header picture + %img{src: current_user.profile_header.url(:mobile), style: 'width: 100%'} %p %a{href: current_user.profile_header.url(:mobile)} Mobile | @@ -69,36 +69,36 @@ .col-md-6.col-sm-6.col-xs-12 %h4 Statistics - %p.data-heading Answers + %p.font-weight-bold.mb-0 Answers %p.text-muted= current_user.answered_count - %p.data-heading Questions + %p.font-weight-bold.mb-0 Questions %p.text-muted= current_user.asked_count - %p.data-heading Following + %p.font-weight-bold.mb-0 Following %p.text-muted= current_user.friend_count - %p.data-heading Followers + %p.font-weight-bold.mb-0 Followers %p.text-muted= current_user.follower_count - %p.data-heading Smiles + %p.font-weight-bold.mb-0 Smiles %p.text-muted= current_user.smiled_count + current_user.comment_smiled_count - %p.data-heading Comments + %p.font-weight-bold.mb-0 Comments %p.text-muted= current_user.commented_count .col-md-6.col-sm-6.col-xs-12 %h4 Badges - %p.data-heading Admin + %p.font-weight-bold.mb-0 Admin %p - - if current_user.admin? + - if current_user.has_role? :administrator %span.label.label-success %i.fa.fa-fw.fa-check - else %span.label.label-danger %i.fa.fa-fw.fa-close - %p.data-heading Moderator + %p.font-weight-bold.mb-0 Moderator %p - if current_user.mod? %span.label.label-success @@ -109,45 +109,45 @@ .row .col-md-6.col-sm-6.col-xs-12 %h3 IP - %p.data-heading Current Sign In + %p.font-weight-bold.mb-0 Current Sign In %p.text-muted= current_user.current_sign_in_ip - %p.data-heading Last Sign In + %p.font-weight-bold.mb-0 Last Sign In %p.text-muted= current_user.last_sign_in_ip .col-md-6.col-sm-6.col-xs-12 %h3 Miscellaneous - %p.data-heading Locale + %p.font-weight-bold.mb-0 Locale %p.text-muted - if current_user.locale.blank? None set! - else = current_user.locale - %p.data-heading Sign In count + %p.font-weight-bold.mb-0 Sign In count %p.text-muted= current_user.sign_in_count %h3 Dates .row .col-md-6.col-sm-6.col-xs-12 %h4 Sign In - %p.data-heading Current Sign In + %p.font-weight-bold.mb-0 Current Sign In %p.text-muted= localize(current_user.current_sign_in_at) - %p.data-heading Last Sign In + %p.font-weight-bold.mb-0 Last Sign In %p.text-muted= localize(current_user.last_sign_in_at) - %p.data-heading Remember me set at + %p.font-weight-bold.mb-0 Remember me set at %p.text-muted= localize(current_user.remember_created_at) .col-md-6.col-sm-6.col-xs-12 %h4 Create/Update - %p.data-heading Account created + %p.font-weight-bold.mb-0 Account created %p.text-muted = localize(current_user.created_at) = " (#{time_ago_in_words(current_user.created_at)} ago)" - %p.data-heading Account last updated + %p.font-weight-bold.mb-0 Account last updated %p.text-muted = localize(current_user.updated_at) = " (#{time_ago_in_words(current_user.updated_at)} ago)" \ No newline at end of file