Commit 8a004ee0 authored by Steffen van Bergerem's avatar Steffen van Bergerem Committed by Jonne Haß

Overwrite Bootstrap variables and fix publisher

parent e372b4eb
/* variables */
@import 'bootstrap-variables'; // our overwrites
@import 'bootstrap/variables'; // the original bootstrap ones
@import 'bootstrap-fix'; @import 'bootstrap-fix';
@import 'perfect-scrollbar'; @import 'perfect-scrollbar';
@import "colors"; @import "colors";
@import 'sizes';
@import 'mixins'; @import 'mixins';
/* core */ /* core */
......
// Calling this file bootstrap would cause an infinite recursion during asset compilation. // Calling this file bootstrap would cause an infinite recursion during asset compilation.
@import "bootstrap-sprockets"; @import "bootstrap-sprockets";
@import "bootstrap-variables";
@import "bootstrap"; @import "bootstrap";
This diff is collapsed.
...@@ -10,7 +10,6 @@ $light-grey: #DDDDDD; ...@@ -10,7 +10,6 @@ $light-grey: #DDDDDD;
$border-grey: #DDDDDD; $border-grey: #DDDDDD;
$border-dark-grey: #999999; $border-dark-grey: #999999;
$link-blue : rgb(42,156,235);
$link-grey: #777777; $link-grey: #777777;
$link-disabled-grey: #999999; $link-disabled-grey: #999999;
......
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
.img { line-height: 15px; } .img { line-height: 15px; }
.subject { .subject {
font-size: $font-size-text; font-size: $font-size-base;
> * { > * {
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#invitationsModal { #invitationsModal {
.modal-header, .modal-body { .modal-header, .modal-body {
color: $text; color: $text;
font-size: $font-size-text; font-size: $font-size-base;
text-align: initial; text-align: initial;
} }
#paste_link { font-weight: 700; } #paste_link { font-weight: 700; }
......
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
ul.as-selections { padding: 4px 5px; } ul.as-selections { padding: 4px 5px; }
.as-original{ width: 100%; } .as-original{ width: 100%; }
.tag_input { .tag_input {
line-height: $font-size-text; line-height: $font-size-base;
vertical-align: top; vertical-align: top;
width: 100%; width: 100%;
} }
......
...@@ -69,12 +69,12 @@ ...@@ -69,12 +69,12 @@
bottom: 0px; bottom: 0px;
left: 0px; left: 0px;
top: 0px; top: 0px;
padding: 4px 6px; padding: $padding-base-vertical $padding-base-horizontal;
} }
.mentions { .mentions {
color: white; color: white;
font-size: 14px; font-size: $font-size-base;
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
line-height: normal; line-height: normal;
overflow: hidden; overflow: hidden;
......
...@@ -7,18 +7,12 @@ body { ...@@ -7,18 +7,12 @@ body {
body { body {
margin-top: 40px; margin-top: 40px;
padding : none; padding : none;
font-size: $font-size-text;
&.lock { &.lock {
overflow: hidden; overflow: hidden;
} }
} }
blockquote p {
font-size: $font-size-text;
line-height: $line-height;
}
/* Overflow */ /* Overflow */
h1, h2, h3, h4, h5, h6, h1, h2, h3, h4, h5, h6,
p, p,
...@@ -27,9 +21,6 @@ code, ...@@ -27,9 +21,6 @@ code,
pre { word-wrap: break-word; } pre { word-wrap: break-word; }
a.tag { word-break: break-all; } a.tag { word-break: break-all; }
/* new link color */
a { color : $link-blue }
.avatar { .avatar {
border-radius: 4px; border-radius: 4px;
...@@ -63,7 +54,6 @@ a { color : $link-blue } ...@@ -63,7 +54,6 @@ a { color : $link-blue }
display : inline-block; display : inline-block;
position : relative; position : relative;
top : 1px; top : 1px;
font-family : Roboto-Bold;
} }
} }
......
...@@ -5,19 +5,19 @@ ...@@ -5,19 +5,19 @@
i.entypo { i.entypo {
color: $text-grey; color: $text-grey;
font-size: $font-size-text; font-size: $font-size-base;
line-height: $line-height; line-height: $line-height-base;
vertical-align: middle; vertical-align: middle;
&:hover { color: $text; } &:hover { color: $text; }
&.cross { font-size: $line-height; } &.cross { font-size: $line-height-base; }
} }
&.hide_conversation i { &.hide_conversation i {
font-size: $line-height*1.5; font-size: $line-height-base*1.5;
} }
&.delete_conversation i { &.delete_conversation i {
font-size: $font-size-text*1.5; font-size: $font-size-base*1.5;
} }
&.destroy_participation i { &.destroy_participation i {
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
font-size: 16px; font-size: 16px;
height: 40px; height: 40px;
padding: 10px 10px 10px 130px; padding: 10px 10px 10px 130px;
line-height: $line-height; line-height: $line-height-base;
box-sizing: border-box; box-sizing: border-box;
width: 100%; width: 100%;
border-bottom: 1px solid $border-grey; border-bottom: 1px solid $border-grey;
......
...@@ -16,8 +16,3 @@ ...@@ -16,8 +16,3 @@
src : image-url('fonts/Roboto-Light.ttf'); src : image-url('fonts/Roboto-Light.ttf');
weight : normal; weight : normal;
} }
body, p, h1, h2, h3, h4, h5, h6, textarea, input {
font-family : "Helvetica Neue", Helvetica, sans-serif;
font-weight : normal;
}
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
margin-bottom: 20px; margin-bottom: 20px;
.tag { .tag {
background-color: transparent; background-color: transparent;
font-size: $font-size-text; font-size: $font-size-base;
} }
.tag:not(.entypo) { .tag:not(.entypo) {
font-weight: 700; font-weight: 700;
......
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
color: $text-grey; color: $text-grey;
margin: 0; margin: 0;
& * { font-size: 13px; }
&.closed { &.closed {
#button_container, #button_container,
#location_container, #location_container,
...@@ -33,7 +31,11 @@ ...@@ -33,7 +31,11 @@
padding: 10px 0 ; padding: 10px 0 ;
#publisher_service_icons { #publisher_service_icons {
.btn-link{ text-decoration: none; } .btn-link{ text-decoration: none; }
.btn-link.question_mark .entypo { color: $text-grey; } .btn-link.question_mark .entypo {
color: $text-grey;
font-size: 16px;
line-height: $line-height-computed;
}
.btn-link.question_mark:hover.entypo { color: $black; } .btn-link.question_mark:hover.entypo { color: $black; }
.btn-link.service_icon { .btn-link.service_icon {
padding-left: 5px; padding-left: 5px;
...@@ -72,7 +74,6 @@ ...@@ -72,7 +74,6 @@
} }
.markdownIndications { .markdownIndications {
font-size: 13px;
line-height: 30px; line-height: 30px;
padding-left: 10px; padding-left: 10px;
margin-bottom: 0; margin-bottom: 0;
...@@ -81,7 +82,7 @@ ...@@ -81,7 +82,7 @@
} }
.mentions-input-box .mentions { .mentions-input-box .mentions {
line-height: $line-height !important; line-height: $line-height-base !important;
} }
&.with_attachments #photodropzone_container { &.with_attachments #photodropzone_container {
...@@ -187,6 +188,7 @@ ...@@ -187,6 +188,7 @@
#hide_location { #hide_location {
text-decoration: none !important; text-decoration: none !important;
font-size: 16px; font-size: 16px;
line-height: $line-height-computed;
padding: 4px 5px; padding: 4px 5px;
i { i {
color: $text-grey; color: $text-grey;
...@@ -216,7 +218,6 @@ ...@@ -216,7 +218,6 @@
position: absolute; position: absolute;
right: 100px; right: 100px;
bottom: -31px; bottom: -31px;
font-size: 13px;
} }
&.with_location .counter { &.with_location .counter {
bottom: -62px; bottom: -62px;
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
h5 { h5 {
color: $text-dark-grey; color: $text-dark-grey;
font-weight: bold; font-weight: bold;
font-size: 13px; font-size: $font-size-base;
margin: 0; margin: 0;
&.title-header { margin-left: 5px; } &.title-header { margin-left: 5px; }
} }
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
.post_scope { margin-right: 5px; } .post_scope { margin-right: 5px; }
.status-message-location { .status-message-location {
padding-top: 2px; padding-top: 2px;
line-height: $font-size-text; line-height: $font-size-base;
} }
} }
.bd { .bd {
......
$font-size-text: 13px;
$line-height: 20px;
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button class="close" type="button" data-dismiss="modal" aria-hidden="true">&times;</button> <button class="close" type="button" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3 id="newAspectModalLabel">{{ t "aspects.create.add_a_new_aspect" }}</h3> <h3 class="modal-title" id="newAspectModalLabel">{{ t "aspects.create.add_a_new_aspect" }}</h3>
</div> </div>
<div class="modal-body"> <div class="modal-body">
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
- for service in current_user.services - for service in current_user.services
= service_button(service) = service_button(service)
%a.btn.btn-group.btn-link{ href: "#question_mark_pane", class: 'question_mark', rel: 'facebox', title: t('shared.public_explain.manage') } %a.btn.btn-group.btn-link{ href: "#question_mark_pane", class: 'question_mark', rel: 'facebox', title: t('shared.public_explain.manage') }
%i.entypo.small.cog %i.entypo.cog
= render partial: "publisher/aspect_dropdown", locals: { :selected_aspects => selected_aspects } = render partial: "publisher/aspect_dropdown", locals: { :selected_aspects => selected_aspects }
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
.modal-header .modal-header
%button.close{type: 'button', 'data-dismiss' => 'modal', 'aria-hidden' => 'true' } %button.close{type: 'button', 'data-dismiss' => 'modal', 'aria-hidden' => 'true' }
&times; &times;
%h3{ id: "#{id}Label"} %h3.modal-title{ id: "#{id}Label"}
= title = title
.modal-body .modal-body
= image_tag('ajax-loader2.gif', id: "modalWaiter", class: "img-responsive center-block") = image_tag('ajax-loader2.gif', id: "modalWaiter", class: "img-responsive center-block")
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment