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

Merge pull request #6458 from svbergerem/move-new-styles

Browse source 
Move new styles
This commit is contained in:
Jonne Haß 2015-10-05 11:27:12 +02:00
commit 98c2e78d44
17 changed files with 113 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,10 +10,11 @@
@import 'entypo';
@import 'icons';
@import 'mentions';
@import 'animations';
@import 'flash_messages';
@import 'sprites';
@import 'hovercard';
@import 'new_styles/base';
@import 'base';
@import 'new_styles/interactions';
@import 'spinner';
@import 'timeago';
@ -22,7 +23,7 @@
@import 'typeahead';
/* font overrides */
@import 'new_styles/typography';
@import 'typography';
/* login */
@import 'new_styles/login';
@ -40,7 +41,7 @@
@import 'footer';
@import 'opengraph';
@import 'single-post-view';
@import 'new_styles/poll';
@import 'poll';
/* map*/
@import 'leaflet';
@ -91,7 +92,7 @@
@import 'navbar_left';
/* code */
@import 'new_styles/code';
@import 'code';
@import 'highlightjs/github';
/* statistics */

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

@ -1,6 +1,3 @@
@import 'new_styles/animations';
#flash_notice,
#flash_alert,
#flash_error {

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

@ -1,5 +1,5 @@
@import 'colors';
@import 'new_styles/animations';
@import 'animations';
/** ADMIN STYlES **/
/** user search **/

23
app/assets/stylesheets/animations.scss Normal file
View file

@ -0,0 +1,23 @@
// flash message animations - header height is about 50px
@keyframes expose {
0% { top: -100px; }
15% { top: 44px; }
85% { top: 44px; }
100% { top: -100px; }
}
// spinner animation
@keyframes spinner {
0% { transform: rotate(0deg); }
100% { transform: rotate(360deg); }
}
@keyframes pulsate {
from {
opacity: 1;
}
to {
opacity: .1;
}
}

67
app/assets/stylesheets/new_styles/_base.scss → app/assets/stylesheets/base.scss
View file

@ -1,19 +1,21 @@
body {
margin-top: $navbar-height;
padding : none;
&.lock {
overflow: hidden;
}
padding: none;
}
/* Overflow */
h1, h2, h3, h4, h5, h6,
// Overflow
h1,
h2,
h3,
h4,
h5,
h6,
p,
blockquote,
code,
pre { word-wrap: break-word; }
a.tag { word-break: break-all; }
.tag { word-break: break-all; }
.avatar {
border-radius: 4px;
@ -30,8 +32,8 @@ a.tag { word-break: break-all; }
&.medium {
height: auto;
width: auto;
max-width: 75px;
width: auto;
}
}
@ -39,41 +41,36 @@ a.tag { word-break: break-all; }
color: inherit;
}
#back-to-top {
display: block;
color: white;
position: fixed;
z-index: 49;
right: 54px;
bottom: 20px;
opacity: 0;
font-size: 2.9em;
padding: 0 12px 0 12px;
.back-to-top {
background-color: $border-dark-grey;
border-radius: 10px;
background-color: #aaa;
&:hover { opacity: 0.85 !important; }
&.visible { opacity: 0.5; }
bottom: 20px;
color: $white;
display: block;
font-size: 2.9em;
line-height: 1.5;
opacity: 0;
padding: 0 12px;
position: fixed;
right: 54px;
z-index: 49;
&:hover,
&.visible:hover {
color: $white;
opacity: .85;
}
&.visible { opacity: .5; }
}
/* general purpose classes */
// general purpose classes
.small-horizontal-spacer {
min-height: 20px;
}
.big-horizontal-spacer {
height: 50px;
}
/* responsive */
@media (max-width: 767px) {
body {
padding : 0;
}
}
/* badge color */
// badge color
.badge-important {
background-color: $red;
}

0
app/assets/stylesheets/new_styles/_code.scss → app/assets/stylesheets/code.scss
View file

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

@ -2,6 +2,7 @@
@import "bootstrap-complete";
@import "_mixins";
@import "vendor/autoSuggest";
@import 'animations';
@import "_flash_messages";
@import 'entypo';
@import 'icons';
@ -13,7 +14,7 @@
@import "mobile/stream_element";
@import "mobile/comments";
@import "new_styles/typography";
@import 'typography';
a {
color: #2489ce;

22
app/assets/stylesheets/new_styles/_animations.scss
View file

@ -1,22 +0,0 @@
/* flash message animations - header height is about 50px */
@keyframes expose {
0% { top : -100px; }
15% { top : 44px; }
85% { top : 44px; }
100% { top : -100px; }
}
/* spinner animation */
@keyframes spinner {
0% { transform: rotate(0deg); }
100% { transform: rotate(360deg); }
}
@keyframes pulsate {
from {
opacity: 1;
}
to {
opacity: .1;
}
}

26
app/assets/stylesheets/new_styles/_typography.scss
View file

@ -1,26 +0,0 @@
/* diaspora custom icons font */
@font-face {
font-family: "diaspora-custom";
src: image-url("fonts/diaspora-custom.ttf");
font-weight: normal;
font-style: normal;
}
[class^="diaspora-custom-"]:before,
[class*=" diaspora-custom-"]:before {
font-family: "diaspora-custom" !important;
font-style: normal !important;
font-weight: normal !important;
font-variant: normal !important;
text-transform: none !important;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.diaspora-custom-compose:before {
content: "a";
}
.diaspora-custom-mail:before {
content: "b";
}

28
app/assets/stylesheets/new_styles/_poll.scss → app/assets/stylesheets/poll.scss
View file

@ -1,18 +1,20 @@
.poll_form {
border-top: 1px solid $border-grey;
border-bottom: 1px solid $border-grey;
margin: 10px 0px 10px 0px;
padding: 10px 0px 5px 0px;
border-top: 1px solid $border-grey;
margin: 10px 0;
padding: 10px 0 5px;
.poll_content {
.poll-content {
margin-top: 5px;
}
.toggle_result_wrapper {
.toggle-result-wrapper {
display: inline-block;
margin-top: 10px;
}
form {
margin-bottom: 0px;
margin-bottom: 0;
}
.result-row > label { width: 100%; }
@ -20,21 +22,23 @@
.progress {
background-image: none;
box-shadow: 0 0 0;
height: 10px;
margin-bottom: 5px;
height: 10px !important;
.bar {
background: $border-dark-grey none;
color: $text-dark-grey;
text-align: left;
height: 100%;
text-align: left;
}
}
.submit[disabled] {
cursor: default;
color: $text-grey;
&:hover, &:active {
.submit[disabled] {
color: $text-grey;
cursor: default;
&:hover,
&:active {
background-image: none;
}
}

27
app/assets/stylesheets/typography.scss Normal file
View file

@ -0,0 +1,27 @@
// diaspora custom icons font
@font-face {
font-family: 'diaspora-custom';
src: image-url('fonts/diaspora-custom.ttf');
font-weight: normal;
font-style: normal;
}
[class^="diaspora-custom-"]:before,
[class*=" diaspora-custom-"]:before {
font-family: 'diaspora-custom';
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
font-style: normal;
font-variant: normal;
font-weight: normal;
text-transform: none;
}
.diaspora-custom-compose:before {
content: 'a';
}
.diaspora-custom-mail:before {
content: 'b';
}

4
app/assets/templates/poll_tpl.jst.hbs
View file

@ -6,7 +6,7 @@
{{t "poll.count" count=poll.participation_count}}
</div>
</div>
<div class="poll_content">
<div class="poll-content">
{{#if show_form}}
<form action="/posts/{{poll.post_id}}/poll_participations" method="POST">
{{#poll.poll_answers}}
@ -21,7 +21,7 @@
</label>
</div>
{{/poll.poll_answers}}
<div class="toggle_result_wrapper">
<div class="toggle-result-wrapper">
<a class="toggle_result" href="#">{{t "poll.show_result"}}</a>
</div>
<input type="submit" class="submit pull-right btn btn-default" value="{{t "poll.vote"}}"/>

2
app/views/people/contacts.haml
View file

@ -23,7 +23,7 @@
= render partial: 'people/person', locals: hash
= will_paginate @contacts_of_contact, renderer: WillPaginate::ActionView::BootstrapLinkRenderer
%a{id:"back-to-top", title:"#{t('layouts.application.back_to_top')}", href:"#"}
%a.back-to-top#back-to-top{title: "#{t('layouts.application.back_to_top')}", href: "#"}
&#8679;
-if user_signed_in? && @person

2
app/views/people/index.html.haml
View file

@ -37,7 +37,7 @@
= will_paginate(@people)
%a{id:"back-to-top", title:"#{t('layouts.application.back_to_top')}", href:"#"}
%a.back-to-top#back-to-top{title: "#{t('layouts.application.back_to_top')}", href: "#"}
&#8679;
.col-md-4

2
app/views/people/show.html.haml
View file

@ -33,7 +33,7 @@
%span.loader.hidden
.spinner
%a{id:"back-to-top", title:"#{t('layouts.application.back_to_top')}", href:"#"}
%a.back-to-top#back-to-top{title: "#{t('layouts.application.back_to_top')}", href: "#"}
&#8679;
-if user_signed_in? && @person

2
app/views/streams/main_stream.html.haml
View file

@ -57,5 +57,5 @@
= render 'shared/right_sections'
%a{id:"back-to-top", title:"#{t('layouts.application.back_to_top')}", href:"#"}
%a.back-to-top#back-to-top{title: "#{t('layouts.application.back_to_top')}", href: "#"}
&#8679;

2
app/views/tags/show.haml
View file

@ -36,5 +36,5 @@
.col-lg-1.visible-lg#right-sidebar-fixed-sub-background
%a{id:"back-to-top", title:"#{t('layouts.application.back_to_top')}", href:"#"}
%a.back-to-top#back-to-top{title: "#{t('layouts.application.back_to_top')}", href: "#"}
&#8679;