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

Merge pull request #4479 from ssrihari/fix-colors-more

Browse source 
Refactored the colors palette a little more
This commit is contained in:
Jonne Haß 2013-08-30 15:22:34 +02:00
commit 9d092c1b2f
13 changed files with 39 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Changelog.md
View file

@ -2,7 +2,7 @@
## Refactor ## Refactor
* Move non-model federation stuff into lib/ [#4363](https://github.com/diaspora/diaspora/pull/4363) * Move non-model federation stuff into lib/ [#4363](https://github.com/diaspora/diaspora/pull/4363)
* Build a color palette to uniform color usage [#4437](https://github.com/diaspora/diaspora/pull/4437) [#4469](https://github.com/diaspora/diaspora/pull/4469) * Build a color palette to uniform color usage [#4437](https://github.com/diaspora/diaspora/pull/4437) [#4469](https://github.com/diaspora/diaspora/pull/4469) [#4479](https://github.com/diaspora/diaspora/pull/4479)
## Bug fixes ## Bug fixes
* Highlight down arrow at the user menu on hover [#4441](https://github.com/diaspora/diaspora/pull/4441) * Highlight down arrow at the user menu on hover [#4441](https://github.com/diaspora/diaspora/pull/4441)

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

@ -11,7 +11,7 @@
width : 100%; width : 100%;
text-align : center; text-align : center;
color: #666; color: $text-dark-grey;
&.expose { &.expose {
@include animation(expose, 10s) @include animation(expose, 10s)
@ -38,7 +38,7 @@
#flash_notice { #flash_notice {
.message { .message {
color: #666; color: $text-dark-grey;
background-color: #F4F899; background-color: #F4F899;
border-color: darken(#F4F899, 40%); border-color: darken(#F4F899, 40%);
} }

22
app/assets/stylesheets/application.css.sass
View file

@ -303,7 +303,6 @@ ul.as-selections
:cursor default :cursor default
.time, .time,
.timeago,
.via .via
:color #aaa :color #aaa
a a
@ -648,7 +647,7 @@ form p.checkbox_select
:vertical-align bottom :vertical-align bottom
&:hover &:hover
:color #666 :color $text-dark-grey
:cursor pointer :cursor pointer
img img
@ -1267,8 +1266,8 @@ ul#press_logos
#already_invited_pane #already_invited_pane
h4 h4
:color #666 :color $text-dark-grey
:color #666 :color $text-dark-grey
#search_title #search_title
:font :font
@ -1493,7 +1492,7 @@ ul#press_logos
.last_author .last_author
:font :font
:size 12px :size 12px
:color #777 :color $text-dark-grey
.collapsible .collapsible
:overflow hidden :overflow hidden
@ -1853,7 +1852,7 @@ h1.tag
:top 3px :top 3px
:font-size smaller :font-size smaller
:font-weight bold :font-weight bold
:color #777 :color $text-dark-grey
.icons-plus, .icons-plus,
.icons-heart, .icons-heart,
@ -1899,7 +1898,7 @@ h1.tag
h5 h5
:font-size 12px :font-size 12px
:margin 0 :margin 0
:color #666 :color $text-dark-grey
.section .section
.content .content
@ -2024,7 +2023,7 @@ ul.left_nav
> a:not(.sub_selected) > a:not(.sub_selected)
:color #333 :color #333
.item_count .item_count
:color #666 :color $text-dark-grey
a.aspect_selector, a.aspect_selector,
a.home_selector, a.home_selector,
@ -2278,7 +2277,7 @@ a.toggle_selector
:padding 10px :padding 10px
:background :background
:color #eee :color #eee
:color #666 :color $text-dark-grey
.cubbies_collage .cubbies_collage
:position absolute :position absolute
@ -2629,8 +2628,7 @@ body
:font-size smaller :font-size smaller
:color $text-grey :color $text-grey
a a
:color #666 :color $text-dark-grey
:color #666
#fileInfo #fileInfo
:font-size small :font-size small
@ -2660,7 +2658,7 @@ body
:padding-top 2px :padding-top 2px
@include opacity(0.4) @include opacity(0.4)
&:hover &:hover
:color #666 :color $text-dark-grey
:cursor pointer :cursor pointer
img img
@include opacity(0.8) @include opacity(0.8)

10
app/assets/stylesheets/colors.css.scss
View file

@ -1,15 +1,19 @@
$highlight-white: #FAFAFA; $highlight-white: #FAFAFA;
$background-white: #FFFFFF; $background-white: #FFFFFF;
$background-grey: #EEEEEE;
$grey: #2B2B2B; $grey: #2B2B2B;
$light-grey: #DDDDDD; $light-grey: #DDDDDD;
$border-grey: #DDDDDD; $border-grey: #DDDDDD;
$background-grey: #EEEEEE;
$header-grey: #939393;
$link-grey: #777777;
$border-dark-grey: #999999; $border-dark-grey: #999999;
$link-grey: #777777;
$link-disabled-grey: #999999; $link-disabled-grey: #999999;
$text-grey: #999999; $text-grey: #999999;
$text-dark-grey: #666666;
$white: white; $white: white;
$black: black; $black: black;

3
app/assets/stylesheets/error_pages.css.scss
View file

@ -1,3 +1,4 @@
@import 'colors';
@import 'mixins'; @import 'mixins';
#big-number { #big-number {
@ -18,7 +19,7 @@
text-shadow: 0 1px 0 #fff; text-shadow: 0 1px 0 #fff;
font-size: 1.25em; font-size: 1.25em;
line-height: 1.5em; line-height: 1.5em;
color: #666; color: $text-dark-grey;
position: absolute; position: absolute;
left: 0; right: 0; left: 0; right: 0;
} }

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

@ -242,7 +242,7 @@ body > header {
.user-menu-item a { .user-menu-item a {
padding: 4px; padding: 4px;
height: 100%; height: 100%;
color: $header-grey; color: $text-grey;
&:hover { &:hover {
background-color: $blue; background-color: $blue;

7
app/assets/stylesheets/lightbox.css.scss
View file

@ -1,7 +1,8 @@
// 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.
@import '_mixins.css.scss'; @import 'colors';
@import 'mixins';
#lightbox{ #lightbox{
z-index: 1003; z-index: 1003;
@ -15,7 +16,7 @@
padding-top: 80px; padding-top: 80px;
padding-bottom: 20px; padding-bottom: 20px;
color: #666; color: $text-dark-grey;
text-shadow: none; text-shadow: none;
font-size: 12px; font-size: 12px;
@ -66,7 +67,7 @@
} }
#lightbox-close-link{ #lightbox-close-link{
color: #666; color: $text-dark-grey;
margin-bottom: 12px; margin-bottom: 12px;
} }
} }

3
app/assets/stylesheets/login.css.scss
View file

@ -2,6 +2,7 @@
// 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.
@import "colors";
@import "mixins"; @import "mixins";
#login { #login {
@ -51,7 +52,7 @@
position: relative; position: relative;
height: 40px; height: 40px;
top: 0px; top: 0px;
color: #666666; color: $text-dark-grey;
margin: { margin: {
bottom: 10px; bottom: 10px;
}; };

8
app/assets/stylesheets/mobile.css.scss
View file

@ -210,7 +210,7 @@ body {
.comment { .comment {
.time { .time {
color: #777; } } color: $text-dark-grey; } }
.info { .info {
margin: { margin: {
@ -615,7 +615,7 @@ select {
z-index: 2; z-index: 2;
span { span {
color: #666; color: $text-dark-grey;
font-weight: bold; font-weight: bold;
padding: 2px 7px; padding: 2px 7px;
margin: 5px 6px; margin: 5px 6px;
@ -703,7 +703,7 @@ display: inline-block;
#header-nav a { #header-nav a {
padding: 0 10px; padding: 0 10px;
width: 100%; width: 100%;
color: $header-grey; color: $text-grey;
} }
#header-nav > div { #header-nav > div {
@ -1116,7 +1116,7 @@ input#q.search {
vertical-align: bottom; vertical-align: bottom;
} }
&:hover { &:hover {
color: #666; color: $text-dark-grey;
cursor: pointer; cursor: pointer;
img { img {

4
app/assets/stylesheets/new_styles/_forms.scss
View file

@ -9,7 +9,7 @@ form.block-form {
display : inline-block; display : inline-block;
label { label {
color : #555; color : $text-dark-grey;
} }
input { input {
@ -22,7 +22,7 @@ form.block-form {
box-shadow : none; box-shadow : none;
border : none; border : none;
color : #555; color : $text-dark-grey;
} }
} }

4
app/assets/stylesheets/new_styles/_interactions.scss
View file

@ -190,7 +190,7 @@
top: 1px solid #222; top: 1px solid #222;
right: 1px solid #444; right: 1px solid #444;
left: 1px solid #444; left: 1px solid #444;
bottom: 1px solid #666; bottom: 1px solid $text-dark-grey;
} }
} }
@ -201,7 +201,7 @@
} }
time { time {
color: #666; color: $text-dark-grey;
font-size: smaller; font-size: smaller;
} }

2
app/assets/stylesheets/new_styles/_landing.scss
View file

@ -107,7 +107,7 @@
#steps { #steps {
text-align: center; text-align: center;
p { p {
color:#666; color: $text-dark-grey;
} }
} }
} }

2
app/assets/stylesheets/scaffolds.css.scss
View file

@ -18,7 +18,7 @@ pre {
a { a {
color: #000; color: #000;
&:visited { &:visited {
color: #666; } color: $text-dark-grey; }
&:hover { &:hover {
color: #fff; color: #fff;
background-color: #000; } } background-color: #000; } }