diff options
author | Steffen van Bergerem <svbergerem@online.de> | 2015-03-13 02:11:30 +0300 |
---|---|---|
committer | Steffen van Bergerem <svbergerem@online.de> | 2015-03-13 03:41:14 +0300 |
commit | 84a5992a42b159b091eafe1a5089cdd940282440 (patch) | |
tree | 4fe588334aa0deb18c331fa78fe6c9eae05f00e7 | |
parent | e6da51d9165f6636cca2229090d764b70e4c7df8 (diff) |
Refactor css code, remove unused code
-rw-r--r-- | app/assets/stylesheets/application.scss | 15 | ||||
-rw-r--r-- | app/assets/stylesheets/bootstrap-fix.scss | 7 | ||||
-rw-r--r-- | app/assets/stylesheets/colors.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/default.scss | 15 | ||||
-rw-r--r-- | app/assets/stylesheets/hovercard.scss | 3 | ||||
-rw-r--r-- | app/assets/stylesheets/lightbox.scss | 6 | ||||
-rw-r--r-- | app/assets/stylesheets/mentions.scss | 3 | ||||
-rw-r--r-- | app/assets/stylesheets/new_styles/_animations.scss | 16 | ||||
-rw-r--r-- | app/assets/stylesheets/new_styles/_base.scss | 93 | ||||
-rw-r--r-- | app/assets/stylesheets/new_styles/_flash_messages.scss | 13 | ||||
-rw-r--r-- | app/assets/stylesheets/new_styles/_new_mixins.scss | 73 | ||||
-rw-r--r-- | app/assets/stylesheets/new_styles/_poll.scss | 6 | ||||
-rw-r--r-- | app/assets/stylesheets/notifications.scss | 4 | ||||
-rw-r--r-- | app/assets/stylesheets/poll.scss | 32 | ||||
-rw-r--r-- | app/assets/stylesheets/profile.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/scaffolds.scss | 56 | ||||
-rw-r--r-- | app/assets/stylesheets/vendor/interim-bootstrap.scss | 13 | ||||
-rw-r--r-- | app/views/layouts/application.html.haml | 2 | ||||
-rw-r--r-- | config/application.rb | 1 |
19 files changed, 25 insertions, 336 deletions
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index e17d19d78..bf06babd6 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -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'; diff --git a/app/assets/stylesheets/bootstrap-fix.scss b/app/assets/stylesheets/bootstrap-fix.scss index e34cd1d63..e54676eb8 100644 --- a/app/assets/stylesheets/bootstrap-fix.scss +++ b/app/assets/stylesheets/bootstrap-fix.scss @@ -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 { diff --git a/app/assets/stylesheets/colors.scss b/app/assets/stylesheets/colors.scss index caa7fa90c..fdd29ec3b 100644 --- a/app/assets/stylesheets/colors.scss +++ b/app/assets/stylesheets/colors.scss @@ -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; diff --git a/app/assets/stylesheets/default.scss b/app/assets/stylesheets/default.scss deleted file mode 100644 index 023b2aba3..000000000 --- a/app/assets/stylesheets/default.scss +++ /dev/null @@ -1,15 +0,0 @@ -/* -*= 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 -*/ diff --git a/app/assets/stylesheets/hovercard.scss b/app/assets/stylesheets/hovercard.scss index c6c114994..eb5ae9518 100644 --- a/app/assets/stylesheets/hovercard.scss +++ b/app/assets/stylesheets/hovercard.scss @@ -1,6 +1,3 @@ -@import "colors"; -@import "_mixins"; - #hovercard { border-radius: 2px; box-shadow: 0 0 5px #666666; diff --git a/app/assets/stylesheets/lightbox.scss b/app/assets/stylesheets/lightbox.scss index 7cdd5e53f..872126eb0 100644 --- a/app/assets/stylesheets/lightbox.scss +++ b/app/assets/stylesheets/lightbox.scss @@ -1,9 +1,3 @@ -// 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; diff --git a/app/assets/stylesheets/mentions.scss b/app/assets/stylesheets/mentions.scss index 71a930ff3..6647170ee 100644 --- a/app/assets/stylesheets/mentions.scss +++ b/app/assets/stylesheets/mentions.scss @@ -1,6 +1,3 @@ -@import "colors"; -@import "_mixins"; - .mentions-input-box { border-radius: 3px; diff --git a/app/assets/stylesheets/new_styles/_animations.scss b/app/assets/stylesheets/new_styles/_animations.scss index 61f251de7..93ca29ad3 100644 --- a/app/assets/stylesheets/new_styles/_animations.scss +++ b/app/assets/stylesheets/new_styles/_animations.scss @@ -1,19 +1,3 @@ -@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; } diff --git a/app/assets/stylesheets/new_styles/_base.scss b/app/assets/stylesheets/new_styles/_base.scss index 0f078ecba..82e54067e 100644 --- a/app/assets/stylesheets/new_styles/_base.scss +++ b/app/assets/stylesheets/new_styles/_base.scss @@ -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; diff --git a/app/assets/stylesheets/new_styles/_flash_messages.scss b/app/assets/stylesheets/new_styles/_flash_messages.scss deleted file mode 100644 index 8665c03b3..000000000 --- a/app/assets/stylesheets/new_styles/_flash_messages.scss +++ /dev/null @@ -1,13 +0,0 @@ - -@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 diff --git a/app/assets/stylesheets/new_styles/_new_mixins.scss b/app/assets/stylesheets/new_styles/_new_mixins.scss deleted file mode 100644 index c6435e857..000000000 --- a/app/assets/stylesheets/new_styles/_new_mixins.scss +++ /dev/null @@ -1,73 +0,0 @@ -$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; -} diff --git a/app/assets/stylesheets/new_styles/_poll.scss b/app/assets/stylesheets/new_styles/_poll.scss index 86fbff773..c7eba90ce 100644 --- a/app/assets/stylesheets/new_styles/_poll.scss +++ b/app/assets/stylesheets/new_styles/_poll.scss @@ -1,7 +1,3 @@ -@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; diff --git a/app/assets/stylesheets/notifications.scss b/app/assets/stylesheets/notifications.scss index 9b67bf0fb..d784105c7 100644 --- a/app/assets/stylesheets/notifications.scss +++ b/app/assets/stylesheets/notifications.scss @@ -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; diff --git a/app/assets/stylesheets/poll.scss b/app/assets/stylesheets/poll.scss deleted file mode 100644 index 2db4e0e6b..000000000 --- a/app/assets/stylesheets/poll.scss +++ /dev/null @@ -1,32 +0,0 @@ -@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; - } - } -} diff --git a/app/assets/stylesheets/profile.scss b/app/assets/stylesheets/profile.scss index ca064c76c..7c868ff55 100644 --- a/app/assets/stylesheets/profile.scss +++ b/app/assets/stylesheets/profile.scss @@ -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%); } diff --git a/app/assets/stylesheets/scaffolds.scss b/app/assets/stylesheets/scaffolds.scss deleted file mode 100644 index 931b39d5f..000000000 --- a/app/assets/stylesheets/scaffolds.scss +++ /dev/null @@ -1,56 +0,0 @@ -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; } } diff --git a/app/assets/stylesheets/vendor/interim-bootstrap.scss b/app/assets/stylesheets/vendor/interim-bootstrap.scss deleted file mode 100644 index 531710600..000000000 --- a/app/assets/stylesheets/vendor/interim-bootstrap.scss +++ /dev/null @@ -1,13 +0,0 @@ -// 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; -} diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 893e7f5d6..dc62d1354 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -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' diff --git a/config/application.rb b/config/application.rb index 5d4512eac..2ea9c6555 100644 --- a/config/application.rb +++ b/config/application.rb @@ -84,7 +84,6 @@ module Diaspora bootstrap.css bootstrap-complete.css bootstrap-responsive.css - default.css error_pages.css admin.css mobile/mobile.css |