com web/php: Merge branch 'notes' into contrast: styles/theme-base.css
| From: | Levi Morrison | Date: | Thu, 08 May 2014 02:58:28 +0000 |
| Subject: | com web/php: Merge branch 'notes' into contrast: styles/theme-base.css | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-18853@lists.php.net to get a copy of this message | ||
Commit: 3cdad363a51b292ca589a056d4378db7da43b73e
Author: Levi Morrison <levim@php.net> Wed, 7 May 2014 20:58:28 -0600
Parents: 6af4451a10dc2b790fba1d999c048ca6b88cd576 0a38599a5d11dea22c80f804b3d7e49365a8929a
Branches: master
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=3cdad363a51b292ca589a056d4378db7da43b73e
Log:
Merge branch 'notes' into contrast
* notes:
'add a note' now shows up (was accidentally hidden); also fixed add-note.php layout
announcement for php 5.6.0beta2
5.4.28
5.4.28
5.5.12 release
Updated distributions
Changed paths:
MM styles/theme-base.css
Diff:
diff --cc styles/theme-base.css
index 3bffb06,c27d43c..53e9551
--- a/styles/theme-base.css
+++ b/styles/theme-base.css
@@@ -1730,62 -1773,17 +1731,8 @@@ aside.tips div.inner
border:0;
background:inherit;
}
-.panel .body {
- background-color: #fff;
- border-top:1px solid #C4C9DF;
- border-radius: 0 0 2px 2px;
-}
-.panel .body:first-child {
- border-top:0;
-}
-
/* }}} */
- /* {{{ Adjustments for add-note.php animations */
- #add-note-usernotes
- {
- overflow: hidden;
- position: relative;
- height: 400px;
- }
-
- #add-note-usernotes .shadow
- {
- box-shadow: inset -10px 0 5px -5px rgba(0, 0, 0, 0.1);
- width:3%;
- height: 100%;
- position:absolute;
- float:right;
- z-index:1;
- left: 97%;
- }
-
- #add-note-usernotes li
- {
- margin-bottom: 1rem;
- }
-
- #add-note-usernotes #usernotes {
- position: relative;
- margin: 1rem 0 1rem 100px;
- }
-
- #whatnottoenter strong
- {
- display: block;
- text-align: left;
- }
-
- #whatnottoenter div, #add-note-usernotes li
- {
- text-align: justify;
- }
-
- #whatnottoenter div.row-fluid
- {
- margin-bottom: 1rem;
- }
-
- #whatnottoenter strong:before{
- color: #333366;
- content: '•';
- position: absolute;
- font-size: 2rem;
- margin: -0.5rem 0 0 -0.5rem;
- }
- /* }}} */
-
/* {{{ Flash message */
#flash-message {
height: auto;