Commit 84a5992a authored by Steffen van Bergerem's avatar Steffen van Bergerem

Refactor css code, remove unused code

parent e6da51d9
......@@ -5,16 +5,23 @@
@import "colors";
@import 'sizes';
@import 'mixins';
@import 'new_styles/new_mixins';
/* core */
@import 'media-box';
@import 'autocomplete';
@import 'entypo-fonts';
@import 'entypo';
@import 'mentions';
@import 'flash_messages';
@import 'sprites';
@import 'hovercard';
@import 'new_styles/base';
@import 'new_styles/buttons';
@import 'new_styles/interactions';
@import 'new_styles/spinner';
@import 'lightbox';
@import 'vendor/fileuploader';
@import 'vendor/autoSuggest';
/* font overrides */
@import 'new_styles/typography';
......@@ -40,6 +47,7 @@
/* conversations */
@import 'conversations';
@import 'vendor/facebox';
@import 'facebox';
/* publisher */
......@@ -69,6 +77,7 @@
@import 'stream';
@import 'stream_element';
@import 'comments';
@import 'diaspora_jsxc';
@import 'chat';
/* right bar */
......@@ -82,4 +91,4 @@
@import 'new_styles/code';
/* statistics */
@import 'new_styles/statistics'
@import 'new_styles/statistics';
......@@ -10,6 +10,13 @@ textarea::input-placeholder {
color: #999999;
}
// A popover hack
.popover h3 {
margin-bottom: 0;
font-weight: bold;
}
// A temporary fix for mention modal #5329
#new_status_message_pane .modal {
......
......@@ -10,6 +10,7 @@ $light-grey: #DDDDDD;
$border-grey: #DDDDDD;
$border-dark-grey: #999999;
$link-blue : rgb(42,156,235);
$link-grey: #777777;
$link-disabled-grey: #999999;
......
/*
*= require media-box
*= require lightbox
*= require autocomplete
*= require mentions
*= require hovercard
*= require vendor/interim-bootstrap
*= require vendor/facebox
*= require vendor/fileuploader
*= require vendor/autoSuggest
*= require entypo-fonts
*= require entypo
*= require diaspora_jsxc
*/
@import "colors";
@import "_mixins";
#hovercard {
border-radius: 2px;
box-shadow: 0 0 5px #666666;
......
// licensed under the Affero General Public License version 3 or later. See
// the COPYRIGHT file.
@import 'colors';
@import 'mixins';
#lightbox{
z-index: 1003;
position: fixed;
......
@import "colors";
@import "_mixins";
.mentions-input-box {
border-radius: 3px;
......
@keyframes opacity-pulse {
0% { opacity: 0.3; }
65% { opacity: 0.9; }
100% { opacity: 0.3; }
}
@keyframes ease-over {
0% { opacity: 0; transform : scale(1.3); }
100% { opacity: 1; transform : scale(1); }
}
@keyframes ease-out {
0% { opacity: 1; transform : scale(1); }
100% { opacity: 0; transform : scale(1.3); }
}
/* flash message animations - header height is about 40px */
@keyframes expose {
0% { top : -100px; }
......
......@@ -23,13 +23,8 @@ pre { word-wrap: break-word; }
a.tag { word-break: break-all; }
/* new link color */
$link-blue : rgb(42,156,235);
a { color : $link-blue }
/* bootstrap extentions */
.icon-red { background-image: image_url("img/glyphicons-halflings-red.png"); }
.icon-blue { background-image: image_url("img/glyphicons-halflings-blue.png"); }
.avatar {
border-radius: 4px;
......@@ -54,58 +49,6 @@ a { color : $link-blue }
color: inherit;
}
.photo-fill {
@include background-cover();
position: absolute;
top: 0;
left: 0;
height: 100%;
width: 100%;
}
$bring-dark-accent-forward-color: #DDD;
#top-right-nav {
z-index: 10;
position : absolute;
right : 10px;
top : 10px;
& > a {
@include transition(opacity);
opacity: 0.4;
margin-left : 5px;
&:hover {
opacity: 0.75;
text-decoration : none;
}
}
}
#header {
position : fixed;
top : 0;
width : 100%;
padding : 15px;
z-index : 30;
box-shadow : inset 0 -10px 10px -8px rgba(0,0,0,0.8);
border-bottom : 1px solid #333;
color : #fff;
background : {
color : #333;
size : cover;
attachment : fixed;
}
h1 {
opacity: 0.4;
}
}
/* bootstrap label fixes for Roboto */
.label {
padding : 2px 5px;
......@@ -119,42 +62,6 @@ $bring-dark-accent-forward-color: #DDD;
}
}
.profile-image-container {
border-radius: 140px;
border : 3px solid #fff;
box-shadow : 0 0 2px rgba(0,0,0,0.5), 0 0 10px rgba(0,0,0,0.6), inset 0 0 15px rgba(0,0,0,0.5), inset 0 -2px 4px rgba(255,255,255,0.3);
background-size: cover;
height : 140px;
width : 140px;
background : {
position : center;
image : image-url('user/default.png');
}
display : inline-block;
margin-bottom : 5px;
&.small {
height : 40px;
width : 40px;
border : 2px solid #fff;
}
&.smaller {
height : 34px;
width : 34px;
border : 2px solid #ccc;
}
&.micro {
height : 24px;
width : 24px;
border : 2px solid #fff;
}
}
#back-to-top {
display: block;
color: white;
......
@import '../_flash_messages';
#flash_notice,
#flash_alert,
#flash_error {
.message {
margin-top : 10px;
padding : 10px 20px 8px;
background-color : rgba(0,0,0,0.8);
border : 1px solid rgba(255,255,255,0.7);
}
}
\ No newline at end of file
$light-grey: #999;
$pane-width: 420px;
$night-background-color : #333;
$night-text-color : #999;
/* mixins */
@mixin center($orient:vertical) {
display: box;
box-orient: $orient;
box-pack: center;
box-align: center;
}
@mixin pane-width() {
width: $pane-width;
max-width: 100%;
}
@mixin background-cover() {
background: no-repeat center center fixed;
background-size: cover;
}
@mixin info-container-base() {
box-shadow: 0 6px 20px #000;
@include dark-hatched-bg();
border-top: 1px solid #555;
color: #ddd;
}
@mixin info-container() {
@include info-container-base();
border-radius: 3px 0px;
@include pane-width();
display: inline-block;
position: relative;
border-right: 1px solid #444;
border-left: 1px solid #444;
padding-top: 25px;
/* webkit acceleration */
-webkit-transform: translateZ(0);
}
@mixin dark-hatched-bg() {
background-color: #444;
background-image: image-url("texture/hatched-dark.png");
}
@mixin photo-shadow() {
box-shadow: 0 3px 15px rgba(0,0,0,0.7);
}
@mixin media-text() {
font-size: 2em;
line-height: 1.2em;
padding-bottom: 0;
margin-bottom: 0;
}
@mixin newspaper-type() {
font-family: Palatino, times, georgia, serif;
}
@mixin centered-frame(){
display: table-cell;
vertical-align: middle;
text-align: center;
}
@import '../colors';
@import '../mixins';
@import 'new_mixins';
.poll_form {
border-top: 1px solid $border-grey;
border-bottom: 1px solid $border-grey;
......@@ -34,7 +30,7 @@
}
.submit[disabled] {
cursor: default;
color: $light-grey;
color: $text-grey;
&:hover, &:active {
background-image: none;
......
......@@ -18,7 +18,7 @@
.year_container { margin-top: 40px; }
.year {
background-color: $white;
color: $light-grey;
color: $text-grey;
font-size: 40px;
line-height: 40px;
margin-bottom: -20px;
......@@ -39,7 +39,7 @@
.day_group {
.date {
text-align: center;
color: $light-grey;
color: $text-grey;
.day {
font-size: 40px;
line-height: 40px;
......
@import 'new_styles/poll';
.poll_form {
.pull-right {
float: right;
}
label {
display: block;
font-size: 13px;
font-weight: normal;
line-height: $line-height;
padding-left: 20px;
input[type=radio] {
float: left;
margin-left: -20px;
}
&:HOVER {
cursor: pointer;
}
}
.progress {
overflow: hidden;
background-color: #f6f6f6;
border-radius: 4px;
.bar {
height: 100%;
float: left;
}
}
}
......@@ -29,7 +29,7 @@
cursor: default;
font-size: 20px;
&.circle {
color: $light-grey;
color: $text-grey;
&:before { content: '\26aa'; }
}
&.entypo.check { color: darken($green,20%); }
......
body {
background-color: #fff;
color: #333;
font-family: verdana, arial, helvetica, sans-serif;
font-size: 13px;
line-height: 18px; }
p, ol, ul, td {
font-family: verdana, arial, helvetica, sans-serif;
font-size: 13px;
line-height: 18px; }
pre {
background-color: #eee;
padding: 10px;
font-size: 11px; }
a {
color: #000;
&:visited {
color: $text-dark-grey; }
&:hover {
color: #fff;
background-color: #000; } }
div {
&.field, &.actions {
margin-bottom: 10px; } }
#notice {
color: green; }
.field_with_errors {
padding: 2px;
background-color: red;
display: table; }
#error_explanation {
width: 450px;
border: 2px solid red;
padding: 7px;
padding-bottom: 0;
margin-bottom: 20px;
background-color: #f0f0f0;
h2 {
text-align: left;
font-weight: bold;
padding: 5px 5px 5px 15px;
font-size: 12px;
margin: -7px;
margin-bottom: 0px;
background-color: #c00;
color: #fff; }
ul li {
font-size: 12px;
list-style: square; } }
// Load the necessary styles from the bootstrap-sass partials to keep this file
// up to date with the version of Bootstrap we're using.
@import "bootstrap/mixins";
@import "bootstrap/variables";
@import "bootstrap/tooltip";
@import "bootstrap/popovers";
@import "bootstrap/component-animations";
/* hacks */
.popover h3 {
margin-bottom: 0;
font-weight: bold;
}
......@@ -22,7 +22,7 @@
= include_mixpanel
= include_base_css_framework
= stylesheet_link_tag :default, 'application', :media => 'all'
= stylesheet_link_tag 'application', :media => 'all'
- if rtl?
= stylesheet_link_tag :rtl, :media => 'all'
......
......@@ -84,7 +84,6 @@ module Diaspora
bootstrap.css
bootstrap-complete.css
bootstrap-responsive.css
default.css
error_pages.css
admin.css
mobile/mobile.css
......
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