nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove inline css, use font-size-small

Browse source
This commit is contained in:
Steffen van Bergerem 2015-06-04 16:32:47 +02:00 committed by Jonne Haß
parent 9f6d6a2e80
commit 20c63b20ba
12 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/bootstrap-variables.scss vendored
View file

@ -52,7 +52,7 @@ $link-color: rgb(42,156,235);
$font-size-base: 13px; $font-size-base: 13px;
// $font-size-large: ceil(($font-size-base * 1.25)) // ~18px // $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-h1: floor(($font-size-base * 2.6)) // ~36px
// $font-size-h2: floor(($font-size-base * 2.15)) // ~30px // $font-size-h2: floor(($font-size-base * 2.15)) // ~30px

4
app/assets/stylesheets/comments.scss
View file

@ -19,8 +19,8 @@
.info { .info {
margin-top: 5px; margin-top: 5px;
font-size: 11px; font-size: $font-size-small;
line-height: 11px; line-height: $font-size-small;
} }
>.highlighted { >.highlighted {

2
app/assets/stylesheets/conversations.scss
View file

@ -27,7 +27,7 @@
min-width: 100%; min-width: 100%;
} }
} }
.timestamp { font-size: 11px; } .timestamp { font-size: $font-size-small; }
} }
.stream_element.conversation { .stream_element.conversation {

2
app/assets/stylesheets/facebox.scss
View file

@ -26,7 +26,7 @@
} }
.tiny_text { .tiny_text {
font-size: 11px; font-size: $font-size-small;
font-weight: normal; font-weight: normal;
} }
} }

2
app/assets/stylesheets/header.scss
View file

@ -149,7 +149,7 @@ body > header {
} }
a { a {
font-size: 11px; font-size: $font-size-small;
font-weight: bold; font-weight: bold;
} }
} }

2
app/assets/stylesheets/leftnavbar.scss
View file

@ -32,7 +32,7 @@
border-bottom: 1px dashed $border-grey; border-bottom: 1px dashed $border-grey;
margin-bottom: 10px; margin-bottom: 10px;
min-height: 50px; min-height: 50px;
padding-bottom: 10px; padding-bottom: 20px;
padding-left: 4px; padding-left: 4px;
.avatar { .avatar {

3
app/assets/stylesheets/people.scss
View file

@ -3,6 +3,7 @@
.term { font-weight: 700; } .term { font-weight: 700; }
small { margin-left: 15px; } small { margin-left: 15px; }
} }
#invitations-button { padding-left: 0; }
} }
#people_stream { #people_stream {
.media, .media-body { .media, .media-body {
@ -24,6 +25,6 @@
line-height: 50px; line-height: 50px;
margin-right: 10px; margin-right: 10px;
} }
.info { font-size: 11px; } .info { font-size: $font-size-small; }
} }
} }

9
app/assets/stylesheets/sidebar.scss
View file

@ -21,7 +21,7 @@
.content { .content {
color: $text-grey; color: $text-grey;
font-size: 11px; font-size: $font-size-small;
line-height: 18px; line-height: 18px;
padding: 5px; padding: 5px;
@ -33,9 +33,14 @@
li { list-style: none; } li { list-style: none; }
} }
.btn-link {
font-size: $font-size-small;
padding-left: 0;
}
& > #invite_code { & > #invite_code {
box-sizing: border-box; box-sizing: border-box;
font-size: 11px; font-size: $font-size-small;
height: 30px; height: 30px;
width: 100%; width: 100%;
} }

6
app/assets/stylesheets/stream_element.scss
View file

@ -59,8 +59,8 @@
a.author-name { color: $blue; } a.author-name { color: $blue; }
.feedback { .feedback {
margin-top: 5px; margin-top: 5px;
font-size: 11px; font-size: $font-size-small;
line-height: 11px; line-height: $font-size-small;
} }
.likes { .likes {
margin-top: 10px; margin-top: 10px;
@ -80,7 +80,7 @@
margin-top: 6px; margin-top: 6px;
} }
.status-message-location .near-from { .status-message-location .near-from {
font-size: 11px; font-size: $font-size-small;
color: $text-grey; color: $text-grey;
} }
.grey { color: $text-grey; } .grey { color: $text-grey; }

4
app/views/shared/_invitations.haml
View file

@ -1,7 +1,7 @@
= t('.share_this') = t('.share_this')
= invite_link(current_user.invitation_code) = invite_link(current_user.invitation_code)
#invitations-button.btn.btn-link{ 'data-toggle' => 'modal', style: "padding-left: 0;"} #invitations-button.btn.btn-link{ "data-toggle" => "modal"}
= t('.by_email') = t(".by_email")
= render 'shared/modal', = render 'shared/modal',
path: new_user_invitation_path, path: new_user_invitation_path,

6
app/views/streams/main_stream.mobile.haml
View file

@ -2,12 +2,6 @@
-# licensed under the Affero General Public License version 3 or later. See -# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file. -# 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 #main_stream.stream.col-md-12
= render 'shared/stream', posts: @stream.stream_posts = render 'shared/stream', posts: @stream.stream_posts
= render 'shared/stream_more_button' = render 'shared/stream_more_button'

2
app/views/users/_edit.haml
View file

@ -179,7 +179,7 @@
= link_to t('.request_export_photos'), export_photos_user_path, method: :post, class: "btn btn-default btn-block" = link_to t('.request_export_photos'), export_photos_user_path, method: :post, class: "btn btn-default btn-block"
.col-lg-5 .col-lg-5
%h3{ style: "text-align: right;" } %h3.text-right
= t('.close_account_text') = t('.close_account_text')
- if mobile - if mobile