Merge pull request #3984 from movilla/frienliar_new_conversation

Friendlier new conversation mobile
This commit is contained in:
Jonne Haß 2013-02-17 06:44:59 -08:00
commit 4264804343
2 changed files with 78 additions and 19 deletions

View file

@ -36,7 +36,8 @@
* Add settings web mobile. [#3701](https://github.com/diaspora/diaspora/pull/3701) * Add settings web mobile. [#3701](https://github.com/diaspora/diaspora/pull/3701)
* Stream form on profile page [#3910](https://github.com/diaspora/diaspora/issues/3910). * Stream form on profile page [#3910](https://github.com/diaspora/diaspora/issues/3910).
* Add Getting_Started page mobile. [#3949](https://github.com/diaspora/diaspora/issues/3949). * Add Getting_Started page mobile. [#3949](https://github.com/diaspora/diaspora/issues/3949).
* Autoscroll to the first unread message in conversations [#3216](https://github.com/diaspora/diaspora/issues/3216) * Autoscroll to the first unread message in conversations. [#3216](https://github.com/diaspora/diaspora/issues/3216)
* Friendlier new-conversation mobile. [#3984](https://github.com/diaspora/diaspora/issues/3984)
## Bug Fixes ## Bug Fixes

View file

@ -756,11 +756,20 @@ textarea#message_text {
} }
form#new_conversation.new_conversation { form#new_conversation.new_conversation {
background-color: #FFFFFF; background-color: #FFFFFF;
border-bottom: 1px solid #999999; border-bottom: 1px solid #999999;
box-shadow: 0 2px 3px #999999; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
margin: 5px 20px; border-radius: 5px;
padding: 5px; margin: 5px 0 5px 15px;
padding: 5px 10px;
h4 {
font-size: 14px;
font-weight: normal;
line-height: 20px;
}
.span-10 {
margin: 5px;
}
} }
.span-2 { .span-2 {
@ -783,25 +792,74 @@ textarea#conversation_text {
} }
.bottom_submit_section { .bottom_submit_section {
display: block; display: block;
position: relative; position: relative;
text-align: right; text-align: right;
padding-bottom: 5px;
} }
.button.creation { .button.creation {
color: #333; display: inline-block;
padding: 4px 12px;
margin-bottom: 0;
font-size: 14px;
line-height: 20px;
color: #333333;
text-align: center;
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
vertical-align: middle;
cursor: pointer;
background-color: #f5f5f5;
background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
background-repeat: repeat-x;
border: 1px solid #cccccc;
border-color: #e6e6e6 #e6e6e6 #bfbfbf;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
border-bottom-color: #b3b3b3;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
}
.button.creation:hover,
.button.creation:focus,
.button.creation:active {
color: #333333;
background-color: #e6e6e6;
}
.button.creation:active {
background-color: #cccccc \9;
}
.button.creation:first-child {
margin-left: 0;
}
.button.creation:hover,
.button.creation:focus {
color: #333333;
text-decoration: none; text-decoration: none;
background-color: #E6E6E6;
background-position: 0 -15px; background-position: 0 -15px;
-webkit-transition: background-position 0.1s linear; -webkit-transition: background-position 0.1s linear;
-webkit-transition-property: background-position; -moz-transition: background-position 0.1s linear;
-webkit-transition-duration: 0.1s; -o-transition: background-position 0.1s linear;
-webkit-transition-timing-function: linear; transition: background-position 0.1s linear;
-webkit-transition-delay: initial; }
-moz-transition: background-position 0.1s linear;
-ms-transition: background-position 0.1s linear; .button.creation:focus {
-o-transition: background-position 0.1s linear; outline: thin dotted #333;
transition: background-position 0.1s linear; outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
} }
.registrations_error, .registrations_error,