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

Merge branch 'ssrihari-fix-colors' into develop

Browse source
This commit is contained in:
Jonne Haß 2013-08-30 10:33:33 +02:00
commit 08dcc8c52d
13 changed files with 41 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -2,6 +2,7 @@
## Refactor
* 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)
## Bug fixes
* Highlight down arrow at the user menu on hover [#4441](https://github.com/diaspora/diaspora/pull/4441)

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

@ -69,7 +69,7 @@ h1, h2, h3, h4
small
:font-size small
:color #999
:color $text-grey
ul > li
:list-style none
@ -292,7 +292,7 @@ ul.as-selections
.grey,
.grey *
:color #999
:color $text-grey
.details,
.details *
@ -307,7 +307,7 @@ ul.as-selections
.via
:color #aaa
a
:color #999
:color $text-grey
:text
:decoration none
:border none
@ -334,7 +334,7 @@ ul.as-selections
:size small
:font
:weight normal
:color #999
:color $text-grey
#latest_message_time
:font-style italic
ul
@ -514,7 +514,7 @@ form p.checkbox_select
:top 6px
@mixin placeholder_styles
:color #999
:color $text-grey
:text-shadow 0 1px 1px #eee
:font-weight normal
@ -530,7 +530,7 @@ form p.checkbox_select
#publisher
:z-index 1
:color #999
:color $text-grey
:position relative
:margin
:top 0
@ -686,7 +686,7 @@ form p.checkbox_select
:background #fff
&.active
:border 1px solid #999
:border 1px solid $border-dark-grey
:position relative
:padding
@ -891,7 +891,7 @@ input[type="search"]
:top 10px
.photo_options
:color #888
:color $text-grey
:text
:align center
@ -1083,7 +1083,7 @@ ul#request_result
:right 5px
:padding 5px
:border 1px solid #999
:border 1px solid $border-dark-grey
> .name
:white-space nowrap
@ -1144,7 +1144,7 @@ ul#request_result
:font
:size 12px
:display block
:color #888
:color $text-grey
:text-shadow 0 1px 0 #fff
#mce-error-response
@ -1227,7 +1227,7 @@ ul#request_result
:margin
:top 14px
:left 540px
:color #888
:color $text-grey
ul#press_logos
@ -1341,7 +1341,7 @@ ul#press_logos
.show_comments,
.likes_container
a
:color #999
:color $text-grey
.likes
.icons-heart
@ -1769,11 +1769,11 @@ h1.tag
:color #efefef
:color $text-grey
:border
:bottom 1px dotted #999
:bottom 1px dotted $border-dark-grey
&:hover
:border
:bottom 1px solid #999
:bottom 1px solid $border-dark-grey
.diaspora_handle
:font
@ -1918,7 +1918,7 @@ h1.tag
@include box-sizing(border-box)
.subtle
:color #888
:color $text-grey
:font
:style italic
@ -2385,7 +2385,7 @@ a.toggle_selector
.tags
a
:color #999
:color $text-grey
.avatar
:height 30px
@ -2669,7 +2669,7 @@ body
:width 19px
#location
:border 1px solid #999
:border 1px solid $border-dark-grey
:height 20px
#location_address
:border none

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

@ -7,6 +7,7 @@ $border-grey: #DDDDDD;
$background-grey: #EEEEEE;
$header-grey: #939393;
$link-grey: #777777;
$border-dark-grey: #999999;
$link-disabled-grey: #999999;
$text-grey: #999999;

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

@ -104,7 +104,7 @@ body > header {
#notification_badge.active {
z-index: 10;
background-color: #fff;
border: 1px solid #888;
border: 1px solid $border-dark-grey;
border-bottom: 0px;
margin-left: 0px;
padding-bottom: 12px;
@ -114,7 +114,7 @@ body > header {
@include dropdown-shadow;
background: white;
border: solid #888 1px;
border: solid $border-dark-grey 1px;
left: 300px;
width: 380px;
display: none;
@ -235,7 +235,7 @@ body > header {
margin-top: -3px;
@include dropdown-shadow;
background-color: rgb(34,30,30);
border: 1px solid #999;
border: 1px solid $border-dark-grey;
}
}

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

@ -12,7 +12,7 @@
background-color: $background-white;
height: 70px;
border: 1px solid #999999;
border: 1px solid $border-dark-grey;
font-size: small;
.avatar {

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

@ -33,7 +33,7 @@
z-index: 10000;
ul {
border: 1px solid #999;
border: 1px solid $border-dark-grey;
margin: 0;
padding: 0;

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

@ -392,7 +392,7 @@ footer {
text-align: center;
a,
a:visited {
color: #999;
color: $text-grey;
margin: 10px;
}
padding: {
@ -422,7 +422,7 @@ footer {
> a,
.show_comments {
@include transition(color);
color: #999;
color: $text-grey;
font-weight: bold;
}
@ -433,7 +433,7 @@ footer {
}
a.show_comments {
color: #999;
color: $text-grey;
&.active:not(.bottom_collapse) {
color: #444;
@ -574,7 +574,7 @@ footer {
background-color: #fff;
padding: 5px;
border: {
bottom: 1px solid #999;
bottom: 1px solid $border-dark-grey;
}
.counter {
font-size: 14px;
@ -799,7 +799,7 @@ textarea#message_text {
form#new_conversation.new_conversation {
background-color: #FFFFFF;
border-bottom: 1px solid #999999;
border-bottom: 1px solid $border-dark-grey;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
border-radius: 5px;
margin: 5px 0 5px 15px;
@ -1155,7 +1155,7 @@ input#q.search {
background: #fff;
&.active {
border: 1px solid #999;
border: 1px solid $border-dark-grey;
}
position: relative;
padding-right: 10px;

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

@ -35,7 +35,7 @@ form.block-form {
background-color : #fff;
border : 1px solid #888;
border : 1px solid $border-dark-grey;
input[type=text],
input[type=email],
@ -95,8 +95,8 @@ form.block-form {
@include box-shadow(0, 1px, 2px, rgba(0,0,0,0));
background-color : rgb(233,233,233);
color : #888;
border : 1px solid #888;
color : $text-grey;
border : 1px solid $border-dark-grey;
//font-family : Roboto-Bold;
font-size : 14px;
@ -109,4 +109,4 @@ form.block-form {
&:active {
box-shadow : inset 0 1px 3px rgba(0,0,0,0.3), 0 1px 2px rgba(255,255,255,0.7);
}
}
}

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

@ -31,7 +31,7 @@
background : #99CC00;
color : #fff;
text-shadow : 0 -1px 0 #669900;
border : 1px solid #999;
border : 1px solid $border-dark-grey;
&:hover {
background : desaturate(#99CC00, 15%);
@ -98,7 +98,7 @@
&:hover {
background:#222;
border:1px solid #999;
border:1px solid $border-dark-grey;
text-decoration:none;
}
}

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

@ -22,7 +22,7 @@
#forgot_password_link {
margin : 40px;
color : #999;
color : $text-grey;
clear : all;
}
}

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

@ -122,7 +122,7 @@ form p {
}
label {
color: $text-grey;
color: #999;
position: absolute;
padding-top: 7px;
left: 8px;

4
app/assets/stylesheets/ui.css.scss
View file

@ -123,7 +123,7 @@ input.button {
padding: 4px 0;
margin-top: 2px;
background-color: #fff;
border: 1px solid #999;
border: 1px solid $border-dark-grey;
ul {
@include user-select(none);
@ -175,7 +175,7 @@ input.button {
&.newItem {
a {
color: #999;
color: $text-grey;
font-style: italic;
&:hover {

2
app/assets/stylesheets/vendor/facebox.css vendored
View file

@ -8,7 +8,7 @@
#facebox .popup{
position:relative;
border:1px solid #888;
border:1px solid #999;
-webkit-border-radius:2px;
-moz-border-radius:2px;
border-radius:2px;